diff --git a/.gitignore b/.gitignore
index 46ed53e46cb..8622eb8484c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,6 +29,9 @@ Servo.app
 capture_webrender/
 /screenshots
 
+# Allow CSV files to be used as resources in tests
+!/tests/**/*.csv
+
 # Editors
 ## IntelliJ
 .idea
diff --git a/tests/wpt/meta-legacy-layout/WebCryptoAPI/import_export/ec_importKey.https.any.js.ini b/tests/wpt/meta-legacy-layout/WebCryptoAPI/import_export/ec_importKey.https.any.js.ini
index ccb45e9861d..b3b3f10b250 100644
--- a/tests/wpt/meta-legacy-layout/WebCryptoAPI/import_export/ec_importKey.https.any.js.ini
+++ b/tests/wpt/meta-legacy-layout/WebCryptoAPI/import_export/ec_importKey.https.any.js.ini
@@ -395,6 +395,258 @@
   [Empty Usages: P-521 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-521}, false, [\])]
     expected: FAIL
 
+  [Good parameters: P-256 bits (spki, buffer(91), {name: ECDSA, namedCurve: P-256}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (spki, buffer(59, compressed), {name: ECDSA, namedCurve: P-256}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (jwk, object(kty, crv, x, y), {name: ECDSA, namedCurve: P-256}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (raw, buffer(65), {name: ECDSA, namedCurve: P-256}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (raw, buffer(33, compressed), {name: ECDSA, namedCurve: P-256}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (spki, buffer(91), {name: ECDSA, namedCurve: P-256}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (spki, buffer(59, compressed), {name: ECDSA, namedCurve: P-256}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (jwk, object(kty, crv, x, y), {name: ECDSA, namedCurve: P-256}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (raw, buffer(65), {name: ECDSA, namedCurve: P-256}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (raw, buffer(33, compressed), {name: ECDSA, namedCurve: P-256}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (pkcs8, buffer(138), {name: ECDSA, namedCurve: P-256}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (jwk, object(kty, crv, x, y, d), {name: ECDSA, namedCurve: P-256}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (spki, buffer(91), {name: ECDSA, namedCurve: P-256}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (spki, buffer(59, compressed), {name: ECDSA, namedCurve: P-256}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (jwk, object(kty, crv, x, y), {name: ECDSA, namedCurve: P-256}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (raw, buffer(65), {name: ECDSA, namedCurve: P-256}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (raw, buffer(33, compressed), {name: ECDSA, namedCurve: P-256}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (spki, buffer(91), {name: ECDSA, namedCurve: P-256}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (spki, buffer(59, compressed), {name: ECDSA, namedCurve: P-256}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (jwk, object(kty, crv, x, y), {name: ECDSA, namedCurve: P-256}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (raw, buffer(65), {name: ECDSA, namedCurve: P-256}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (raw, buffer(33, compressed), {name: ECDSA, namedCurve: P-256}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (pkcs8, buffer(138), {name: ECDSA, namedCurve: P-256}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (jwk, object(kty, crv, x, y, d), {name: ECDSA, namedCurve: P-256}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (spki, buffer(120), {name: ECDSA, namedCurve: P-384}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (spki, buffer(72, compressed), {name: ECDSA, namedCurve: P-384}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (jwk, object(kty, crv, x, y), {name: ECDSA, namedCurve: P-384}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (raw, buffer(97), {name: ECDSA, namedCurve: P-384}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (raw, buffer(49, compressed), {name: ECDSA, namedCurve: P-384}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (spki, buffer(120), {name: ECDSA, namedCurve: P-384}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (spki, buffer(72, compressed), {name: ECDSA, namedCurve: P-384}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (jwk, object(kty, crv, x, y), {name: ECDSA, namedCurve: P-384}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (raw, buffer(97), {name: ECDSA, namedCurve: P-384}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (raw, buffer(49, compressed), {name: ECDSA, namedCurve: P-384}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (pkcs8, buffer(185), {name: ECDSA, namedCurve: P-384}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (jwk, object(kty, crv, x, y, d), {name: ECDSA, namedCurve: P-384}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (spki, buffer(120), {name: ECDSA, namedCurve: P-384}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (spki, buffer(72, compressed), {name: ECDSA, namedCurve: P-384}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (jwk, object(kty, crv, x, y), {name: ECDSA, namedCurve: P-384}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (raw, buffer(97), {name: ECDSA, namedCurve: P-384}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (raw, buffer(49, compressed), {name: ECDSA, namedCurve: P-384}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (spki, buffer(120), {name: ECDSA, namedCurve: P-384}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (spki, buffer(72, compressed), {name: ECDSA, namedCurve: P-384}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (jwk, object(kty, crv, x, y), {name: ECDSA, namedCurve: P-384}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (raw, buffer(97), {name: ECDSA, namedCurve: P-384}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (raw, buffer(49, compressed), {name: ECDSA, namedCurve: P-384}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (pkcs8, buffer(185), {name: ECDSA, namedCurve: P-384}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (jwk, object(kty, crv, x, y, d), {name: ECDSA, namedCurve: P-384}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (spki, buffer(158), {name: ECDSA, namedCurve: P-521}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (spki, buffer(90, compressed), {name: ECDSA, namedCurve: P-521}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (jwk, object(kty, crv, x, y), {name: ECDSA, namedCurve: P-521}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (raw, buffer(133), {name: ECDSA, namedCurve: P-521}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (raw, buffer(67, compressed), {name: ECDSA, namedCurve: P-521}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (spki, buffer(158), {name: ECDSA, namedCurve: P-521}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (spki, buffer(90, compressed), {name: ECDSA, namedCurve: P-521}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (jwk, object(kty, crv, x, y), {name: ECDSA, namedCurve: P-521}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (raw, buffer(133), {name: ECDSA, namedCurve: P-521}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (raw, buffer(67, compressed), {name: ECDSA, namedCurve: P-521}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (pkcs8, buffer(241), {name: ECDSA, namedCurve: P-521}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (jwk, object(kty, crv, x, y, d), {name: ECDSA, namedCurve: P-521}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (spki, buffer(158), {name: ECDSA, namedCurve: P-521}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (spki, buffer(90, compressed), {name: ECDSA, namedCurve: P-521}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (jwk, object(kty, crv, x, y), {name: ECDSA, namedCurve: P-521}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (raw, buffer(133), {name: ECDSA, namedCurve: P-521}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (raw, buffer(67, compressed), {name: ECDSA, namedCurve: P-521}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (spki, buffer(158), {name: ECDSA, namedCurve: P-521}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (spki, buffer(90, compressed), {name: ECDSA, namedCurve: P-521}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (jwk, object(kty, crv, x, y), {name: ECDSA, namedCurve: P-521}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (raw, buffer(133), {name: ECDSA, namedCurve: P-521}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (raw, buffer(67, compressed), {name: ECDSA, namedCurve: P-521}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (pkcs8, buffer(241), {name: ECDSA, namedCurve: P-521}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (jwk, object(kty, crv, x, y, d), {name: ECDSA, namedCurve: P-521}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (pkcs8, buffer(138), {name: ECDH, namedCurve: P-256}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-256}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (pkcs8, buffer(138), {name: ECDH, namedCurve: P-256}, false, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-256}, false, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (pkcs8, buffer(185), {name: ECDH, namedCurve: P-384}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-384}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (pkcs8, buffer(185), {name: ECDH, namedCurve: P-384}, false, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-384}, false, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (pkcs8, buffer(241), {name: ECDH, namedCurve: P-521}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-521}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (pkcs8, buffer(241), {name: ECDH, namedCurve: P-521}, false, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-521}, false, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
 
 [ec_importKey.https.any.worker.html]
   [Good parameters: P-256 bits (spki, buffer(91), {name: ECDSA, namedCurve: P-256}, true, [\])]
@@ -792,3 +1044,255 @@
 
   [Empty Usages: P-521 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-521}, false, [\])]
     expected: FAIL
+
+  [Good parameters: P-256 bits (spki, buffer(91), {name: ECDSA, namedCurve: P-256}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (spki, buffer(59, compressed), {name: ECDSA, namedCurve: P-256}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (jwk, object(kty, crv, x, y), {name: ECDSA, namedCurve: P-256}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (raw, buffer(65), {name: ECDSA, namedCurve: P-256}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (raw, buffer(33, compressed), {name: ECDSA, namedCurve: P-256}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (spki, buffer(91), {name: ECDSA, namedCurve: P-256}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (spki, buffer(59, compressed), {name: ECDSA, namedCurve: P-256}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (jwk, object(kty, crv, x, y), {name: ECDSA, namedCurve: P-256}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (raw, buffer(65), {name: ECDSA, namedCurve: P-256}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (raw, buffer(33, compressed), {name: ECDSA, namedCurve: P-256}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (pkcs8, buffer(138), {name: ECDSA, namedCurve: P-256}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (jwk, object(kty, crv, x, y, d), {name: ECDSA, namedCurve: P-256}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (spki, buffer(91), {name: ECDSA, namedCurve: P-256}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (spki, buffer(59, compressed), {name: ECDSA, namedCurve: P-256}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (jwk, object(kty, crv, x, y), {name: ECDSA, namedCurve: P-256}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (raw, buffer(65), {name: ECDSA, namedCurve: P-256}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (raw, buffer(33, compressed), {name: ECDSA, namedCurve: P-256}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (spki, buffer(91), {name: ECDSA, namedCurve: P-256}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (spki, buffer(59, compressed), {name: ECDSA, namedCurve: P-256}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (jwk, object(kty, crv, x, y), {name: ECDSA, namedCurve: P-256}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (raw, buffer(65), {name: ECDSA, namedCurve: P-256}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (raw, buffer(33, compressed), {name: ECDSA, namedCurve: P-256}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (pkcs8, buffer(138), {name: ECDSA, namedCurve: P-256}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (jwk, object(kty, crv, x, y, d), {name: ECDSA, namedCurve: P-256}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (spki, buffer(120), {name: ECDSA, namedCurve: P-384}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (spki, buffer(72, compressed), {name: ECDSA, namedCurve: P-384}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (jwk, object(kty, crv, x, y), {name: ECDSA, namedCurve: P-384}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (raw, buffer(97), {name: ECDSA, namedCurve: P-384}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (raw, buffer(49, compressed), {name: ECDSA, namedCurve: P-384}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (spki, buffer(120), {name: ECDSA, namedCurve: P-384}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (spki, buffer(72, compressed), {name: ECDSA, namedCurve: P-384}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (jwk, object(kty, crv, x, y), {name: ECDSA, namedCurve: P-384}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (raw, buffer(97), {name: ECDSA, namedCurve: P-384}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (raw, buffer(49, compressed), {name: ECDSA, namedCurve: P-384}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (pkcs8, buffer(185), {name: ECDSA, namedCurve: P-384}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (jwk, object(kty, crv, x, y, d), {name: ECDSA, namedCurve: P-384}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (spki, buffer(120), {name: ECDSA, namedCurve: P-384}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (spki, buffer(72, compressed), {name: ECDSA, namedCurve: P-384}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (jwk, object(kty, crv, x, y), {name: ECDSA, namedCurve: P-384}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (raw, buffer(97), {name: ECDSA, namedCurve: P-384}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (raw, buffer(49, compressed), {name: ECDSA, namedCurve: P-384}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (spki, buffer(120), {name: ECDSA, namedCurve: P-384}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (spki, buffer(72, compressed), {name: ECDSA, namedCurve: P-384}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (jwk, object(kty, crv, x, y), {name: ECDSA, namedCurve: P-384}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (raw, buffer(97), {name: ECDSA, namedCurve: P-384}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (raw, buffer(49, compressed), {name: ECDSA, namedCurve: P-384}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (pkcs8, buffer(185), {name: ECDSA, namedCurve: P-384}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (jwk, object(kty, crv, x, y, d), {name: ECDSA, namedCurve: P-384}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (spki, buffer(158), {name: ECDSA, namedCurve: P-521}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (spki, buffer(90, compressed), {name: ECDSA, namedCurve: P-521}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (jwk, object(kty, crv, x, y), {name: ECDSA, namedCurve: P-521}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (raw, buffer(133), {name: ECDSA, namedCurve: P-521}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (raw, buffer(67, compressed), {name: ECDSA, namedCurve: P-521}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (spki, buffer(158), {name: ECDSA, namedCurve: P-521}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (spki, buffer(90, compressed), {name: ECDSA, namedCurve: P-521}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (jwk, object(kty, crv, x, y), {name: ECDSA, namedCurve: P-521}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (raw, buffer(133), {name: ECDSA, namedCurve: P-521}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (raw, buffer(67, compressed), {name: ECDSA, namedCurve: P-521}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (pkcs8, buffer(241), {name: ECDSA, namedCurve: P-521}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (jwk, object(kty, crv, x, y, d), {name: ECDSA, namedCurve: P-521}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (spki, buffer(158), {name: ECDSA, namedCurve: P-521}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (spki, buffer(90, compressed), {name: ECDSA, namedCurve: P-521}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (jwk, object(kty, crv, x, y), {name: ECDSA, namedCurve: P-521}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (raw, buffer(133), {name: ECDSA, namedCurve: P-521}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (raw, buffer(67, compressed), {name: ECDSA, namedCurve: P-521}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (spki, buffer(158), {name: ECDSA, namedCurve: P-521}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (spki, buffer(90, compressed), {name: ECDSA, namedCurve: P-521}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (jwk, object(kty, crv, x, y), {name: ECDSA, namedCurve: P-521}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (raw, buffer(133), {name: ECDSA, namedCurve: P-521}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (raw, buffer(67, compressed), {name: ECDSA, namedCurve: P-521}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (pkcs8, buffer(241), {name: ECDSA, namedCurve: P-521}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (jwk, object(kty, crv, x, y, d), {name: ECDSA, namedCurve: P-521}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (pkcs8, buffer(138), {name: ECDH, namedCurve: P-256}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-256}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (pkcs8, buffer(138), {name: ECDH, namedCurve: P-256}, false, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-256}, false, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (pkcs8, buffer(185), {name: ECDH, namedCurve: P-384}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-384}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (pkcs8, buffer(185), {name: ECDH, namedCurve: P-384}, false, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-384}, false, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (pkcs8, buffer(241), {name: ECDH, namedCurve: P-521}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-521}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (pkcs8, buffer(241), {name: ECDH, namedCurve: P-521}, false, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-521}, false, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/WebCryptoAPI/import_export/okp_importKey.https.any.js.ini b/tests/wpt/meta-legacy-layout/WebCryptoAPI/import_export/okp_importKey.https.any.js.ini
index f438158dae8..ed0fd4312df 100644
--- a/tests/wpt/meta-legacy-layout/WebCryptoAPI/import_export/okp_importKey.https.any.js.ini
+++ b/tests/wpt/meta-legacy-layout/WebCryptoAPI/import_export/okp_importKey.https.any.js.ini
@@ -167,6 +167,126 @@
   [Good parameters: X448 bits (raw, buffer(56), {name: X448}, false, [\])]
     expected: FAIL
 
+  [Good parameters: Ed25519 bits (spki, buffer(44), {name: Ed25519}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (jwk, object(kty, crv, x), {name: Ed25519}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (raw, buffer(32), {name: Ed25519}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (spki, buffer(44), {name: Ed25519}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (jwk, object(kty, crv, x), {name: Ed25519}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (raw, buffer(32), {name: Ed25519}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (pkcs8, buffer(48), {name: Ed25519}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (jwk, object(crv, d, x, kty), {name: Ed25519}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (spki, buffer(44), {name: Ed25519}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (jwk, object(kty, crv, x), {name: Ed25519}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (raw, buffer(32), {name: Ed25519}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (spki, buffer(44), {name: Ed25519}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (jwk, object(kty, crv, x), {name: Ed25519}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (raw, buffer(32), {name: Ed25519}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (pkcs8, buffer(48), {name: Ed25519}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (jwk, object(crv, d, x, kty), {name: Ed25519}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (spki, buffer(69), {name: Ed448}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (jwk, object(kty, crv, x), {name: Ed448}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (raw, buffer(57), {name: Ed448}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (spki, buffer(69), {name: Ed448}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (jwk, object(kty, crv, x), {name: Ed448}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (raw, buffer(57), {name: Ed448}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (pkcs8, buffer(73), {name: Ed448}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (jwk, object(crv, d, x, kty), {name: Ed448}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (spki, buffer(69), {name: Ed448}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (jwk, object(kty, crv, x), {name: Ed448}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (raw, buffer(57), {name: Ed448}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (spki, buffer(69), {name: Ed448}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (jwk, object(kty, crv, x), {name: Ed448}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (raw, buffer(57), {name: Ed448}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (pkcs8, buffer(73), {name: Ed448}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (jwk, object(crv, d, x, kty), {name: Ed448}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (pkcs8, buffer(48), {name: X25519}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (jwk, object(crv, d, x, kty), {name: X25519}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (pkcs8, buffer(48), {name: X25519}, false, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (jwk, object(crv, d, x, kty), {name: X25519}, false, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (pkcs8, buffer(72), {name: X448}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (jwk, object(crv, d, x, kty), {name: X448}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (pkcs8, buffer(72), {name: X448}, false, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (jwk, object(crv, d, x, kty), {name: X448}, false, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
 
 [okp_importKey.https.any.worker.html]
   [Good parameters: Ed25519 bits (spki, buffer(44), {name: Ed25519}, true, [\])]
@@ -336,3 +456,123 @@
 
   [Good parameters: X448 bits (raw, buffer(56), {name: X448}, false, [\])]
     expected: FAIL
+
+  [Good parameters: Ed25519 bits (spki, buffer(44), {name: Ed25519}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (jwk, object(kty, crv, x), {name: Ed25519}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (raw, buffer(32), {name: Ed25519}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (spki, buffer(44), {name: Ed25519}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (jwk, object(kty, crv, x), {name: Ed25519}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (raw, buffer(32), {name: Ed25519}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (pkcs8, buffer(48), {name: Ed25519}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (jwk, object(crv, d, x, kty), {name: Ed25519}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (spki, buffer(44), {name: Ed25519}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (jwk, object(kty, crv, x), {name: Ed25519}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (raw, buffer(32), {name: Ed25519}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (spki, buffer(44), {name: Ed25519}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (jwk, object(kty, crv, x), {name: Ed25519}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (raw, buffer(32), {name: Ed25519}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (pkcs8, buffer(48), {name: Ed25519}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (jwk, object(crv, d, x, kty), {name: Ed25519}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (spki, buffer(69), {name: Ed448}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (jwk, object(kty, crv, x), {name: Ed448}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (raw, buffer(57), {name: Ed448}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (spki, buffer(69), {name: Ed448}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (jwk, object(kty, crv, x), {name: Ed448}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (raw, buffer(57), {name: Ed448}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (pkcs8, buffer(73), {name: Ed448}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (jwk, object(crv, d, x, kty), {name: Ed448}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (spki, buffer(69), {name: Ed448}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (jwk, object(kty, crv, x), {name: Ed448}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (raw, buffer(57), {name: Ed448}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (spki, buffer(69), {name: Ed448}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (jwk, object(kty, crv, x), {name: Ed448}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (raw, buffer(57), {name: Ed448}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (pkcs8, buffer(73), {name: Ed448}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (jwk, object(crv, d, x, kty), {name: Ed448}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (pkcs8, buffer(48), {name: X25519}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (jwk, object(crv, d, x, kty), {name: X25519}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (pkcs8, buffer(48), {name: X25519}, false, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (jwk, object(crv, d, x, kty), {name: X25519}, false, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (pkcs8, buffer(72), {name: X448}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (jwk, object(crv, d, x, kty), {name: X448}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (pkcs8, buffer(72), {name: X448}, false, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (jwk, object(crv, d, x, kty), {name: X448}, false, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/WebCryptoAPI/import_export/rsa_importKey.https.any.js.ini b/tests/wpt/meta-legacy-layout/WebCryptoAPI/import_export/rsa_importKey.https.any.js.ini
index 624406cac27..125e9c19504 100644
--- a/tests/wpt/meta-legacy-layout/WebCryptoAPI/import_export/rsa_importKey.https.any.js.ini
+++ b/tests/wpt/meta-legacy-layout/WebCryptoAPI/import_export/rsa_importKey.https.any.js.ini
@@ -1871,6 +1871,1302 @@
   [Empty Usages: 4096 bits (jwk, object(spki, pkcs8, jwk), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, false, [\])]
     expected: FAIL
 
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-1, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-1, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-1, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-1, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-1, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-1, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-1, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-1, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-256, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-256, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-256, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-256, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-256, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-256, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-256, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-256, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-384, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-384, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-384, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-384, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-384, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-384, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-384, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-384, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-512, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-512, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-512, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-512, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-512, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-512, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-512, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-512, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-1, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-1, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-1, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-1, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-1, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-1, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-1, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-1, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-256, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-256, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-256, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-256, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-256, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-256, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-256, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-256, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-384, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-384, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-384, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-384, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-384, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-384, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-384, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-384, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-512, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-512, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-512, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-512, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-512, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-512, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-512, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-512, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-1, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-1, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-1, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-1, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-1, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-1, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-1, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-1, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-256, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-256, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-256, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-256, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-256, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-256, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-256, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-256, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-384, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-384, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-384, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-384, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-384, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-384, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-384, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-384, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-512, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-512, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-512, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-512, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-512, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-512, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-512, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-512, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-1, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-1, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-1, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-1, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-1, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-1, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-1, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-1, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-256, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-256, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-256, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-256, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-256, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-256, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-256, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-256, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-384, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-384, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-384, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-384, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-384, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-384, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-384, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-384, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-512, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-512, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-512, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-512, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-512, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-512, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-512, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-512, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-1, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-1, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-1, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-1, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-1, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-1, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-1, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-1, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-256, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-256, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-256, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-256, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-256, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-256, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-256, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-256, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-384, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-384, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-384, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-384, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-384, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-384, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-384, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-384, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-512, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-512, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-512, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-512, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-512, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-512, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-512, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-512, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-1, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-1, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-1, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-1, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-1, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-1, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-1, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-1, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-256, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-256, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-256, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-256, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-256, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-256, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-256, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-256, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-384, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-384, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-384, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-384, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-384, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-384, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-384, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-384, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-512, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-512, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-512, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-512, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-512, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-512, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-512, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-512, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
 
 [rsa_importKey.https.any.html]
   [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-1, name: RSA-OAEP}, true, [encrypt\])]
@@ -3744,3 +5040,1299 @@
 
   [Empty Usages: 4096 bits (jwk, object(spki, pkcs8, jwk), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, false, [\])]
     expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-1, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-1, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-1, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-1, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-1, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-1, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-1, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-1, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-256, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-256, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-256, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-256, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-256, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-256, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-256, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-256, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-384, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-384, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-384, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-384, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-384, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-384, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-384, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-384, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-512, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-512, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-512, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-512, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-512, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-512, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-512, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-512, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-1, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-1, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-1, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-1, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-1, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-1, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-1, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-1, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-256, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-256, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-256, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-256, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-256, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-256, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-256, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-256, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-384, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-384, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-384, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-384, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-384, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-384, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-384, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-384, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-512, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-512, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-512, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-512, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-512, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-512, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-512, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-512, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-1, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-1, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-1, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-1, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-1, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-1, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-1, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-1, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-256, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-256, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-256, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-256, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-256, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-256, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-256, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-256, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-384, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-384, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-384, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-384, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-384, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-384, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-384, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-384, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-512, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-512, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-512, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-512, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-512, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-512, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-512, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-512, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-1, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-1, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-1, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-1, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-1, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-1, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-1, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-1, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-256, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-256, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-256, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-256, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-256, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-256, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-256, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-256, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-384, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-384, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-384, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-384, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-384, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-384, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-384, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-384, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-512, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-512, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-512, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-512, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-512, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-512, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-512, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-512, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-1, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-1, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-1, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-1, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-1, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-1, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-1, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-1, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-256, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-256, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-256, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-256, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-256, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-256, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-256, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-256, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-384, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-384, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-384, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-384, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-384, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-384, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-384, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-384, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-512, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-512, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-512, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-512, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-512, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-512, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-512, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-512, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-1, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-1, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-1, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-1, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-1, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-1, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-1, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-1, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-256, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-256, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-256, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-256, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-256, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-256, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-256, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-256, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-384, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-384, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-384, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-384, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-384, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-384, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-384, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-384, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-512, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-512, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-512, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-512, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-512, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-512, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-512, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-512, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/WebCryptoAPI/import_export/symmetric_importKey.https.any.js.ini b/tests/wpt/meta-legacy-layout/WebCryptoAPI/import_export/symmetric_importKey.https.any.js.ini
index 49374f9470a..47bb9113415 100644
--- a/tests/wpt/meta-legacy-layout/WebCryptoAPI/import_export/symmetric_importKey.https.any.js.ini
+++ b/tests/wpt/meta-legacy-layout/WebCryptoAPI/import_export/symmetric_importKey.https.any.js.ini
@@ -935,6 +935,240 @@
   [Empty Usages: 256 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 24: 25, 25: 26, 26: 27, 27: 28, 28: 29, 29: 30, 3: 4, 30: 31, 31: 32, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: PBKDF2}, false, [\])]
     expected: FAIL
 
+  [Good parameters: 128 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 2: 3, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-CTR}, true, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (jwk, {alg: A128CTR, k: AQIDBAUGBwgJCgsMDQ4PEA, kty: oct}, {name: AES-CTR}, true, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 2: 3, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-CTR}, false, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (jwk, {alg: A128CTR, k: AQIDBAUGBwgJCgsMDQ4PEA, kty: oct}, {name: AES-CTR}, false, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-CTR}, true, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (jwk, {alg: A192CTR, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcY, kty: oct}, {name: AES-CTR}, true, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-CTR}, false, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (jwk, {alg: A192CTR, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcY, kty: oct}, {name: AES-CTR}, false, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 24: 25, 25: 26, 26: 27, 27: 28, 28: 29, 29: 30, 3: 4, 30: 31, 31: 32, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-CTR}, true, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (jwk, {alg: A256CTR, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eHyA, kty: oct}, {name: AES-CTR}, true, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 24: 25, 25: 26, 26: 27, 27: 28, 28: 29, 29: 30, 3: 4, 30: 31, 31: 32, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-CTR}, false, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (jwk, {alg: A256CTR, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eHyA, kty: oct}, {name: AES-CTR}, false, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 2: 3, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-CBC}, true, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (jwk, {alg: A128CBC, k: AQIDBAUGBwgJCgsMDQ4PEA, kty: oct}, {name: AES-CBC}, true, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 2: 3, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-CBC}, false, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (jwk, {alg: A128CBC, k: AQIDBAUGBwgJCgsMDQ4PEA, kty: oct}, {name: AES-CBC}, false, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-CBC}, true, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (jwk, {alg: A192CBC, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcY, kty: oct}, {name: AES-CBC}, true, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-CBC}, false, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (jwk, {alg: A192CBC, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcY, kty: oct}, {name: AES-CBC}, false, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 24: 25, 25: 26, 26: 27, 27: 28, 28: 29, 29: 30, 3: 4, 30: 31, 31: 32, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-CBC}, true, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (jwk, {alg: A256CBC, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eHyA, kty: oct}, {name: AES-CBC}, true, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 24: 25, 25: 26, 26: 27, 27: 28, 28: 29, 29: 30, 3: 4, 30: 31, 31: 32, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-CBC}, false, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (jwk, {alg: A256CBC, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eHyA, kty: oct}, {name: AES-CBC}, false, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 2: 3, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-GCM}, true, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (jwk, {alg: A128GCM, k: AQIDBAUGBwgJCgsMDQ4PEA, kty: oct}, {name: AES-GCM}, true, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 2: 3, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-GCM}, false, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (jwk, {alg: A128GCM, k: AQIDBAUGBwgJCgsMDQ4PEA, kty: oct}, {name: AES-GCM}, false, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-GCM}, true, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (jwk, {alg: A192GCM, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcY, kty: oct}, {name: AES-GCM}, true, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-GCM}, false, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (jwk, {alg: A192GCM, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcY, kty: oct}, {name: AES-GCM}, false, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 24: 25, 25: 26, 26: 27, 27: 28, 28: 29, 29: 30, 3: 4, 30: 31, 31: 32, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-GCM}, true, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (jwk, {alg: A256GCM, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eHyA, kty: oct}, {name: AES-GCM}, true, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 24: 25, 25: 26, 26: 27, 27: 28, 28: 29, 29: 30, 3: 4, 30: 31, 31: 32, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-GCM}, false, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (jwk, {alg: A256GCM, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eHyA, kty: oct}, {name: AES-GCM}, false, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 2: 3, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-KW}, true, [wrapKey, unwrapKey, wrapKey, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (jwk, {alg: A128KW, k: AQIDBAUGBwgJCgsMDQ4PEA, kty: oct}, {name: AES-KW}, true, [wrapKey, unwrapKey, wrapKey, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 2: 3, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-KW}, false, [wrapKey, unwrapKey, wrapKey, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (jwk, {alg: A128KW, k: AQIDBAUGBwgJCgsMDQ4PEA, kty: oct}, {name: AES-KW}, false, [wrapKey, unwrapKey, wrapKey, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-KW}, true, [wrapKey, unwrapKey, wrapKey, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (jwk, {alg: A192KW, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcY, kty: oct}, {name: AES-KW}, true, [wrapKey, unwrapKey, wrapKey, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-KW}, false, [wrapKey, unwrapKey, wrapKey, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (jwk, {alg: A192KW, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcY, kty: oct}, {name: AES-KW}, false, [wrapKey, unwrapKey, wrapKey, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 24: 25, 25: 26, 26: 27, 27: 28, 28: 29, 29: 30, 3: 4, 30: 31, 31: 32, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-KW}, true, [wrapKey, unwrapKey, wrapKey, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (jwk, {alg: A256KW, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eHyA, kty: oct}, {name: AES-KW}, true, [wrapKey, unwrapKey, wrapKey, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 24: 25, 25: 26, 26: 27, 27: 28, 28: 29, 29: 30, 3: 4, 30: 31, 31: 32, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-KW}, false, [wrapKey, unwrapKey, wrapKey, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (jwk, {alg: A256KW, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eHyA, kty: oct}, {name: AES-KW}, false, [wrapKey, unwrapKey, wrapKey, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 2: 3, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {hash: SHA-1, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (jwk, {alg: HS1, k: AQIDBAUGBwgJCgsMDQ4PEA, kty: oct}, {hash: SHA-1, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {hash: SHA-1, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (jwk, {alg: HS1, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcY, kty: oct}, {hash: SHA-1, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 24: 25, 25: 26, 26: 27, 27: 28, 28: 29, 29: 30, 3: 4, 30: 31, 31: 32, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {hash: SHA-1, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (jwk, {alg: HS1, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eHyA, kty: oct}, {hash: SHA-1, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 2: 3, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {hash: SHA-256, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (jwk, {alg: HS256, k: AQIDBAUGBwgJCgsMDQ4PEA, kty: oct}, {hash: SHA-256, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {hash: SHA-256, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (jwk, {alg: HS256, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcY, kty: oct}, {hash: SHA-256, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 24: 25, 25: 26, 26: 27, 27: 28, 28: 29, 29: 30, 3: 4, 30: 31, 31: 32, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {hash: SHA-256, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (jwk, {alg: HS256, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eHyA, kty: oct}, {hash: SHA-256, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 2: 3, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {hash: SHA-384, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (jwk, {alg: HS384, k: AQIDBAUGBwgJCgsMDQ4PEA, kty: oct}, {hash: SHA-384, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {hash: SHA-384, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (jwk, {alg: HS384, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcY, kty: oct}, {hash: SHA-384, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 24: 25, 25: 26, 26: 27, 27: 28, 28: 29, 29: 30, 3: 4, 30: 31, 31: 32, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {hash: SHA-384, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (jwk, {alg: HS384, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eHyA, kty: oct}, {hash: SHA-384, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 2: 3, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {hash: SHA-512, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (jwk, {alg: HS512, k: AQIDBAUGBwgJCgsMDQ4PEA, kty: oct}, {hash: SHA-512, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {hash: SHA-512, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (jwk, {alg: HS512, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcY, kty: oct}, {hash: SHA-512, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 24: 25, 25: 26, 26: 27, 27: 28, 28: 29, 29: 30, 3: 4, 30: 31, 31: 32, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {hash: SHA-512, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (jwk, {alg: HS512, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eHyA, kty: oct}, {hash: SHA-512, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 2: 3, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: HKDF}, false, [deriveBits, deriveKey, deriveBits, deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: HKDF}, false, [deriveBits, deriveKey, deriveBits, deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 24: 25, 25: 26, 26: 27, 27: 28, 28: 29, 29: 30, 3: 4, 30: 31, 31: 32, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: HKDF}, false, [deriveBits, deriveKey, deriveBits, deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 2: 3, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: PBKDF2}, false, [deriveBits, deriveKey, deriveBits, deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: PBKDF2}, false, [deriveBits, deriveKey, deriveBits, deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 24: 25, 25: 26, 26: 27, 27: 28, 28: 29, 29: 30, 3: 4, 30: 31, 31: 32, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: PBKDF2}, false, [deriveBits, deriveKey, deriveBits, deriveKey\])]
+    expected: FAIL
+
 
 [symmetric_importKey.https.any.html]
   [Good parameters: 128 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 2: 3, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-CTR}, true, [encrypt\])]
@@ -1872,3 +2106,237 @@
 
   [Empty Usages: 256 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 24: 25, 25: 26, 26: 27, 27: 28, 28: 29, 29: 30, 3: 4, 30: 31, 31: 32, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: PBKDF2}, false, [\])]
     expected: FAIL
+
+  [Good parameters: 128 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 2: 3, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-CTR}, true, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (jwk, {alg: A128CTR, k: AQIDBAUGBwgJCgsMDQ4PEA, kty: oct}, {name: AES-CTR}, true, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 2: 3, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-CTR}, false, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (jwk, {alg: A128CTR, k: AQIDBAUGBwgJCgsMDQ4PEA, kty: oct}, {name: AES-CTR}, false, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-CTR}, true, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (jwk, {alg: A192CTR, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcY, kty: oct}, {name: AES-CTR}, true, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-CTR}, false, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (jwk, {alg: A192CTR, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcY, kty: oct}, {name: AES-CTR}, false, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 24: 25, 25: 26, 26: 27, 27: 28, 28: 29, 29: 30, 3: 4, 30: 31, 31: 32, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-CTR}, true, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (jwk, {alg: A256CTR, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eHyA, kty: oct}, {name: AES-CTR}, true, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 24: 25, 25: 26, 26: 27, 27: 28, 28: 29, 29: 30, 3: 4, 30: 31, 31: 32, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-CTR}, false, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (jwk, {alg: A256CTR, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eHyA, kty: oct}, {name: AES-CTR}, false, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 2: 3, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-CBC}, true, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (jwk, {alg: A128CBC, k: AQIDBAUGBwgJCgsMDQ4PEA, kty: oct}, {name: AES-CBC}, true, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 2: 3, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-CBC}, false, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (jwk, {alg: A128CBC, k: AQIDBAUGBwgJCgsMDQ4PEA, kty: oct}, {name: AES-CBC}, false, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-CBC}, true, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (jwk, {alg: A192CBC, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcY, kty: oct}, {name: AES-CBC}, true, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-CBC}, false, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (jwk, {alg: A192CBC, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcY, kty: oct}, {name: AES-CBC}, false, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 24: 25, 25: 26, 26: 27, 27: 28, 28: 29, 29: 30, 3: 4, 30: 31, 31: 32, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-CBC}, true, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (jwk, {alg: A256CBC, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eHyA, kty: oct}, {name: AES-CBC}, true, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 24: 25, 25: 26, 26: 27, 27: 28, 28: 29, 29: 30, 3: 4, 30: 31, 31: 32, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-CBC}, false, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (jwk, {alg: A256CBC, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eHyA, kty: oct}, {name: AES-CBC}, false, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 2: 3, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-GCM}, true, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (jwk, {alg: A128GCM, k: AQIDBAUGBwgJCgsMDQ4PEA, kty: oct}, {name: AES-GCM}, true, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 2: 3, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-GCM}, false, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (jwk, {alg: A128GCM, k: AQIDBAUGBwgJCgsMDQ4PEA, kty: oct}, {name: AES-GCM}, false, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-GCM}, true, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (jwk, {alg: A192GCM, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcY, kty: oct}, {name: AES-GCM}, true, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-GCM}, false, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (jwk, {alg: A192GCM, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcY, kty: oct}, {name: AES-GCM}, false, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 24: 25, 25: 26, 26: 27, 27: 28, 28: 29, 29: 30, 3: 4, 30: 31, 31: 32, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-GCM}, true, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (jwk, {alg: A256GCM, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eHyA, kty: oct}, {name: AES-GCM}, true, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 24: 25, 25: 26, 26: 27, 27: 28, 28: 29, 29: 30, 3: 4, 30: 31, 31: 32, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-GCM}, false, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (jwk, {alg: A256GCM, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eHyA, kty: oct}, {name: AES-GCM}, false, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 2: 3, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-KW}, true, [wrapKey, unwrapKey, wrapKey, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (jwk, {alg: A128KW, k: AQIDBAUGBwgJCgsMDQ4PEA, kty: oct}, {name: AES-KW}, true, [wrapKey, unwrapKey, wrapKey, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 2: 3, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-KW}, false, [wrapKey, unwrapKey, wrapKey, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (jwk, {alg: A128KW, k: AQIDBAUGBwgJCgsMDQ4PEA, kty: oct}, {name: AES-KW}, false, [wrapKey, unwrapKey, wrapKey, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-KW}, true, [wrapKey, unwrapKey, wrapKey, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (jwk, {alg: A192KW, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcY, kty: oct}, {name: AES-KW}, true, [wrapKey, unwrapKey, wrapKey, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-KW}, false, [wrapKey, unwrapKey, wrapKey, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (jwk, {alg: A192KW, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcY, kty: oct}, {name: AES-KW}, false, [wrapKey, unwrapKey, wrapKey, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 24: 25, 25: 26, 26: 27, 27: 28, 28: 29, 29: 30, 3: 4, 30: 31, 31: 32, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-KW}, true, [wrapKey, unwrapKey, wrapKey, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (jwk, {alg: A256KW, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eHyA, kty: oct}, {name: AES-KW}, true, [wrapKey, unwrapKey, wrapKey, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 24: 25, 25: 26, 26: 27, 27: 28, 28: 29, 29: 30, 3: 4, 30: 31, 31: 32, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-KW}, false, [wrapKey, unwrapKey, wrapKey, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (jwk, {alg: A256KW, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eHyA, kty: oct}, {name: AES-KW}, false, [wrapKey, unwrapKey, wrapKey, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 2: 3, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {hash: SHA-1, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (jwk, {alg: HS1, k: AQIDBAUGBwgJCgsMDQ4PEA, kty: oct}, {hash: SHA-1, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {hash: SHA-1, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (jwk, {alg: HS1, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcY, kty: oct}, {hash: SHA-1, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 24: 25, 25: 26, 26: 27, 27: 28, 28: 29, 29: 30, 3: 4, 30: 31, 31: 32, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {hash: SHA-1, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (jwk, {alg: HS1, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eHyA, kty: oct}, {hash: SHA-1, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 2: 3, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {hash: SHA-256, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (jwk, {alg: HS256, k: AQIDBAUGBwgJCgsMDQ4PEA, kty: oct}, {hash: SHA-256, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {hash: SHA-256, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (jwk, {alg: HS256, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcY, kty: oct}, {hash: SHA-256, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 24: 25, 25: 26, 26: 27, 27: 28, 28: 29, 29: 30, 3: 4, 30: 31, 31: 32, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {hash: SHA-256, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (jwk, {alg: HS256, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eHyA, kty: oct}, {hash: SHA-256, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 2: 3, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {hash: SHA-384, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (jwk, {alg: HS384, k: AQIDBAUGBwgJCgsMDQ4PEA, kty: oct}, {hash: SHA-384, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {hash: SHA-384, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (jwk, {alg: HS384, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcY, kty: oct}, {hash: SHA-384, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 24: 25, 25: 26, 26: 27, 27: 28, 28: 29, 29: 30, 3: 4, 30: 31, 31: 32, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {hash: SHA-384, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (jwk, {alg: HS384, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eHyA, kty: oct}, {hash: SHA-384, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 2: 3, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {hash: SHA-512, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (jwk, {alg: HS512, k: AQIDBAUGBwgJCgsMDQ4PEA, kty: oct}, {hash: SHA-512, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {hash: SHA-512, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (jwk, {alg: HS512, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcY, kty: oct}, {hash: SHA-512, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 24: 25, 25: 26, 26: 27, 27: 28, 28: 29, 29: 30, 3: 4, 30: 31, 31: 32, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {hash: SHA-512, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (jwk, {alg: HS512, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eHyA, kty: oct}, {hash: SHA-512, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 2: 3, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: HKDF}, false, [deriveBits, deriveKey, deriveBits, deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: HKDF}, false, [deriveBits, deriveKey, deriveBits, deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 24: 25, 25: 26, 26: 27, 27: 28, 28: 29, 29: 30, 3: 4, 30: 31, 31: 32, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: HKDF}, false, [deriveBits, deriveKey, deriveBits, deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 2: 3, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: PBKDF2}, false, [deriveBits, deriveKey, deriveBits, deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: PBKDF2}, false, [deriveBits, deriveKey, deriveBits, deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 24: 25, 25: 26, 26: 27, 27: 28, 28: 29, 29: 30, 3: 4, 30: 31, 31: 32, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: PBKDF2}, false, [deriveBits, deriveKey, deriveBits, deriveKey\])]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/cookies/third-party-cookies/third-party-cookies.tentative.https.html.ini b/tests/wpt/meta-legacy-layout/cookies/third-party-cookies/third-party-cookies.tentative.https.html.ini
new file mode 100644
index 00000000000..5c59aab6090
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/cookies/third-party-cookies/third-party-cookies.tentative.https.html.ini
@@ -0,0 +1,2 @@
+[third-party-cookies.tentative.https.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/css/compositing/canvas-composite-modes.html.ini b/tests/wpt/meta-legacy-layout/css/compositing/canvas-composite-modes.html.ini
new file mode 100644
index 00000000000..b015086cf5c
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/compositing/canvas-composite-modes.html.ini
@@ -0,0 +1,21 @@
+[canvas-composite-modes.html]
+  [globalCompositeOperation destination]
+    expected: FAIL
+
+  [globalCompositeOperation source-out]
+    expected: FAIL
+
+  [globalCompositeOperation destination-out]
+    expected: FAIL
+
+  [globalCompositeOperation xor]
+    expected: FAIL
+
+  [globalCompositeOperation lighter]
+    expected: FAIL
+
+  [globalCompositeOperation plus-darker]
+    expected: FAIL
+
+  [globalCompositeOperation plus-lighter]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/compositing/compositing_simple_div.html.ini b/tests/wpt/meta-legacy-layout/css/compositing/compositing_simple_div.html.ini
deleted file mode 100644
index ca8e5e9c9ba..00000000000
--- a/tests/wpt/meta-legacy-layout/css/compositing/compositing_simple_div.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[compositing_simple_div.html]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-align/blocks/align-content-block-001.html.ini b/tests/wpt/meta-legacy-layout/css/css-align/blocks/align-content-block-001.html.ini
new file mode 100644
index 00000000000..9cec50f1501
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-align/blocks/align-content-block-001.html.ini
@@ -0,0 +1,2 @@
+[align-content-block-001.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-align/blocks/align-content-block-002.html.ini b/tests/wpt/meta-legacy-layout/css/css-align/blocks/align-content-block-002.html.ini
new file mode 100644
index 00000000000..5f0d16e9286
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-align/blocks/align-content-block-002.html.ini
@@ -0,0 +1,2 @@
+[align-content-block-002.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-align/blocks/align-content-block-003.html.ini b/tests/wpt/meta-legacy-layout/css/css-align/blocks/align-content-block-003.html.ini
new file mode 100644
index 00000000000..c1bb4746647
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-align/blocks/align-content-block-003.html.ini
@@ -0,0 +1,2 @@
+[align-content-block-003.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-align/blocks/align-content-block-004.html.ini b/tests/wpt/meta-legacy-layout/css/css-align/blocks/align-content-block-004.html.ini
new file mode 100644
index 00000000000..229571e9dfa
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-align/blocks/align-content-block-004.html.ini
@@ -0,0 +1,2 @@
+[align-content-block-004.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-align/blocks/align-content-block-005.html.ini b/tests/wpt/meta-legacy-layout/css/css-align/blocks/align-content-block-005.html.ini
new file mode 100644
index 00000000000..5fe5827c538
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-align/blocks/align-content-block-005.html.ini
@@ -0,0 +1,2 @@
+[align-content-block-005.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-align/blocks/align-content-block-006.html.ini b/tests/wpt/meta-legacy-layout/css/css-align/blocks/align-content-block-006.html.ini
new file mode 100644
index 00000000000..3cd1af3ea35
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-align/blocks/align-content-block-006.html.ini
@@ -0,0 +1,2 @@
+[align-content-block-006.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/css/css-align/blocks/align-content-block-007.html.ini b/tests/wpt/meta-legacy-layout/css/css-align/blocks/align-content-block-007.html.ini
new file mode 100644
index 00000000000..1311a1028d4
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-align/blocks/align-content-block-007.html.ini
@@ -0,0 +1,2 @@
+[align-content-block-007.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/css/css-align/blocks/align-content-block-008.html.ini b/tests/wpt/meta-legacy-layout/css/css-align/blocks/align-content-block-008.html.ini
new file mode 100644
index 00000000000..561a9cca389
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-align/blocks/align-content-block-008.html.ini
@@ -0,0 +1,2 @@
+[align-content-block-008.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/css/css-align/blocks/align-content-block-009.html.ini b/tests/wpt/meta-legacy-layout/css/css-align/blocks/align-content-block-009.html.ini
new file mode 100644
index 00000000000..0d75e4f3a29
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-align/blocks/align-content-block-009.html.ini
@@ -0,0 +1,2 @@
+[align-content-block-009.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/css/css-align/blocks/align-content-block-010.html.ini b/tests/wpt/meta-legacy-layout/css/css-align/blocks/align-content-block-010.html.ini
new file mode 100644
index 00000000000..cccd55e5e31
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-align/blocks/align-content-block-010.html.ini
@@ -0,0 +1,2 @@
+[align-content-block-010.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/css/css-align/blocks/align-content-block-011.html.ini b/tests/wpt/meta-legacy-layout/css/css-align/blocks/align-content-block-011.html.ini
new file mode 100644
index 00000000000..cf02c4422cc
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-align/blocks/align-content-block-011.html.ini
@@ -0,0 +1,2 @@
+[align-content-block-011.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/css/css-align/blocks/align-content-block-break-content-020.html.ini b/tests/wpt/meta-legacy-layout/css/css-align/blocks/align-content-block-break-content-020.html.ini
new file mode 100644
index 00000000000..c19c67ff247
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-align/blocks/align-content-block-break-content-020.html.ini
@@ -0,0 +1,2 @@
+[align-content-block-break-content-020.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-align/blocks/align-content-block-break-overflow-010.html.ini b/tests/wpt/meta-legacy-layout/css/css-align/blocks/align-content-block-break-overflow-010.html.ini
new file mode 100644
index 00000000000..e653232eafb
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-align/blocks/align-content-block-break-overflow-010.html.ini
@@ -0,0 +1,2 @@
+[align-content-block-break-overflow-010.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-align/blocks/align-content-block-break-overflow-020.html.ini b/tests/wpt/meta-legacy-layout/css/css-align/blocks/align-content-block-break-overflow-020.html.ini
new file mode 100644
index 00000000000..e1ec410dff5
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-align/blocks/align-content-block-break-overflow-020.html.ini
@@ -0,0 +1,2 @@
+[align-content-block-break-overflow-020.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-align/blocks/align-content-block-overflow-000.html.ini b/tests/wpt/meta-legacy-layout/css/css-align/blocks/align-content-block-overflow-000.html.ini
new file mode 100644
index 00000000000..461283fa780
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-align/blocks/align-content-block-overflow-000.html.ini
@@ -0,0 +1,2 @@
+[align-content-block-overflow-000.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/css/css-backgrounds/animations/box-shadow-interpolation.html.ini b/tests/wpt/meta-legacy-layout/css/css-backgrounds/animations/box-shadow-interpolation.html.ini
index 016af7475e7..055c19a8042 100644
--- a/tests/wpt/meta-legacy-layout/css/css-backgrounds/animations/box-shadow-interpolation.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-backgrounds/animations/box-shadow-interpolation.html.ini
@@ -268,3 +268,219 @@
 
   [CSS Transitions: property <box-shadow> from [10px 20px yellow, 5px 10px green\] to [inset 5px 10px green, 15px 20px blue\] at (0.3) should be [10px 20px yellow, 5px 10px green\]]
     expected: FAIL
+
+  [CSS Transitions: property <box-shadow> from [10px 10px 10px 10px rgb(0 0 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (-0.3) should be [10px 10px 10px 10px oklab(0 0 0)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <box-shadow> from [10px 10px 10px 10px rgb(0 0 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (0) should be [10px 10px 10px 10px oklab(0 0 0)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <box-shadow> from [10px 10px 10px 10px rgb(0 0 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (0.3) should be [10px 10px 10px 10px oklab(0.3 0 0)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <box-shadow> from [10px 10px 10px 10px rgb(0 0 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (0.6) should be [10px 10px 10px 10px oklab(0.6 0 0)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <box-shadow> from [10px 10px 10px 10px rgb(0 0 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (1) should be [10px 10px 10px 10px oklab(1 0 0)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <box-shadow> from [10px 10px 10px 10px rgb(0 0 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (1.5) should be [10px 10px 10px 10px oklab(1 0 0)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <box-shadow> from [10px 10px 10px 10px rgb(0 0 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (-0.3) should be [10px 10px 10px 10px oklab(0 0 0)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <box-shadow> from [10px 10px 10px 10px rgb(0 0 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (0) should be [10px 10px 10px 10px oklab(0 0 0)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <box-shadow> from [10px 10px 10px 10px rgb(0 0 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (0.3) should be [10px 10px 10px 10px oklab(0.3 0 0)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <box-shadow> from [10px 10px 10px 10px rgb(0 0 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (0.6) should be [10px 10px 10px 10px oklab(0.6 0 0)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <box-shadow> from [10px 10px 10px 10px rgb(0 0 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (1) should be [10px 10px 10px 10px oklab(1 0 0)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <box-shadow> from [10px 10px 10px 10px rgb(0 0 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (1.5) should be [10px 10px 10px 10px oklab(1 0 0)\]]
+    expected: FAIL
+
+  [CSS Animations: property <box-shadow> from [10px 10px 10px 10px rgb(0 0 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (-0.3) should be [10px 10px 10px 10px oklab(0 0 0)\]]
+    expected: FAIL
+
+  [CSS Animations: property <box-shadow> from [10px 10px 10px 10px rgb(0 0 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (0) should be [10px 10px 10px 10px oklab(0 0 0)\]]
+    expected: FAIL
+
+  [CSS Animations: property <box-shadow> from [10px 10px 10px 10px rgb(0 0 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (0.3) should be [10px 10px 10px 10px oklab(0.3 0 0)\]]
+    expected: FAIL
+
+  [CSS Animations: property <box-shadow> from [10px 10px 10px 10px rgb(0 0 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (0.6) should be [10px 10px 10px 10px oklab(0.6 0 0)\]]
+    expected: FAIL
+
+  [CSS Animations: property <box-shadow> from [10px 10px 10px 10px rgb(0 0 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (1) should be [10px 10px 10px 10px oklab(1 0 0)\]]
+    expected: FAIL
+
+  [CSS Animations: property <box-shadow> from [10px 10px 10px 10px rgb(0 0 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (1.5) should be [10px 10px 10px 10px oklab(1 0 0)\]]
+    expected: FAIL
+
+  [Web Animations: property <box-shadow> from [10px 10px 10px 10px rgb(0 0 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (-0.3) should be [10px 10px 10px 10px oklab(0 0 0)\]]
+    expected: FAIL
+
+  [Web Animations: property <box-shadow> from [10px 10px 10px 10px rgb(0 0 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (0) should be [10px 10px 10px 10px oklab(0 0 0)\]]
+    expected: FAIL
+
+  [Web Animations: property <box-shadow> from [10px 10px 10px 10px rgb(0 0 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (0.3) should be [10px 10px 10px 10px oklab(0.3 0 0)\]]
+    expected: FAIL
+
+  [Web Animations: property <box-shadow> from [10px 10px 10px 10px rgb(0 0 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (0.6) should be [10px 10px 10px 10px oklab(0.6 0 0)\]]
+    expected: FAIL
+
+  [Web Animations: property <box-shadow> from [10px 10px 10px 10px rgb(0 0 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (1) should be [10px 10px 10px 10px oklab(1 0 0)\]]
+    expected: FAIL
+
+  [Web Animations: property <box-shadow> from [10px 10px 10px 10px rgb(0 0 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (1.5) should be [10px 10px 10px 10px oklab(1 0 0)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px rgb(255 255 255)\] at (-0.3) should be [10px 10px 10px 10px oklab(0 0 0)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px rgb(255 255 255)\] at (0) should be [10px 10px 10px 10px oklab(0 0 0)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px rgb(255 255 255)\] at (0.3) should be [10px 10px 10px 10px oklab(0.3 0 0)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px rgb(255 255 255)\] at (0.6) should be [10px 10px 10px 10px oklab(0.6 0 0)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px rgb(255 255 255)\] at (1) should be [10px 10px 10px 10px oklab(1 0 0)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px rgb(255 255 255)\] at (1.5) should be [10px 10px 10px 10px oklab(1 0 0)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px rgb(255 255 255)\] at (-0.3) should be [10px 10px 10px 10px oklab(0 0 0)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px rgb(255 255 255)\] at (0) should be [10px 10px 10px 10px oklab(0 0 0)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px rgb(255 255 255)\] at (0.3) should be [10px 10px 10px 10px oklab(0.3 0 0)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px rgb(255 255 255)\] at (0.6) should be [10px 10px 10px 10px oklab(0.6 0 0)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px rgb(255 255 255)\] at (1) should be [10px 10px 10px 10px oklab(1 0 0)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px rgb(255 255 255)\] at (1.5) should be [10px 10px 10px 10px oklab(1 0 0)\]]
+    expected: FAIL
+
+  [CSS Animations: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px rgb(255 255 255)\] at (-0.3) should be [10px 10px 10px 10px oklab(0 0 0)\]]
+    expected: FAIL
+
+  [CSS Animations: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px rgb(255 255 255)\] at (0) should be [10px 10px 10px 10px oklab(0 0 0)\]]
+    expected: FAIL
+
+  [CSS Animations: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px rgb(255 255 255)\] at (0.3) should be [10px 10px 10px 10px oklab(0.3 0 0)\]]
+    expected: FAIL
+
+  [CSS Animations: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px rgb(255 255 255)\] at (0.6) should be [10px 10px 10px 10px oklab(0.6 0 0)\]]
+    expected: FAIL
+
+  [CSS Animations: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px rgb(255 255 255)\] at (1) should be [10px 10px 10px 10px oklab(1 0 0)\]]
+    expected: FAIL
+
+  [CSS Animations: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px rgb(255 255 255)\] at (1.5) should be [10px 10px 10px 10px oklab(1 0 0)\]]
+    expected: FAIL
+
+  [Web Animations: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px rgb(255 255 255)\] at (-0.3) should be [10px 10px 10px 10px oklab(0 0 0)\]]
+    expected: FAIL
+
+  [Web Animations: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px rgb(255 255 255)\] at (0) should be [10px 10px 10px 10px oklab(0 0 0)\]]
+    expected: FAIL
+
+  [Web Animations: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px rgb(255 255 255)\] at (0.3) should be [10px 10px 10px 10px oklab(0.3 0 0)\]]
+    expected: FAIL
+
+  [Web Animations: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px rgb(255 255 255)\] at (0.6) should be [10px 10px 10px 10px oklab(0.6 0 0)\]]
+    expected: FAIL
+
+  [Web Animations: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px rgb(255 255 255)\] at (1) should be [10px 10px 10px 10px oklab(1 0 0)\]]
+    expected: FAIL
+
+  [Web Animations: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px rgb(255 255 255)\] at (1.5) should be [10px 10px 10px 10px oklab(1 0 0)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (-0.3) should be [10px 10px 10px 10px oklab(0 0 0)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (0) should be [10px 10px 10px 10px oklab(0 0 0)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (0.3) should be [10px 10px 10px 10px oklab(0.3 0 0)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (0.6) should be [10px 10px 10px 10px oklab(0.6 0 0)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (1) should be [10px 10px 10px 10px oklab(1 0 0)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (1.5) should be [10px 10px 10px 10px oklab(1 0 0)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (-0.3) should be [10px 10px 10px 10px oklab(0 0 0)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (0) should be [10px 10px 10px 10px oklab(0 0 0)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (0.3) should be [10px 10px 10px 10px oklab(0.3 0 0)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (0.6) should be [10px 10px 10px 10px oklab(0.6 0 0)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (1) should be [10px 10px 10px 10px oklab(1 0 0)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (1.5) should be [10px 10px 10px 10px oklab(1 0 0)\]]
+    expected: FAIL
+
+  [CSS Animations: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (-0.3) should be [10px 10px 10px 10px oklab(0 0 0)\]]
+    expected: FAIL
+
+  [CSS Animations: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (0) should be [10px 10px 10px 10px oklab(0 0 0)\]]
+    expected: FAIL
+
+  [CSS Animations: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (0.3) should be [10px 10px 10px 10px oklab(0.3 0 0)\]]
+    expected: FAIL
+
+  [CSS Animations: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (0.6) should be [10px 10px 10px 10px oklab(0.6 0 0)\]]
+    expected: FAIL
+
+  [CSS Animations: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (1) should be [10px 10px 10px 10px oklab(1 0 0)\]]
+    expected: FAIL
+
+  [CSS Animations: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (1.5) should be [10px 10px 10px 10px oklab(1 0 0)\]]
+    expected: FAIL
+
+  [Web Animations: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (-0.3) should be [10px 10px 10px 10px oklab(0 0 0)\]]
+    expected: FAIL
+
+  [Web Animations: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (0) should be [10px 10px 10px 10px oklab(0 0 0)\]]
+    expected: FAIL
+
+  [Web Animations: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (0.3) should be [10px 10px 10px 10px oklab(0.3 0 0)\]]
+    expected: FAIL
+
+  [Web Animations: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (0.6) should be [10px 10px 10px 10px oklab(0.6 0 0)\]]
+    expected: FAIL
+
+  [Web Animations: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (1) should be [10px 10px 10px 10px oklab(1 0 0)\]]
+    expected: FAIL
+
+  [Web Animations: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (1.5) should be [10px 10px 10px 10px oklab(1 0 0)\]]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-color/color-mix-currentcolor-visited-getcomputedstyle.html.ini b/tests/wpt/meta-legacy-layout/css/css-color/color-mix-currentcolor-visited-getcomputedstyle.html.ini
new file mode 100644
index 00000000000..29b03c297c1
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-color/color-mix-currentcolor-visited-getcomputedstyle.html.ini
@@ -0,0 +1,3 @@
+[color-mix-currentcolor-visited-getcomputedstyle.html]
+  [Property background-color value 'color-mix(in srgb, currentcolor, white)' should not leak :visited for computed style]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-color/color-mix-currentcolor-visited.html.ini b/tests/wpt/meta-legacy-layout/css/css-color/color-mix-currentcolor-visited.html.ini
new file mode 100644
index 00000000000..162c497b79e
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-color/color-mix-currentcolor-visited.html.ini
@@ -0,0 +1,2 @@
+[color-mix-currentcolor-visited.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-color/currentcolor-004.html.ini b/tests/wpt/meta-legacy-layout/css/css-color/currentcolor-004.html.ini
new file mode 100644
index 00000000000..87284767cf0
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-color/currentcolor-004.html.ini
@@ -0,0 +1,2 @@
+[currentcolor-004.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-color/parsing/color-computed-color-mix-function.html.ini b/tests/wpt/meta-legacy-layout/css/css-color/parsing/color-computed-color-mix-function.html.ini
index 5d561ec3883..d3d886aa5ee 100644
--- a/tests/wpt/meta-legacy-layout/css/css-color/parsing/color-computed-color-mix-function.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-color/parsing/color-computed-color-mix-function.html.ini
@@ -1798,3 +1798,15 @@
 
   [Property color value 'color-mix(in xyz-d65, color(xyz-d65 0.1 0.2 0.3 / 0) 10%, color(xyz-d65 0.3 0.4 0.5))']
     expected: FAIL
+
+  [Property color value 'color-mix(in oklch, transparent, oklch(0.3 40 30deg))']
+    expected: FAIL
+
+  [Property color value 'color-mix(in oklch, transparent 10%, oklch(0.3 40 30deg))']
+    expected: FAIL
+
+  [Property color value 'color-mix(in oklch, oklch(0.1 20 120deg / 0), oklch(0.3 40 30deg))']
+    expected: FAIL
+
+  [Property color value 'color-mix(in oklch, oklch(0.1 20 120deg / 0) 10%, oklch(0.3 40 30deg))']
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-color/parsing/color-computed-relative-color.html.ini b/tests/wpt/meta-legacy-layout/css/css-color/parsing/color-computed-relative-color.html.ini
index f6ca762dc07..f2843c40203 100644
--- a/tests/wpt/meta-legacy-layout/css/css-color/parsing/color-computed-relative-color.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-color/parsing/color-computed-relative-color.html.ini
@@ -3196,3 +3196,75 @@
 
   [Property color value 'oklch(from oklch(.7 0.45 30 / 40%) alpha c c / alpha)']
     expected: FAIL
+
+  [Property color value 'color(from color(srgb-linear 0.25 0.5 0.75) srgb r g b)']
+    expected: FAIL
+
+  [Property color value 'color(from color(srgb 0.25 0.5 0.75) srgb-linear r g b)']
+    expected: FAIL
+
+  [Property color value 'color(from color(display-p3 0.25 0.5 0.75) srgb r g b)']
+    expected: FAIL
+
+  [Property color value 'color(from color(srgb 0.25 0.5 0.75) display-p3 r g b)']
+    expected: FAIL
+
+  [Property color value 'color(from color(a98-rgb 0.25 0.5 0.75) srgb r g b)']
+    expected: FAIL
+
+  [Property color value 'color(from color(srgb 0.25 0.5 0.75) a98-rgb r g b)']
+    expected: FAIL
+
+  [Property color value 'color(from color(prophoto-rgb 0.25 0.5 0.75) srgb r g b)']
+    expected: FAIL
+
+  [Property color value 'color(from color(srgb 0.25 0.5 0.75) prophoto-rgb r g b)']
+    expected: FAIL
+
+  [Property color value 'color(from color(rec2020 0.25 0.5 0.75) srgb r g b)']
+    expected: FAIL
+
+  [Property color value 'color(from color(srgb 0.25 0.5 0.75) rec2020 r g b)']
+    expected: FAIL
+
+  [Property color value 'color(from color(xyz-d50 0.25 0.5 0.75) srgb r g b)']
+    expected: FAIL
+
+  [Property color value 'color(from color(srgb 0.25 0.5 0.75) xyz-d50 r g b)']
+    expected: FAIL
+
+  [Property color value 'color(from color(xyz-d65 0.25 0.5 0.75) srgb r g b)']
+    expected: FAIL
+
+  [Property color value 'color(from color(srgb 0.25 0.5 0.75) xyz-d65 r g b)']
+    expected: FAIL
+
+  [Property color value 'lab(from color(srgb 0.25 0.5 0.75) l a b)']
+    expected: FAIL
+
+  [Property color value 'color(from lab(67.5345 -8.6911 -41.6019) srgb r g b)']
+    expected: FAIL
+
+  [Property color value 'oklab(from color(srgb 0.25 0.5 0.75) l a b)']
+    expected: FAIL
+
+  [Property color value 'color(from oklab(72.322% -0.0465 -0.1150) srgb r g b)']
+    expected: FAIL
+
+  [Property color value 'lch(from color(srgb 0.25 0.5 0.75) l c h)']
+    expected: FAIL
+
+  [Property color value 'color(from lch(67.5345% 42.5 258.2) srgb r g b)']
+    expected: FAIL
+
+  [Property color value 'oklch(from color(srgb 0.25 0.5 0.75) l c h)']
+    expected: FAIL
+
+  [Property color value 'color(from oklch(72.322% 0.12403 247.996) srgb r g b)']
+    expected: FAIL
+
+  [Property color value 'hsl(from var(--accent) calc(h + 180) s l)']
+    expected: FAIL
+
+  [Property color value 'LCH(from var(--accent) l c calc(h + 180))']
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-color/parsing/color-valid-hsl.html.ini b/tests/wpt/meta-legacy-layout/css/css-color/parsing/color-valid-hsl.html.ini
index efd69fefe4d..47af398a3b9 100644
--- a/tests/wpt/meta-legacy-layout/css/css-color/parsing/color-valid-hsl.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-color/parsing/color-valid-hsl.html.ini
@@ -25,3 +25,21 @@
 
   [e.style['color'\] = "hsl(none 100% 50%)" should set the property value]
     expected: FAIL
+
+  [e.style['color'\] = "hsl(calc(infinity) 100% 50%)" should set the property value]
+    expected: FAIL
+
+  [e.style['color'\] = "hsl(calc(-infinity) 100% 50%)" should set the property value]
+    expected: FAIL
+
+  [e.style['color'\] = "hsl(calc(0 / 0) 100% 50%)" should set the property value]
+    expected: FAIL
+
+  [e.style['color'\] = "hsl(90 50% 50% / calc(infinity))" should set the property value]
+    expected: FAIL
+
+  [e.style['color'\] = "hsl(90 50% 50% / calc(-infinity))" should set the property value]
+    expected: FAIL
+
+  [e.style['color'\] = "hsl(90 50% 50% / calc(0 / 0))" should set the property value]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-color/parsing/color-valid-hwb.html.ini b/tests/wpt/meta-legacy-layout/css/css-color/parsing/color-valid-hwb.html.ini
index b52a2cd54fa..05538c78502 100644
--- a/tests/wpt/meta-legacy-layout/css/css-color/parsing/color-valid-hwb.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-color/parsing/color-valid-hwb.html.ini
@@ -22,3 +22,21 @@
 
   [e.style['color'\] = "hwb(320deg 30% 40%)" should set the property value]
     expected: FAIL
+
+  [e.style['color'\] = "hwb(calc(infinity) 20% 10%)" should set the property value]
+    expected: FAIL
+
+  [e.style['color'\] = "hwb(calc(-infinity) 20% 10%)" should set the property value]
+    expected: FAIL
+
+  [e.style['color'\] = "hwb(calc(0 / 0) 20% 10%)" should set the property value]
+    expected: FAIL
+
+  [e.style['color'\] = "hwb(90 20% 10% / calc(infinity))" should set the property value]
+    expected: FAIL
+
+  [e.style['color'\] = "hwb(90 20% 10% / calc(-infinity))" should set the property value]
+    expected: FAIL
+
+  [e.style['color'\] = "hwb(90 20% 10% / calc(0 / 0))" should set the property value]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-color/parsing/color-valid-relative-color.html.ini b/tests/wpt/meta-legacy-layout/css/css-color/parsing/color-valid-relative-color.html.ini
index 64ebd2cd7b1..4bdb4add61a 100644
--- a/tests/wpt/meta-legacy-layout/css/css-color/parsing/color-valid-relative-color.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-color/parsing/color-valid-relative-color.html.ini
@@ -3157,3 +3157,51 @@
 
   [e.style['color'\] = "oklch(from oklch(.7 0.45 30 / 40%) alpha c c / alpha)" should set the property value]
     expected: FAIL
+
+  [e.style['color'\] = "rgb(from currentColor r g b)" should set the property value]
+    expected: FAIL
+
+  [e.style['color'\] = "hsl(from currentColor h s l)" should set the property value]
+    expected: FAIL
+
+  [e.style['color'\] = "hwb(from currentColor h w b)" should set the property value]
+    expected: FAIL
+
+  [e.style['color'\] = "lab(from currentColor l a b)" should set the property value]
+    expected: FAIL
+
+  [e.style['color'\] = "oklab(from currentColor l a b)" should set the property value]
+    expected: FAIL
+
+  [e.style['color'\] = "lch(from currentColor) l c h)" should set the property value]
+    expected: FAIL
+
+  [e.style['color'\] = "oklch(from currentColor l c h)" should set the property value]
+    expected: FAIL
+
+  [e.style['color'\] = "color(from currentColor srgb r g b)" should set the property value]
+    expected: FAIL
+
+  [e.style['color'\] = "color(from currentColor srgb-linear r g b)" should set the property value]
+    expected: FAIL
+
+  [e.style['color'\] = "color(from currentColor a98-rgb r g b)" should set the property value]
+    expected: FAIL
+
+  [e.style['color'\] = "color(from currentColor rec2020 r g b)" should set the property value]
+    expected: FAIL
+
+  [e.style['color'\] = "color(from currentColor prophoto-rgb r g b)" should set the property value]
+    expected: FAIL
+
+  [e.style['color'\] = "color(from currentColor display-p3 r g b)" should set the property value]
+    expected: FAIL
+
+  [e.style['color'\] = "color(from currentColor xyz x y z)" should set the property value]
+    expected: FAIL
+
+  [e.style['color'\] = "color(from currentColor xyz-d50 x y z)" should set the property value]
+    expected: FAIL
+
+  [e.style['color'\] = "color(from currentColor xyz-d65 x y z)" should set the property value]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-color/parsing/relative-color-out-of-gamut.html.ini b/tests/wpt/meta-legacy-layout/css/css-color/parsing/relative-color-out-of-gamut.html.ini
new file mode 100644
index 00000000000..33f7c5c6858
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-color/parsing/relative-color-out-of-gamut.html.ini
@@ -0,0 +1,81 @@
+[relative-color-out-of-gamut.html]
+  [Property color value 'rgb(from color(display-p3 0 1 0) r g b / alpha)']
+    expected: FAIL
+
+  [Property color value 'rgb(from lab(100 104.3 -50.9) r g b)']
+    expected: FAIL
+
+  [Property color value 'rgb(from lab(0 104.3 -50.9) r g b)']
+    expected: FAIL
+
+  [Property color value 'rgb(from lch(100 116 334) r g b)']
+    expected: FAIL
+
+  [Property color value 'rgb(from lch(0 116 334) r g b)']
+    expected: FAIL
+
+  [Property color value 'rgb(from oklab(1 0.365 -0.16) r g b)']
+    expected: FAIL
+
+  [Property color value 'rgb(from oklab(0 0.365 -0.16) r g b)']
+    expected: FAIL
+
+  [Property color value 'rgb(from oklch(1 0.399 336.3) r g b)']
+    expected: FAIL
+
+  [Property color value 'rgb(from oklch(0 0.399 336.3) r g b)']
+    expected: FAIL
+
+  [Property color value 'hsl(from color(display-p3 0 1 0) h s l / alpha)']
+    expected: FAIL
+
+  [Property color value 'hsl(from lab(100 104.3 -50.9) h s l)']
+    expected: FAIL
+
+  [Property color value 'hsl(from lab(0 104.3 -50.9) h s l)']
+    expected: FAIL
+
+  [Property color value 'hsl(from lch(100 116 334) h s l)']
+    expected: FAIL
+
+  [Property color value 'hsl(from lch(0 116 334) h s l)']
+    expected: FAIL
+
+  [Property color value 'hsl(from oklab(1 0.365 -0.16) h s l)']
+    expected: FAIL
+
+  [Property color value 'hsl(from oklab(0 0.365 -0.16) h s l)']
+    expected: FAIL
+
+  [Property color value 'hsl(from oklch(1 0.399 336.3) h s l)']
+    expected: FAIL
+
+  [Property color value 'hsl(from oklch(0 0.399 336.3) h s l)']
+    expected: FAIL
+
+  [Property color value 'hwb(from color(display-p3 0 1 0) h w b / alpha)']
+    expected: FAIL
+
+  [Property color value 'hwb(from lab(100 104.3 -50.9) h w b)']
+    expected: FAIL
+
+  [Property color value 'hwb(from lab(0 104.3 -50.9) h w b)']
+    expected: FAIL
+
+  [Property color value 'hwb(from lch(100 116 334) h w b)']
+    expected: FAIL
+
+  [Property color value 'hwb(from lch(0 116 334) h w b)']
+    expected: FAIL
+
+  [Property color value 'hwb(from oklab(1 0.365 -0.16) h w b)']
+    expected: FAIL
+
+  [Property color value 'hwb(from oklab(0 0.365 -0.16) h w b)']
+    expected: FAIL
+
+  [Property color value 'hwb(from oklch(1 0.399 336.3) h w b)']
+    expected: FAIL
+
+  [Property color value 'hwb(from oklch(0 0.399 336.3) h w b)']
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-color/relative-currentcolor-a98rgb-01.html.ini b/tests/wpt/meta-legacy-layout/css/css-color/relative-currentcolor-a98rgb-01.html.ini
new file mode 100644
index 00000000000..1e125b3cb7b
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-color/relative-currentcolor-a98rgb-01.html.ini
@@ -0,0 +1,2 @@
+[relative-currentcolor-a98rgb-01.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-color/relative-currentcolor-displayp3-01.html.ini b/tests/wpt/meta-legacy-layout/css/css-color/relative-currentcolor-displayp3-01.html.ini
new file mode 100644
index 00000000000..36098b34aaf
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-color/relative-currentcolor-displayp3-01.html.ini
@@ -0,0 +1,2 @@
+[relative-currentcolor-displayp3-01.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-color/relative-currentcolor-hsl-01.html.ini b/tests/wpt/meta-legacy-layout/css/css-color/relative-currentcolor-hsl-01.html.ini
new file mode 100644
index 00000000000..4ddc9dfa968
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-color/relative-currentcolor-hsl-01.html.ini
@@ -0,0 +1,2 @@
+[relative-currentcolor-hsl-01.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-color/relative-currentcolor-hsl-02.html.ini b/tests/wpt/meta-legacy-layout/css/css-color/relative-currentcolor-hsl-02.html.ini
new file mode 100644
index 00000000000..cb42bb3bba7
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-color/relative-currentcolor-hsl-02.html.ini
@@ -0,0 +1,2 @@
+[relative-currentcolor-hsl-02.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-color/relative-currentcolor-hwb-01.html.ini b/tests/wpt/meta-legacy-layout/css/css-color/relative-currentcolor-hwb-01.html.ini
new file mode 100644
index 00000000000..17c350bbadd
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-color/relative-currentcolor-hwb-01.html.ini
@@ -0,0 +1,2 @@
+[relative-currentcolor-hwb-01.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-color/relative-currentcolor-lab-01.html.ini b/tests/wpt/meta-legacy-layout/css/css-color/relative-currentcolor-lab-01.html.ini
new file mode 100644
index 00000000000..6912822578c
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-color/relative-currentcolor-lab-01.html.ini
@@ -0,0 +1,2 @@
+[relative-currentcolor-lab-01.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-color/relative-currentcolor-lch-01.html.ini b/tests/wpt/meta-legacy-layout/css/css-color/relative-currentcolor-lch-01.html.ini
new file mode 100644
index 00000000000..5ebf684f72b
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-color/relative-currentcolor-lch-01.html.ini
@@ -0,0 +1,2 @@
+[relative-currentcolor-lch-01.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-color/relative-currentcolor-oklab-01.html.ini b/tests/wpt/meta-legacy-layout/css/css-color/relative-currentcolor-oklab-01.html.ini
new file mode 100644
index 00000000000..8d3142bb410
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-color/relative-currentcolor-oklab-01.html.ini
@@ -0,0 +1,2 @@
+[relative-currentcolor-oklab-01.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-color/relative-currentcolor-oklch-01.html.ini b/tests/wpt/meta-legacy-layout/css/css-color/relative-currentcolor-oklch-01.html.ini
new file mode 100644
index 00000000000..163add2a14b
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-color/relative-currentcolor-oklch-01.html.ini
@@ -0,0 +1,2 @@
+[relative-currentcolor-oklch-01.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-color/relative-currentcolor-prophoto-01.html.ini b/tests/wpt/meta-legacy-layout/css/css-color/relative-currentcolor-prophoto-01.html.ini
new file mode 100644
index 00000000000..89b27a45012
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-color/relative-currentcolor-prophoto-01.html.ini
@@ -0,0 +1,2 @@
+[relative-currentcolor-prophoto-01.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-color/relative-currentcolor-rec2020-01.html.ini b/tests/wpt/meta-legacy-layout/css/css-color/relative-currentcolor-rec2020-01.html.ini
new file mode 100644
index 00000000000..6cc93af43e5
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-color/relative-currentcolor-rec2020-01.html.ini
@@ -0,0 +1,2 @@
+[relative-currentcolor-rec2020-01.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-color/relative-currentcolor-rec2020-02.html.ini b/tests/wpt/meta-legacy-layout/css/css-color/relative-currentcolor-rec2020-02.html.ini
new file mode 100644
index 00000000000..76c5b14f311
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-color/relative-currentcolor-rec2020-02.html.ini
@@ -0,0 +1,2 @@
+[relative-currentcolor-rec2020-02.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-color/relative-currentcolor-rgb-01.html.ini b/tests/wpt/meta-legacy-layout/css/css-color/relative-currentcolor-rgb-01.html.ini
new file mode 100644
index 00000000000..c9657c151a9
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-color/relative-currentcolor-rgb-01.html.ini
@@ -0,0 +1,2 @@
+[relative-currentcolor-rgb-01.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-color/relative-currentcolor-rgb-02.html.ini b/tests/wpt/meta-legacy-layout/css/css-color/relative-currentcolor-rgb-02.html.ini
new file mode 100644
index 00000000000..e1b99630d8d
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-color/relative-currentcolor-rgb-02.html.ini
@@ -0,0 +1,2 @@
+[relative-currentcolor-rgb-02.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-color/relative-currentcolor-xyzd50-01.html.ini b/tests/wpt/meta-legacy-layout/css/css-color/relative-currentcolor-xyzd50-01.html.ini
new file mode 100644
index 00000000000..7f68b11108e
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-color/relative-currentcolor-xyzd50-01.html.ini
@@ -0,0 +1,2 @@
+[relative-currentcolor-xyzd50-01.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-color/relative-currentcolor-xyzd65-01.html.ini b/tests/wpt/meta-legacy-layout/css/css-color/relative-currentcolor-xyzd65-01.html.ini
new file mode 100644
index 00000000000..843a21cbbca
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-color/relative-currentcolor-xyzd65-01.html.ini
@@ -0,0 +1,2 @@
+[relative-currentcolor-xyzd65-01.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-fonts/animations/font-palette-interpolation.html.ini b/tests/wpt/meta-legacy-layout/css/css-fonts/animations/font-palette-interpolation.html.ini
new file mode 100644
index 00000000000..d1bfaf95897
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-fonts/animations/font-palette-interpolation.html.ini
@@ -0,0 +1,342 @@
+[font-palette-interpolation.html]
+  [CSS Transitions: property <font-palette> from [light\] to [dark\] at (-2) should be [light\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-palette> from [light\] to [dark\] at (-0.25) should be [light\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-palette> from [light\] to [dark\] at (0) should be [light\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-palette> from [light\] to [dark\] at (0.3) should be [palette-mix(in oklab, light, dark 30%)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-palette> from [light\] to [dark\] at (0.6) should be [palette-mix(in oklab, light, dark 60%)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-palette> from [light\] to [dark\] at (1) should be [dark\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-palette> from [light\] to [dark\] at (1.5) should be [dark\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <font-palette> from [light\] to [dark\] at (-2) should be [light\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <font-palette> from [light\] to [dark\] at (-0.25) should be [light\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <font-palette> from [light\] to [dark\] at (0) should be [light\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <font-palette> from [light\] to [dark\] at (0.3) should be [palette-mix(in oklab, light, dark 30%)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <font-palette> from [light\] to [dark\] at (0.6) should be [palette-mix(in oklab, light, dark 60%)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <font-palette> from [light\] to [dark\] at (1) should be [dark\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <font-palette> from [light\] to [dark\] at (1.5) should be [dark\]]
+    expected: FAIL
+
+  [CSS Animations: property <font-palette> from [light\] to [dark\] at (-2) should be [light\]]
+    expected: FAIL
+
+  [CSS Animations: property <font-palette> from [light\] to [dark\] at (-0.25) should be [light\]]
+    expected: FAIL
+
+  [CSS Animations: property <font-palette> from [light\] to [dark\] at (0) should be [light\]]
+    expected: FAIL
+
+  [CSS Animations: property <font-palette> from [light\] to [dark\] at (0.3) should be [palette-mix(in oklab, light, dark 30%)\]]
+    expected: FAIL
+
+  [CSS Animations: property <font-palette> from [light\] to [dark\] at (0.6) should be [palette-mix(in oklab, light, dark 60%)\]]
+    expected: FAIL
+
+  [CSS Animations: property <font-palette> from [light\] to [dark\] at (1) should be [dark\]]
+    expected: FAIL
+
+  [CSS Animations: property <font-palette> from [light\] to [dark\] at (1.5) should be [dark\]]
+    expected: FAIL
+
+  [Web Animations: property <font-palette> from [light\] to [dark\] at (-2) should be [light\]]
+    expected: FAIL
+
+  [Web Animations: property <font-palette> from [light\] to [dark\] at (-0.25) should be [light\]]
+    expected: FAIL
+
+  [Web Animations: property <font-palette> from [light\] to [dark\] at (0) should be [light\]]
+    expected: FAIL
+
+  [Web Animations: property <font-palette> from [light\] to [dark\] at (0.3) should be [palette-mix(in oklab, light, dark 30%)\]]
+    expected: FAIL
+
+  [Web Animations: property <font-palette> from [light\] to [dark\] at (0.6) should be [palette-mix(in oklab, light, dark 60%)\]]
+    expected: FAIL
+
+  [Web Animations: property <font-palette> from [light\] to [dark\] at (1) should be [dark\]]
+    expected: FAIL
+
+  [Web Animations: property <font-palette> from [light\] to [dark\] at (1.5) should be [dark\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-palette> from [initial\] to [inherit\] at (-2) should be [normal\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-palette> from [initial\] to [inherit\] at (-0.25) should be [normal\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-palette> from [initial\] to [inherit\] at (0) should be [normal\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-palette> from [initial\] to [inherit\] at (0.3) should be [palette-mix(in oklab, normal, light 30%)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-palette> from [initial\] to [inherit\] at (0.6) should be [palette-mix(in oklab, normal, light 60%)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-palette> from [initial\] to [inherit\] at (1) should be [light\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-palette> from [initial\] to [inherit\] at (1.5) should be [light\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <font-palette> from [initial\] to [inherit\] at (-2) should be [normal\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <font-palette> from [initial\] to [inherit\] at (-0.25) should be [normal\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <font-palette> from [initial\] to [inherit\] at (0) should be [normal\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <font-palette> from [initial\] to [inherit\] at (0.3) should be [palette-mix(in oklab, normal, light 30%)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <font-palette> from [initial\] to [inherit\] at (0.6) should be [palette-mix(in oklab, normal, light 60%)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <font-palette> from [initial\] to [inherit\] at (1) should be [light\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <font-palette> from [initial\] to [inherit\] at (1.5) should be [light\]]
+    expected: FAIL
+
+  [CSS Animations: property <font-palette> from [initial\] to [inherit\] at (-2) should be [normal\]]
+    expected: FAIL
+
+  [CSS Animations: property <font-palette> from [initial\] to [inherit\] at (-0.25) should be [normal\]]
+    expected: FAIL
+
+  [CSS Animations: property <font-palette> from [initial\] to [inherit\] at (0) should be [normal\]]
+    expected: FAIL
+
+  [CSS Animations: property <font-palette> from [initial\] to [inherit\] at (0.3) should be [palette-mix(in oklab, normal, light 30%)\]]
+    expected: FAIL
+
+  [CSS Animations: property <font-palette> from [initial\] to [inherit\] at (0.6) should be [palette-mix(in oklab, normal, light 60%)\]]
+    expected: FAIL
+
+  [CSS Animations: property <font-palette> from [initial\] to [inherit\] at (1) should be [light\]]
+    expected: FAIL
+
+  [CSS Animations: property <font-palette> from [initial\] to [inherit\] at (1.5) should be [light\]]
+    expected: FAIL
+
+  [Web Animations: property <font-palette> from [initial\] to [inherit\] at (-2) should be [normal\]]
+    expected: FAIL
+
+  [Web Animations: property <font-palette> from [initial\] to [inherit\] at (-0.25) should be [normal\]]
+    expected: FAIL
+
+  [Web Animations: property <font-palette> from [initial\] to [inherit\] at (0) should be [normal\]]
+    expected: FAIL
+
+  [Web Animations: property <font-palette> from [initial\] to [inherit\] at (0.3) should be [palette-mix(in oklab, normal, light 30%)\]]
+    expected: FAIL
+
+  [Web Animations: property <font-palette> from [initial\] to [inherit\] at (0.6) should be [palette-mix(in oklab, normal, light 60%)\]]
+    expected: FAIL
+
+  [Web Animations: property <font-palette> from [initial\] to [inherit\] at (1) should be [light\]]
+    expected: FAIL
+
+  [Web Animations: property <font-palette> from [initial\] to [inherit\] at (1.5) should be [light\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-palette> from [--custom-palette\] to [normal\] at (-2) should be [--custom-palette\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-palette> from [--custom-palette\] to [normal\] at (-0.25) should be [--custom-palette\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-palette> from [--custom-palette\] to [normal\] at (0) should be [--custom-palette\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-palette> from [--custom-palette\] to [normal\] at (0.3) should be [palette-mix(in oklab, --custom-palette, normal 30%)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-palette> from [--custom-palette\] to [normal\] at (0.6) should be [palette-mix(in oklab, --custom-palette, normal 60%)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-palette> from [--custom-palette\] to [normal\] at (1) should be [normal\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-palette> from [--custom-palette\] to [normal\] at (1.5) should be [normal\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <font-palette> from [--custom-palette\] to [normal\] at (-2) should be [--custom-palette\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <font-palette> from [--custom-palette\] to [normal\] at (-0.25) should be [--custom-palette\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <font-palette> from [--custom-palette\] to [normal\] at (0) should be [--custom-palette\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <font-palette> from [--custom-palette\] to [normal\] at (0.3) should be [palette-mix(in oklab, --custom-palette, normal 30%)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <font-palette> from [--custom-palette\] to [normal\] at (0.6) should be [palette-mix(in oklab, --custom-palette, normal 60%)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <font-palette> from [--custom-palette\] to [normal\] at (1) should be [normal\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <font-palette> from [--custom-palette\] to [normal\] at (1.5) should be [normal\]]
+    expected: FAIL
+
+  [CSS Animations: property <font-palette> from [--custom-palette\] to [normal\] at (-2) should be [--custom-palette\]]
+    expected: FAIL
+
+  [CSS Animations: property <font-palette> from [--custom-palette\] to [normal\] at (-0.25) should be [--custom-palette\]]
+    expected: FAIL
+
+  [CSS Animations: property <font-palette> from [--custom-palette\] to [normal\] at (0) should be [--custom-palette\]]
+    expected: FAIL
+
+  [CSS Animations: property <font-palette> from [--custom-palette\] to [normal\] at (0.3) should be [palette-mix(in oklab, --custom-palette, normal 30%)\]]
+    expected: FAIL
+
+  [CSS Animations: property <font-palette> from [--custom-palette\] to [normal\] at (0.6) should be [palette-mix(in oklab, --custom-palette, normal 60%)\]]
+    expected: FAIL
+
+  [CSS Animations: property <font-palette> from [--custom-palette\] to [normal\] at (1) should be [normal\]]
+    expected: FAIL
+
+  [CSS Animations: property <font-palette> from [--custom-palette\] to [normal\] at (1.5) should be [normal\]]
+    expected: FAIL
+
+  [Web Animations: property <font-palette> from [--custom-palette\] to [normal\] at (-2) should be [--custom-palette\]]
+    expected: FAIL
+
+  [Web Animations: property <font-palette> from [--custom-palette\] to [normal\] at (-0.25) should be [--custom-palette\]]
+    expected: FAIL
+
+  [Web Animations: property <font-palette> from [--custom-palette\] to [normal\] at (0) should be [--custom-palette\]]
+    expected: FAIL
+
+  [Web Animations: property <font-palette> from [--custom-palette\] to [normal\] at (0.3) should be [palette-mix(in oklab, --custom-palette, normal 30%)\]]
+    expected: FAIL
+
+  [Web Animations: property <font-palette> from [--custom-palette\] to [normal\] at (0.6) should be [palette-mix(in oklab, --custom-palette, normal 60%)\]]
+    expected: FAIL
+
+  [Web Animations: property <font-palette> from [--custom-palette\] to [normal\] at (1) should be [normal\]]
+    expected: FAIL
+
+  [Web Animations: property <font-palette> from [--custom-palette\] to [normal\] at (1.5) should be [normal\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-palette> from [initial\] to [normal\] at (-2) should be [normal\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-palette> from [initial\] to [normal\] at (-0.25) should be [normal\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-palette> from [initial\] to [normal\] at (0) should be [normal\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-palette> from [initial\] to [normal\] at (0.3) should be [normal\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-palette> from [initial\] to [normal\] at (0.6) should be [normal\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-palette> from [initial\] to [normal\] at (1) should be [normal\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-palette> from [initial\] to [normal\] at (1.5) should be [normal\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <font-palette> from [initial\] to [normal\] at (-2) should be [normal\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <font-palette> from [initial\] to [normal\] at (-0.25) should be [normal\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <font-palette> from [initial\] to [normal\] at (0) should be [normal\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <font-palette> from [initial\] to [normal\] at (0.3) should be [normal\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <font-palette> from [initial\] to [normal\] at (0.6) should be [normal\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <font-palette> from [initial\] to [normal\] at (1) should be [normal\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <font-palette> from [initial\] to [normal\] at (1.5) should be [normal\]]
+    expected: FAIL
+
+  [CSS Animations: property <font-palette> from [initial\] to [normal\] at (-2) should be [normal\]]
+    expected: FAIL
+
+  [CSS Animations: property <font-palette> from [initial\] to [normal\] at (-0.25) should be [normal\]]
+    expected: FAIL
+
+  [CSS Animations: property <font-palette> from [initial\] to [normal\] at (0) should be [normal\]]
+    expected: FAIL
+
+  [CSS Animations: property <font-palette> from [initial\] to [normal\] at (0.3) should be [normal\]]
+    expected: FAIL
+
+  [CSS Animations: property <font-palette> from [initial\] to [normal\] at (0.6) should be [normal\]]
+    expected: FAIL
+
+  [CSS Animations: property <font-palette> from [initial\] to [normal\] at (1) should be [normal\]]
+    expected: FAIL
+
+  [CSS Animations: property <font-palette> from [initial\] to [normal\] at (1.5) should be [normal\]]
+    expected: FAIL
+
+  [Web Animations: property <font-palette> from [initial\] to [normal\] at (-2) should be [normal\]]
+    expected: FAIL
+
+  [Web Animations: property <font-palette> from [initial\] to [normal\] at (-0.25) should be [normal\]]
+    expected: FAIL
+
+  [Web Animations: property <font-palette> from [initial\] to [normal\] at (0) should be [normal\]]
+    expected: FAIL
+
+  [Web Animations: property <font-palette> from [initial\] to [normal\] at (0.3) should be [normal\]]
+    expected: FAIL
+
+  [Web Animations: property <font-palette> from [initial\] to [normal\] at (0.6) should be [normal\]]
+    expected: FAIL
+
+  [Web Animations: property <font-palette> from [initial\] to [normal\] at (1) should be [normal\]]
+    expected: FAIL
+
+  [Web Animations: property <font-palette> from [initial\] to [normal\] at (1.5) should be [normal\]]
+    expected: FAIL
+
+  [An interpolation to inherit updates correctly on a parent style change.]
+    expected: FAIL
+
+  [Test additive animations]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-fonts/palette-mix-computed.html.ini b/tests/wpt/meta-legacy-layout/css/css-fonts/palette-mix-computed.html.ini
new file mode 100644
index 00000000000..30c4656acac
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-fonts/palette-mix-computed.html.ini
@@ -0,0 +1,81 @@
+[palette-mix-computed.html]
+  [Property font-palette value 'palette-mix(in oklab, light 30%, dark)']
+    expected: FAIL
+
+  [Property font-palette value 'palette-mix(in oklab, light 30%, light)']
+    expected: FAIL
+
+  [Property font-palette value 'palette-mix(in oklab, light 30%, normal)']
+    expected: FAIL
+
+  [Property font-palette value 'palette-mix(in oklab, --custom-palette 30%, normal)']
+    expected: FAIL
+
+  [Property font-palette value 'palette-mix(in oklab, light 50%, dark 50%)']
+    expected: FAIL
+
+  [Property font-palette value 'palette-mix(in oklab, light, dark 50%)']
+    expected: FAIL
+
+  [Property font-palette value 'palette-mix(in oklab, light 50%, dark)']
+    expected: FAIL
+
+  [Property font-palette value 'palette-mix(in oklab, light, dark)']
+    expected: FAIL
+
+  [Property font-palette value 'palette-mix(in oklab, light 50%, dark 70%)']
+    expected: FAIL
+
+  [Property font-palette value 'palette-mix(in oklab, light 70%, dark 70%)']
+    expected: FAIL
+
+  [Property font-palette value 'palette-mix(in oklab, light, dark 70%)']
+    expected: FAIL
+
+  [Property font-palette value 'palette-mix(in oklab, light 30%, dark 70%)']
+    expected: FAIL
+
+  [Property font-palette value 'palette-mix(in oklab, light 60%, dark)']
+    expected: FAIL
+
+  [Property font-palette value 'palette-mix(in oklab, light 10%, dark 40%)']
+    expected: FAIL
+
+  [Property font-palette value 'palette-mix(in hsl, light 10%, dark)']
+    expected: FAIL
+
+  [Property font-palette value 'palette-mix(in hwb, light 10%, dark)']
+    expected: FAIL
+
+  [Property font-palette value 'palette-mix(in lch, light 10%, dark)']
+    expected: FAIL
+
+  [Property font-palette value 'palette-mix(in oklch, light 10%, dark)']
+    expected: FAIL
+
+  [Property font-palette value 'palette-mix(in lab, light 10%, dark)']
+    expected: FAIL
+
+  [Property font-palette value 'palette-mix(in oklab, light 10%, dark)']
+    expected: FAIL
+
+  [Property font-palette value 'palette-mix(in srgb, light 10%, dark)']
+    expected: FAIL
+
+  [Property font-palette value 'palette-mix(in srgb-linear, light 10%, dark)']
+    expected: FAIL
+
+  [Property font-palette value 'palette-mix(in xyz, light 10%, dark)']
+    expected: FAIL
+
+  [Property font-palette value 'palette-mix(in xyz-d50, light 10%, dark)']
+    expected: FAIL
+
+  [Property font-palette value 'palette-mix(in xyz-d65, light 10%, dark)']
+    expected: FAIL
+
+  [Property font-palette value 'palette-mix(in oklab, palette-mix(in srgb, light 30%, normal) 20%, dark)']
+    expected: FAIL
+
+  [Property font-palette value 'palette-mix(in oklab, palette-mix(in srgb, light 30%, normal) 30%, palette-mix(in srgb, --custom-palette 30%, dark))']
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-fonts/rcap-in-monospace.html.ini b/tests/wpt/meta-legacy-layout/css/css-fonts/rcap-in-monospace.html.ini
new file mode 100644
index 00000000000..43c07d772f2
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-fonts/rcap-in-monospace.html.ini
@@ -0,0 +1,2 @@
+[rcap-in-monospace.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-fonts/rch-in-monospace.html.ini b/tests/wpt/meta-legacy-layout/css/css-fonts/rch-in-monospace.html.ini
new file mode 100644
index 00000000000..a17b4e5c53f
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-fonts/rch-in-monospace.html.ini
@@ -0,0 +1,2 @@
+[rch-in-monospace.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-fonts/rex-in-monospace.html.ini b/tests/wpt/meta-legacy-layout/css/css-fonts/rex-in-monospace.html.ini
new file mode 100644
index 00000000000..0567da868b8
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-fonts/rex-in-monospace.html.ini
@@ -0,0 +1,2 @@
+[rex-in-monospace.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-fonts/ric-in-monospace.html.ini b/tests/wpt/meta-legacy-layout/css/css-fonts/ric-in-monospace.html.ini
new file mode 100644
index 00000000000..45092377da0
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-fonts/ric-in-monospace.html.ini
@@ -0,0 +1,2 @@
+[ric-in-monospace.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-fonts/variations/font-weight-matching.html.ini b/tests/wpt/meta-legacy-layout/css/css-fonts/variations/font-weight-matching.html.ini
index 5d6fc3e8ed5..c6172dfc8e8 100644
--- a/tests/wpt/meta-legacy-layout/css/css-fonts/variations/font-weight-matching.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-fonts/variations/font-weight-matching.html.ini
@@ -37,3 +37,6 @@
 
   [Test @font-face matching for weight 420]
     expected: FAIL
+
+  [Test @font-face matching for weight 100]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-position/backdrop-inherit-computed.html.ini b/tests/wpt/meta-legacy-layout/css/css-position/backdrop-inherit-computed.html.ini
new file mode 100644
index 00000000000..2a9378d9bbb
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-position/backdrop-inherit-computed.html.ini
@@ -0,0 +1,2 @@
+[backdrop-inherit-computed.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/css/css-text-decor/invalidation/selection-pseudo-with-decoration-invalidation-001.html.ini b/tests/wpt/meta-legacy-layout/css/css-text-decor/invalidation/selection-pseudo-with-decoration-invalidation-001.html.ini
new file mode 100644
index 00000000000..1a98d8ff779
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-text-decor/invalidation/selection-pseudo-with-decoration-invalidation-001.html.ini
@@ -0,0 +1,2 @@
+[selection-pseudo-with-decoration-invalidation-001.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text-decor/invalidation/selection-pseudo-with-decoration-invalidation-002.html.ini b/tests/wpt/meta-legacy-layout/css/css-text-decor/invalidation/selection-pseudo-with-decoration-invalidation-002.html.ini
new file mode 100644
index 00000000000..17d161ef076
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-text-decor/invalidation/selection-pseudo-with-decoration-invalidation-002.html.ini
@@ -0,0 +1,2 @@
+[selection-pseudo-with-decoration-invalidation-002.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/hanging-punctuation/hanging-punctuation-first-002.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/hanging-punctuation/hanging-punctuation-first-002.html.ini
new file mode 100644
index 00000000000..3c88e7c0734
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-text/hanging-punctuation/hanging-punctuation-first-002.html.ini
@@ -0,0 +1,2 @@
+[hanging-punctuation-first-002.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/parsing/text-autospace-valid.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/parsing/text-autospace-valid.html.ini
index 77015f212ee..bbfd554dad3 100644
--- a/tests/wpt/meta-legacy-layout/css/css-text/parsing/text-autospace-valid.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-text/parsing/text-autospace-valid.html.ini
@@ -28,3 +28,81 @@
 
   [e.style['text-autospace'\] = "punctuation ideograph-alpha ideograph-numeric" should set the property value]
     expected: FAIL
+
+  [e.style['text-autospace'\] = "ideograph-alpha insert" should set the property value]
+    expected: FAIL
+
+  [e.style['text-autospace'\] = "ideograph-numeric insert" should set the property value]
+    expected: FAIL
+
+  [e.style['text-autospace'\] = "ideograph-alpha ideograph-numeric insert" should set the property value]
+    expected: FAIL
+
+  [e.style['text-autospace'\] = "punctuation insert" should set the property value]
+    expected: FAIL
+
+  [e.style['text-autospace'\] = "punctuation normal insert" should set the property value]
+    expected: FAIL
+
+  [e.style['text-autospace'\] = "punctuation ideograph-alpha insert" should set the property value]
+    expected: FAIL
+
+  [e.style['text-autospace'\] = "insert ideograph-alpha" should set the property value]
+    expected: FAIL
+
+  [e.style['text-autospace'\] = "insert ideograph-numeric" should set the property value]
+    expected: FAIL
+
+  [e.style['text-autospace'\] = "insert ideograph-alpha ideograph-numeric" should set the property value]
+    expected: FAIL
+
+  [e.style['text-autospace'\] = "insert punctuation" should set the property value]
+    expected: FAIL
+
+  [e.style['text-autospace'\] = "insert punctuation normal" should set the property value]
+    expected: FAIL
+
+  [e.style['text-autospace'\] = "insert punctuation ideograph-alpha" should set the property value]
+    expected: FAIL
+
+  [e.style['text-autospace'\] = "insert punctuation ideograph-alpha ideograph-numeric" should set the property value]
+    expected: FAIL
+
+  [e.style['text-autospace'\] = "ideograph-alpha replace" should set the property value]
+    expected: FAIL
+
+  [e.style['text-autospace'\] = "ideograph-numeric replace" should set the property value]
+    expected: FAIL
+
+  [e.style['text-autospace'\] = "ideograph-alpha ideograph-numeric replace" should set the property value]
+    expected: FAIL
+
+  [e.style['text-autospace'\] = "punctuation replace" should set the property value]
+    expected: FAIL
+
+  [e.style['text-autospace'\] = "punctuation normal replace" should set the property value]
+    expected: FAIL
+
+  [e.style['text-autospace'\] = "punctuation ideograph-alpha replace" should set the property value]
+    expected: FAIL
+
+  [e.style['text-autospace'\] = "replace ideograph-alpha" should set the property value]
+    expected: FAIL
+
+  [e.style['text-autospace'\] = "replace ideograph-numeric" should set the property value]
+    expected: FAIL
+
+  [e.style['text-autospace'\] = "replace ideograph-alpha ideograph-numeric" should set the property value]
+    expected: FAIL
+
+  [e.style['text-autospace'\] = "replace punctuation" should set the property value]
+    expected: FAIL
+
+  [e.style['text-autospace'\] = "replace punctuation normal" should set the property value]
+    expected: FAIL
+
+  [e.style['text-autospace'\] = "replace punctuation ideograph-alpha" should set the property value]
+    expected: FAIL
+
+  [e.style['text-autospace'\] = "replace punctuation ideograph-alpha ideograph-numeric" should set the property value]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/parsing/text-spacing-trim-computed.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/parsing/text-spacing-trim-computed.html.ini
new file mode 100644
index 00000000000..55f43aa1353
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-text/parsing/text-spacing-trim-computed.html.ini
@@ -0,0 +1,24 @@
+[text-spacing-trim-computed.html]
+  [Property text-spacing-trim value 'auto']
+    expected: FAIL
+
+  [Property text-spacing-trim value 'space-all']
+    expected: FAIL
+
+  [Property text-spacing-trim value 'trim-auto']
+    expected: FAIL
+
+  [Property text-spacing-trim value 'trim-all']
+    expected: FAIL
+
+  [Property text-spacing-trim value 'allow-end']
+    expected: FAIL
+
+  [Property text-spacing-trim value 'space-first']
+    expected: FAIL
+
+  [Property text-spacing-trim value 'allow-end space-first']
+    expected: FAIL
+
+  [Property text-spacing-trim value 'space-first allow-end']
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/parsing/text-spacing-trim-valid.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/parsing/text-spacing-trim-valid.html.ini
new file mode 100644
index 00000000000..dc325c5f4c5
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-text/parsing/text-spacing-trim-valid.html.ini
@@ -0,0 +1,24 @@
+[text-spacing-trim-valid.html]
+  [e.style['text-spacing-trim'\] = "auto" should set the property value]
+    expected: FAIL
+
+  [e.style['text-spacing-trim'\] = "space-all" should set the property value]
+    expected: FAIL
+
+  [e.style['text-spacing-trim'\] = "trim-auto" should set the property value]
+    expected: FAIL
+
+  [e.style['text-spacing-trim'\] = "trim-all" should set the property value]
+    expected: FAIL
+
+  [e.style['text-spacing-trim'\] = "allow-end" should set the property value]
+    expected: FAIL
+
+  [e.style['text-spacing-trim'\] = "space-first" should set the property value]
+    expected: FAIL
+
+  [e.style['text-spacing-trim'\] = "allow-end space-first" should set the property value]
+    expected: FAIL
+
+  [e.style['text-spacing-trim'\] = "space-first allow-end" should set the property value]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/parsing/text-wrap-valid.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/parsing/text-wrap-valid.html.ini
index 6900f7a1f73..9eb9caae38e 100644
--- a/tests/wpt/meta-legacy-layout/css/css-text/parsing/text-wrap-valid.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-text/parsing/text-wrap-valid.html.ini
@@ -28,3 +28,54 @@
 
   [e.style['text-wrap'\] = "revert-layer" should set the property value]
     expected: FAIL
+
+  [e.style['text-wrap'\] = "auto" should set the property value]
+    expected: FAIL
+
+  [e.style['text-wrap'\] = "wrap auto" should set the property value]
+    expected: FAIL
+
+  [e.style['text-wrap'\] = "wrap balance" should set the property value]
+    expected: FAIL
+
+  [e.style['text-wrap'\] = "wrap pretty" should set the property value]
+    expected: FAIL
+
+  [e.style['text-wrap'\] = "wrap stable" should set the property value]
+    expected: FAIL
+
+  [e.style['text-wrap'\] = "auto wrap" should set the property value]
+    expected: FAIL
+
+  [e.style['text-wrap'\] = "balance wrap" should set the property value]
+    expected: FAIL
+
+  [e.style['text-wrap'\] = "pretty wrap" should set the property value]
+    expected: FAIL
+
+  [e.style['text-wrap'\] = "stable wrap" should set the property value]
+    expected: FAIL
+
+  [e.style['text-wrap'\] = "nowrap auto" should set the property value]
+    expected: FAIL
+
+  [e.style['text-wrap'\] = "nowrap balance" should set the property value]
+    expected: FAIL
+
+  [e.style['text-wrap'\] = "nowrap pretty" should set the property value]
+    expected: FAIL
+
+  [e.style['text-wrap'\] = "nowrap stable" should set the property value]
+    expected: FAIL
+
+  [e.style['text-wrap'\] = "auto nowrap" should set the property value]
+    expected: FAIL
+
+  [e.style['text-wrap'\] = "balance nowrap" should set the property value]
+    expected: FAIL
+
+  [e.style['text-wrap'\] = "pretty nowrap" should set the property value]
+    expected: FAIL
+
+  [e.style['text-wrap'\] = "stable nowrap" should set the property value]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/parsing/word-boundary-detection-computed.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/parsing/word-boundary-detection-computed.html.ini
deleted file mode 100644
index 59898e48af0..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-text/parsing/word-boundary-detection-computed.html.ini
+++ /dev/null
@@ -1,13 +0,0 @@
-[word-boundary-detection-computed.html]
-  [Property word-boundary-detection value 'normal' computes to 'normal']
-    expected: FAIL
-
-  [Property word-boundary-detection value 'manual' computes to 'manual']
-    expected: FAIL
-
-  [Property word-boundary-detection value 'manual']
-    expected: FAIL
-
-  [Property word-boundary-detection value 'normal']
-    expected: FAIL
-
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/parsing/word-boundary-detection-valid.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/parsing/word-boundary-detection-valid.html.ini
deleted file mode 100644
index c05d7a883cb..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-text/parsing/word-boundary-detection-valid.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[word-boundary-detection-valid.html]
-  [e.style['word-boundary-detection'\] = "normal" should set the property value]
-    expected: FAIL
-
-  [e.style['word-boundary-detection'\] = "manual" should set the property value]
-    expected: FAIL
-
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/parsing/word-boundary-expansion-computed.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/parsing/word-boundary-expansion-computed.html.ini
deleted file mode 100644
index 1ec2a730d65..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-text/parsing/word-boundary-expansion-computed.html.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-[word-boundary-expansion-computed.html]
-  [Property word-boundary-expansion value 'space' computes to 'space']
-    expected: FAIL
-
-  [Property word-boundary-expansion value 'ideographic-space' computes to 'ideographic-space']
-    expected: FAIL
-
-  [Property word-boundary-expansion value 'none' computes to 'none']
-    expected: FAIL
-
-  [Property word-boundary-expansion value 'none']
-    expected: FAIL
-
-  [Property word-boundary-expansion value 'ideographic-space']
-    expected: FAIL
-
-  [Property word-boundary-expansion value 'space']
-    expected: FAIL
-
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/parsing/word-boundary-expansion-valid.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/parsing/word-boundary-expansion-valid.html.ini
deleted file mode 100644
index c1f25ca839c..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-text/parsing/word-boundary-expansion-valid.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[word-boundary-expansion-valid.html]
-  [e.style['word-boundary-expansion'\] = "space" should set the property value]
-    expected: FAIL
-
-  [e.style['word-boundary-expansion'\] = "ideographic-space" should set the property value]
-    expected: FAIL
-
-  [e.style['word-boundary-expansion'\] = "none" should set the property value]
-    expected: FAIL
-
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/parsing/word-break-valid.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/parsing/word-break-valid.html.ini
index ef2cd5e9fe4..fbc5d81efe9 100644
--- a/tests/wpt/meta-legacy-layout/css/css-text/parsing/word-break-valid.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-text/parsing/word-break-valid.html.ini
@@ -4,3 +4,6 @@
 
   [e.style['word-break'\] = "auto-phrase" should set the property value]
     expected: FAIL
+
+  [e.style['word-break'\] = "manual" should set the property value]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/parsing/word-space-transform-computed.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/parsing/word-space-transform-computed.html.ini
new file mode 100644
index 00000000000..42cbfb34cf9
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-text/parsing/word-space-transform-computed.html.ini
@@ -0,0 +1,15 @@
+[word-space-transform-computed.html]
+  [Property word-space-transform value 'none']
+    expected: FAIL
+
+  [Property word-space-transform value 'space']
+    expected: FAIL
+
+  [Property word-space-transform value 'ideographic-space']
+    expected: FAIL
+
+  [Property word-space-transform value 'space auto-phrase']
+    expected: FAIL
+
+  [Property word-space-transform value 'ideographic-space auto-phrase']
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/parsing/word-space-transform-valid.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/parsing/word-space-transform-valid.html.ini
new file mode 100644
index 00000000000..fefac5f0336
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-text/parsing/word-space-transform-valid.html.ini
@@ -0,0 +1,21 @@
+[word-space-transform-valid.html]
+  [e.style['word-space-transform'\] = "none" should set the property value]
+    expected: FAIL
+
+  [e.style['word-space-transform'\] = "space" should set the property value]
+    expected: FAIL
+
+  [e.style['word-space-transform'\] = "ideographic-space" should set the property value]
+    expected: FAIL
+
+  [e.style['word-space-transform'\] = "space auto-phrase" should set the property value]
+    expected: FAIL
+
+  [e.style['word-space-transform'\] = "ideographic-space auto-phrase" should set the property value]
+    expected: FAIL
+
+  [e.style['word-space-transform'\] = "auto-phrase space" should set the property value]
+    expected: FAIL
+
+  [e.style['word-space-transform'\] = "auto-phrase ideographic-space" should set the property value]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/tab-size/tab-size-integer-005.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/tab-size/tab-size-integer-005.html.ini
new file mode 100644
index 00000000000..50ef08178ba
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-text/tab-size/tab-size-integer-005.html.ini
@@ -0,0 +1,2 @@
+[tab-size-integer-005.html]
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/text-autospace/text-autospace-001.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/text-autospace/text-autospace-001.html.ini
new file mode 100644
index 00000000000..81c60721b6b
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-text/text-autospace/text-autospace-001.html.ini
@@ -0,0 +1,2 @@
+[text-autospace-001.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/text-autospace/text-autospace-break-001.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/text-autospace/text-autospace-break-001.html.ini
new file mode 100644
index 00000000000..eef64d20e85
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-text/text-autospace/text-autospace-break-001.html.ini
@@ -0,0 +1,2 @@
+[text-autospace-break-001.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/text-autospace/text-autospace-dynamic-001.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/text-autospace/text-autospace-dynamic-001.html.ini
new file mode 100644
index 00000000000..95739378448
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-text/text-autospace/text-autospace-dynamic-001.html.ini
@@ -0,0 +1,2 @@
+[text-autospace-dynamic-001.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/text-autospace/text-autospace-first-line-001.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/text-autospace/text-autospace-first-line-001.html.ini
new file mode 100644
index 00000000000..3f928a6194d
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-text/text-autospace/text-autospace-first-line-001.html.ini
@@ -0,0 +1,3 @@
+[text-autospace-first-line-001.html]
+  [text-autospace-first-line-001]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/text-autospace/text-autospace-ligature-001.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/text-autospace/text-autospace-ligature-001.html.ini
new file mode 100644
index 00000000000..67c2adbfe7e
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-text/text-autospace/text-autospace-ligature-001.html.ini
@@ -0,0 +1,2 @@
+[text-autospace-ligature-001.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/text-autospace/text-autospace-no-001.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/text-autospace/text-autospace-no-001.html.ini
new file mode 100644
index 00000000000..853b10e9a36
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-text/text-autospace/text-autospace-no-001.html.ini
@@ -0,0 +1,2 @@
+[text-autospace-no-001.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/text-spacing-trim/text-spacing-trim-colon-001.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/text-spacing-trim/text-spacing-trim-colon-001.html.ini
new file mode 100644
index 00000000000..fd495eb2ba9
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-text/text-spacing-trim/text-spacing-trim-colon-001.html.ini
@@ -0,0 +1,5 @@
+[text-spacing-trim-colon-001.html?class=chws,vrl]
+  expected: FAIL
+
+[text-spacing-trim-colon-001.html?class=halt,vrl]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/text-spacing-trim/text-spacing-trim-combinations-001.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/text-spacing-trim/text-spacing-trim-combinations-001.html.ini
new file mode 100644
index 00000000000..52b0d0166bc
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-text/text-spacing-trim/text-spacing-trim-combinations-001.html.ini
@@ -0,0 +1,27 @@
+[text-spacing-trim-combinations-001.html]
+  ["国（（国"]
+    expected: FAIL
+
+  ["国・（国"]
+    expected: FAIL
+
+  ["国）（国"]
+    expected: FAIL
+
+  ["国　（国"]
+    expected: FAIL
+
+  ["国））国"]
+    expected: FAIL
+
+  ["国）・国"]
+    expected: FAIL
+
+  ["国）　国"]
+    expected: FAIL
+
+  ["国（（（国"]
+    expected: FAIL
+
+  ["国）））国"]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/text-spacing-trim/text-spacing-trim-dot-001.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/text-spacing-trim/text-spacing-trim-dot-001.html.ini
new file mode 100644
index 00000000000..22931cb6723
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-text/text-spacing-trim/text-spacing-trim-dot-001.html.ini
@@ -0,0 +1,5 @@
+[text-spacing-trim-dot-001.html?class=halt,vrl]
+  expected: FAIL
+
+[text-spacing-trim-dot-001.html?class=chws,vrl]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/white-space/text-space-collapse-discard-001.xht.ini b/tests/wpt/meta-legacy-layout/css/css-text/white-space/text-space-collapse-discard-001.xht.ini
deleted file mode 100644
index c7046e79914..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-text/white-space/text-space-collapse-discard-001.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[text-space-collapse-discard-001.xht]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/white-space/text-space-collapse-preserve-breaks-001.xht.ini b/tests/wpt/meta-legacy-layout/css/css-text/white-space/text-space-collapse-preserve-breaks-001.xht.ini
deleted file mode 100644
index 343f85988a2..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-text/white-space/text-space-collapse-preserve-breaks-001.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[text-space-collapse-preserve-breaks-001.xht]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/white-space/text-space-trim-trim-inner-001.xht.ini b/tests/wpt/meta-legacy-layout/css/css-text/white-space/text-space-trim-trim-inner-001.xht.ini
deleted file mode 100644
index 52470fe1c5b..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-text/white-space/text-space-trim-trim-inner-001.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[text-space-trim-trim-inner-001.xht]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/white-space/text-wrap-balance-float-001.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/white-space/text-wrap-balance-float-001.html.ini
new file mode 100644
index 00000000000..7cd37398508
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-text/white-space/text-wrap-balance-float-001.html.ini
@@ -0,0 +1,2 @@
+[text-wrap-balance-float-001.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/white-space/text-wrap-balance-float-002.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/white-space/text-wrap-balance-float-002.html.ini
new file mode 100644
index 00000000000..656abfbba7b
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-text/white-space/text-wrap-balance-float-002.html.ini
@@ -0,0 +1,2 @@
+[text-wrap-balance-float-002.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/white-space/text-wrap-balance-float-003.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/white-space/text-wrap-balance-float-003.html.ini
new file mode 100644
index 00000000000..c0fb44fa721
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-text/white-space/text-wrap-balance-float-003.html.ini
@@ -0,0 +1,2 @@
+[text-wrap-balance-float-003.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/white-space/text-wrap-balance-float-004.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/white-space/text-wrap-balance-float-004.html.ini
new file mode 100644
index 00000000000..6ab8fe344ba
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-text/white-space/text-wrap-balance-float-004.html.ini
@@ -0,0 +1,2 @@
+[text-wrap-balance-float-004.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/white-space/text-wrap-balance-float-005.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/white-space/text-wrap-balance-float-005.html.ini
new file mode 100644
index 00000000000..68ca02454b8
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-text/white-space/text-wrap-balance-float-005.html.ini
@@ -0,0 +1,2 @@
+[text-wrap-balance-float-005.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/white-space/white-space-collapse-discard-001.xht.ini b/tests/wpt/meta-legacy-layout/css/css-text/white-space/white-space-collapse-discard-001.xht.ini
new file mode 100644
index 00000000000..16d18cbbbcf
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-text/white-space/white-space-collapse-discard-001.xht.ini
@@ -0,0 +1,2 @@
+[white-space-collapse-discard-001.xht]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/white-space/white-space-collapse-preserve-breaks-001.xht.ini b/tests/wpt/meta-legacy-layout/css/css-text/white-space/white-space-collapse-preserve-breaks-001.xht.ini
new file mode 100644
index 00000000000..338c942aeab
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-text/white-space/white-space-collapse-preserve-breaks-001.xht.ini
@@ -0,0 +1,2 @@
+[white-space-collapse-preserve-breaks-001.xht]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/white-space/white-space-trim-discard-inner-001.xht.ini b/tests/wpt/meta-legacy-layout/css/css-text/white-space/white-space-trim-discard-inner-001.xht.ini
new file mode 100644
index 00000000000..b360d5c85e6
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-text/white-space/white-space-trim-discard-inner-001.xht.ini
@@ -0,0 +1,2 @@
+[white-space-trim-discard-inner-001.xht]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-001.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-001.html.ini
deleted file mode 100644
index 201a7f68bc6..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-001.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-001.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-002.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-002.html.ini
deleted file mode 100644
index 671edc8c6b6..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-002.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-002.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-003.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-003.html.ini
deleted file mode 100644
index dcc7ea518e3..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-003.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-003.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-004.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-004.html.ini
deleted file mode 100644
index c2ed0704079..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-004.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-004.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-005.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-005.html.ini
deleted file mode 100644
index 5c8f8888bf1..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-005.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-005.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-006.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-006.html.ini
deleted file mode 100644
index 59990e91eff..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-006.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-006.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-007.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-007.html.ini
deleted file mode 100644
index e4f9fe57f1c..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-007.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-007.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-008.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-008.html.ini
deleted file mode 100644
index 3d3bda613ff..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-008.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-008.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-009.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-009.html.ini
deleted file mode 100644
index bf153d1a569..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-009.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-009.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-010.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-010.html.ini
deleted file mode 100644
index bb02af24b3d..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-010.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-010.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-011.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-011.html.ini
deleted file mode 100644
index bacbc5fdf59..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-011.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-011.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-012.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-012.html.ini
deleted file mode 100644
index 00e16d20863..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-012.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-012.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-013.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-013.html.ini
deleted file mode 100644
index 0171725420f..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-013.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-013.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-014.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-014.html.ini
deleted file mode 100644
index 705d9e14464..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-014.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-014.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-102.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-102.html.ini
deleted file mode 100644
index 0e40fcb9f09..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-102.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-102.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-103.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-103.html.ini
deleted file mode 100644
index 27899b63155..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-103.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-103.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-104.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-104.html.ini
deleted file mode 100644
index 77f96a47ac0..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-104.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-104.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-105.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-105.html.ini
deleted file mode 100644
index 840044bc006..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-105.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-105.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-107.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-107.html.ini
deleted file mode 100644
index 63d6fcc1168..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-107.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-107.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-108.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-108.html.ini
deleted file mode 100644
index 767d3ca5a00..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-108.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-108.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-109.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-109.html.ini
deleted file mode 100644
index 7fcf6cd2867..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-109.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-109.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-110.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-110.html.ini
deleted file mode 100644
index a17d0a24611..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-110.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-110.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-112.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-112.html.ini
deleted file mode 100644
index ee07c319feb..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-112.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-112.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-113.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-113.html.ini
deleted file mode 100644
index abea305088f..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-113.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-113.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-114.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-114.html.ini
deleted file mode 100644
index da95790bcf8..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-114.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-114.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-115.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-115.html.ini
deleted file mode 100644
index d85c5512b66..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-115.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-115.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-116.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-116.html.ini
deleted file mode 100644
index 6968d8f652c..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-116.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-116.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-117.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-117.html.ini
deleted file mode 100644
index f62025e8326..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-117.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-117.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-118.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-118.html.ini
deleted file mode 100644
index 7d7e9975994..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-118.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-118.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-119.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-119.html.ini
deleted file mode 100644
index fab9077f0b5..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-119.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-119.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-120.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-120.html.ini
deleted file mode 100644
index 450539a5df9..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-120.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-120.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-121.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-121.html.ini
deleted file mode 100644
index 0337c634dd9..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-121.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-121.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-122.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-122.html.ini
deleted file mode 100644
index ece305eb8a4..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-122.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-122.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-123.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-123.html.ini
deleted file mode 100644
index 2ec608aa4fd..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-123.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-123.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-124.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-124.html.ini
deleted file mode 100644
index 199463f5151..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-124.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-124.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-125.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-125.html.ini
deleted file mode 100644
index 0acaeca9615..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-125.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-125.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-126.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-126.html.ini
deleted file mode 100644
index 024b35d55b2..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-126.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-126.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-127.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-127.html.ini
deleted file mode 100644
index 7e43d876903..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-127.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-127.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-128.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-128.html.ini
deleted file mode 100644
index c517a4e1d54..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-128.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-128.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-129.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-129.html.ini
deleted file mode 100644
index d14e053675b..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-text/word-boundary/word-boundary-129.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-129.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/word-break/word-break-normal-002.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/word-break/word-break-normal-002.html.ini
new file mode 100644
index 00000000000..db03fede0af
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-text/word-break/word-break-normal-002.html.ini
@@ -0,0 +1,2 @@
+[word-break-normal-002.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/word-break/word-break-normal-003.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/word-break/word-break-normal-003.html.ini
new file mode 100644
index 00000000000..795ac13c70b
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-text/word-break/word-break-normal-003.html.ini
@@ -0,0 +1,2 @@
+[word-break-normal-003.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/word-break/word-break-normal-th-001.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/word-break/word-break-normal-th-001.html.ini
new file mode 100644
index 00000000000..ae690e382e8
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-text/word-break/word-break-normal-th-001.html.ini
@@ -0,0 +1,2 @@
+[word-break-normal-th-001.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/word-space-transform/word-space-transform-001.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/word-space-transform/word-space-transform-001.html.ini
new file mode 100644
index 00000000000..ed36235dcec
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-text/word-space-transform/word-space-transform-001.html.ini
@@ -0,0 +1,2 @@
+[word-space-transform-001.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/word-space-transform/word-space-transform-002.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/word-space-transform/word-space-transform-002.html.ini
new file mode 100644
index 00000000000..fb4d1903d09
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-text/word-space-transform/word-space-transform-002.html.ini
@@ -0,0 +1,2 @@
+[word-space-transform-002.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/word-space-transform/word-space-transform-003.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/word-space-transform/word-space-transform-003.html.ini
new file mode 100644
index 00000000000..1caf1da34db
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-text/word-space-transform/word-space-transform-003.html.ini
@@ -0,0 +1,2 @@
+[word-space-transform-003.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/word-space-transform/word-space-transform-004.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/word-space-transform/word-space-transform-004.html.ini
new file mode 100644
index 00000000000..e100a5456f0
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-text/word-space-transform/word-space-transform-004.html.ini
@@ -0,0 +1,2 @@
+[word-space-transform-004.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/word-space-transform/word-space-transform-005.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/word-space-transform/word-space-transform-005.html.ini
new file mode 100644
index 00000000000..4488941951d
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-text/word-space-transform/word-space-transform-005.html.ini
@@ -0,0 +1,2 @@
+[word-space-transform-005.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/word-space-transform/word-space-transform-006.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/word-space-transform/word-space-transform-006.html.ini
new file mode 100644
index 00000000000..569650aae57
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-text/word-space-transform/word-space-transform-006.html.ini
@@ -0,0 +1,2 @@
+[word-space-transform-006.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/word-space-transform/word-space-transform-007.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/word-space-transform/word-space-transform-007.html.ini
new file mode 100644
index 00000000000..a1f2b899404
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-text/word-space-transform/word-space-transform-007.html.ini
@@ -0,0 +1,2 @@
+[word-space-transform-007.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/word-space-transform/word-space-transform-008.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/word-space-transform/word-space-transform-008.html.ini
new file mode 100644
index 00000000000..049a1f539ec
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-text/word-space-transform/word-space-transform-008.html.ini
@@ -0,0 +1,2 @@
+[word-space-transform-008.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/word-space-transform/word-space-transform-009.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/word-space-transform/word-space-transform-009.html.ini
new file mode 100644
index 00000000000..c624473164b
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-text/word-space-transform/word-space-transform-009.html.ini
@@ -0,0 +1,2 @@
+[word-space-transform-009.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/word-space-transform/word-space-transform-010.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/word-space-transform/word-space-transform-010.html.ini
new file mode 100644
index 00000000000..d8629a7ab48
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-text/word-space-transform/word-space-transform-010.html.ini
@@ -0,0 +1,2 @@
+[word-space-transform-010.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/word-space-transform/word-space-transform-011.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/word-space-transform/word-space-transform-011.html.ini
new file mode 100644
index 00000000000..e5c52041b3b
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-text/word-space-transform/word-space-transform-011.html.ini
@@ -0,0 +1,2 @@
+[word-space-transform-011.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/word-space-transform/word-space-transform-012.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/word-space-transform/word-space-transform-012.html.ini
new file mode 100644
index 00000000000..51355eea6e6
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-text/word-space-transform/word-space-transform-012.html.ini
@@ -0,0 +1,2 @@
+[word-space-transform-012.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/word-space-transform/word-space-transform-013.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/word-space-transform/word-space-transform-013.html.ini
new file mode 100644
index 00000000000..e02e91b487d
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-text/word-space-transform/word-space-transform-013.html.ini
@@ -0,0 +1,2 @@
+[word-space-transform-013.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/word-space-transform/word-space-transform-014.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/word-space-transform/word-space-transform-014.html.ini
new file mode 100644
index 00000000000..010bd971a8d
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-text/word-space-transform/word-space-transform-014.html.ini
@@ -0,0 +1,2 @@
+[word-space-transform-014.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/word-space-transform/word-space-transform-016.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/word-space-transform/word-space-transform-016.html.ini
new file mode 100644
index 00000000000..da648618bdd
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-text/word-space-transform/word-space-transform-016.html.ini
@@ -0,0 +1,2 @@
+[word-space-transform-016.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/word-space-transform/word-space-transform-017.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/word-space-transform/word-space-transform-017.html.ini
new file mode 100644
index 00000000000..4d3381aef7e
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-text/word-space-transform/word-space-transform-017.html.ini
@@ -0,0 +1,2 @@
+[word-space-transform-017.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/word-space-transform/word-space-transform-018.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/word-space-transform/word-space-transform-018.html.ini
new file mode 100644
index 00000000000..5936b3509b0
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-text/word-space-transform/word-space-transform-018.html.ini
@@ -0,0 +1,2 @@
+[word-space-transform-018.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/word-space-transform/word-space-transform-019.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/word-space-transform/word-space-transform-019.html.ini
new file mode 100644
index 00000000000..60151dc8599
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-text/word-space-transform/word-space-transform-019.html.ini
@@ -0,0 +1,2 @@
+[word-space-transform-019.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/word-space-transform/word-space-transform-023.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/word-space-transform/word-space-transform-023.html.ini
new file mode 100644
index 00000000000..3e71717adb4
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-text/word-space-transform/word-space-transform-023.html.ini
@@ -0,0 +1,2 @@
+[word-space-transform-023.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/word-space-transform/word-space-transform-030.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/word-space-transform/word-space-transform-030.html.ini
new file mode 100644
index 00000000000..a256c81a56d
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-text/word-space-transform/word-space-transform-030.html.ini
@@ -0,0 +1,2 @@
+[word-space-transform-030.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-transforms/backface-visibility-hidden-002.html.ini b/tests/wpt/meta-legacy-layout/css/css-transforms/backface-visibility-hidden-002.html.ini
new file mode 100644
index 00000000000..64ec6ecd1f5
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-transforms/backface-visibility-hidden-002.html.ini
@@ -0,0 +1,2 @@
+[backface-visibility-hidden-002.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-transforms/backface-visibility-hidden-002.tentative.html.ini b/tests/wpt/meta-legacy-layout/css/css-transforms/backface-visibility-hidden-002.tentative.html.ini
deleted file mode 100644
index 841c42ee93d..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-transforms/backface-visibility-hidden-002.tentative.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[backface-visibility-hidden-002.tentative.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-transforms/backface-visibility-hidden-003.html.ini b/tests/wpt/meta-legacy-layout/css/css-transforms/backface-visibility-hidden-003.html.ini
new file mode 100644
index 00000000000..423ef90b4fa
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-transforms/backface-visibility-hidden-003.html.ini
@@ -0,0 +1,2 @@
+[backface-visibility-hidden-003.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-transforms/backface-visibility-hidden-003.tentative.html.ini b/tests/wpt/meta-legacy-layout/css/css-transforms/backface-visibility-hidden-003.tentative.html.ini
deleted file mode 100644
index 7fe78cc9418..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-transforms/backface-visibility-hidden-003.tentative.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[backface-visibility-hidden-003.tentative.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-transforms/backface-visibility-hidden-004.html.ini b/tests/wpt/meta-legacy-layout/css/css-transforms/backface-visibility-hidden-004.html.ini
new file mode 100644
index 00000000000..9b7a0872986
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-transforms/backface-visibility-hidden-004.html.ini
@@ -0,0 +1,2 @@
+[backface-visibility-hidden-004.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-transforms/backface-visibility-hidden-005.html.ini b/tests/wpt/meta-legacy-layout/css/css-transforms/backface-visibility-hidden-005.html.ini
new file mode 100644
index 00000000000..ac8498a18f3
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-transforms/backface-visibility-hidden-005.html.ini
@@ -0,0 +1,2 @@
+[backface-visibility-hidden-005.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-transforms/backface-visibility-hidden-animated-002.html.ini b/tests/wpt/meta-legacy-layout/css/css-transforms/backface-visibility-hidden-animated-002.html.ini
deleted file mode 100644
index 90198176f4d..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-transforms/backface-visibility-hidden-animated-002.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[backface-visibility-hidden-animated-002.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/css/css-transforms/transform-2d-getComputedStyle-001.html.ini b/tests/wpt/meta-legacy-layout/css/css-transforms/transform-2d-getComputedStyle-001.html.ini
index c845caf3022..ee407f81468 100644
--- a/tests/wpt/meta-legacy-layout/css/css-transforms/transform-2d-getComputedStyle-001.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-transforms/transform-2d-getComputedStyle-001.html.ini
@@ -11,6 +11,3 @@
 
   [Matrix for skew]
     expected: FAIL
-
-  [Matrix for general transform]
-    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-transforms/transform-input-009.html.ini b/tests/wpt/meta-legacy-layout/css/css-transforms/transform-input-009.html.ini
index 51a18a634fd..9d12d774203 100644
--- a/tests/wpt/meta-legacy-layout/css/css-transforms/transform-input-009.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-transforms/transform-input-009.html.ini
@@ -1,3 +1,2 @@
 [transform-input-009.html]
   bug: https://github.com/servo/servo/issues/21092
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-transitions/idlharness-2.html.ini b/tests/wpt/meta-legacy-layout/css/css-transitions/idlharness-2.html.ini
index ec9b24fdaeb..565a1224007 100644
--- a/tests/wpt/meta-legacy-layout/css/css-transitions/idlharness-2.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-transitions/idlharness-2.html.ini
@@ -19,3 +19,27 @@
 
   [CSSTransition interface: attribute transitionProperty]
     expected: FAIL
+
+  [CSSStartingStyleRule interface: existence and properties of interface object]
+    expected: FAIL
+
+  [CSSStartingStyleRule interface object length]
+    expected: FAIL
+
+  [CSSStartingStyleRule interface object name]
+    expected: FAIL
+
+  [CSSStartingStyleRule interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [CSSStartingStyleRule interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [CSSStartingStyleRule interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [CSSStartingStyleRule must be primary interface of sheet.cssRules[0\]]
+    expected: FAIL
+
+  [Stringification of sheet.cssRules[0\]]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-ui/negative-outline-offset.html.ini b/tests/wpt/meta-legacy-layout/css/css-ui/negative-outline-offset.html.ini
new file mode 100644
index 00000000000..5883faa6763
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-ui/negative-outline-offset.html.ini
@@ -0,0 +1,2 @@
+[negative-outline-offset.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-ui/parsing/form-sizing-computed.html.ini b/tests/wpt/meta-legacy-layout/css/css-ui/parsing/form-sizing-computed.html.ini
new file mode 100644
index 00000000000..39141cebc56
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-ui/parsing/form-sizing-computed.html.ini
@@ -0,0 +1,6 @@
+[form-sizing-computed.html]
+  [Property form-sizing value 'auto']
+    expected: FAIL
+
+  [Property form-sizing value 'normal']
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-ui/parsing/form-sizing-valid.html.ini b/tests/wpt/meta-legacy-layout/css/css-ui/parsing/form-sizing-valid.html.ini
new file mode 100644
index 00000000000..cda7dbed687
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-ui/parsing/form-sizing-valid.html.ini
@@ -0,0 +1,6 @@
+[form-sizing-valid.html]
+  [e.style['form-sizing'\] = "auto" should set the property value]
+    expected: FAIL
+
+  [e.style['form-sizing'\] = "normal" should set the property value]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-ui/parsing/outline-color-computed.html.ini b/tests/wpt/meta-legacy-layout/css/css-ui/parsing/outline-color-computed.html.ini
new file mode 100644
index 00000000000..9b6d67c9ca8
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-ui/parsing/outline-color-computed.html.ini
@@ -0,0 +1,3 @@
+[outline-color-computed.html]
+  [auto computes to itself or to currentColor depending on the value of outline-style]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-ui/parsing/outline-color-valid-optional.html.ini b/tests/wpt/meta-legacy-layout/css/css-ui/parsing/outline-color-valid-optional.html.ini
deleted file mode 100644
index 9b4b531885b..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-ui/parsing/outline-color-valid-optional.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[outline-color-valid-optional.html]
-  [e.style['outline-color'\] = "invert" should set the property value]
-    expected: FAIL
-
diff --git a/tests/wpt/meta-legacy-layout/css/css-ui/parsing/outline-color-valid.html.ini b/tests/wpt/meta-legacy-layout/css/css-ui/parsing/outline-color-valid.html.ini
new file mode 100644
index 00000000000..d751a6aa1b1
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-ui/parsing/outline-color-valid.html.ini
@@ -0,0 +1,3 @@
+[outline-color-valid.html]
+  [e.style['outline-color'\] = "auto" should set the property value]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-ui/parsing/outline-valid-optional.html.ini b/tests/wpt/meta-legacy-layout/css/css-ui/parsing/outline-valid-optional.html.ini
deleted file mode 100644
index afd6185502b..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-ui/parsing/outline-valid-optional.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[outline-valid-optional.html]
-  [e.style['outline'\] = "invert" should set the property value]
-    expected: FAIL
-
-  [e.style['outline'\] = "invert dotted 1px" should set the property value]
-    expected: FAIL
-
diff --git a/tests/wpt/meta-legacy-layout/css/css-values/acos-asin-atan-atan2-computed.html.ini b/tests/wpt/meta-legacy-layout/css/css-values/acos-asin-atan-atan2-computed.html.ini
index 11c22e299d5..3b8371f8577 100644
--- a/tests/wpt/meta-legacy-layout/css/css-values/acos-asin-atan-atan2-computed.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-values/acos-asin-atan-atan2-computed.html.ini
@@ -124,3 +124,9 @@
 
   [calc(atan2(0,-1) / 4) should be used-value-equivalent to 45deg]
     expected: FAIL
+
+  [atan2(1rem + 1px - 1px, -1rem) should be used-value-equivalent to 135deg]
+    expected: FAIL
+
+  [atan2(1vh + 0px, -1vh + 0px) should be used-value-equivalent to 135deg]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-values/clamp-length-computed.html.ini b/tests/wpt/meta-legacy-layout/css/css-values/clamp-length-computed.html.ini
index add1bb314b6..860d2cb5f2a 100644
--- a/tests/wpt/meta-legacy-layout/css/css-values/clamp-length-computed.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-values/clamp-length-computed.html.ini
@@ -10,3 +10,6 @@
 
   [Property letter-spacing value 'clamp(10px, 20px, 30px)' computes to '20px']
     expected: FAIL
+
+  [Property letter-spacing value 'calc(0px - clamp(30px, 100px, 20px))']
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-values/clamp-length-serialize.html.ini b/tests/wpt/meta-legacy-layout/css/css-values/clamp-length-serialize.html.ini
new file mode 100644
index 00000000000..944c6860e3e
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-values/clamp-length-serialize.html.ini
@@ -0,0 +1,12 @@
+[clamp-length-serialize.html]
+  [e.style['letter-spacing'\] = "calc(0px - clamp(30px, 100px, 20px))" should set the property value]
+    expected: FAIL
+
+  [e.style['letter-spacing'\] = "calc(calc(0px - clamp(30px, 100px, 20px)))" should set the property value]
+    expected: FAIL
+
+  [e.style['letter-spacing'\] = "calc(0px - clamp(1px, 1em, 1vh))" should set the property value]
+    expected: FAIL
+
+  [e.style['letter-spacing'\] = "calc(calc(0px - clamp(1px, 1em, 1vh)))" should set the property value]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-values/lh-unit-005.html.ini b/tests/wpt/meta-legacy-layout/css/css-values/lh-unit-005.html.ini
new file mode 100644
index 00000000000..e2cc94a5f11
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-values/lh-unit-005.html.ini
@@ -0,0 +1,3 @@
+[lh-unit-005.html]
+  [lh relative to line-height inherited from parent]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/cssom-view/elementFromPoint-list-001.html.ini b/tests/wpt/meta-legacy-layout/css/cssom-view/elementFromPoint-list-001.html.ini
index 59347f6c432..0352721aa80 100644
--- a/tests/wpt/meta-legacy-layout/css/cssom-view/elementFromPoint-list-001.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/cssom-view/elementFromPoint-list-001.html.ini
@@ -1,19 +1,10 @@
 [elementFromPoint-list-001.html]
-  [<li>Outside 1</li>]
-    expected: FAIL
-
-  [<li>Image Outside 2</li>]
-    expected: FAIL
-
   [<li>Outside 2</li>]
     expected: FAIL
 
   [<li>Image Outside 1</li>]
     expected: FAIL
 
-  [<li>Outside 3</li>]
-    expected: FAIL
-
   [<li>Inside 1</li>]
     expected: FAIL
 
diff --git a/tests/wpt/meta-legacy-layout/css/cssom-view/scroll-behavior-smooth-navigation.html.ini b/tests/wpt/meta-legacy-layout/css/cssom-view/scroll-behavior-smooth-navigation.html.ini
index 977ef8f774c..a3e30250229 100644
--- a/tests/wpt/meta-legacy-layout/css/cssom-view/scroll-behavior-smooth-navigation.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/cssom-view/scroll-behavior-smooth-navigation.html.ini
@@ -1,3 +1,6 @@
 [scroll-behavior-smooth-navigation.html]
   [Instant scrolling while doing history navigation.]
     expected: FAIL
+
+  [Smooth scrolling while doing history navigation.]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/cssom/getComputedStyle-insets-absolute-roundtrip.html.ini b/tests/wpt/meta-legacy-layout/css/cssom/getComputedStyle-insets-absolute-roundtrip.html.ini
new file mode 100644
index 00000000000..081101e1f12
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/cssom/getComputedStyle-insets-absolute-roundtrip.html.ini
@@ -0,0 +1,6 @@
+[getComputedStyle-insets-absolute-roundtrip.html]
+  [Fixed-length right property value should roundtrip]
+    expected: FAIL
+
+  [Fixed-length bottom property value should roundtrip]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/cssom/getComputedStyle-pseudo.html.ini b/tests/wpt/meta-legacy-layout/css/cssom/getComputedStyle-pseudo.html.ini
index c8359899ba7..8aab037c522 100644
--- a/tests/wpt/meta-legacy-layout/css/cssom/getComputedStyle-pseudo.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/cssom/getComputedStyle-pseudo.html.ini
@@ -19,3 +19,6 @@
 
   [Unknown pseudo-elements]
     expected: FAIL
+
+  [Unknown pseudo-element with a known string (ex: marker)]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/cssom/serialize-values.html.ini b/tests/wpt/meta-legacy-layout/css/cssom/serialize-values.html.ini
index 701fa2d1b31..dedb5905d11 100644
--- a/tests/wpt/meta-legacy-layout/css/cssom/serialize-values.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/cssom/serialize-values.html.ini
@@ -83,47 +83,20 @@
   [widows: inherit]
     expected: FAIL
 
-  [background-position: 5% center]
+  [content: attr( |bar )]
     expected: FAIL
 
-  [background-position: .5% center]
+  [content: attr(foo-bar, "fallback")]
     expected: FAIL
 
-  [background-position: -5% center]
+  [content: attr(foo_bar, "fallback")]
     expected: FAIL
 
-  [background-position: -.5% center]
+  [content: attr(|bar, "fallback")]
     expected: FAIL
 
-  [background-position: 0px center]
+  [content: attr(foo, "")]
     expected: FAIL
 
-  [background-position: 1px center]
-    expected: FAIL
-
-  [background-position: .1em center]
-    expected: FAIL
-
-  [background-position: -0px center]
-    expected: FAIL
-
-  [background-position: -1px center]
-    expected: FAIL
-
-  [background-position: -.1em center]
-    expected: FAIL
-
-  [background-position: left center]
-    expected: FAIL
-
-  [background-position: center top]
-    expected: FAIL
-
-  [background-position: center center]
-    expected: FAIL
-
-  [background-position: center bottom]
-    expected: FAIL
-
-  [background-position: right center]
+  [content: attr( |foo ,  "" )]
     expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/filter-effects/drop-shadow-currentcolor-dynamic-002.html.ini b/tests/wpt/meta-legacy-layout/css/filter-effects/drop-shadow-currentcolor-dynamic-002.html.ini
new file mode 100644
index 00000000000..118b2b9c5ae
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/filter-effects/drop-shadow-currentcolor-dynamic-002.html.ini
@@ -0,0 +1,2 @@
+[drop-shadow-currentcolor-dynamic-002.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/mediaqueries/display-mode.html.ini b/tests/wpt/meta-legacy-layout/css/mediaqueries/display-mode.html.ini
new file mode 100644
index 00000000000..07c8a260134
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/mediaqueries/display-mode.html.ini
@@ -0,0 +1,33 @@
+[display-mode.html]
+  [Should be known: '(display-mode)']
+    expected: FAIL
+
+  [Should be known: '(display-mode: standalone)']
+    expected: FAIL
+
+  [Should be known: '(display-mode: browser)']
+    expected: FAIL
+
+  [Should be known: '(display-mode: minimal-ui)']
+    expected: FAIL
+
+  [Should be known: '(display-mode: fullscreen)']
+    expected: FAIL
+
+  [Should be parseable: '(display-mode: 0)']
+    expected: FAIL
+
+  [Should be parseable: '(display-mode: none)']
+    expected: FAIL
+
+  [Should be parseable: '(display-mode: random)']
+    expected: FAIL
+
+  [Should be parseable: '(display-mode: 10px)']
+    expected: FAIL
+
+  [Should be parseable: '(display-mode: 1%)']
+    expected: FAIL
+
+  [Check that display-mode evaluates to true in the boolean context]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/mediaqueries/display-mode.tentative.html.ini b/tests/wpt/meta-legacy-layout/css/mediaqueries/display-mode.tentative.html.ini
new file mode 100644
index 00000000000..1d1233a85e9
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/mediaqueries/display-mode.tentative.html.ini
@@ -0,0 +1,6 @@
+[display-mode.tentative.html]
+  [Should be known: '(display-mode: borderless)']
+    expected: FAIL
+
+  [Should be known: '(display-mode: window-controls-overlay)']
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/selectors/dir-pseudo-on-input-element.html.ini b/tests/wpt/meta-legacy-layout/css/selectors/dir-pseudo-on-input-element.html.ini
index d00922ca86d..2d9fe551053 100644
--- a/tests/wpt/meta-legacy-layout/css/selectors/dir-pseudo-on-input-element.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/selectors/dir-pseudo-on-input-element.html.ini
@@ -52,3 +52,6 @@
 
   [input element whose type attribute is in the button state]
     expected: FAIL
+
+  [dynamic changes to type of input elements affect whether value is used for dir=auto]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/selectors/invalidation/empty-pseudo-in-has.html.ini b/tests/wpt/meta-legacy-layout/css/selectors/invalidation/empty-pseudo-in-has.html.ini
index f98c5d0c507..417afceab88 100644
--- a/tests/wpt/meta-legacy-layout/css/selectors/invalidation/empty-pseudo-in-has.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/selectors/invalidation/empty-pseudo-in-has.html.ini
@@ -4,3 +4,12 @@
 
   [Insert div to div.#child]
     expected: FAIL
+
+  [Remove div from div.#child]
+    expected: FAIL
+
+  [Insert text into div.#child]
+    expected: FAIL
+
+  [Remove text from div.#child]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/selectors/invalidation/has-sibling-insertion-removal.html.ini b/tests/wpt/meta-legacy-layout/css/selectors/invalidation/has-sibling-insertion-removal.html.ini
new file mode 100644
index 00000000000..76513c88a16
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/selectors/invalidation/has-sibling-insertion-removal.html.ini
@@ -0,0 +1,36 @@
+[has-sibling-insertion-removal.html]
+  [subject1: color after #sibling1_1 inserted should be rgb(255, 0, 0)]
+    expected: FAIL
+
+  [subject2: color after #sibling2_1 removed should be rgb(0, 128, 0)]
+    expected: FAIL
+
+  [subject3: color after #sibling3_1 inserted should be rgb(0, 0, 255)]
+    expected: FAIL
+
+  [subject4: color after #sibling4_1 removed should be rgb(255, 255, 0)]
+    expected: FAIL
+
+  [subject5: initial color should be rgb(255, 0, 0)]
+    expected: FAIL
+
+  [subject6: initial color should be rgb(0, 128, 0)]
+    expected: FAIL
+
+  [subject7: initial color should be rgb(0, 0, 255)]
+    expected: FAIL
+
+  [subject8: initial color should be rgb(255, 255, 0)]
+    expected: FAIL
+
+  [subject9: color after #sibling9_1 inserted should be rgb(255, 0, 0)]
+    expected: FAIL
+
+  [subject10: color after #sibling10_1 removed should be rgb(0, 128, 0)]
+    expected: FAIL
+
+  [subject11: color after #sibling11_1 inserted should be rgb(0, 0, 255)]
+    expected: FAIL
+
+  [subject12: color after #sibling12_1 removed should be rgb(255, 255, 0)]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/selectors/invalidation/has-side-effect.html.ini b/tests/wpt/meta-legacy-layout/css/selectors/invalidation/has-side-effect.html.ini
new file mode 100644
index 00000000000..3f185795710
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/selectors/invalidation/has-side-effect.html.ini
@@ -0,0 +1,3 @@
+[has-side-effect.html]
+  [Matches after #blocks_match removed]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/selectors/invalidation/has-unstyled.html.ini b/tests/wpt/meta-legacy-layout/css/selectors/invalidation/has-unstyled.html.ini
new file mode 100644
index 00000000000..188649ade83
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/selectors/invalidation/has-unstyled.html.ini
@@ -0,0 +1,12 @@
+[has-unstyled.html]
+  [add test to subject_descendant]
+    expected: FAIL
+
+  [add test to sibling_descendant]
+    expected: FAIL
+
+  [add test_inner to subject_child]
+    expected: FAIL
+
+  [add test_inner to sibling_child]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/selectors/invalidation/host-context-pseudo-class-in-has.html.ini b/tests/wpt/meta-legacy-layout/css/selectors/invalidation/host-context-pseudo-class-in-has.html.ini
new file mode 100644
index 00000000000..b9fdb7253a3
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/selectors/invalidation/host-context-pseudo-class-in-has.html.ini
@@ -0,0 +1,2 @@
+[host-context-pseudo-class-in-has.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/css/selectors/invalidation/input-pseudo-classes-in-has.html.ini b/tests/wpt/meta-legacy-layout/css/selectors/invalidation/input-pseudo-classes-in-has.html.ini
index b0a26dc9513..a238d3f6b87 100644
--- a/tests/wpt/meta-legacy-layout/css/selectors/invalidation/input-pseudo-classes-in-has.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/selectors/invalidation/input-pseudo-classes-in-has.html.ini
@@ -25,3 +25,6 @@
 
   [:placeholder-shown invalidation]
     expected: FAIL
+
+  [:default invalidation with input[type=checkbox\] and assignment to .checked]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/selectors/invalidation/part-pseudo.html.ini b/tests/wpt/meta-legacy-layout/css/selectors/invalidation/part-pseudo.html.ini
new file mode 100644
index 00000000000..10f1aa0b918
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/selectors/invalidation/part-pseudo.html.ini
@@ -0,0 +1,2 @@
+[part-pseudo.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/selectors/invalidation/placeholder-shown.html.ini b/tests/wpt/meta-legacy-layout/css/selectors/invalidation/placeholder-shown.html.ini
new file mode 100644
index 00000000000..b13be0abf60
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/selectors/invalidation/placeholder-shown.html.ini
@@ -0,0 +1,3 @@
+[placeholder-shown.html]
+  [Set placeholder text to empty string]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/selectors/parsing/parse-has-disallow-nesting-has-inside-has.html.ini b/tests/wpt/meta-legacy-layout/css/selectors/parsing/parse-has-disallow-nesting-has-inside-has.html.ini
index 48b39b6115a..7b4af3d0cd3 100644
--- a/tests/wpt/meta-legacy-layout/css/selectors/parsing/parse-has-disallow-nesting-has-inside-has.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/selectors/parsing/parse-has-disallow-nesting-has-inside-has.html.ini
@@ -13,3 +13,6 @@
 
   [".a:has(:is(.b:has(.c), .d))" should be a valid selector]
     expected: FAIL
+
+  [CSS Selectors: The relational pseudo-class (disallow nesting :has() inside :has())]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/selectors/placeholder-shown.html.ini b/tests/wpt/meta-legacy-layout/css/selectors/placeholder-shown.html.ini
new file mode 100644
index 00000000000..2a504fb4c85
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/selectors/placeholder-shown.html.ini
@@ -0,0 +1,6 @@
+[placeholder-shown.html]
+  [CSS Selectors Test: :placeholder-shown matching 1]
+    expected: FAIL
+
+  [CSS Selectors Test: :placeholder-shown matching 2]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/custom-elements/form-associated/focusability.html.ini b/tests/wpt/meta-legacy-layout/custom-elements/form-associated/focusability.html.ini
new file mode 100644
index 00000000000..2d7bc2a0f73
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/custom-elements/form-associated/focusability.html.ini
@@ -0,0 +1,3 @@
+[focusability.html]
+  [Focusability of form-associated custom elements]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/custom-elements/scoped-registry/ShadowRoot-createElement.tentative.html.ini b/tests/wpt/meta-legacy-layout/custom-elements/scoped-registry/ShadowRoot-createElement.tentative.html.ini
new file mode 100644
index 00000000000..47b3baabc52
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/custom-elements/scoped-registry/ShadowRoot-createElement.tentative.html.ini
@@ -0,0 +1,12 @@
+[ShadowRoot-createElement.tentative.html]
+  [ShadowRoot.createElement() for autonomous custom element]
+    expected: FAIL
+
+  [ShadowRoot.createElementNS() for autonomous custom element]
+    expected: FAIL
+
+  [ShadowRoot.createElement() for customized built-in element]
+    expected: FAIL
+
+  [ShadowRoot.createElementNS() for customized built-in element]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/dom/events/Event-dispatch-single-activation-behavior.html.ini b/tests/wpt/meta-legacy-layout/dom/events/Event-dispatch-single-activation-behavior.html.ini
new file mode 100644
index 00000000000..a464f5a1f72
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/dom/events/Event-dispatch-single-activation-behavior.html.ini
@@ -0,0 +1,117 @@
+[Event-dispatch-single-activation-behavior.html]
+  [When clicking child <FORM><INPUT type=submit></INPUT></FORM> of parent <FORM><INPUT type=image></INPUT></FORM>, only child should be activated.]
+    expected: FAIL
+
+  [When clicking child <FORM><INPUT type=submit></INPUT></FORM> of parent <FORM><BUTTON type=submit></BUTTON></FORM>, only child should be activated.]
+    expected: FAIL
+
+  [When clicking child <FORM><INPUT type=image></INPUT></FORM> of parent <INPUT type=checkbox></INPUT>, only child should be activated.]
+    expected: FAIL
+
+  [When clicking child <FORM><INPUT type=image></INPUT></FORM> of parent <INPUT type=radio></INPUT>, only child should be activated.]
+    expected: FAIL
+
+  [When clicking child <FORM><INPUT type=image></INPUT></FORM> of parent <FORM><INPUT type=submit></INPUT></FORM>, only child should be activated.]
+    expected: FAIL
+
+  [When clicking child <FORM><INPUT type=image></INPUT></FORM> of parent <FORM><INPUT type=reset></INPUT></FORM>, only child should be activated.]
+    expected: FAIL
+
+  [When clicking child <FORM><INPUT type=image></INPUT></FORM> of parent <FORM><BUTTON type=submit></BUTTON></FORM>, only child should be activated.]
+    expected: FAIL
+
+  [When clicking child <FORM><INPUT type=image></INPUT></FORM> of parent <FORM><BUTTON type=reset></BUTTON></FORM>, only child should be activated.]
+    expected: FAIL
+
+  [When clicking child <FORM><INPUT type=image></INPUT></FORM> of parent <A></A>, only child should be activated.]
+    expected: FAIL
+
+  [When clicking child <FORM><INPUT type=image></INPUT></FORM> of parent <AREA></AREA>, only child should be activated.]
+    expected: FAIL
+
+  [When clicking child <FORM><INPUT type=image></INPUT></FORM> of parent <DETAILS><SUMMARY></SUMMARY></DETAILS>, only child should be activated.]
+    expected: FAIL
+
+  [When clicking child <FORM><INPUT type=image></INPUT></FORM> of parent <LABEL><INPUT type=checkbox></INPUT><SPAN></SPAN></LABEL>, only child should be activated.]
+    expected: FAIL
+
+  [When clicking child <FORM><INPUT type=image></INPUT></FORM> of parent <LABEL><BUTTON type=button></BUTTON></LABEL>, only child should be activated.]
+    expected: FAIL
+
+  [When clicking child <FORM><INPUT type=reset></INPUT></FORM> of parent <FORM><BUTTON type=reset></BUTTON></FORM>, only child should be activated.]
+    expected: FAIL
+
+  [When clicking child <FORM><BUTTON type=submit></BUTTON></FORM> of parent <FORM><INPUT type=submit></INPUT></FORM>, only child should be activated.]
+    expected: FAIL
+
+  [When clicking child <FORM><BUTTON type=submit></BUTTON></FORM> of parent <FORM><INPUT type=image></INPUT></FORM>, only child should be activated.]
+    expected: FAIL
+
+  [When clicking child <FORM><BUTTON type=reset></BUTTON></FORM> of parent <FORM><INPUT type=reset></INPUT></FORM>, only child should be activated.]
+    expected: FAIL
+
+  [When clicking child <A></A> of parent <INPUT type=checkbox></INPUT>, only child should be activated.]
+    expected: FAIL
+
+  [When clicking child <A></A> of parent <INPUT type=radio></INPUT>, only child should be activated.]
+    expected: FAIL
+
+  [When clicking child <A></A> of parent <FORM><INPUT type=submit></INPUT></FORM>, only child should be activated.]
+    expected: FAIL
+
+  [When clicking child <A></A> of parent <FORM><INPUT type=image></INPUT></FORM>, only child should be activated.]
+    expected: FAIL
+
+  [When clicking child <A></A> of parent <FORM><INPUT type=reset></INPUT></FORM>, only child should be activated.]
+    expected: FAIL
+
+  [When clicking child <A></A> of parent <FORM><BUTTON type=submit></BUTTON></FORM>, only child should be activated.]
+    expected: FAIL
+
+  [When clicking child <A></A> of parent <FORM><BUTTON type=reset></BUTTON></FORM>, only child should be activated.]
+    expected: FAIL
+
+  [When clicking child <A></A> of parent <AREA></AREA>, only child should be activated.]
+    expected: FAIL
+
+  [When clicking child <A></A> of parent <DETAILS><SUMMARY></SUMMARY></DETAILS>, only child should be activated.]
+    expected: FAIL
+
+  [When clicking child <A></A> of parent <LABEL><INPUT type=checkbox></INPUT><SPAN></SPAN></LABEL>, only child should be activated.]
+    expected: FAIL
+
+  [When clicking child <A></A> of parent <LABEL><BUTTON type=button></BUTTON></LABEL>, only child should be activated.]
+    expected: FAIL
+
+  [When clicking child <AREA></AREA> of parent <INPUT type=checkbox></INPUT>, only child should be activated.]
+    expected: FAIL
+
+  [When clicking child <AREA></AREA> of parent <INPUT type=radio></INPUT>, only child should be activated.]
+    expected: FAIL
+
+  [When clicking child <AREA></AREA> of parent <FORM><INPUT type=submit></INPUT></FORM>, only child should be activated.]
+    expected: FAIL
+
+  [When clicking child <AREA></AREA> of parent <FORM><INPUT type=image></INPUT></FORM>, only child should be activated.]
+    expected: FAIL
+
+  [When clicking child <AREA></AREA> of parent <FORM><INPUT type=reset></INPUT></FORM>, only child should be activated.]
+    expected: FAIL
+
+  [When clicking child <AREA></AREA> of parent <FORM><BUTTON type=submit></BUTTON></FORM>, only child should be activated.]
+    expected: FAIL
+
+  [When clicking child <AREA></AREA> of parent <FORM><BUTTON type=reset></BUTTON></FORM>, only child should be activated.]
+    expected: FAIL
+
+  [When clicking child <AREA></AREA> of parent <A></A>, only child should be activated.]
+    expected: FAIL
+
+  [When clicking child <AREA></AREA> of parent <DETAILS><SUMMARY></SUMMARY></DETAILS>, only child should be activated.]
+    expected: FAIL
+
+  [When clicking child <AREA></AREA> of parent <LABEL><INPUT type=checkbox></INPUT><SPAN></SPAN></LABEL>, only child should be activated.]
+    expected: FAIL
+
+  [When clicking child <AREA></AREA> of parent <LABEL><BUTTON type=button></BUTTON></LABEL>, only child should be activated.]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/dom/parts/basic-dom-part-declarative-brace-syntax.tentative.html.ini b/tests/wpt/meta-legacy-layout/dom/parts/basic-dom-part-declarative-brace-syntax.tentative.html.ini
new file mode 100644
index 00000000000..99e1e6ade1a
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/dom/parts/basic-dom-part-declarative-brace-syntax.tentative.html.ini
@@ -0,0 +1,33 @@
+[basic-dom-part-declarative-brace-syntax.tentative.html]
+  [Basic declarative DOM Parts (Main Document)]
+    expected: FAIL
+
+  [Basic declarative DOM Parts (Template)]
+    expected: FAIL
+
+  [Basic declarative DOM Parts (Clone)]
+    expected: FAIL
+
+  [Basic declarative DOM Parts (PartClone)]
+    expected: FAIL
+
+  [Post-parsing structure of child parts, and stickiness]
+    expected: FAIL
+
+  [Parser only behavior - adding parseparts does nothing]
+    expected: FAIL
+
+  [Just parts, no text before]
+    expected: FAIL
+
+  [Self closing elements can't use parseparts]
+    expected: FAIL
+
+  [Second head element can't use parseparts]
+    expected: FAIL
+
+  [Foreign content should support Parts]
+    expected: FAIL
+
+  [Not quite parts syntax - none should become parts, and nothing should crash]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/dom/parts/basic-dom-part-declarative-pi-syntax.tentative.html.ini b/tests/wpt/meta-legacy-layout/dom/parts/basic-dom-part-declarative-pi-syntax.tentative.html.ini
new file mode 100644
index 00000000000..3982572f016
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/dom/parts/basic-dom-part-declarative-pi-syntax.tentative.html.ini
@@ -0,0 +1,12 @@
+[basic-dom-part-declarative-pi-syntax.tentative.html]
+  [Basic declarative DOM Parts (Main Document)]
+    expected: FAIL
+
+  [Basic declarative DOM Parts (Template)]
+    expected: FAIL
+
+  [Basic declarative DOM Parts (Clone)]
+    expected: FAIL
+
+  [Basic declarative DOM Parts (PartClone)]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/dom/parts/basic-dom-part-objects.tentative.html.ini b/tests/wpt/meta-legacy-layout/dom/parts/basic-dom-part-objects.tentative.html.ini
index 5daf7b7abad..20cde0f6f98 100644
--- a/tests/wpt/meta-legacy-layout/dom/parts/basic-dom-part-objects.tentative.html.ini
+++ b/tests/wpt/meta-legacy-layout/dom/parts/basic-dom-part-objects.tentative.html.ini
@@ -79,3 +79,9 @@
 
   [Basic declarative DOM Parts (DeclarativeShadowDOM)]
     expected: FAIL
+
+  [DOM mutations are not tracked (Document)]
+    expected: FAIL
+
+  [DOM mutations are not tracked (DocumentFragment)]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/dom/parts/dom-parts-parseparts-on-body.tentative.html.ini b/tests/wpt/meta-legacy-layout/dom/parts/dom-parts-parseparts-on-body.tentative.html.ini
new file mode 100644
index 00000000000..ef4028dacc8
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/dom/parts/dom-parts-parseparts-on-body.tentative.html.ini
@@ -0,0 +1,3 @@
+[dom-parts-parseparts-on-body.tentative.html]
+  [It is possible to put parseparts on the body element]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/dom/parts/dom-parts-parseparts-on-head.tentative.html.ini b/tests/wpt/meta-legacy-layout/dom/parts/dom-parts-parseparts-on-head.tentative.html.ini
new file mode 100644
index 00000000000..293e6143439
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/dom/parts/dom-parts-parseparts-on-head.tentative.html.ini
@@ -0,0 +1,3 @@
+[dom-parts-parseparts-on-head.tentative.html]
+  [It is not possible to put parseparts on the head element]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/dom/parts/dom-parts-parseparts-on-root.tentative.html.ini b/tests/wpt/meta-legacy-layout/dom/parts/dom-parts-parseparts-on-root.tentative.html.ini
new file mode 100644
index 00000000000..1f2b307165f
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/dom/parts/dom-parts-parseparts-on-root.tentative.html.ini
@@ -0,0 +1,3 @@
+[dom-parts-parseparts-on-root.tentative.html]
+  [It is not possible to put parseparts on the root element]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/encoding/api-basics.any.js.ini b/tests/wpt/meta-legacy-layout/encoding/api-basics.any.js.ini
new file mode 100644
index 00000000000..81e89c26d43
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/encoding/api-basics.any.js.ini
@@ -0,0 +1,6 @@
+[api-basics.any.html]
+
+[api-basics.any.worker.html]
+
+[api-basics.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/encoding/api-surrogates-utf8.any.js.ini b/tests/wpt/meta-legacy-layout/encoding/api-surrogates-utf8.any.js.ini
new file mode 100644
index 00000000000..f6c06fab7f9
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/encoding/api-surrogates-utf8.any.js.ini
@@ -0,0 +1,6 @@
+[api-surrogates-utf8.any.worker.html]
+
+[api-surrogates-utf8.any.html]
+
+[api-surrogates-utf8.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/encoding/iso-2022-jp-decoder.any.js.ini b/tests/wpt/meta-legacy-layout/encoding/iso-2022-jp-decoder.any.js.ini
new file mode 100644
index 00000000000..3e0f0c76981
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/encoding/iso-2022-jp-decoder.any.js.ini
@@ -0,0 +1,6 @@
+[iso-2022-jp-decoder.any.html]
+
+[iso-2022-jp-decoder.any.shadowrealm.html]
+  expected: ERROR
+
+[iso-2022-jp-decoder.any.worker.html]
diff --git a/tests/wpt/meta-legacy-layout/encoding/streams/backpressure.any.js.ini b/tests/wpt/meta-legacy-layout/encoding/streams/backpressure.any.js.ini
index b51399b7066..9d458d07d7a 100644
--- a/tests/wpt/meta-legacy-layout/encoding/streams/backpressure.any.js.ini
+++ b/tests/wpt/meta-legacy-layout/encoding/streams/backpressure.any.js.ini
@@ -43,3 +43,6 @@
   [additional writes should wait for backpressure to be relieved for class TextEncoderStream]
     expected: FAIL
 
+
+[backpressure.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/encoding/streams/decode-attributes.any.js.ini b/tests/wpt/meta-legacy-layout/encoding/streams/decode-attributes.any.js.ini
index 9800e08b7fe..42497e80af5 100644
--- a/tests/wpt/meta-legacy-layout/encoding/streams/decode-attributes.any.js.ini
+++ b/tests/wpt/meta-legacy-layout/encoding/streams/decode-attributes.any.js.ini
@@ -181,3 +181,6 @@
   [encoding attribute should have correct value for 'ascii']
     expected: FAIL
 
+
+[decode-attributes.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/encoding/streams/decode-bad-chunks.any.js.ini b/tests/wpt/meta-legacy-layout/encoding/streams/decode-bad-chunks.any.js.ini
index 4a41d7010bd..28e91a1fa45 100644
--- a/tests/wpt/meta-legacy-layout/encoding/streams/decode-bad-chunks.any.js.ini
+++ b/tests/wpt/meta-legacy-layout/encoding/streams/decode-bad-chunks.any.js.ini
@@ -61,3 +61,6 @@
   [decode-bad-chunks]
     expected: FAIL
 
+
+[decode-bad-chunks.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/encoding/streams/decode-non-utf8.any.js.ini b/tests/wpt/meta-legacy-layout/encoding/streams/decode-non-utf8.any.js.ini
index 752d9a392ad..7daa88c2bc7 100644
--- a/tests/wpt/meta-legacy-layout/encoding/streams/decode-non-utf8.any.js.ini
+++ b/tests/wpt/meta-legacy-layout/encoding/streams/decode-non-utf8.any.js.ini
@@ -91,3 +91,6 @@
   [decode-non-utf8]
     expected: FAIL
 
+
+[decode-non-utf8.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/encoding/streams/readable-writable-properties.any.js.ini b/tests/wpt/meta-legacy-layout/encoding/streams/readable-writable-properties.any.js.ini
index 9a34cc5f946..5495ee7d7c3 100644
--- a/tests/wpt/meta-legacy-layout/encoding/streams/readable-writable-properties.any.js.ini
+++ b/tests/wpt/meta-legacy-layout/encoding/streams/readable-writable-properties.any.js.ini
@@ -25,3 +25,6 @@
   [readable-writable-properties]
     expected: FAIL
 
+
+[readable-writable-properties.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/encoding/textdecoder-arguments.any.js.ini b/tests/wpt/meta-legacy-layout/encoding/textdecoder-arguments.any.js.ini
new file mode 100644
index 00000000000..a2dc995f4e6
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/encoding/textdecoder-arguments.any.js.ini
@@ -0,0 +1,6 @@
+[textdecoder-arguments.any.worker.html]
+
+[textdecoder-arguments.any.shadowrealm.html]
+  expected: ERROR
+
+[textdecoder-arguments.any.html]
diff --git a/tests/wpt/meta-legacy-layout/encoding/textdecoder-byte-order-marks.any.js.ini b/tests/wpt/meta-legacy-layout/encoding/textdecoder-byte-order-marks.any.js.ini
new file mode 100644
index 00000000000..0496081accc
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/encoding/textdecoder-byte-order-marks.any.js.ini
@@ -0,0 +1,6 @@
+[textdecoder-byte-order-marks.any.worker.html]
+
+[textdecoder-byte-order-marks.any.shadowrealm.html]
+  expected: ERROR
+
+[textdecoder-byte-order-marks.any.html]
diff --git a/tests/wpt/meta-legacy-layout/encoding/textdecoder-fatal-streaming.any.js.ini b/tests/wpt/meta-legacy-layout/encoding/textdecoder-fatal-streaming.any.js.ini
new file mode 100644
index 00000000000..14bd4abe786
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/encoding/textdecoder-fatal-streaming.any.js.ini
@@ -0,0 +1,6 @@
+[textdecoder-fatal-streaming.any.worker.html]
+
+[textdecoder-fatal-streaming.any.shadowrealm.html]
+  expected: ERROR
+
+[textdecoder-fatal-streaming.any.html]
diff --git a/tests/wpt/meta-legacy-layout/encoding/textdecoder-fatal.any.js.ini b/tests/wpt/meta-legacy-layout/encoding/textdecoder-fatal.any.js.ini
new file mode 100644
index 00000000000..01e6432c575
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/encoding/textdecoder-fatal.any.js.ini
@@ -0,0 +1,6 @@
+[textdecoder-fatal.any.worker.html]
+
+[textdecoder-fatal.any.html]
+
+[textdecoder-fatal.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/encoding/textdecoder-ignorebom.any.js.ini b/tests/wpt/meta-legacy-layout/encoding/textdecoder-ignorebom.any.js.ini
new file mode 100644
index 00000000000..74217d859d5
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/encoding/textdecoder-ignorebom.any.js.ini
@@ -0,0 +1,6 @@
+[textdecoder-ignorebom.any.html]
+
+[textdecoder-ignorebom.any.worker.html]
+
+[textdecoder-ignorebom.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/encoding/textdecoder-utf16-surrogates.any.js.ini b/tests/wpt/meta-legacy-layout/encoding/textdecoder-utf16-surrogates.any.js.ini
new file mode 100644
index 00000000000..5bbf4c938cb
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/encoding/textdecoder-utf16-surrogates.any.js.ini
@@ -0,0 +1,6 @@
+[textdecoder-utf16-surrogates.any.shadowrealm.html]
+  expected: ERROR
+
+[textdecoder-utf16-surrogates.any.worker.html]
+
+[textdecoder-utf16-surrogates.any.html]
diff --git a/tests/wpt/meta-legacy-layout/encoding/textencoder-utf16-surrogates.any.js.ini b/tests/wpt/meta-legacy-layout/encoding/textencoder-utf16-surrogates.any.js.ini
new file mode 100644
index 00000000000..6624ae34fb6
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/encoding/textencoder-utf16-surrogates.any.js.ini
@@ -0,0 +1,6 @@
+[textencoder-utf16-surrogates.any.shadowrealm.html]
+  expected: ERROR
+
+[textencoder-utf16-surrogates.any.html]
+
+[textencoder-utf16-surrogates.any.worker.html]
diff --git a/tests/wpt/meta-legacy-layout/fetch/api/basic/request-private-network-headers.tentative.any.js.ini b/tests/wpt/meta-legacy-layout/fetch/api/basic/request-private-network-headers.tentative.any.js.ini
new file mode 100644
index 00000000000..76e46d3d30d
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/fetch/api/basic/request-private-network-headers.tentative.any.js.ini
@@ -0,0 +1,21 @@
+[request-private-network-headers.tentative.any.worker.html]
+  [Access-Control-Request-Private-Network is a forbidden request header]
+    expected: FAIL
+
+  [Adding invalid request header "Access-Control-Request-Private-Network: KO"]
+    expected: FAIL
+
+
+[request-private-network-headers.tentative.any.sharedworker.html]
+  expected: ERROR
+
+[request-private-network-headers.tentative.any.html]
+  [Access-Control-Request-Private-Network is a forbidden request header]
+    expected: FAIL
+
+  [Adding invalid request header "Access-Control-Request-Private-Network: KO"]
+    expected: FAIL
+
+
+[request-private-network-headers.tentative.any.serviceworker.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/fetch/api/basic/scheme-blob.sub.any.js.ini b/tests/wpt/meta-legacy-layout/fetch/api/basic/scheme-blob.sub.any.js.ini
index dcb842c4c4c..1c9182ad802 100644
--- a/tests/wpt/meta-legacy-layout/fetch/api/basic/scheme-blob.sub.any.js.ini
+++ b/tests/wpt/meta-legacy-layout/fetch/api/basic/scheme-blob.sub.any.js.ini
@@ -20,6 +20,9 @@
   [Blob.slice should not sniff the content for a content type]
     expected: FAIL
 
+  [Fetching URL.createObjectURL(invalid_type_blob) is OK]
+    expected: FAIL
+
 
 [scheme-blob.sub.any.worker.html]
   [Fetching URL.createObjectURL(empty_blob) is OK]
@@ -42,3 +45,6 @@
 
   [Blob.slice should not sniff the content for a content type]
     expected: FAIL
+
+  [Fetching URL.createObjectURL(invalid_type_blob) is OK]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/fetch/api/response/response-headers-guard.any.js.ini b/tests/wpt/meta-legacy-layout/fetch/api/response/response-headers-guard.any.js.ini
new file mode 100644
index 00000000000..a5934bf8452
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/fetch/api/response/response-headers-guard.any.js.ini
@@ -0,0 +1,9 @@
+[response-headers-guard.any.sharedworker.html]
+  expected: ERROR
+
+[response-headers-guard.any.html]
+
+[response-headers-guard.any.worker.html]
+
+[response-headers-guard.any.serviceworker.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/fetch/fetch-later/basic.tentative.https.window.js.ini b/tests/wpt/meta-legacy-layout/fetch/fetch-later/basic.tentative.https.window.js.ini
index 4a6e75b55f7..c3859cd2643 100644
--- a/tests/wpt/meta-legacy-layout/fetch/fetch-later/basic.tentative.https.window.js.ini
+++ b/tests/wpt/meta-legacy-layout/fetch/fetch-later/basic.tentative.https.window.js.ini
@@ -4,3 +4,18 @@
 
   [fetchLater()'s return tells the deferred request is not yet sent.]
     expected: FAIL
+
+  [fetchLater() throws TypeError on non-HTTPS URL.]
+    expected: FAIL
+
+  [fetchLater() throws RangeError on negative activationTimeout.]
+    expected: FAIL
+
+  [fetchLater() throws TypeError when mutating its returned state.]
+    expected: FAIL
+
+  [fetchLater() throws AbortError when its initial abort signal is aborted.]
+    expected: FAIL
+
+  [fetchLater() does not throw error when it is aborted before sending.]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/fetch/fetch-later/quota.tentative.https.window.js.ini b/tests/wpt/meta-legacy-layout/fetch/fetch-later/quota.tentative.https.window.js.ini
new file mode 100644
index 00000000000..d520b45dd61
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/fetch/fetch-later/quota.tentative.https.window.js.ini
@@ -0,0 +1,2 @@
+[quota.tentative.https.window.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/fetch/fetch-later/send-on-deactivate.tentative.https.window.js.ini b/tests/wpt/meta-legacy-layout/fetch/fetch-later/send-on-deactivate.tentative.https.window.js.ini
new file mode 100644
index 00000000000..a2b0463bd23
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/fetch/fetch-later/send-on-deactivate.tentative.https.window.js.ini
@@ -0,0 +1,2 @@
+[send-on-deactivate.tentative.https.window.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/fetch/fetch-later/send-on-discard.tentative.https.window.js.ini b/tests/wpt/meta-legacy-layout/fetch/fetch-later/send-on-discard.tentative.https.window.js.ini
new file mode 100644
index 00000000000..26a34475368
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/fetch/fetch-later/send-on-discard.tentative.https.window.js.ini
@@ -0,0 +1,2 @@
+[send-on-discard.tentative.https.window.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/fetch/fetch-later/sendondiscard.tentative.https.window.js.ini b/tests/wpt/meta-legacy-layout/fetch/fetch-later/sendondiscard.tentative.https.window.js.ini
deleted file mode 100644
index 33db434fab3..00000000000
--- a/tests/wpt/meta-legacy-layout/fetch/fetch-later/sendondiscard.tentative.https.window.js.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[sendondiscard.tentative.https.window.html]
-  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/fetch/fetch-later/timeout.tentative.https.window.js.ini b/tests/wpt/meta-legacy-layout/fetch/fetch-later/timeout.tentative.https.window.js.ini
new file mode 100644
index 00000000000..2d32eaebde7
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/fetch/fetch-later/timeout.tentative.https.window.js.ini
@@ -0,0 +1,2 @@
+[timeout.tentative.https.window.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/css-images.sub.tentative.html.ini b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/css-images.sub.tentative.html.ini
index 2fa561150d5..f9de5391ad6 100644
--- a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/css-images.sub.tentative.html.ini
+++ b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/css-images.sub.tentative.html.ini
@@ -146,12 +146,3 @@
 
   [list-style-image sec-fetch-site - HTTPS downgrade-upgrade]
     expected: FAIL
-
-  [background-image sec-fetch-site - HTTPS downgrade (header not sent)]
-    expected: TIMEOUT
-
-  [border-image sec-fetch-site - HTTPS downgrade (header not sent)]
-    expected: FAIL
-
-  [background-image sec-fetch-dest - Not sent to non-trustworthy same-site destination]
-    expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/fetch/orb/tentative/content-range.sub.any.js.ini b/tests/wpt/meta-legacy-layout/fetch/orb/tentative/content-range.sub.any.js.ini
index c397469e41d..446864c62b3 100644
--- a/tests/wpt/meta-legacy-layout/fetch/orb/tentative/content-range.sub.any.js.ini
+++ b/tests/wpt/meta-legacy-layout/fetch/orb/tentative/content-range.sub.any.js.ini
@@ -2,7 +2,13 @@
   [ORB should block opaque range of image/png not starting at zero, that isn't subsequent]
     expected: FAIL
 
+  [ORB should block opaque range of image/png not starting at zero, that isn't subsequent: fetch(..., {mode: "no-cors"})]
+    expected: FAIL
+
 
 [content-range.sub.any.worker.html]
   [ORB should block opaque range of image/png not starting at zero, that isn't subsequent]
     expected: FAIL
+
+  [ORB should block opaque range of image/png not starting at zero, that isn't subsequent: fetch(..., {mode: "no-cors"})]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/fetch/orb/tentative/known-mime-type.sub.any.js.ini b/tests/wpt/meta-legacy-layout/fetch/orb/tentative/known-mime-type.sub.any.js.ini
index f757e2241ee..b05b6f9e2bd 100644
--- a/tests/wpt/meta-legacy-layout/fetch/orb/tentative/known-mime-type.sub.any.js.ini
+++ b/tests/wpt/meta-legacy-layout/fetch/orb/tentative/known-mime-type.sub.any.js.ini
@@ -1,4 +1,5 @@
 [known-mime-type.sub.any.html]
+  expected: ERROR
   [ORB should block opaque font/ttf]
     expected: FAIL
 
@@ -17,6 +18,111 @@
   [ORB should block opaque application/json which contains non ascii characters]
     expected: FAIL
 
+  [ORB should block opaque font/ttf: fetch(..., {mode: "no-cors"})]
+    expected: FAIL
+
+  [ORB should block opaque font/ttf: <script src=...>]
+    expected: FAIL
+
+  [ORB should block opaque text/plain: fetch(..., {mode: "no-cors"})]
+    expected: FAIL
+
+  [ORB should block opaque text/plain: <audio src=...>]
+    expected: TIMEOUT
+
+  [ORB should block opaque text/plain: <video src=...>]
+    expected: NOTRUN
+
+  [ORB should block opaque text/plain: <script src=...>]
+    expected: NOTRUN
+
+  [ORB should block opaque application/json (non-empty): fetch(..., {mode: "no-cors"})]
+    expected: NOTRUN
+
+  [ORB should block opaque application/json (non-empty): <img src=...>]
+    expected: NOTRUN
+
+  [ORB should block opaque application/json (non-empty): <audio src=...>]
+    expected: NOTRUN
+
+  [ORB should block opaque application/json (non-empty): <video src=...>]
+    expected: NOTRUN
+
+  [ORB should block opaque application/json (non-empty): <script src=...>]
+    expected: NOTRUN
+
+  [ORB should block opaque application/json (empty): fetch(..., {mode: "no-cors"})]
+    expected: NOTRUN
+
+  [ORB should block opaque application/json (empty): <img src=...>]
+    expected: NOTRUN
+
+  [ORB should block opaque application/json (empty): <audio src=...>]
+    expected: NOTRUN
+
+  [ORB should block opaque application/json (empty): <video src=...>]
+    expected: NOTRUN
+
+  [ORB should block opaque application/json (empty): <script src=...>]
+    expected: NOTRUN
+
+  [ORB should block opaque application/json which contains non ascii characters: fetch(..., {mode: "no-cors"})]
+    expected: NOTRUN
+
+  [ORB should block opaque application/json which contains non ascii characters: <img src=...>]
+    expected: NOTRUN
+
+  [ORB should block opaque application/json which contains non ascii characters: <audio src=...>]
+    expected: NOTRUN
+
+  [ORB should block opaque application/json which contains non ascii characters: <video src=...>]
+    expected: NOTRUN
+
+  [ORB should block opaque application/json which contains non ascii characters: <script src=...>]
+    expected: NOTRUN
+
+  [ORB shouldn't block opaque image/png: fetch(..., {mode: "no-cors"})]
+    expected: NOTRUN
+
+  [ORB shouldn't block opaque image/png: <img src=...>]
+    expected: NOTRUN
+
+  [ORB shouldn't block opaque text/javascript: fetch(..., {mode: "no-cors"})]
+    expected: NOTRUN
+
+  [ORB shouldn't block opaque text/javascript: <script src=...>]
+    expected: NOTRUN
+
+  [ORB shouldn't block opaque text/javascript (utf16 encoded with BOM): fetch(..., {mode: "no-cors"})]
+    expected: NOTRUN
+
+  [ORB shouldn't block opaque text/javascript (utf16 encoded with BOM): <script src=...>]
+    expected: NOTRUN
+
+  [ORB shouldn't block opaque text/javascript (utf16 encoded without BOM but charset is provided in content-type): fetch(..., {mode: "no-cors"})]
+    expected: NOTRUN
+
+  [ORB shouldn't block opaque text/javascript (utf16 encoded without BOM but charset is provided in content-type): <script src=...>]
+    expected: NOTRUN
+
+  [ORB shouldn't block opaque text/javascript (iso-8559-1 encoded): fetch(..., {mode: "no-cors"})]
+    expected: NOTRUN
+
+  [ORB shouldn't block opaque text/javascript (iso-8559-1 encoded): <script src=...>]
+    expected: NOTRUN
+
+  [ORB shouldn't block text/javascript with valid asm.js: fetch(..., {mode: "no-cors"})]
+    expected: NOTRUN
+
+  [ORB shouldn't block text/javascript with valid asm.js: <script src=...>]
+    expected: NOTRUN
+
+  [ORB shouldn't block text/javascript with invalid asm.js: fetch(..., {mode: "no-cors"})]
+    expected: NOTRUN
+
+  [ORB shouldn't block text/javascript with invalid asm.js: <script src=...>]
+    expected: NOTRUN
+
 
 [known-mime-type.sub.any.worker.html]
   [ORB should block opaque font/ttf]
@@ -36,3 +142,18 @@
 
   [ORB should block opaque application/json which contains non ascii characters]
     expected: FAIL
+
+  [ORB should block opaque font/ttf: fetch(..., {mode: "no-cors"})]
+    expected: FAIL
+
+  [ORB should block opaque text/plain: fetch(..., {mode: "no-cors"})]
+    expected: FAIL
+
+  [ORB should block opaque application/json (non-empty): fetch(..., {mode: "no-cors"})]
+    expected: FAIL
+
+  [ORB should block opaque application/json (empty): fetch(..., {mode: "no-cors"})]
+    expected: FAIL
+
+  [ORB should block opaque application/json which contains non ascii characters: fetch(..., {mode: "no-cors"})]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/fetch/orb/tentative/nosniff.sub.any.js.ini b/tests/wpt/meta-legacy-layout/fetch/orb/tentative/nosniff.sub.any.js.ini
index 134f31556a2..d922a3ef99a 100644
--- a/tests/wpt/meta-legacy-layout/fetch/orb/tentative/nosniff.sub.any.js.ini
+++ b/tests/wpt/meta-legacy-layout/fetch/orb/tentative/nosniff.sub.any.js.ini
@@ -1,4 +1,5 @@
 [nosniff.sub.any.html]
+  expected: TIMEOUT
   [ORB should block opaque text/plain with nosniff]
     expected: FAIL
 
@@ -8,6 +9,54 @@
   [ORB should block opaque response with empty Content-Type and nosniff]
     expected: FAIL
 
+  [ORB should block opaque text/plain with nosniff: fetch(..., {mode: "no-cors"})]
+    expected: FAIL
+
+  [ORB should block opaque text/plain with nosniff: <audio src=...>]
+    expected: TIMEOUT
+
+  [ORB should block opaque text/plain with nosniff: <video src=...>]
+    expected: NOTRUN
+
+  [ORB should block opaque text/plain with nosniff: <script src=...>]
+    expected: NOTRUN
+
+  [ORB should block opaque-response-blocklisted MIME type with nosniff: fetch(..., {mode: "no-cors"})]
+    expected: NOTRUN
+
+  [ORB should block opaque-response-blocklisted MIME type with nosniff: <img src=...>]
+    expected: NOTRUN
+
+  [ORB should block opaque-response-blocklisted MIME type with nosniff: <audio src=...>]
+    expected: NOTRUN
+
+  [ORB should block opaque-response-blocklisted MIME type with nosniff: <video src=...>]
+    expected: NOTRUN
+
+  [ORB should block opaque-response-blocklisted MIME type with nosniff: <script src=...>]
+    expected: NOTRUN
+
+  [ORB should block opaque response with empty Content-Type and nosniff: fetch(..., {mode: "no-cors"})]
+    expected: NOTRUN
+
+  [ORB should block opaque response with empty Content-Type and nosniff: <img src=...>]
+    expected: NOTRUN
+
+  [ORB should block opaque response with empty Content-Type and nosniff: <audio src=...>]
+    expected: NOTRUN
+
+  [ORB should block opaque response with empty Content-Type and nosniff: <video src=...>]
+    expected: NOTRUN
+
+  [ORB should block opaque response with empty Content-Type and nosniff: <script src=...>]
+    expected: NOTRUN
+
+  [ORB shouldn't block opaque image with empty Content-Type and nosniff: fetch(..., {mode: "no-cors"})]
+    expected: NOTRUN
+
+  [ORB shouldn't block opaque image with empty Content-Type and nosniff: <img src=...>]
+    expected: NOTRUN
+
 
 [nosniff.sub.any.worker.html]
   [ORB should block opaque text/plain with nosniff]
@@ -18,3 +67,12 @@
 
   [ORB should block opaque response with empty Content-Type and nosniff]
     expected: FAIL
+
+  [ORB should block opaque text/plain with nosniff: fetch(..., {mode: "no-cors"})]
+    expected: FAIL
+
+  [ORB should block opaque-response-blocklisted MIME type with nosniff: fetch(..., {mode: "no-cors"})]
+    expected: FAIL
+
+  [ORB should block opaque response with empty Content-Type and nosniff: fetch(..., {mode: "no-cors"})]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/fetch/orb/tentative/status.sub.any.js.ini b/tests/wpt/meta-legacy-layout/fetch/orb/tentative/status.sub.any.js.ini
index a78ee901e1c..332ee884317 100644
--- a/tests/wpt/meta-legacy-layout/fetch/orb/tentative/status.sub.any.js.ini
+++ b/tests/wpt/meta-legacy-layout/fetch/orb/tentative/status.sub.any.js.ini
@@ -5,10 +5,44 @@
   [ORB should block opaque response with non-ok status]
     expected: FAIL
 
+  [ORB should block opaque-response-blocklisted MIME type with status 206: fetch(..., {mode: "no-cors"})]
+    expected: FAIL
+
+  [ORB should block opaque response with non-ok status: fetch(..., {mode: "no-cors"})]
+    expected: FAIL
+
 
 [status.sub.any.html]
+  expected: TIMEOUT
   [ORB should block opaque-response-blocklisted MIME type with status 206]
     expected: FAIL
 
   [ORB should block opaque response with non-ok status]
     expected: FAIL
+
+  [ORB should block opaque-response-blocklisted MIME type with status 206: fetch(..., {mode: "no-cors"})]
+    expected: FAIL
+
+  [ORB should block opaque-response-blocklisted MIME type with status 206: <audio src=...>]
+    expected: TIMEOUT
+
+  [ORB should block opaque-response-blocklisted MIME type with status 206: <video src=...>]
+    expected: NOTRUN
+
+  [ORB should block opaque-response-blocklisted MIME type with status 206: <script src=...>]
+    expected: NOTRUN
+
+  [ORB should block opaque response with non-ok status: fetch(..., {mode: "no-cors"})]
+    expected: NOTRUN
+
+  [ORB should block opaque response with non-ok status: <img src=...>]
+    expected: NOTRUN
+
+  [ORB should block opaque response with non-ok status: <audio src=...>]
+    expected: NOTRUN
+
+  [ORB should block opaque response with non-ok status: <video src=...>]
+    expected: NOTRUN
+
+  [ORB should block opaque response with non-ok status: <script src=...>]
+    expected: NOTRUN
diff --git a/tests/wpt/meta-legacy-layout/html/browsers/browsing-the-web/history-traversal/PopStateEvent.html.ini b/tests/wpt/meta-legacy-layout/html/browsers/browsing-the-web/history-traversal/PopStateEvent.html.ini
new file mode 100644
index 00000000000..9ce210ac840
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/browsers/browsing-the-web/history-traversal/PopStateEvent.html.ini
@@ -0,0 +1,6 @@
+[PopStateEvent.html]
+  [Initial value of PopStateEvent.hasUAVisualTransition must be false]
+    expected: FAIL
+
+  [Dispatching a synthetic PopStateEvent]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-src-aboutblank-navigate-immediately.html.ini b/tests/wpt/meta-legacy-layout/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-src-aboutblank-navigate-immediately.html.ini
index 1bca09f21d6..c5fc1407992 100644
--- a/tests/wpt/meta-legacy-layout/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-src-aboutblank-navigate-immediately.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-src-aboutblank-navigate-immediately.html.ini
@@ -1,4 +1,5 @@
 [iframe-src-aboutblank-navigate-immediately.html]
+  expected: TIMEOUT
   [Navigating to a different document with window.open]
     expected: FAIL
 
@@ -6,4 +7,4 @@
     expected: FAIL
 
   [Navigating to a different document with form submission]
-    expected: FAIL
+    expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-iframe-contentWindow.html.ini b/tests/wpt/meta-legacy-layout/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-iframe-contentWindow.html.ini
index d19311abec9..149bcb4ff8c 100644
--- a/tests/wpt/meta-legacy-layout/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-iframe-contentWindow.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-iframe-contentWindow.html.ini
@@ -8,8 +8,5 @@
   [load & pageshow events do not fire on contentWindow of <iframe> element created with src='about:blank#foo']
     expected: FAIL
 
-  [load & pageshow events do not fire on contentWindow of <iframe> element created with src='']
-    expected: FAIL
-
   [load & pageshow events do not fire on contentWindow of <iframe> element created with src='about:blank']
     expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-window-open.html.ini b/tests/wpt/meta-legacy-layout/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-window-open.html.ini
index 5aef7ce66ce..324db3d9b35 100644
--- a/tests/wpt/meta-legacy-layout/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-window-open.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-window-open.html.ini
@@ -10,6 +10,3 @@
 
   [load event does not fire on window.open('about:blank?foo')]
     expected: FAIL
-
-  [load event does not fire on window.open('about:blank')]
-    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-return-value-handling-dynamic.html.ini b/tests/wpt/meta-legacy-layout/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-return-value-handling-dynamic.html.ini
index b169452e04a..8ae58f9f1e2 100644
--- a/tests/wpt/meta-legacy-layout/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-return-value-handling-dynamic.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-return-value-handling-dynamic.html.ini
@@ -10,3 +10,12 @@
 
   [0080 00FF set in href="" targeting a frame and clicked]
     expected: FAIL
+
+  [0080 00FF 0100 set in href="" targeting a frame and clicked]
+    expected: FAIL
+
+  [D83D DE0D set in href="" targeting a frame and clicked]
+    expected: FAIL
+
+  [DE0D 0041 set in href="" targeting a frame and clicked]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-cross-origin.sub.window.js.ini b/tests/wpt/meta-legacy-layout/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-cross-origin.sub.window.js.ini
deleted file mode 100644
index 4ecd6d9f753..00000000000
--- a/tests/wpt/meta-legacy-layout/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-cross-origin.sub.window.js.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[navigation-unload-cross-origin.sub.window.html]
-  [Cross-origin navigation started from unload handler must be ignored]
-    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini b/tests/wpt/meta-legacy-layout/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
new file mode 100644
index 00000000000..7a5fcb79165
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
@@ -0,0 +1,3 @@
+[traverse_the_history_5.html]
+  [Multiple history traversals, last would be aborted]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/browsers/history/the-location-interface/location-protocol-setter.html.ini b/tests/wpt/meta-legacy-layout/html/browsers/history/the-location-interface/location-protocol-setter.html.ini
deleted file mode 100644
index b014cf7652d..00000000000
--- a/tests/wpt/meta-legacy-layout/html/browsers/history/the-location-interface/location-protocol-setter.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[location-protocol-setter.html]
-  type: testharness
-  [Equivalent tests for data URL and srcdoc <iframe>s]
-    expected: FAIL
-
diff --git a/tests/wpt/meta-legacy-layout/html/browsers/windows/dangling-markup-window-name.html.ini b/tests/wpt/meta-legacy-layout/html/browsers/windows/dangling-markup-window-name.html.ini
new file mode 100644
index 00000000000..3ab80f5d5e3
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/browsers/windows/dangling-markup-window-name.html.ini
@@ -0,0 +1,2 @@
+[dangling-markup-window-name.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/html/browsers/windows/dangling-markup-window-name.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/browsers/windows/dangling-markup-window-name.tentative.html.ini
deleted file mode 100644
index 4f7e41cd752..00000000000
--- a/tests/wpt/meta-legacy-layout/html/browsers/windows/dangling-markup-window-name.tentative.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[dangling-markup-window-name.tentative.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/layers/2d.layer.shadow-from-outside-canvas.long-distance.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/layers/2d.layer.shadow-from-outside-canvas.long-distance.html.ini
new file mode 100644
index 00000000000..4f2ae62125b
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/layers/2d.layer.shadow-from-outside-canvas.long-distance.html.ini
@@ -0,0 +1,2 @@
+[2d.layer.shadow-from-outside-canvas.long-distance.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/layers/2d.layer.shadow-from-outside-canvas.short-distance.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/layers/2d.layer.shadow-from-outside-canvas.short-distance.html.ini
new file mode 100644
index 00000000000..46f724b3e99
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/layers/2d.layer.shadow-from-outside-canvas.short-distance.html.ini
@@ -0,0 +1,2 @@
+[2d.layer.shadow-from-outside-canvas.short-distance.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/manual/text/canvas.2d.disconnected.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/manual/text/canvas.2d.disconnected.html.ini
index 5cdcce07c65..17247137cb1 100644
--- a/tests/wpt/meta-legacy-layout/html/canvas/element/manual/text/canvas.2d.disconnected.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/manual/text/canvas.2d.disconnected.html.ini
@@ -1,2 +1,2 @@
 [canvas.2d.disconnected.html]
-  expected: FAIL
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.render.drop_shadow.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.render.drop_shadow.html.ini
new file mode 100644
index 00000000000..de427924922
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.render.drop_shadow.html.ini
@@ -0,0 +1,2 @@
+[2d.reset.render.drop_shadow.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.render.global_composite_operation.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.render.global_composite_operation.html.ini
new file mode 100644
index 00000000000..8c93940d805
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.render.global_composite_operation.html.ini
@@ -0,0 +1,2 @@
+[2d.reset.render.global_composite_operation.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.render.line.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.render.line.html.ini
new file mode 100644
index 00000000000..46b6c887ca4
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.render.line.html.ini
@@ -0,0 +1,2 @@
+[2d.reset.render.line.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.render.misc.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.render.misc.html.ini
new file mode 100644
index 00000000000..4a50e35fd10
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.render.misc.html.ini
@@ -0,0 +1,2 @@
+[2d.reset.render.misc.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.render.miter_limit.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.render.miter_limit.html.ini
new file mode 100644
index 00000000000..dcbf36db069
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.render.miter_limit.html.ini
@@ -0,0 +1,2 @@
+[2d.reset.render.miter_limit.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.render.text.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.render.text.html.ini
new file mode 100644
index 00000000000..bab41d308bf
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.render.text.html.ini
@@ -0,0 +1,2 @@
+[2d.reset.render.text.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/text/2d.text.fontVariantCaps2.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/text/2d.text.fontVariantCaps2.html.ini
index 2d73809345f..53142ddcd6c 100644
--- a/tests/wpt/meta-legacy-layout/html/canvas/element/text/2d.text.fontVariantCaps2.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/text/2d.text.fontVariantCaps2.html.ini
@@ -1,2 +1,3 @@
 [2d.text.fontVariantCaps2.html]
-  expected: FAIL
+  [Testing small caps setting in fontVariant]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/text/2d.text.fontVariantCaps3.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/text/2d.text.fontVariantCaps3.html.ini
deleted file mode 100644
index 72b037dc26c..00000000000
--- a/tests/wpt/meta-legacy-layout/html/canvas/element/text/2d.text.fontVariantCaps3.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[2d.text.fontVariantCaps3.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/text/2d.text.fontVariantCaps4.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/text/2d.text.fontVariantCaps4.html.ini
deleted file mode 100644
index 9614b6a8b10..00000000000
--- a/tests/wpt/meta-legacy-layout/html/canvas/element/text/2d.text.fontVariantCaps4.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[2d.text.fontVariantCaps4.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/context.casesensitive.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-context/2d.canvas.context.casesensitive.html.ini
similarity index 68%
rename from tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/context.casesensitive.html.ini
rename to tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-context/2d.canvas.context.casesensitive.html.ini
index d1e49fdef97..64e281aae16 100644
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/context.casesensitive.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-context/2d.canvas.context.casesensitive.html.ini
@@ -1,4 +1,3 @@
-[context.casesensitive.html]
+[2d.canvas.context.casesensitive.html]
   [Context name "2D" is unrecognised; matching is case sensitive]
     expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/context.casesensitive.worker.js.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-context/2d.canvas.context.casesensitive.worker.js.ini
similarity index 64%
rename from tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/context.casesensitive.worker.js.ini
rename to tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-context/2d.canvas.context.casesensitive.worker.js.ini
index 540b6170978..27e9dca7c02 100644
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/context.casesensitive.worker.js.ini
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-context/2d.canvas.context.casesensitive.worker.js.ini
@@ -1,4 +1,3 @@
-[context.casesensitive.worker.html]
+[2d.canvas.context.casesensitive.worker.html]
   [Context name "2D" is unrecognised; matching is case sensitive]
     expected: FAIL
-
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/context.emptystring.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-context/2d.canvas.context.emptystring.html.ini
similarity index 63%
rename from tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/context.emptystring.html.ini
rename to tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-context/2d.canvas.context.emptystring.html.ini
index f3ca915d04a..2c3eefedcd0 100644
--- a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/context.emptystring.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-context/2d.canvas.context.emptystring.html.ini
@@ -1,4 +1,3 @@
-[context.emptystring.html]
+[2d.canvas.context.emptystring.html]
   [getContext with empty string returns null]
     expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/context.emptystring.worker.js.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-context/2d.canvas.context.emptystring.worker.js.ini
similarity index 59%
rename from tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/context.emptystring.worker.js.ini
rename to tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-context/2d.canvas.context.emptystring.worker.js.ini
index ee99fcfc67c..cc368ac511e 100644
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/context.emptystring.worker.js.ini
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-context/2d.canvas.context.emptystring.worker.js.ini
@@ -1,4 +1,3 @@
-[context.emptystring.worker.html]
+[2d.canvas.context.emptystring.worker.html]
   [getContext with empty string returns null]
     expected: FAIL
-
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.badname.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-context/2d.canvas.context.unrecognised.badname.html.ini
similarity index 62%
rename from tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.badname.html.ini
rename to tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-context/2d.canvas.context.unrecognised.badname.html.ini
index c8f93b1a049..61f40bc0e2a 100644
--- a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.badname.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-context/2d.canvas.context.unrecognised.badname.html.ini
@@ -1,4 +1,3 @@
-[context.unrecognised.badname.html]
+[2d.canvas.context.unrecognised.badname.html]
   [getContext with unrecognised context name returns null]
     expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.badname.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-context/2d.canvas.context.unrecognised.badname.worker.js.ini
similarity index 59%
rename from tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.badname.html.ini
rename to tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-context/2d.canvas.context.unrecognised.badname.worker.js.ini
index c8f93b1a049..ba433ddb153 100644
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.badname.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-context/2d.canvas.context.unrecognised.badname.worker.js.ini
@@ -1,4 +1,3 @@
-[context.unrecognised.badname.html]
+[2d.canvas.context.unrecognised.badname.worker.html]
   [getContext with unrecognised context name returns null]
     expected: FAIL
-
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.badsuffix.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-context/2d.canvas.context.unrecognised.badsuffix.html.ini
similarity index 59%
rename from tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.badsuffix.html.ini
rename to tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-context/2d.canvas.context.unrecognised.badsuffix.html.ini
index 6a74fbdec7b..42e7640cc34 100644
--- a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.badsuffix.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-context/2d.canvas.context.unrecognised.badsuffix.html.ini
@@ -1,4 +1,3 @@
-[context.unrecognised.badsuffix.html]
+[2d.canvas.context.unrecognised.badsuffix.html]
   [Context name "2d" plus a suffix is unrecognised]
     expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.badsuffix.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-context/2d.canvas.context.unrecognised.badsuffix.worker.js.ini
similarity index 56%
rename from tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.badsuffix.html.ini
rename to tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-context/2d.canvas.context.unrecognised.badsuffix.worker.js.ini
index 6a74fbdec7b..89c114b0e1d 100644
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.badsuffix.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-context/2d.canvas.context.unrecognised.badsuffix.worker.js.ini
@@ -1,4 +1,3 @@
-[context.unrecognised.badsuffix.html]
+[2d.canvas.context.unrecognised.badsuffix.worker.html]
   [Context name "2d" plus a suffix is unrecognised]
     expected: FAIL
-
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.nullsuffix.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-context/2d.canvas.context.unrecognised.nullsuffix.html.ini
similarity index 61%
rename from tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.nullsuffix.html.ini
rename to tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-context/2d.canvas.context.unrecognised.nullsuffix.html.ini
index 77705e05cd8..8cd6b8b614c 100644
--- a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.nullsuffix.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-context/2d.canvas.context.unrecognised.nullsuffix.html.ini
@@ -1,4 +1,3 @@
-[context.unrecognised.nullsuffix.html]
+[2d.canvas.context.unrecognised.nullsuffix.html]
   [Context name "2d" plus a "\\0" suffix is unrecognised]
     expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.nullsuffix.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-context/2d.canvas.context.unrecognised.nullsuffix.worker.js.ini
similarity index 57%
rename from tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.nullsuffix.html.ini
rename to tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-context/2d.canvas.context.unrecognised.nullsuffix.worker.js.ini
index 77705e05cd8..e850767487e 100644
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.nullsuffix.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-context/2d.canvas.context.unrecognised.nullsuffix.worker.js.ini
@@ -1,4 +1,3 @@
-[context.unrecognised.nullsuffix.html]
+[2d.canvas.context.unrecognised.nullsuffix.worker.html]
   [Context name "2d" plus a "\\0" suffix is unrecognised]
     expected: FAIL
-
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.unicode.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-context/2d.canvas.context.unrecognised.unicode.html.ini
similarity index 64%
rename from tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.unicode.html.ini
rename to tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-context/2d.canvas.context.unrecognised.unicode.html.ini
index d2c56a9de28..88eff7740fd 100644
--- a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.unicode.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-context/2d.canvas.context.unrecognised.unicode.html.ini
@@ -1,4 +1,3 @@
-[context.unrecognised.unicode.html]
+[2d.canvas.context.unrecognised.unicode.html]
   [Context name which kind of looks like "2d" is unrecognised]
     expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.unicode.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-context/2d.canvas.context.unrecognised.unicode.worker.js.ini
similarity index 60%
rename from tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.unicode.html.ini
rename to tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-context/2d.canvas.context.unrecognised.unicode.worker.js.ini
index d2c56a9de28..7cf8fcb7e38 100644
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.unicode.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-context/2d.canvas.context.unrecognised.unicode.worker.js.ini
@@ -1,4 +1,3 @@
-[context.unrecognised.unicode.html]
+[2d.canvas.context.unrecognised.unicode.worker.html]
   [Context name which kind of looks like "2d" is unrecognised]
     expected: FAIL
-
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-context/2d.getContext.options.any.js.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-context/2d.getContext.options.any.js.ini
new file mode 100644
index 00000000000..3c49853c4cc
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-context/2d.getContext.options.any.js.ini
@@ -0,0 +1,8 @@
+[2d.getContext.options.any.html]
+  [2d]
+    expected: FAIL
+
+
+[2d.getContext.options.any.worker.html]
+  [2d]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/initial.reset.path.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.path.html.ini
similarity index 64%
rename from tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/initial.reset.path.html.ini
rename to tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.path.html.ini
index a709122fe61..e12e364d828 100644
--- a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/initial.reset.path.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.path.html.ini
@@ -1,4 +1,3 @@
-[initial.reset.path.html]
+[2d.canvas.host.initial.reset.path.html]
   [Resetting the canvas state resets the current path]
     expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/initial.reset.path.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.path.worker.js.ini
similarity index 60%
rename from tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/initial.reset.path.html.ini
rename to tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.path.worker.js.ini
index a709122fe61..d37d5bc29d9 100644
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/initial.reset.path.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.path.worker.js.ini
@@ -1,4 +1,3 @@
-[initial.reset.path.html]
+[2d.canvas.host.initial.reset.path.worker.html]
   [Resetting the canvas state resets the current path]
     expected: FAIL
-
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/size.attributes.idl.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.idl.html.ini
similarity index 61%
rename from tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/size.attributes.idl.html.ini
rename to tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.idl.html.ini
index c6b302271fe..7a67c55bf1d 100644
--- a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/size.attributes.idl.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.idl.html.ini
@@ -1,3 +1,3 @@
-[size.attributes.idl.html]
+[2d.canvas.host.size.attributes.idl.html]
   [Getting/setting width/height IDL attributes]
     expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.idl.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.idl.worker.js.ini
similarity index 57%
rename from tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.idl.html.ini
rename to tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.idl.worker.js.ini
index c6b302271fe..0946b523e8a 100644
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.idl.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.idl.worker.js.ini
@@ -1,3 +1,3 @@
-[size.attributes.idl.html]
+[2d.canvas.host.size.attributes.idl.worker.html]
   [Getting/setting width/height IDL attributes]
     expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.em.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.em.html.ini
similarity index 54%
rename from tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.em.html.ini
rename to tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.em.html.ini
index 7a0512ad9f0..d8ccbed5caa 100644
--- a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.em.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.em.html.ini
@@ -1,4 +1,3 @@
-[size.attributes.parse.em.html]
+[2d.canvas.host.size.attributes.parse.em.html]
   [Parsing of non-negative integers]
     expected: FAIL
-
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.em.worker.js.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.em.worker.js.ini
new file mode 100644
index 00000000000..aa70cb2a565
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.em.worker.js.ini
@@ -0,0 +1,3 @@
+[2d.canvas.host.size.attributes.parse.em.worker.html]
+  [Parsing of non-negative integers]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.junk.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.junk.html.ini
new file mode 100644
index 00000000000..2c79d5c389f
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.junk.html.ini
@@ -0,0 +1,3 @@
+[2d.canvas.host.size.attributes.parse.junk.html]
+  [Parsing of non-negative integers]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.junk.worker.js.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.junk.worker.js.ini
new file mode 100644
index 00000000000..3d1ba9cd750
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.junk.worker.js.ini
@@ -0,0 +1,3 @@
+[2d.canvas.host.size.attributes.parse.junk.worker.html]
+  [Parsing of non-negative integers]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.minus.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.minus.html.ini
new file mode 100644
index 00000000000..a1700667887
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.minus.html.ini
@@ -0,0 +1,3 @@
+[2d.canvas.host.size.attributes.parse.minus.html]
+  [Parsing of non-negative integers]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.minus.worker.js.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.minus.worker.js.ini
new file mode 100644
index 00000000000..f40514bce36
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.minus.worker.js.ini
@@ -0,0 +1,3 @@
+[2d.canvas.host.size.attributes.parse.minus.worker.html]
+  [Parsing of non-negative integers]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.percent.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.percent.html.ini
new file mode 100644
index 00000000000..83d334905c6
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.percent.html.ini
@@ -0,0 +1,3 @@
+[2d.canvas.host.size.attributes.parse.percent.html]
+  [Parsing of non-negative integers]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.percent.worker.js.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.percent.worker.js.ini
new file mode 100644
index 00000000000..864ce77b029
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.percent.worker.js.ini
@@ -0,0 +1,3 @@
+[2d.canvas.host.size.attributes.parse.percent.worker.html]
+  [Parsing of non-negative integers]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.trailingjunk.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.trailingjunk.html.ini
new file mode 100644
index 00000000000..bbac2296e3d
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.trailingjunk.html.ini
@@ -0,0 +1,3 @@
+[2d.canvas.host.size.attributes.parse.trailingjunk.html]
+  [Parsing of non-negative integers]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.trailingjunk.worker.js.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.trailingjunk.worker.js.ini
new file mode 100644
index 00000000000..3535cc12f38
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.trailingjunk.worker.js.ini
@@ -0,0 +1,3 @@
+[2d.canvas.host.size.attributes.parse.trailingjunk.worker.html]
+  [Parsing of non-negative integers]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/layers/2d.layer.blur-from-outside-canvas.no-clipping.w.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/layers/2d.layer.blur-from-outside-canvas.no-clipping.w.html.ini
new file mode 100644
index 00000000000..cfee0f0d2eb
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/layers/2d.layer.blur-from-outside-canvas.no-clipping.w.html.ini
@@ -0,0 +1,2 @@
+[2d.layer.blur-from-outside-canvas.no-clipping.w.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/layers/2d.layer.blur-from-outside-canvas.with-clipping.w.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/layers/2d.layer.blur-from-outside-canvas.with-clipping.w.html.ini
new file mode 100644
index 00000000000..aa4dc8d83e7
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/layers/2d.layer.blur-from-outside-canvas.with-clipping.w.html.ini
@@ -0,0 +1,2 @@
+[2d.layer.blur-from-outside-canvas.with-clipping.w.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.long-distance-with-clipping.w.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.long-distance-with-clipping.w.html.ini
new file mode 100644
index 00000000000..d8cea8cbc48
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.long-distance-with-clipping.w.html.ini
@@ -0,0 +1,2 @@
+[2d.layer.shadow-from-outside-canvas.long-distance-with-clipping.w.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.long-distance.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.long-distance.html.ini
new file mode 100644
index 00000000000..4f2ae62125b
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.long-distance.html.ini
@@ -0,0 +1,2 @@
+[2d.layer.shadow-from-outside-canvas.long-distance.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.long-distance.w.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.long-distance.w.html.ini
new file mode 100644
index 00000000000..c2d27b36e9d
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.long-distance.w.html.ini
@@ -0,0 +1,2 @@
+[2d.layer.shadow-from-outside-canvas.long-distance.w.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.short-distance-with-clipping.w.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.short-distance-with-clipping.w.html.ini
new file mode 100644
index 00000000000..b62852b1e7c
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.short-distance-with-clipping.w.html.ini
@@ -0,0 +1,2 @@
+[2d.layer.shadow-from-outside-canvas.short-distance-with-clipping.w.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.short-distance.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.short-distance.html.ini
new file mode 100644
index 00000000000..46f724b3e99
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.short-distance.html.ini
@@ -0,0 +1,2 @@
+[2d.layer.shadow-from-outside-canvas.short-distance.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.short-distance.w.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.short-distance.w.html.ini
new file mode 100644
index 00000000000..3fb227c88ef
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.short-distance.w.html.ini
@@ -0,0 +1,2 @@
+[2d.layer.shadow-from-outside-canvas.short-distance.w.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.render.drop_shadow.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.render.drop_shadow.html.ini
new file mode 100644
index 00000000000..de427924922
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.render.drop_shadow.html.ini
@@ -0,0 +1,2 @@
+[2d.reset.render.drop_shadow.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.render.drop_shadow.w.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.render.drop_shadow.w.html.ini
new file mode 100644
index 00000000000..3d88579b4eb
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.render.drop_shadow.w.html.ini
@@ -0,0 +1,2 @@
+[2d.reset.render.drop_shadow.w.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.render.global_composite_operation.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.render.global_composite_operation.html.ini
new file mode 100644
index 00000000000..8c93940d805
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.render.global_composite_operation.html.ini
@@ -0,0 +1,2 @@
+[2d.reset.render.global_composite_operation.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.render.global_composite_operation.w.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.render.global_composite_operation.w.html.ini
new file mode 100644
index 00000000000..667bf479aac
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.render.global_composite_operation.w.html.ini
@@ -0,0 +1,2 @@
+[2d.reset.render.global_composite_operation.w.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.render.line.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.render.line.html.ini
new file mode 100644
index 00000000000..46b6c887ca4
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.render.line.html.ini
@@ -0,0 +1,2 @@
+[2d.reset.render.line.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.render.line.w.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.render.line.w.html.ini
new file mode 100644
index 00000000000..cf5f87c380e
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.render.line.w.html.ini
@@ -0,0 +1,2 @@
+[2d.reset.render.line.w.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.render.misc.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.render.misc.html.ini
new file mode 100644
index 00000000000..4a50e35fd10
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.render.misc.html.ini
@@ -0,0 +1,2 @@
+[2d.reset.render.misc.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.render.misc.w.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.render.misc.w.html.ini
new file mode 100644
index 00000000000..96c0af4b618
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.render.misc.w.html.ini
@@ -0,0 +1,2 @@
+[2d.reset.render.misc.w.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.render.miter_limit.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.render.miter_limit.html.ini
new file mode 100644
index 00000000000..dcbf36db069
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.render.miter_limit.html.ini
@@ -0,0 +1,2 @@
+[2d.reset.render.miter_limit.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.render.miter_limit.w.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.render.miter_limit.w.html.ini
new file mode 100644
index 00000000000..f7e5dc24118
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.render.miter_limit.w.html.ini
@@ -0,0 +1,2 @@
+[2d.reset.render.miter_limit.w.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.render.text.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.render.text.html.ini
new file mode 100644
index 00000000000..bab41d308bf
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.render.text.html.ini
@@ -0,0 +1,2 @@
+[2d.reset.render.text.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.render.text.w.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.render.text.w.html.ini
new file mode 100644
index 00000000000..c509ea86091
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.render.text.w.html.ini
@@ -0,0 +1,2 @@
+[2d.reset.render.text.w.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.fontVariantCaps1.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.fontVariantCaps1.html.ini
deleted file mode 100644
index 89fd3194bc6..00000000000
--- a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.fontVariantCaps1.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[2d.text.fontVariantCaps1.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.fontVariantCaps1.w.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.fontVariantCaps1.w.html.ini
new file mode 100644
index 00000000000..31831438399
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.fontVariantCaps1.w.html.ini
@@ -0,0 +1,2 @@
+[2d.text.fontVariantCaps1.w.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.fontVariantCaps2.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.fontVariantCaps2.html.ini
index fa58259ed38..53142ddcd6c 100644
--- a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.fontVariantCaps2.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.fontVariantCaps2.html.ini
@@ -1,2 +1,3 @@
 [2d.text.fontVariantCaps2.html]
-  expected: TIMEOUT
+  [Testing small caps setting in fontVariant]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.fontVariantCaps2.worker.js.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.fontVariantCaps2.worker.js.ini
new file mode 100644
index 00000000000..ee3ff3c0602
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.fontVariantCaps2.worker.js.ini
@@ -0,0 +1,3 @@
+[2d.text.fontVariantCaps2.worker.html]
+  [Testing small caps setting in fontVariant]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.fontVariantCaps3.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.fontVariantCaps3.html.ini
deleted file mode 100644
index 553d2bd4171..00000000000
--- a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.fontVariantCaps3.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[2d.text.fontVariantCaps3.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.fontVariantCaps3.w.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.fontVariantCaps3.w.html.ini
new file mode 100644
index 00000000000..377ba2603a1
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.fontVariantCaps3.w.html.ini
@@ -0,0 +1,2 @@
+[2d.text.fontVariantCaps3.w.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.fontVariantCaps4.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.fontVariantCaps4.html.ini
deleted file mode 100644
index 9c5c9297054..00000000000
--- a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.fontVariantCaps4.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[2d.text.fontVariantCaps4.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.fontVariantCaps4.w.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.fontVariantCaps4.w.html.ini
new file mode 100644
index 00000000000..4d9c346b829
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.fontVariantCaps4.w.html.ini
@@ -0,0 +1,2 @@
+[2d.text.fontVariantCaps4.w.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.fontVariantCaps5.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.fontVariantCaps5.html.ini
deleted file mode 100644
index 5b3007e7d4e..00000000000
--- a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.fontVariantCaps5.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[2d.text.fontVariantCaps5.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.fontVariantCaps5.w.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.fontVariantCaps5.w.html.ini
new file mode 100644
index 00000000000..c061380b6d5
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.fontVariantCaps5.w.html.ini
@@ -0,0 +1,2 @@
+[2d.text.fontVariantCaps5.w.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.fontVariantCaps6.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.fontVariantCaps6.html.ini
deleted file mode 100644
index 73615053193..00000000000
--- a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.fontVariantCaps6.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[2d.text.fontVariantCaps6.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.fontVariantCaps6.w.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.fontVariantCaps6.w.html.ini
new file mode 100644
index 00000000000..919352eb84b
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.fontVariantCaps6.w.html.ini
@@ -0,0 +1,2 @@
+[2d.text.fontVariantCaps6.w.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/2d-getcontext-options.any.js.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/2d-getcontext-options.any.js.ini
deleted file mode 100644
index 8578d7c6bc9..00000000000
--- a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/2d-getcontext-options.any.js.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[2d-getcontext-options.any.worker.html]
-  [2d-getcontext-options]
-    expected: FAIL
-
-
-[2d-getcontext-options.any.html]
-  [2d-getcontext-options]
-    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.minus.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.minus.html.ini
deleted file mode 100644
index 65f61338c7a..00000000000
--- a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.minus.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[size.attributes.parse.minus.html]
-  [Parsing of non-negative integers]
-    expected: FAIL
-
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.minus.worker.js.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.minus.worker.js.ini
deleted file mode 100644
index 085f9a074cb..00000000000
--- a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.minus.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[size.attributes.parse.minus.worker.html]
-  expected: CRASH
-  [Parsing of non-negative integers]
-    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.percent.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.percent.html.ini
deleted file mode 100644
index 3616116f9d5..00000000000
--- a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.percent.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[size.attributes.parse.percent.html]
-  [Parsing of non-negative integers]
-    expected: FAIL
-
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.percent.worker.js.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.percent.worker.js.ini
deleted file mode 100644
index 593e7be1da0..00000000000
--- a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.percent.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[size.attributes.parse.percent.worker.html]
-  [Parsing of non-negative integers]
-    expected: FAIL
-
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.trailingjunk.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.trailingjunk.html.ini
deleted file mode 100644
index 9e3d3533a05..00000000000
--- a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.trailingjunk.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[size.attributes.parse.trailingjunk.html]
-  [Parsing of non-negative integers]
-    expected: FAIL
-
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.trailingjunk.worker.js.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.trailingjunk.worker.js.ini
deleted file mode 100644
index bdbc4d4c968..00000000000
--- a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.trailingjunk.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[size.attributes.parse.trailingjunk.worker.html]
-  [Parsing of non-negative integers]
-    expected: FAIL
-
diff --git a/tests/wpt/meta-legacy-layout/html/dom/elements/global-attributes/dir-assorted.window.js.ini b/tests/wpt/meta-legacy-layout/html/dom/elements/global-attributes/dir-assorted.window.js.ini
new file mode 100644
index 00000000000..a350126250c
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/dom/elements/global-attributes/dir-assorted.window.js.ini
@@ -0,0 +1,21 @@
+[dir-assorted.window.html]
+  [Root element has a direction]
+    expected: FAIL
+
+  [Element outside the document tree has a direction]
+    expected: FAIL
+
+  [Non-HTML element outside the document tree has a direction]
+    expected: FAIL
+
+  [Element without direction has parent element direction]
+    expected: FAIL
+
+  [Non-HTML element without direction has parent element direction]
+    expected: FAIL
+
+  [dir inheritance is correct after insertion and removal from document]
+    expected: FAIL
+
+  [Non-HTML element text contents influence dir=auto]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/dom/elements/global-attributes/dir-auto-dynamic-changes.window.js.ini b/tests/wpt/meta-legacy-layout/html/dom/elements/global-attributes/dir-auto-dynamic-changes.window.js.ini
new file mode 100644
index 00000000000..8becf694cfa
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/dom/elements/global-attributes/dir-auto-dynamic-changes.window.js.ini
@@ -0,0 +1,24 @@
+[dir-auto-dynamic-changes.window.html]
+  [dynamic insertion of RTL text in a child element]
+    expected: FAIL
+
+  [dir=auto changes for content insertion and removal, in and out of document]
+    expected: FAIL
+
+  [dir=auto changes for slot reassignment]
+    expected: FAIL
+
+  [text changes affecting both slot and ancestor with dir=auto]
+    expected: FAIL
+
+  [dynamic changes to subtrees excluded as a result of the dir attribute]
+    expected: FAIL
+
+  [dynamic changes inside of non-HTML elements]
+    expected: FAIL
+
+  [slotted non-HTML elements]
+    expected: FAIL
+
+  [slotted non-HTML elements after dynamically assigning dir=auto, and dir attribute ignored on non-HTML elements]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/dom/elements/global-attributes/dir-slots-directionality.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/dom/elements/global-attributes/dir-slots-directionality.tentative.html.ini
index 9c605ab4702..32cb19c22c3 100644
--- a/tests/wpt/meta-legacy-layout/html/dom/elements/global-attributes/dir-slots-directionality.tentative.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/dom/elements/global-attributes/dir-slots-directionality.tentative.html.ini
@@ -1,2 +1,18 @@
 [dir-slots-directionality.tentative.html]
-  expected: ERROR
+  [Slots: Directionality: dir=rtl on slot]
+    expected: FAIL
+
+  [Slots: Directionality: dir=rtl on host]
+    expected: FAIL
+
+  [Slots: Directionality: dir=auto on host with Arabic shadow tree content]
+    expected: FAIL
+
+  [Slots: Directionality: dir=auto in shadow tree with Arabic light tree content]
+    expected: FAIL
+
+  [Slots: Directionality: dir=auto in shadow tree with Arabic shadow tree content]
+    expected: FAIL
+
+  [Slots: Directionality: dir=auto on slot with Arabic light tree content]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/dom/idlharness.https.html.ini b/tests/wpt/meta-legacy-layout/html/dom/idlharness.https.html.ini
index 4e1401a399e..c8b2fc8a1da 100644
--- a/tests/wpt/meta-legacy-layout/html/dom/idlharness.https.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/dom/idlharness.https.html.ini
@@ -1670,6 +1670,258 @@
   [VisibilityStateEntry interface: attribute duration]
     expected: FAIL
 
+  [CustomElementRegistry interface: operation getName(CustomElementConstructor)]
+    expected: FAIL
+
+  [Navigation interface: existence and properties of interface object]
+    expected: FAIL
+
+  [Navigation interface object length]
+    expected: FAIL
+
+  [Navigation interface object name]
+    expected: FAIL
+
+  [Navigation interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [Navigation interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [Navigation interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [Navigation interface: operation entries()]
+    expected: FAIL
+
+  [Navigation interface: attribute currentEntry]
+    expected: FAIL
+
+  [Navigation interface: operation updateCurrentEntry(NavigationUpdateCurrentEntryOptions)]
+    expected: FAIL
+
+  [Navigation interface: attribute transition]
+    expected: FAIL
+
+  [Navigation interface: attribute canGoBack]
+    expected: FAIL
+
+  [Navigation interface: attribute canGoForward]
+    expected: FAIL
+
+  [Navigation interface: operation navigate(USVString, optional NavigationNavigateOptions)]
+    expected: FAIL
+
+  [Navigation interface: operation reload(optional NavigationReloadOptions)]
+    expected: FAIL
+
+  [Navigation interface: operation traverseTo(DOMString, optional NavigationOptions)]
+    expected: FAIL
+
+  [Navigation interface: operation back(optional NavigationOptions)]
+    expected: FAIL
+
+  [Navigation interface: operation forward(optional NavigationOptions)]
+    expected: FAIL
+
+  [Navigation interface: attribute onnavigate]
+    expected: FAIL
+
+  [Navigation interface: attribute onnavigatesuccess]
+    expected: FAIL
+
+  [Navigation interface: attribute onnavigateerror]
+    expected: FAIL
+
+  [Navigation interface: attribute oncurrententrychange]
+    expected: FAIL
+
+  [NavigationHistoryEntry interface: existence and properties of interface object]
+    expected: FAIL
+
+  [NavigationHistoryEntry interface object length]
+    expected: FAIL
+
+  [NavigationHistoryEntry interface object name]
+    expected: FAIL
+
+  [NavigationHistoryEntry interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [NavigationHistoryEntry interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [NavigationHistoryEntry interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [NavigationHistoryEntry interface: attribute url]
+    expected: FAIL
+
+  [NavigationHistoryEntry interface: attribute key]
+    expected: FAIL
+
+  [NavigationHistoryEntry interface: attribute id]
+    expected: FAIL
+
+  [NavigationHistoryEntry interface: attribute index]
+    expected: FAIL
+
+  [NavigationHistoryEntry interface: attribute sameDocument]
+    expected: FAIL
+
+  [NavigationHistoryEntry interface: operation getState()]
+    expected: FAIL
+
+  [NavigationHistoryEntry interface: attribute ondispose]
+    expected: FAIL
+
+  [NavigationTransition interface: existence and properties of interface object]
+    expected: FAIL
+
+  [NavigationTransition interface object length]
+    expected: FAIL
+
+  [NavigationTransition interface object name]
+    expected: FAIL
+
+  [NavigationTransition interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [NavigationTransition interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [NavigationTransition interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [NavigationTransition interface: attribute navigationType]
+    expected: FAIL
+
+  [NavigationTransition interface: attribute from]
+    expected: FAIL
+
+  [NavigationTransition interface: attribute finished]
+    expected: FAIL
+
+  [NavigateEvent interface: existence and properties of interface object]
+    expected: FAIL
+
+  [NavigateEvent interface object length]
+    expected: FAIL
+
+  [NavigateEvent interface object name]
+    expected: FAIL
+
+  [NavigateEvent interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [NavigateEvent interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [NavigateEvent interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [NavigateEvent interface: attribute navigationType]
+    expected: FAIL
+
+  [NavigateEvent interface: attribute destination]
+    expected: FAIL
+
+  [NavigateEvent interface: attribute canIntercept]
+    expected: FAIL
+
+  [NavigateEvent interface: attribute userInitiated]
+    expected: FAIL
+
+  [NavigateEvent interface: attribute hashChange]
+    expected: FAIL
+
+  [NavigateEvent interface: attribute signal]
+    expected: FAIL
+
+  [NavigateEvent interface: attribute formData]
+    expected: FAIL
+
+  [NavigateEvent interface: attribute downloadRequest]
+    expected: FAIL
+
+  [NavigateEvent interface: attribute info]
+    expected: FAIL
+
+  [NavigateEvent interface: attribute hasUAVisualTransition]
+    expected: FAIL
+
+  [NavigateEvent interface: operation intercept(optional NavigationInterceptOptions)]
+    expected: FAIL
+
+  [NavigateEvent interface: operation scroll()]
+    expected: FAIL
+
+  [NavigationDestination interface: existence and properties of interface object]
+    expected: FAIL
+
+  [NavigationDestination interface object length]
+    expected: FAIL
+
+  [NavigationDestination interface object name]
+    expected: FAIL
+
+  [NavigationDestination interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [NavigationDestination interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [NavigationDestination interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [NavigationDestination interface: attribute url]
+    expected: FAIL
+
+  [NavigationDestination interface: attribute key]
+    expected: FAIL
+
+  [NavigationDestination interface: attribute id]
+    expected: FAIL
+
+  [NavigationDestination interface: attribute index]
+    expected: FAIL
+
+  [NavigationDestination interface: attribute sameDocument]
+    expected: FAIL
+
+  [NavigationDestination interface: operation getState()]
+    expected: FAIL
+
+  [NavigationCurrentEntryChangeEvent interface: existence and properties of interface object]
+    expected: FAIL
+
+  [NavigationCurrentEntryChangeEvent interface object length]
+    expected: FAIL
+
+  [NavigationCurrentEntryChangeEvent interface object name]
+    expected: FAIL
+
+  [NavigationCurrentEntryChangeEvent interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [NavigationCurrentEntryChangeEvent interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [NavigationCurrentEntryChangeEvent interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [NavigationCurrentEntryChangeEvent interface: attribute navigationType]
+    expected: FAIL
+
+  [NavigationCurrentEntryChangeEvent interface: attribute from]
+    expected: FAIL
+
+  [PopStateEvent interface: attribute hasUAVisualTransition]
+    expected: FAIL
+
+  [PopStateEvent interface: new PopStateEvent("popstate", { data: {} }) must inherit property "hasUAVisualTransition" with the proper type]
+    expected: FAIL
+
 
 [idlharness.https.html?include=(Document|Window)]
   [Document interface: documentWithHandlers must inherit property "queryCommandEnabled(DOMString)" with the proper type]
@@ -2308,6 +2560,12 @@
   [Document interface: documentWithHandlers must inherit property "onbeforetoggle" with the proper type]
     expected: FAIL
 
+  [Window interface: attribute navigation]
+    expected: FAIL
+
+  [Window interface: window must inherit property "navigation" with the proper type]
+    expected: FAIL
+
 
 [idlharness.https.html?include=HTML.*]
   [HTMLTableSectionElement interface: document.createElement("tfoot") must inherit property "align" with the proper type]
diff --git a/tests/wpt/meta-legacy-layout/html/interaction/focus/the-autofocus-attribute/document-with-fragment-top.html.ini b/tests/wpt/meta-legacy-layout/html/interaction/focus/the-autofocus-attribute/document-with-fragment-top.html.ini
index 574e55c4760..ab1003579be 100644
--- a/tests/wpt/meta-legacy-layout/html/interaction/focus/the-autofocus-attribute/document-with-fragment-top.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/interaction/focus/the-autofocus-attribute/document-with-fragment-top.html.ini
@@ -1,7 +1,7 @@
 [document-with-fragment-top.html]
+  expected: TIMEOUT
   [Autofocus elements in iframed documents with "top" fragments should work.]
     expected: FAIL
 
   [Autofocus elements in top-level browsing context's documents with "top" fragments should work.]
-    expected: FAIL
-
+    expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini b/tests/wpt/meta-legacy-layout/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
index d169bd2e9fa..8a926207630 100644
--- a/tests/wpt/meta-legacy-layout/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
@@ -1,4 +1,5 @@
 [supported-elements.html]
+  expected: TIMEOUT
   [Contenteditable element should support autofocus]
     expected: FAIL
 
@@ -6,10 +7,10 @@
     expected: FAIL
 
   [Host element with delegatesFocus including no focusable descendants should be skipped]
-    expected: FAIL
+    expected: TIMEOUT
 
   [Area element should support autofocus]
-    expected: FAIL
+    expected: NOTRUN
 
   [Host element with delegatesFocus should support autofocus]
     expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/links/stylesheet/quirk-origin-check-recursive-import.html.ini b/tests/wpt/meta-legacy-layout/html/links/stylesheet/quirk-origin-check-recursive-import.html.ini
new file mode 100644
index 00000000000..3f0df9b071f
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/links/stylesheet/quirk-origin-check-recursive-import.html.ini
@@ -0,0 +1,3 @@
+[quirk-origin-check-recursive-import.html]
+  [Origin check for stylesheet with non-CSS MIME type quirk: recursive @import]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/rendering/non-replaced-elements/hidden-elements.html.ini b/tests/wpt/meta-legacy-layout/html/rendering/non-replaced-elements/hidden-elements.html.ini
index c8168428dfd..582172c60ea 100644
--- a/tests/wpt/meta-legacy-layout/html/rendering/non-replaced-elements/hidden-elements.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/rendering/non-replaced-elements/hidden-elements.html.ini
@@ -4,3 +4,9 @@
 
   [track should not be hidden]
     expected: FAIL
+
+  [embed[hidden=''\] element should be inline 0x0]
+    expected: FAIL
+
+  [embed[hidden='until-found'\] element should be inline 0x0]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/rendering/the-details-element/details-pseudo-elements-002.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/rendering/the-details-element/details-pseudo-elements-002.tentative.html.ini
new file mode 100644
index 00000000000..75b4ed86b24
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/rendering/the-details-element/details-pseudo-elements-002.tentative.html.ini
@@ -0,0 +1,2 @@
+[details-pseudo-elements-002.tentative.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/rendering/widgets/form-sizing-input-number.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/rendering/widgets/form-sizing-input-number.tentative.html.ini
new file mode 100644
index 00000000000..6854f8ebcfb
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/rendering/widgets/form-sizing-input-number.tentative.html.ini
@@ -0,0 +1,15 @@
+[form-sizing-input-number.tentative.html]
+  [number: Empty value]
+    expected: FAIL
+
+  [number: Auto width and auto height with a long text]
+    expected: FAIL
+
+  [number: Explicit height and auto width]
+    expected: FAIL
+
+  [number: Text caret is shorter than the placeholder]
+    expected: FAIL
+
+  [number: Update form-sizing property dynamically]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/rendering/widgets/form-sizing-input-text.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/rendering/widgets/form-sizing-input-text.tentative.html.ini
new file mode 100644
index 00000000000..33eabf960dd
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/rendering/widgets/form-sizing-input-text.tentative.html.ini
@@ -0,0 +1,126 @@
+[form-sizing-input-text.tentative.html]
+  [text: Empty value]
+    expected: FAIL
+
+  [text: Empty value with a size atttribute]
+    expected: FAIL
+
+  [text: Auto width and auto height with a long text]
+    expected: FAIL
+
+  [text: Explicit height and auto width]
+    expected: FAIL
+
+  [text: Text caret is taller than the placeholder]
+    expected: FAIL
+
+  [text: Text caret is shorter than the placeholder]
+    expected: FAIL
+
+  [text: Update form-sizing property dynamically]
+    expected: FAIL
+
+  [search: Empty value]
+    expected: FAIL
+
+  [search: Empty value with a size atttribute]
+    expected: FAIL
+
+  [search: Auto width and auto height with a long text]
+    expected: FAIL
+
+  [search: Explicit height and auto width]
+    expected: FAIL
+
+  [search: Text caret is taller than the placeholder]
+    expected: FAIL
+
+  [search: Text caret is shorter than the placeholder]
+    expected: FAIL
+
+  [search: Update form-sizing property dynamically]
+    expected: FAIL
+
+  [tel: Empty value]
+    expected: FAIL
+
+  [tel: Empty value with a size atttribute]
+    expected: FAIL
+
+  [tel: Auto width and auto height with a long text]
+    expected: FAIL
+
+  [tel: Explicit height and auto width]
+    expected: FAIL
+
+  [tel: Text caret is taller than the placeholder]
+    expected: FAIL
+
+  [tel: Text caret is shorter than the placeholder]
+    expected: FAIL
+
+  [tel: Update form-sizing property dynamically]
+    expected: FAIL
+
+  [url: Empty value]
+    expected: FAIL
+
+  [url: Empty value with a size atttribute]
+    expected: FAIL
+
+  [url: Auto width and auto height with a long text]
+    expected: FAIL
+
+  [url: Explicit height and auto width]
+    expected: FAIL
+
+  [url: Text caret is taller than the placeholder]
+    expected: FAIL
+
+  [url: Text caret is shorter than the placeholder]
+    expected: FAIL
+
+  [url: Update form-sizing property dynamically]
+    expected: FAIL
+
+  [email: Empty value]
+    expected: FAIL
+
+  [email: Empty value with a size atttribute]
+    expected: FAIL
+
+  [email: Auto width and auto height with a long text]
+    expected: FAIL
+
+  [email: Explicit height and auto width]
+    expected: FAIL
+
+  [email: Text caret is taller than the placeholder]
+    expected: FAIL
+
+  [email: Text caret is shorter than the placeholder]
+    expected: FAIL
+
+  [email: Update form-sizing property dynamically]
+    expected: FAIL
+
+  [password: Empty value]
+    expected: FAIL
+
+  [password: Empty value with a size atttribute]
+    expected: FAIL
+
+  [password: Auto width and auto height with a long text]
+    expected: FAIL
+
+  [password: Explicit height and auto width]
+    expected: FAIL
+
+  [password: Text caret is taller than the placeholder]
+    expected: FAIL
+
+  [password: Text caret is shorter than the placeholder]
+    expected: FAIL
+
+  [password: Update form-sizing property dynamically]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/rendering/widgets/form-sizing-select.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/rendering/widgets/form-sizing-select.tentative.html.ini
new file mode 100644
index 00000000000..bd921cc4895
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/rendering/widgets/form-sizing-select.tentative.html.ini
@@ -0,0 +1,15 @@
+[form-sizing-select.tentative.html]
+  [dropdown: The width should depend on the selected OPTION]
+    expected: FAIL
+
+  [dropdown: Change the form-sizing value dynamically]
+    expected: FAIL
+
+  [listbox: The size depend on the content]
+    expected: FAIL
+
+  [listbox: The size attribute value is ignored]
+    expected: FAIL
+
+  [listbox: Change the form-sizing value dynamically]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/rendering/widgets/form-sizing-textarea.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/rendering/widgets/form-sizing-textarea.tentative.html.ini
new file mode 100644
index 00000000000..e7397eb411f
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/rendering/widgets/form-sizing-textarea.tentative.html.ini
@@ -0,0 +1,24 @@
+[form-sizing-textarea.tentative.html]
+  [Empty value]
+    expected: FAIL
+
+  [Empty value with cols/rows]
+    expected: FAIL
+
+  [Auto width and auto height with a long text]
+    expected: FAIL
+
+  [Explicit width and auto height]
+    expected: FAIL
+
+  [Explicit height and auto width]
+    expected: FAIL
+
+  [Text caret is taller than the placeholder]
+    expected: FAIL
+
+  [Text caret is shorter than the placeholder]
+    expected: FAIL
+
+  [Update form-sizing property dynamically]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/document-metadata/the-base-element/base-data.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/document-metadata/the-base-element/base-data.html.ini
new file mode 100644
index 00000000000..859fbc431bf
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/semantics/document-metadata/the-base-element/base-data.html.ini
@@ -0,0 +1,6 @@
+[base-data.html]
+  [First <base> has a data: URL so fallback is used]
+    expected: FAIL
+
+  [Dynamically inserted first <base> has a data: URL so fallback is used]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/document-metadata/the-base-element/base-javascript.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/document-metadata/the-base-element/base-javascript.html.ini
new file mode 100644
index 00000000000..0cd8cecf4fe
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/semantics/document-metadata/the-base-element/base-javascript.html.ini
@@ -0,0 +1,6 @@
+[base-javascript.html]
+  [First <base> has a javascript: URL so fallback is used]
+    expected: FAIL
+
+  [Dynamically inserted first <base> has a javascript: URL so fallback is used]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
index 26704422bbe..841bafc6eca 100644
--- a/tests/wpt/meta-legacy-layout/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
@@ -1,4 +1,3 @@
 [iframe_sandbox_popups_escaping-2.html]
-  expected: TIMEOUT
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
-    expected: TIMEOUT
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
index eacbe5794ea..fe55ddae3f1 100644
--- a/tests/wpt/meta-legacy-layout/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
@@ -1,5 +1,4 @@
 [iframe_sandbox_popups_escaping-3.html]
   type: testharness
-  expected: TIMEOUT
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
-    expected: TIMEOUT
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/embedded-content/the-img-element/non-active-document.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/embedded-content/the-img-element/non-active-document.html.ini
index 47b45e65a1c..3cdeb8ebcbc 100644
--- a/tests/wpt/meta-legacy-layout/html/semantics/embedded-content/the-img-element/non-active-document.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/semantics/embedded-content/the-img-element/non-active-document.html.ini
@@ -1,9 +1,3 @@
 [non-active-document.html]
   [DOMParser]
     expected: FAIL
-
-  [createHTMLDocument]
-    expected: FAIL
-
-  [<template>]
-    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/forms/constraints/infinite_backtracking.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/forms/constraints/infinite_backtracking.html.ini
deleted file mode 100644
index f0776f9c17f..00000000000
--- a/tests/wpt/meta-legacy-layout/html/semantics/forms/constraints/infinite_backtracking.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[infinite_backtracking.html]
-  expected: TIMEOUT
-  [Infinite backtracking pattern terminates]
-    expected: FAIL
-
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/forms/constraints/infinite_backtracking.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/forms/constraints/infinite_backtracking.tentative.html.ini
new file mode 100644
index 00000000000..ce52ffb4728
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/semantics/forms/constraints/infinite_backtracking.tentative.html.ini
@@ -0,0 +1,2 @@
+[infinite_backtracking.tentative.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/forms/form-submission-0/multipart-formdata.window.js.ini b/tests/wpt/meta-legacy-layout/html/semantics/forms/form-submission-0/multipart-formdata.window.js.ini
index b50f4822a6a..52f30c9e707 100644
--- a/tests/wpt/meta-legacy-layout/html/semantics/forms/form-submission-0/multipart-formdata.window.js.ini
+++ b/tests/wpt/meta-legacy-layout/html/semantics/forms/form-submission-0/multipart-formdata.window.js.ini
@@ -134,9 +134,6 @@
   [multipart/form-data: backslash in filename (formdata event)]
     expected: FAIL
 
-  [multipart/form-data: non-ASCII in name and value (normal form)]
-    expected: FAIL
-
   [multipart/form-data: non-ASCII in name and value (formdata event)]
     expected: FAIL
 
@@ -176,9 +173,6 @@
   [multipart/form-data: lone surrogate in name and value (formdata event)]
     expected: FAIL
 
-  [multipart/form-data: Basic test (formdata event)]
-    expected: FAIL
-
   [multipart/form-data: \\r\\n in value (formdata event)]
     expected: FAIL
 
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/forms/form-submission-0/urlencoded2.window.js.ini b/tests/wpt/meta-legacy-layout/html/semantics/forms/form-submission-0/urlencoded2.window.js.ini
index 6de2640e613..63ed783745e 100644
--- a/tests/wpt/meta-legacy-layout/html/semantics/forms/form-submission-0/urlencoded2.window.js.ini
+++ b/tests/wpt/meta-legacy-layout/html/semantics/forms/form-submission-0/urlencoded2.window.js.ini
@@ -8,9 +8,6 @@
   [application/x-www-form-urlencoded: Basic File test (formdata event)]
     expected: FAIL
 
-  [application/x-www-form-urlencoded: 0x00 in value (formdata event)]
-    expected: FAIL
-
   [application/x-www-form-urlencoded: 0x00 in filename (normal form)]
     expected: FAIL
 
@@ -167,9 +164,6 @@
   [application/x-www-form-urlencoded: 0x00 in name (normal form)]
     expected: FAIL
 
-  [application/x-www-form-urlencoded: 0x00 in value (normal form)]
-    expected: FAIL
-
   [application/x-www-form-urlencoded: double quote in value (normal form)]
     expected: FAIL
 
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-input-element/radio-disconnected-group-owner.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-input-element/radio-disconnected-group-owner.html.ini
new file mode 100644
index 00000000000..225fb3f96e3
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-input-element/radio-disconnected-group-owner.html.ini
@@ -0,0 +1,15 @@
+[radio-disconnected-group-owner.html]
+  [Removed elements are moved into separate radio groups.]
+    expected: FAIL
+
+  [Disconnected radio buttons can serve as radio group containers.]
+    expected: FAIL
+
+  [Shadow roots in disconnected trees can serve as radio group containers.]
+    expected: FAIL
+
+  [Non-HTML elements in disconnected trees can serve as radio group containers.]
+    expected: FAIL
+
+  [Disconnected document fragments can serve as radio group containers.]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-select-element/show-picker-cross-origin-iframe.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-select-element/show-picker-cross-origin-iframe.tentative.html.ini
new file mode 100644
index 00000000000..12bb3b1110f
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-select-element/show-picker-cross-origin-iframe.tentative.html.ini
@@ -0,0 +1,6 @@
+[show-picker-cross-origin-iframe.tentative.html]
+  [Test showPicker() called from cross-origin iframe 1]
+    expected: FAIL
+
+  [Test showPicker() called from cross-origin iframe 3]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-default-button-slot.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-default-button-slot.tentative.html.ini
new file mode 100644
index 00000000000..54fa9e538d1
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-default-button-slot.tentative.html.ini
@@ -0,0 +1,2 @@
+[selectlist-default-button-slot.tentative.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-listbox-element.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-listbox-element.tentative.html.ini
new file mode 100644
index 00000000000..a20cfc7c4bb
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-listbox-element.tentative.html.ini
@@ -0,0 +1,2 @@
+[selectlist-listbox-element.tentative.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-selectedoption-element-cloning.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-selectedoption-element-cloning.tentative.html.ini
new file mode 100644
index 00000000000..a43e466ba14
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-selectedoption-element-cloning.tentative.html.ini
@@ -0,0 +1,2 @@
+[selectlist-selectedoption-element-cloning.tentative.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-selectedoption-element.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-selectedoption-element.tentative.html.ini
new file mode 100644
index 00000000000..eabdcc0bccc
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-selectedoption-element.tentative.html.ini
@@ -0,0 +1,3 @@
+[selectlist-selectedoption-element.tentative.html]
+  [<selectedoption>'s text contents should be replaced with its ancestor <selectlist>'s selected value.]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-text-only.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-text-only.tentative.html.ini
new file mode 100644
index 00000000000..62dcd3e9e8c
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-text-only.tentative.html.ini
@@ -0,0 +1,2 @@
+[selectlist-text-only.tentative.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/interactive-elements/the-details-element/name-attribute.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/interactive-elements/the-details-element/name-attribute.tentative.html.ini
index 4e44b5ec46f..1b9c7154376 100644
--- a/tests/wpt/meta-legacy-layout/html/semantics/interactive-elements/the-details-element/name-attribute.tentative.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/semantics/interactive-elements/the-details-element/name-attribute.tentative.html.ini
@@ -37,3 +37,15 @@
 
   [exclusivity enforcement with attachment scenario connected-in-template]
     expected: FAIL
+
+  [mutation event and toggle event order]
+    expected: FAIL
+
+  [handling of name attribute changes]
+    expected: FAIL
+
+  [closing as a result of parsing doesn't depend on attribute order]
+    expected: FAIL
+
+  [handling of insertion of elements into group]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/interactive-elements/the-details-element/toggleEvent.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/interactive-elements/the-details-element/toggleEvent.html.ini
new file mode 100644
index 00000000000..d008e71443c
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/semantics/interactive-elements/the-details-element/toggleEvent.html.ini
@@ -0,0 +1,24 @@
+[toggleEvent.html]
+  [Adding open to 'details' should fire a toggle event at the 'details' element, with 'oldState: closed' and 'newState: open']
+    expected: FAIL
+
+  [Adding open to 'details' and then removing open from that 'details' should fire only one toggle event at the 'details' element, with 'oldState: closed' and 'newState: closed']
+    expected: FAIL
+
+  [Adding open to 'details' (display:none) should fire a toggle event at the 'details' element, with 'oldState: closed' and 'newState: open']
+    expected: FAIL
+
+  [Adding open to 'details' (no children) should fire a toggle event at the 'details' element, with 'oldState: closed' and 'newState: open']
+    expected: FAIL
+
+  [Adding open to 'details' and then removing open from that 'details' and then again adding open to that 'details' should fire only one toggle event at the 'details' element, with 'oldState: closed' and 'newState: closed']
+    expected: FAIL
+
+  [Adding open to 'details' using setAttribute('open', '') should fire a toggle event at the 'details' element, with 'oldState: closed' and 'newState: open']
+    expected: FAIL
+
+  [Adding open to 'details' and then calling removeAttribute('open') should fire only one toggle event at the 'details' element, with 'oldState: closed' and 'newState: closed']
+    expected: FAIL
+
+  [Adding open to 'details' (not in the document) should fire a toggle event at the 'details' element, with 'oldState: closed' and 'newState: open']
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/interactive-elements/the-dialog-element/backdrop-does-not-inherit.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/interactive-elements/the-dialog-element/backdrop-does-not-inherit.html.ini
deleted file mode 100644
index 219b9331fd8..00000000000
--- a/tests/wpt/meta-legacy-layout/html/semantics/interactive-elements/the-dialog-element/backdrop-does-not-inherit.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[backdrop-does-not-inherit.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/interactive-elements/the-dialog-element/backdrop-inherits.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/interactive-elements/the-dialog-element/backdrop-inherits.html.ini
new file mode 100644
index 00000000000..cf2df3ca49f
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/semantics/interactive-elements/the-dialog-element/backdrop-inherits.html.ini
@@ -0,0 +1,2 @@
+[backdrop-inherits.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/links/links-created-by-a-and-area-elements/non-parsable-url-getter-setter.window.js.ini b/tests/wpt/meta-legacy-layout/html/semantics/links/links-created-by-a-and-area-elements/non-parsable-url-getter-setter.window.js.ini
new file mode 100644
index 00000000000..277c41b3c2f
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/semantics/links/links-created-by-a-and-area-elements/non-parsable-url-getter-setter.window.js.ini
@@ -0,0 +1,57 @@
+[non-parsable-url-getter-setter.window.html]
+  [<area href="http://test:test/">.origin getter]
+    expected: FAIL
+
+  [<area href="http://test:test/">.protocol getter]
+    expected: FAIL
+
+  [<area href="http://test:test/">.protocol setter]
+    expected: FAIL
+
+  [<area href="http://test:test/">.username getter]
+    expected: FAIL
+
+  [<area href="http://test:test/">.username setter]
+    expected: FAIL
+
+  [<area href="http://test:test/">.password getter]
+    expected: FAIL
+
+  [<area href="http://test:test/">.password setter]
+    expected: FAIL
+
+  [<area href="http://test:test/">.host getter]
+    expected: FAIL
+
+  [<area href="http://test:test/">.host setter]
+    expected: FAIL
+
+  [<area href="http://test:test/">.hostname getter]
+    expected: FAIL
+
+  [<area href="http://test:test/">.hostname setter]
+    expected: FAIL
+
+  [<area href="http://test:test/">.port getter]
+    expected: FAIL
+
+  [<area href="http://test:test/">.port setter]
+    expected: FAIL
+
+  [<area href="http://test:test/">.pathname getter]
+    expected: FAIL
+
+  [<area href="http://test:test/">.pathname setter]
+    expected: FAIL
+
+  [<area href="http://test:test/">.search getter]
+    expected: FAIL
+
+  [<area href="http://test:test/">.search setter]
+    expected: FAIL
+
+  [<area href="http://test:test/">.hash getter]
+    expected: FAIL
+
+  [<area href="http://test:test/">.hash setter]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/links/links-created-by-a-and-area-elements/non-special-opaque-path-url-getter-setter.window.js.ini b/tests/wpt/meta-legacy-layout/html/semantics/links/links-created-by-a-and-area-elements/non-special-opaque-path-url-getter-setter.window.js.ini
new file mode 100644
index 00000000000..ef5a8c229f0
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/semantics/links/links-created-by-a-and-area-elements/non-special-opaque-path-url-getter-setter.window.js.ini
@@ -0,0 +1,57 @@
+[non-special-opaque-path-url-getter-setter.window.html]
+  [<area href="non-special:opaque">.origin getter]
+    expected: FAIL
+
+  [<area href="non-special:opaque">.protocol getter]
+    expected: FAIL
+
+  [<area href="non-special:opaque">.protocol setter]
+    expected: FAIL
+
+  [<area href="non-special:opaque">.username getter]
+    expected: FAIL
+
+  [<area href="non-special:opaque">.username setter]
+    expected: FAIL
+
+  [<area href="non-special:opaque">.password getter]
+    expected: FAIL
+
+  [<area href="non-special:opaque">.password setter]
+    expected: FAIL
+
+  [<area href="non-special:opaque">.host getter]
+    expected: FAIL
+
+  [<area href="non-special:opaque">.host setter]
+    expected: FAIL
+
+  [<area href="non-special:opaque">.hostname getter]
+    expected: FAIL
+
+  [<area href="non-special:opaque">.hostname setter]
+    expected: FAIL
+
+  [<area href="non-special:opaque">.port getter]
+    expected: FAIL
+
+  [<area href="non-special:opaque">.port setter]
+    expected: FAIL
+
+  [<area href="non-special:opaque">.pathname getter]
+    expected: FAIL
+
+  [<area href="non-special:opaque">.pathname setter]
+    expected: FAIL
+
+  [<area href="non-special:opaque">.search getter]
+    expected: FAIL
+
+  [<area href="non-special:opaque">.search setter]
+    expected: FAIL
+
+  [<area href="non-special:opaque">.hash getter]
+    expected: FAIL
+
+  [<area href="non-special:opaque">.hash setter]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/links/links-created-by-a-and-area-elements/non-special-url-getter-setter.window.js.ini b/tests/wpt/meta-legacy-layout/html/semantics/links/links-created-by-a-and-area-elements/non-special-url-getter-setter.window.js.ini
new file mode 100644
index 00000000000..4e3e534d35c
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/semantics/links/links-created-by-a-and-area-elements/non-special-url-getter-setter.window.js.ini
@@ -0,0 +1,45 @@
+[non-special-url-getter-setter.window.html]
+  [<area href="non-special://test:9001/">.origin getter]
+    expected: FAIL
+
+  [<area href="non-special://test:9001/">.protocol getter]
+    expected: FAIL
+
+  [<area href="non-special://test:9001/">.protocol setter]
+    expected: FAIL
+
+  [<area href="non-special://test:9001/">.username getter]
+    expected: FAIL
+
+  [<area href="non-special://test:9001/">.password getter]
+    expected: FAIL
+
+  [<area href="non-special://test:9001/">.host getter]
+    expected: FAIL
+
+  [<area href="non-special://test:9001/">.host setter]
+    expected: FAIL
+
+  [<area href="non-special://test:9001/">.hostname getter]
+    expected: FAIL
+
+  [<area href="non-special://test:9001/">.port getter]
+    expected: FAIL
+
+  [<area href="non-special://test:9001/">.pathname getter]
+    expected: FAIL
+
+  [<area href="non-special://test:9001/">.pathname setter]
+    expected: FAIL
+
+  [<area href="non-special://test:9001/">.search getter]
+    expected: FAIL
+
+  [<area href="non-special://test:9001/">.search setter]
+    expected: FAIL
+
+  [<area href="non-special://test:9001/">.hash getter]
+    expected: FAIL
+
+  [<area href="non-special://test:9001/">.hash setter]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/scripting-1/the-script-element/module/referrer-policy-for-descendants.sub.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/scripting-1/the-script-element/module/referrer-policy-for-descendants.sub.html.ini
index f1c62dc9306..4bcd91bc962 100644
--- a/tests/wpt/meta-legacy-layout/html/semantics/scripting-1/the-script-element/module/referrer-policy-for-descendants.sub.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/semantics/scripting-1/the-script-element/module/referrer-policy-for-descendants.sub.html.ini
@@ -16,3 +16,12 @@
 
   [Parent module delivered with invalid policy importing a same-origin descendant script.]
     expected: FAIL
+
+  [Parent module delivered with `same-origin` policy importing a same-origin descendant script.]
+    expected: FAIL
+
+  [Remote parent module delivered with `same-origin` policy importing a same-origin-to-parent-module descendant script.]
+    expected: FAIL
+
+  [Remote parent module delivered with `same-origin` policy importing a cross-origin-to-parent-module descendant script.]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/selectors/pseudo-classes/readwrite-readonly.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/selectors/pseudo-classes/readwrite-readonly.html.ini
index b8cebc3e4f4..7268779f3b6 100644
--- a/tests/wpt/meta-legacy-layout/html/semantics/selectors/pseudo-classes/readwrite-readonly.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/semantics/selectors/pseudo-classes/readwrite-readonly.html.ini
@@ -19,3 +19,5 @@
   [The :read-only pseudo-class must match input elements to which the readonly attribute does not apply]
     expected: FAIL
 
+  [The :read-write pseudo-class must match elements that are inside editing hosts, but not match inputs and textareas inside that aren't]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/syntax/parsing/DOMContentLoaded-defer.html.ini b/tests/wpt/meta-legacy-layout/html/syntax/parsing/DOMContentLoaded-defer.html.ini
deleted file mode 100644
index b8bdf33cb65..00000000000
--- a/tests/wpt/meta-legacy-layout/html/syntax/parsing/DOMContentLoaded-defer.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[DOMContentLoaded-defer.html]
-  [The end: DOMContentLoaded and defer scripts]
-    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini b/tests/wpt/meta-legacy-layout/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
index 8845054116d..e55f8f2ce3c 100644
--- a/tests/wpt/meta-legacy-layout/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
@@ -3,3 +3,6 @@
   expected: TIMEOUT
   [The incumbent settings object while executing the compiled callback via Web IDL's invoke must be that of the node document]
     expected: TIMEOUT
+
+  [The entry settings object while executing the compiled callback via Web IDL's invoke must be that of the node document]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/navigation-timing/idlharness.window.js.ini b/tests/wpt/meta-legacy-layout/navigation-timing/idlharness.window.js.ini
index 2fdb4c6d54a..89e59978de2 100644
--- a/tests/wpt/meta-legacy-layout/navigation-timing/idlharness.window.js.ini
+++ b/tests/wpt/meta-legacy-layout/navigation-timing/idlharness.window.js.ini
@@ -101,3 +101,8 @@
   [PerformanceTiming interface: default toJSON operation on performance.timing]
     expected: FAIL
 
+  [PerformanceNavigationTiming interface: attribute criticalCHRestart]
+    expected: FAIL
+
+  [PerformanceNavigationTiming interface: performance.getEntriesByType("navigation")[0\] must inherit property "criticalCHRestart" with the proper type]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/navigation-timing/test-timing-attributes-dependent-on-document-load.html.ini b/tests/wpt/meta-legacy-layout/navigation-timing/test-timing-attributes-dependent-on-document-load.html.ini
new file mode 100644
index 00000000000..133ac7148f7
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/navigation-timing/test-timing-attributes-dependent-on-document-load.html.ini
@@ -0,0 +1,3 @@
+[test-timing-attributes-dependent-on-document-load.html]
+  [Navigation Timing 2 WPT]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/performance-timeline/not-restored-reasons/performance-navigation-timing-fetch.tentative.window.js.ini b/tests/wpt/meta-legacy-layout/performance-timeline/not-restored-reasons/performance-navigation-timing-fetch.tentative.window.js.ini
new file mode 100644
index 00000000000..876710cd31f
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/performance-timeline/not-restored-reasons/performance-navigation-timing-fetch.tentative.window.js.ini
@@ -0,0 +1,3 @@
+[performance-navigation-timing-fetch.tentative.window.html]
+  [Ensure that ongoing fetch upon entering bfcache blocks bfcache and recorded.]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/performance-timeline/not-restored-reasons/performance-navigation-timing-lock.https.tentative.window.js.ini b/tests/wpt/meta-legacy-layout/performance-timeline/not-restored-reasons/performance-navigation-timing-lock.https.tentative.window.js.ini
new file mode 100644
index 00000000000..3bc9e436aac
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/performance-timeline/not-restored-reasons/performance-navigation-timing-lock.https.tentative.window.js.ini
@@ -0,0 +1,3 @@
+[performance-navigation-timing-lock.https.tentative.window.html]
+  [Ensure that if WebLock is held upon entering bfcache, it cannot enter bfcache and gets reported.]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/performance-timeline/not-restored-reasons/performance-navigation-timing-navigation-failure.tentative.window.js.ini b/tests/wpt/meta-legacy-layout/performance-timeline/not-restored-reasons/performance-navigation-timing-navigation-failure.tentative.window.js.ini
new file mode 100644
index 00000000000..2863298772f
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/performance-timeline/not-restored-reasons/performance-navigation-timing-navigation-failure.tentative.window.js.ini
@@ -0,0 +1,3 @@
+[performance-navigation-timing-navigation-failure.tentative.window.html]
+  [Ensure that navigation failure blocks bfcache and gets recorded.]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/resource-timing/content-type-parsing.html.ini b/tests/wpt/meta-legacy-layout/resource-timing/content-type-parsing.html.ini
index 49b17a921b5..71ca4ed5411 100644
--- a/tests/wpt/meta-legacy-layout/resource-timing/content-type-parsing.html.ini
+++ b/tests/wpt/meta-legacy-layout/resource-timing/content-type-parsing.html.ini
@@ -94,10 +94,10 @@
     expected: FAIL
 
   [mime-type 16 : text/html;charset=\x0bgbk]
-    expected: TIMEOUT
+    expected: FAIL
 
   [mime-type 17 : text/html;charset=\x0cgbk]
-    expected: NOTRUN
+    expected: TIMEOUT
 
   [mime-type 18 : text/html;\x0bcharset=gbk]
     expected: NOTRUN
diff --git a/tests/wpt/meta-legacy-layout/resource-timing/resource-timing-failed-fetch-web-bundle.tentative.html.ini b/tests/wpt/meta-legacy-layout/resource-timing/resource-timing-failed-fetch-web-bundle.tentative.html.ini
new file mode 100644
index 00000000000..f7a11a26db0
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/resource-timing/resource-timing-failed-fetch-web-bundle.tentative.html.ini
@@ -0,0 +1,2 @@
+[resource-timing-failed-fetch-web-bundle.tentative.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/streams/readable-streams/async-iterator.any.js.ini b/tests/wpt/meta-legacy-layout/streams/readable-streams/async-iterator.any.js.ini
index d4cc8070c98..0126c346abb 100644
--- a/tests/wpt/meta-legacy-layout/streams/readable-streams/async-iterator.any.js.ini
+++ b/tests/wpt/meta-legacy-layout/streams/readable-streams/async-iterator.any.js.ini
@@ -270,3 +270,7 @@
 
   [close() while next() is pending]
     expected: FAIL
+
+
+[async-iterator.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/streams/readable-streams/bad-strategies.any.js.ini b/tests/wpt/meta-legacy-layout/streams/readable-streams/bad-strategies.any.js.ini
index 3dd18b756a7..1732bb15bd1 100644
--- a/tests/wpt/meta-legacy-layout/streams/readable-streams/bad-strategies.any.js.ini
+++ b/tests/wpt/meta-legacy-layout/streams/readable-streams/bad-strategies.any.js.ini
@@ -7,3 +7,6 @@
 
 [bad-strategies.any.sharedworker.html]
   expected: ERROR
+
+[bad-strategies.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/streams/readable-streams/bad-underlying-sources.any.js.ini b/tests/wpt/meta-legacy-layout/streams/readable-streams/bad-underlying-sources.any.js.ini
index 007a49367a6..f31c84d09d4 100644
--- a/tests/wpt/meta-legacy-layout/streams/readable-streams/bad-underlying-sources.any.js.ini
+++ b/tests/wpt/meta-legacy-layout/streams/readable-streams/bad-underlying-sources.any.js.ini
@@ -7,3 +7,6 @@
 
 [bad-underlying-sources.any.serviceworker.html]
   expected: ERROR
+
+[bad-underlying-sources.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/streams/readable-streams/cancel.any.js.ini b/tests/wpt/meta-legacy-layout/streams/readable-streams/cancel.any.js.ini
index d01fbb08f1c..af45c8a38e4 100644
--- a/tests/wpt/meta-legacy-layout/streams/readable-streams/cancel.any.js.ini
+++ b/tests/wpt/meta-legacy-layout/streams/readable-streams/cancel.any.js.ini
@@ -7,3 +7,6 @@
 
 [cancel.any.serviceworker.html]
   expected: ERROR
+
+[cancel.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/streams/readable-streams/constructor.any.js.ini b/tests/wpt/meta-legacy-layout/streams/readable-streams/constructor.any.js.ini
index f293440de3c..cc81203f7c8 100644
--- a/tests/wpt/meta-legacy-layout/streams/readable-streams/constructor.any.js.ini
+++ b/tests/wpt/meta-legacy-layout/streams/readable-streams/constructor.any.js.ini
@@ -7,3 +7,6 @@
 [constructor.any.html]
 
 [constructor.any.worker.html]
+
+[constructor.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/streams/readable-streams/count-queuing-strategy-integration.any.js.ini b/tests/wpt/meta-legacy-layout/streams/readable-streams/count-queuing-strategy-integration.any.js.ini
index 1c5f16950f9..eb20e449cd0 100644
--- a/tests/wpt/meta-legacy-layout/streams/readable-streams/count-queuing-strategy-integration.any.js.ini
+++ b/tests/wpt/meta-legacy-layout/streams/readable-streams/count-queuing-strategy-integration.any.js.ini
@@ -7,3 +7,6 @@
   expected: ERROR
 
 [count-queuing-strategy-integration.any.html]
+
+[count-queuing-strategy-integration.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/streams/readable-streams/crashtests/strategy-worker-terminate.html.ini b/tests/wpt/meta-legacy-layout/streams/readable-streams/crashtests/strategy-worker-terminate.html.ini
deleted file mode 100644
index 964697e81e9..00000000000
--- a/tests/wpt/meta-legacy-layout/streams/readable-streams/crashtests/strategy-worker-terminate.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[strategy-worker-terminate.html]
-  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/streams/readable-streams/default-reader.any.js.ini b/tests/wpt/meta-legacy-layout/streams/readable-streams/default-reader.any.js.ini
index 7d9f1aa80a3..ab392a349cb 100644
--- a/tests/wpt/meta-legacy-layout/streams/readable-streams/default-reader.any.js.ini
+++ b/tests/wpt/meta-legacy-layout/streams/readable-streams/default-reader.any.js.ini
@@ -54,3 +54,7 @@
 
   [Second reader can read chunks after first reader was released with pending read requests]
     expected: FAIL
+
+
+[default-reader.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/streams/readable-streams/floating-point-total-queue-size.any.js.ini b/tests/wpt/meta-legacy-layout/streams/readable-streams/floating-point-total-queue-size.any.js.ini
index 38f774451a1..dae0fdd0262 100644
--- a/tests/wpt/meta-legacy-layout/streams/readable-streams/floating-point-total-queue-size.any.js.ini
+++ b/tests/wpt/meta-legacy-layout/streams/readable-streams/floating-point-total-queue-size.any.js.ini
@@ -7,3 +7,6 @@
 
 [floating-point-total-queue-size.any.sharedworker.html]
   expected: ERROR
+
+[floating-point-total-queue-size.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/streams/readable-streams/from.any.js.ini b/tests/wpt/meta-legacy-layout/streams/readable-streams/from.any.js.ini
index ae4b01974cf..6492ae48834 100644
--- a/tests/wpt/meta-legacy-layout/streams/readable-streams/from.any.js.ini
+++ b/tests/wpt/meta-legacy-layout/streams/readable-streams/from.any.js.ini
@@ -169,3 +169,6 @@
 
 [from.any.sharedworker.html]
   expected: ERROR
+
+[from.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/streams/readable-streams/garbage-collection.any.js.ini b/tests/wpt/meta-legacy-layout/streams/readable-streams/garbage-collection.any.js.ini
index a3ed6b5e3f2..6cd386dbebe 100644
--- a/tests/wpt/meta-legacy-layout/streams/readable-streams/garbage-collection.any.js.ini
+++ b/tests/wpt/meta-legacy-layout/streams/readable-streams/garbage-collection.any.js.ini
@@ -7,3 +7,6 @@
   expected: ERROR
 
 [garbage-collection.any.worker.html]
+
+[garbage-collection.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/streams/readable-streams/general.any.js.ini b/tests/wpt/meta-legacy-layout/streams/readable-streams/general.any.js.ini
index 7fab0b22708..d27d2c82aef 100644
--- a/tests/wpt/meta-legacy-layout/streams/readable-streams/general.any.js.ini
+++ b/tests/wpt/meta-legacy-layout/streams/readable-streams/general.any.js.ini
@@ -24,3 +24,7 @@
 
   [ReadableStream: if pull rejects, it should error the stream]
     expected: FAIL
+
+
+[general.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/streams/readable-streams/owning-type-message-port.any.js.ini b/tests/wpt/meta-legacy-layout/streams/readable-streams/owning-type-message-port.any.js.ini
index ce878bde61a..8ee58658c18 100644
--- a/tests/wpt/meta-legacy-layout/streams/readable-streams/owning-type-message-port.any.js.ini
+++ b/tests/wpt/meta-legacy-layout/streams/readable-streams/owning-type-message-port.any.js.ini
@@ -19,3 +19,6 @@
 
 [owning-type-message-port.any.serviceworker.html]
   expected: ERROR
+
+[owning-type-message-port.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/streams/readable-streams/owning-type-video-frame.any.js.ini b/tests/wpt/meta-legacy-layout/streams/readable-streams/owning-type-video-frame.any.js.ini
index 283faebc9c8..ff8404402db 100644
--- a/tests/wpt/meta-legacy-layout/streams/readable-streams/owning-type-video-frame.any.js.ini
+++ b/tests/wpt/meta-legacy-layout/streams/readable-streams/owning-type-video-frame.any.js.ini
@@ -36,3 +36,7 @@
 
   [ReadableStream of type owning should clone JS Objects with serializables when teeing]
     expected: FAIL
+
+
+[owning-type-video-frame.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/streams/readable-streams/owning-type.any.js.ini b/tests/wpt/meta-legacy-layout/streams/readable-streams/owning-type.any.js.ini
index 4d1c7f59d60..cb5efe13bc1 100644
--- a/tests/wpt/meta-legacy-layout/streams/readable-streams/owning-type.any.js.ini
+++ b/tests/wpt/meta-legacy-layout/streams/readable-streams/owning-type.any.js.ini
@@ -37,3 +37,6 @@
 
 [owning-type.any.serviceworker.html]
   expected: ERROR
+
+[owning-type.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/streams/readable-streams/patched-global.any.js.ini b/tests/wpt/meta-legacy-layout/streams/readable-streams/patched-global.any.js.ini
index 556fb4b6417..8c978155473 100644
--- a/tests/wpt/meta-legacy-layout/streams/readable-streams/patched-global.any.js.ini
+++ b/tests/wpt/meta-legacy-layout/streams/readable-streams/patched-global.any.js.ini
@@ -25,3 +25,6 @@
   [ReadableStream async iterator should use the original values of getReader() and ReadableStreamDefaultReader methods]
     expected: FAIL
 
+
+[patched-global.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/streams/readable-streams/reentrant-strategies.any.js.ini b/tests/wpt/meta-legacy-layout/streams/readable-streams/reentrant-strategies.any.js.ini
index 2fad75d91ac..d488009db00 100644
--- a/tests/wpt/meta-legacy-layout/streams/readable-streams/reentrant-strategies.any.js.ini
+++ b/tests/wpt/meta-legacy-layout/streams/readable-streams/reentrant-strategies.any.js.ini
@@ -13,3 +13,6 @@
 
 [reentrant-strategies.any.sharedworker.html]
   expected: ERROR
+
+[reentrant-strategies.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/streams/readable-streams/tee.any.js.ini b/tests/wpt/meta-legacy-layout/streams/readable-streams/tee.any.js.ini
index d77e48af60a..983ead19dbe 100644
--- a/tests/wpt/meta-legacy-layout/streams/readable-streams/tee.any.js.ini
+++ b/tests/wpt/meta-legacy-layout/streams/readable-streams/tee.any.js.ini
@@ -7,3 +7,6 @@
   expected: ERROR
 
 [tee.any.html]
+
+[tee.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/streams/readable-streams/templated.any.js.ini b/tests/wpt/meta-legacy-layout/streams/readable-streams/templated.any.js.ini
index 3f473b5009e..408f849f24c 100644
--- a/tests/wpt/meta-legacy-layout/streams/readable-streams/templated.any.js.ini
+++ b/tests/wpt/meta-legacy-layout/streams/readable-streams/templated.any.js.ini
@@ -18,3 +18,7 @@
 
   [ReadableStream (empty) reader: releasing the lock should reject all pending read requests]
     expected: FAIL
+
+
+[templated.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/wasm/jsapi/constructor/compile.any.js.ini b/tests/wpt/meta-legacy-layout/wasm/jsapi/constructor/compile.any.js.ini
new file mode 100644
index 00000000000..dfc9bd50cad
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/wasm/jsapi/constructor/compile.any.js.ini
@@ -0,0 +1,6 @@
+[compile.any.shadowrealm.html]
+  expected: ERROR
+
+[compile.any.worker.html]
+
+[compile.any.html]
diff --git a/tests/wpt/meta-legacy-layout/wasm/jsapi/constructor/instantiate-bad-imports.any.js.ini b/tests/wpt/meta-legacy-layout/wasm/jsapi/constructor/instantiate-bad-imports.any.js.ini
new file mode 100644
index 00000000000..7b0e06ea84f
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/wasm/jsapi/constructor/instantiate-bad-imports.any.js.ini
@@ -0,0 +1,6 @@
+[instantiate-bad-imports.any.shadowrealm.html]
+  expected: ERROR
+
+[instantiate-bad-imports.any.html]
+
+[instantiate-bad-imports.any.worker.html]
diff --git a/tests/wpt/meta-legacy-layout/wasm/jsapi/constructor/instantiate.any.js.ini b/tests/wpt/meta-legacy-layout/wasm/jsapi/constructor/instantiate.any.js.ini
index 1ab23d6de8b..a122a8f4657 100644
--- a/tests/wpt/meta-legacy-layout/wasm/jsapi/constructor/instantiate.any.js.ini
+++ b/tests/wpt/meta-legacy-layout/wasm/jsapi/constructor/instantiate.any.js.ini
@@ -19,3 +19,6 @@
   [Module argument]
     expected: FAIL
 
+
+[instantiate.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/wasm/jsapi/constructor/multi-value.any.js.ini b/tests/wpt/meta-legacy-layout/wasm/jsapi/constructor/multi-value.any.js.ini
new file mode 100644
index 00000000000..3e994a5e148
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/wasm/jsapi/constructor/multi-value.any.js.ini
@@ -0,0 +1,6 @@
+[multi-value.any.shadowrealm.html]
+  expected: ERROR
+
+[multi-value.any.worker.html]
+
+[multi-value.any.html]
diff --git a/tests/wpt/meta-legacy-layout/wasm/jsapi/constructor/toStringTag.any.js.ini b/tests/wpt/meta-legacy-layout/wasm/jsapi/constructor/toStringTag.any.js.ini
new file mode 100644
index 00000000000..204eefd2fe0
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/wasm/jsapi/constructor/toStringTag.any.js.ini
@@ -0,0 +1,6 @@
+[toStringTag.any.shadowrealm.html]
+  expected: ERROR
+
+[toStringTag.any.html]
+
+[toStringTag.any.worker.html]
diff --git a/tests/wpt/meta-legacy-layout/wasm/jsapi/constructor/validate.any.js.ini b/tests/wpt/meta-legacy-layout/wasm/jsapi/constructor/validate.any.js.ini
new file mode 100644
index 00000000000..aa554ba5483
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/wasm/jsapi/constructor/validate.any.js.ini
@@ -0,0 +1,6 @@
+[validate.any.worker.html]
+
+[validate.any.shadowrealm.html]
+  expected: ERROR
+
+[validate.any.html]
diff --git a/tests/wpt/meta-legacy-layout/wasm/jsapi/exception/basic.tentative.any.js.ini b/tests/wpt/meta-legacy-layout/wasm/jsapi/exception/basic.tentative.any.js.ini
index c28301608df..863e5544783 100644
--- a/tests/wpt/meta-legacy-layout/wasm/jsapi/exception/basic.tentative.any.js.ini
+++ b/tests/wpt/meta-legacy-layout/wasm/jsapi/exception/basic.tentative.any.js.ini
@@ -7,3 +7,6 @@
   expected: ERROR
 
 [basic.tentative.any.html]
+
+[basic.tentative.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/wasm/jsapi/exception/constructor.tentative.any.js.ini b/tests/wpt/meta-legacy-layout/wasm/jsapi/exception/constructor.tentative.any.js.ini
new file mode 100644
index 00000000000..2dde72fcbbc
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/wasm/jsapi/exception/constructor.tentative.any.js.ini
@@ -0,0 +1,6 @@
+[constructor.tentative.any.shadowrealm.html]
+  expected: ERROR
+
+[constructor.tentative.any.worker.html]
+
+[constructor.tentative.any.html]
diff --git a/tests/wpt/meta-legacy-layout/wasm/jsapi/exception/getArg.tentative.any.js.ini b/tests/wpt/meta-legacy-layout/wasm/jsapi/exception/getArg.tentative.any.js.ini
index 012fe6c7f8b..6c03a9843e1 100644
--- a/tests/wpt/meta-legacy-layout/wasm/jsapi/exception/getArg.tentative.any.js.ini
+++ b/tests/wpt/meta-legacy-layout/wasm/jsapi/exception/getArg.tentative.any.js.ini
@@ -6,3 +6,7 @@
 [getArg.tentative.any.html]
   [Getting out-of-range argument]
     expected: FAIL
+
+
+[getArg.tentative.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/wasm/jsapi/exception/identity.tentative.any.js.ini b/tests/wpt/meta-legacy-layout/wasm/jsapi/exception/identity.tentative.any.js.ini
new file mode 100644
index 00000000000..1d217f68c2c
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/wasm/jsapi/exception/identity.tentative.any.js.ini
@@ -0,0 +1,6 @@
+[identity.tentative.any.worker.html]
+
+[identity.tentative.any.html]
+
+[identity.tentative.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/wasm/jsapi/exception/is.tentative.any.js.ini b/tests/wpt/meta-legacy-layout/wasm/jsapi/exception/is.tentative.any.js.ini
new file mode 100644
index 00000000000..0384adc9fef
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/wasm/jsapi/exception/is.tentative.any.js.ini
@@ -0,0 +1,6 @@
+[is.tentative.any.shadowrealm.html]
+  expected: ERROR
+
+[is.tentative.any.html]
+
+[is.tentative.any.worker.html]
diff --git a/tests/wpt/meta-legacy-layout/wasm/jsapi/exception/toString.tentative.any.js.ini b/tests/wpt/meta-legacy-layout/wasm/jsapi/exception/toString.tentative.any.js.ini
new file mode 100644
index 00000000000..0bb6e8890ef
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/wasm/jsapi/exception/toString.tentative.any.js.ini
@@ -0,0 +1,6 @@
+[toString.tentative.any.shadowrealm.html]
+  expected: ERROR
+
+[toString.tentative.any.worker.html]
+
+[toString.tentative.any.html]
diff --git a/tests/wpt/meta-legacy-layout/wasm/jsapi/function/call.tentative.any.js.ini b/tests/wpt/meta-legacy-layout/wasm/jsapi/function/call.tentative.any.js.ini
index 189c2255703..ea034f8d563 100644
--- a/tests/wpt/meta-legacy-layout/wasm/jsapi/function/call.tentative.any.js.ini
+++ b/tests/wpt/meta-legacy-layout/wasm/jsapi/function/call.tentative.any.js.ini
@@ -12,3 +12,7 @@
 
   [test constructing function]
     expected: FAIL
+
+
+[call.tentative.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/wasm/jsapi/function/constructor.tentative.any.js.ini b/tests/wpt/meta-legacy-layout/wasm/jsapi/function/constructor.tentative.any.js.ini
index 194ac003bbf..071bcb1cf47 100644
--- a/tests/wpt/meta-legacy-layout/wasm/jsapi/function/constructor.tentative.any.js.ini
+++ b/tests/wpt/meta-legacy-layout/wasm/jsapi/function/constructor.tentative.any.js.ini
@@ -66,3 +66,7 @@
 
   [fail to construct with non-callable object]
     expected: FAIL
+
+
+[constructor.tentative.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/wasm/jsapi/function/table.tentative.any.js.ini b/tests/wpt/meta-legacy-layout/wasm/jsapi/function/table.tentative.any.js.ini
index d1c9e23ec99..a5ce570abce 100644
--- a/tests/wpt/meta-legacy-layout/wasm/jsapi/function/table.tentative.any.js.ini
+++ b/tests/wpt/meta-legacy-layout/wasm/jsapi/function/table.tentative.any.js.ini
@@ -6,3 +6,7 @@
 [table.tentative.any.worker.html]
   [Test insertion into table]
     expected: FAIL
+
+
+[table.tentative.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/wasm/jsapi/function/type.tentative.any.js.ini b/tests/wpt/meta-legacy-layout/wasm/jsapi/function/type.tentative.any.js.ini
index 36df2f3c833..cb4fa7b3d0d 100644
--- a/tests/wpt/meta-legacy-layout/wasm/jsapi/function/type.tentative.any.js.ini
+++ b/tests/wpt/meta-legacy-layout/wasm/jsapi/function/type.tentative.any.js.ini
@@ -12,3 +12,7 @@
 
   [Check all types]
     expected: FAIL
+
+
+[type.tentative.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/wasm/jsapi/global/constructor.any.js.ini b/tests/wpt/meta-legacy-layout/wasm/jsapi/global/constructor.any.js.ini
new file mode 100644
index 00000000000..ec1e0569cac
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/wasm/jsapi/global/constructor.any.js.ini
@@ -0,0 +1,6 @@
+[constructor.any.worker.html]
+
+[constructor.any.html]
+
+[constructor.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/wasm/jsapi/global/toString.any.js.ini b/tests/wpt/meta-legacy-layout/wasm/jsapi/global/toString.any.js.ini
new file mode 100644
index 00000000000..4d7e7394aa7
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/wasm/jsapi/global/toString.any.js.ini
@@ -0,0 +1,6 @@
+[toString.any.worker.html]
+
+[toString.any.shadowrealm.html]
+  expected: ERROR
+
+[toString.any.html]
diff --git a/tests/wpt/meta-legacy-layout/wasm/jsapi/global/type.tentative.any.js.ini b/tests/wpt/meta-legacy-layout/wasm/jsapi/global/type.tentative.any.js.ini
index 774efeeedb4..93469a74697 100644
--- a/tests/wpt/meta-legacy-layout/wasm/jsapi/global/type.tentative.any.js.ini
+++ b/tests/wpt/meta-legacy-layout/wasm/jsapi/global/type.tentative.any.js.ini
@@ -102,3 +102,7 @@
 
   [anyfunc, immutable]
     expected: FAIL
+
+
+[type.tentative.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/wasm/jsapi/global/value-get-set.any.js.ini b/tests/wpt/meta-legacy-layout/wasm/jsapi/global/value-get-set.any.js.ini
new file mode 100644
index 00000000000..4ad74f700c3
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/wasm/jsapi/global/value-get-set.any.js.ini
@@ -0,0 +1,6 @@
+[value-get-set.any.html]
+
+[value-get-set.any.worker.html]
+
+[value-get-set.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/wasm/jsapi/global/valueOf.any.js.ini b/tests/wpt/meta-legacy-layout/wasm/jsapi/global/valueOf.any.js.ini
new file mode 100644
index 00000000000..16e938b438e
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/wasm/jsapi/global/valueOf.any.js.ini
@@ -0,0 +1,6 @@
+[valueOf.any.html]
+
+[valueOf.any.worker.html]
+
+[valueOf.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/wasm/jsapi/instance/constructor-bad-imports.any.js.ini b/tests/wpt/meta-legacy-layout/wasm/jsapi/instance/constructor-bad-imports.any.js.ini
new file mode 100644
index 00000000000..f58bc7ffbd6
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/wasm/jsapi/instance/constructor-bad-imports.any.js.ini
@@ -0,0 +1,6 @@
+[constructor-bad-imports.any.html]
+
+[constructor-bad-imports.any.worker.html]
+
+[constructor-bad-imports.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/wasm/jsapi/instance/constructor-caching.any.js.ini b/tests/wpt/meta-legacy-layout/wasm/jsapi/instance/constructor-caching.any.js.ini
new file mode 100644
index 00000000000..882692158fa
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/wasm/jsapi/instance/constructor-caching.any.js.ini
@@ -0,0 +1,6 @@
+[constructor-caching.any.worker.html]
+
+[constructor-caching.any.shadowrealm.html]
+  expected: ERROR
+
+[constructor-caching.any.html]
diff --git a/tests/wpt/meta-legacy-layout/wasm/jsapi/instance/constructor.any.js.ini b/tests/wpt/meta-legacy-layout/wasm/jsapi/instance/constructor.any.js.ini
index 8b80173f7e0..f371c999295 100644
--- a/tests/wpt/meta-legacy-layout/wasm/jsapi/instance/constructor.any.js.ini
+++ b/tests/wpt/meta-legacy-layout/wasm/jsapi/instance/constructor.any.js.ini
@@ -2,6 +2,11 @@
   [exports]
     expected: FAIL
 
+
 [constructor.any.worker.html]
   [exports]
     expected: FAIL
+
+
+[constructor.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/wasm/jsapi/instance/exports.any.js.ini b/tests/wpt/meta-legacy-layout/wasm/jsapi/instance/exports.any.js.ini
new file mode 100644
index 00000000000..ad9aabe97d9
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/wasm/jsapi/instance/exports.any.js.ini
@@ -0,0 +1,6 @@
+[exports.any.html]
+
+[exports.any.shadowrealm.html]
+  expected: ERROR
+
+[exports.any.worker.html]
diff --git a/tests/wpt/meta-legacy-layout/wasm/jsapi/instance/toString.any.js.ini b/tests/wpt/meta-legacy-layout/wasm/jsapi/instance/toString.any.js.ini
new file mode 100644
index 00000000000..a6171f3a687
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/wasm/jsapi/instance/toString.any.js.ini
@@ -0,0 +1,6 @@
+[toString.any.shadowrealm.html]
+  expected: ERROR
+
+[toString.any.worker.html]
+
+[toString.any.html]
diff --git a/tests/wpt/meta-legacy-layout/wasm/jsapi/interface.any.js.ini b/tests/wpt/meta-legacy-layout/wasm/jsapi/interface.any.js.ini
index abcba0dd093..81e58a5bc55 100644
--- a/tests/wpt/meta-legacy-layout/wasm/jsapi/interface.any.js.ini
+++ b/tests/wpt/meta-legacy-layout/wasm/jsapi/interface.any.js.ini
@@ -6,3 +6,7 @@
 [interface.any.html]
   [WebAssembly.Table.set: length]
     expected: FAIL
+
+
+[interface.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/wasm/jsapi/memory/constructor-shared.tentative.any.js.ini b/tests/wpt/meta-legacy-layout/wasm/jsapi/memory/constructor-shared.tentative.any.js.ini
index 9e9e62e2ade..747cd00f915 100644
--- a/tests/wpt/meta-legacy-layout/wasm/jsapi/memory/constructor-shared.tentative.any.js.ini
+++ b/tests/wpt/meta-legacy-layout/wasm/jsapi/memory/constructor-shared.tentative.any.js.ini
@@ -1,6 +1,7 @@
 [constructor-shared.tentative.any.worker.html]
   [Shared memory]
     expected: FAIL
+
   [Order of evaluation for descriptor (with shared)]
     expected: FAIL
 
@@ -8,5 +9,10 @@
 [constructor-shared.tentative.any.html]
   [Shared memory]
     expected: FAIL
+
   [Order of evaluation for descriptor (with shared)]
     expected: FAIL
+
+
+[constructor-shared.tentative.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/wasm/jsapi/memory/constructor-types.tentative.any.js.ini b/tests/wpt/meta-legacy-layout/wasm/jsapi/memory/constructor-types.tentative.any.js.ini
index 383e4828679..04fe71ed3b6 100644
--- a/tests/wpt/meta-legacy-layout/wasm/jsapi/memory/constructor-types.tentative.any.js.ini
+++ b/tests/wpt/meta-legacy-layout/wasm/jsapi/memory/constructor-types.tentative.any.js.ini
@@ -19,3 +19,6 @@
   [Non-zero minimum]
     expected: FAIL
 
+
+[constructor-types.tentative.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/wasm/jsapi/memory/constructor.any.js.ini b/tests/wpt/meta-legacy-layout/wasm/jsapi/memory/constructor.any.js.ini
index 4f50e76a2de..273b5047677 100644
--- a/tests/wpt/meta-legacy-layout/wasm/jsapi/memory/constructor.any.js.ini
+++ b/tests/wpt/meta-legacy-layout/wasm/jsapi/memory/constructor.any.js.ini
@@ -7,3 +7,6 @@
   [Shared memory]
     expected: FAIL
 
+
+[constructor.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/wasm/jsapi/memory/grow.any.js.ini b/tests/wpt/meta-legacy-layout/wasm/jsapi/memory/grow.any.js.ini
index d1dab31df88..4f10101a8de 100644
--- a/tests/wpt/meta-legacy-layout/wasm/jsapi/memory/grow.any.js.ini
+++ b/tests/wpt/meta-legacy-layout/wasm/jsapi/memory/grow.any.js.ini
@@ -7,3 +7,6 @@
   [Growing shared memory does not detach old buffer]
     expected: FAIL
 
+
+[grow.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/wasm/jsapi/memory/type.tentative.any.js.ini b/tests/wpt/meta-legacy-layout/wasm/jsapi/memory/type.tentative.any.js.ini
index e243a969365..d6d69dcf2dc 100644
--- a/tests/wpt/meta-legacy-layout/wasm/jsapi/memory/type.tentative.any.js.ini
+++ b/tests/wpt/meta-legacy-layout/wasm/jsapi/memory/type.tentative.any.js.ini
@@ -37,3 +37,6 @@
   [Non-zero initial, no maximum]
     expected: FAIL
 
+
+[type.tentative.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/wasm/jsapi/module/constructor.any.js.ini b/tests/wpt/meta-legacy-layout/wasm/jsapi/module/constructor.any.js.ini
new file mode 100644
index 00000000000..ec1e0569cac
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/wasm/jsapi/module/constructor.any.js.ini
@@ -0,0 +1,6 @@
+[constructor.any.worker.html]
+
+[constructor.any.html]
+
+[constructor.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/wasm/jsapi/module/customSections.any.js.ini b/tests/wpt/meta-legacy-layout/wasm/jsapi/module/customSections.any.js.ini
index 13b03d06e58..040537e79e0 100644
--- a/tests/wpt/meta-legacy-layout/wasm/jsapi/module/customSections.any.js.ini
+++ b/tests/wpt/meta-legacy-layout/wasm/jsapi/module/customSections.any.js.ini
@@ -7,3 +7,6 @@
   [Custom sections with U+FFFD]
     expected: FAIL
 
+
+[customSections.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/wasm/jsapi/module/exports.any.js.ini b/tests/wpt/meta-legacy-layout/wasm/jsapi/module/exports.any.js.ini
new file mode 100644
index 00000000000..ad9aabe97d9
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/wasm/jsapi/module/exports.any.js.ini
@@ -0,0 +1,6 @@
+[exports.any.html]
+
+[exports.any.shadowrealm.html]
+  expected: ERROR
+
+[exports.any.worker.html]
diff --git a/tests/wpt/meta-legacy-layout/wasm/jsapi/module/imports.any.js.ini b/tests/wpt/meta-legacy-layout/wasm/jsapi/module/imports.any.js.ini
new file mode 100644
index 00000000000..cb27e4acdf5
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/wasm/jsapi/module/imports.any.js.ini
@@ -0,0 +1,6 @@
+[imports.any.worker.html]
+
+[imports.any.html]
+
+[imports.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/wasm/jsapi/module/toString.any.js.ini b/tests/wpt/meta-legacy-layout/wasm/jsapi/module/toString.any.js.ini
new file mode 100644
index 00000000000..4d7e7394aa7
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/wasm/jsapi/module/toString.any.js.ini
@@ -0,0 +1,6 @@
+[toString.any.worker.html]
+
+[toString.any.shadowrealm.html]
+  expected: ERROR
+
+[toString.any.html]
diff --git a/tests/wpt/meta-legacy-layout/wasm/jsapi/prototypes.any.js.ini b/tests/wpt/meta-legacy-layout/wasm/jsapi/prototypes.any.js.ini
new file mode 100644
index 00000000000..40d7d71ef79
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/wasm/jsapi/prototypes.any.js.ini
@@ -0,0 +1,6 @@
+[prototypes.any.worker.html]
+
+[prototypes.any.shadowrealm.html]
+  expected: ERROR
+
+[prototypes.any.html]
diff --git a/tests/wpt/meta-legacy-layout/wasm/jsapi/table/constructor-types.tentative.any.js.ini b/tests/wpt/meta-legacy-layout/wasm/jsapi/table/constructor-types.tentative.any.js.ini
index 383e4828679..04fe71ed3b6 100644
--- a/tests/wpt/meta-legacy-layout/wasm/jsapi/table/constructor-types.tentative.any.js.ini
+++ b/tests/wpt/meta-legacy-layout/wasm/jsapi/table/constructor-types.tentative.any.js.ini
@@ -19,3 +19,6 @@
   [Non-zero minimum]
     expected: FAIL
 
+
+[constructor-types.tentative.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/wasm/jsapi/table/constructor.any.js.ini b/tests/wpt/meta-legacy-layout/wasm/jsapi/table/constructor.any.js.ini
new file mode 100644
index 00000000000..ec1e0569cac
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/wasm/jsapi/table/constructor.any.js.ini
@@ -0,0 +1,6 @@
+[constructor.any.worker.html]
+
+[constructor.any.html]
+
+[constructor.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/wasm/jsapi/table/get-set.any.js.ini b/tests/wpt/meta-legacy-layout/wasm/jsapi/table/get-set.any.js.ini
new file mode 100644
index 00000000000..e5ccea5ebf9
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/wasm/jsapi/table/get-set.any.js.ini
@@ -0,0 +1,6 @@
+[get-set.any.html]
+
+[get-set.any.shadowrealm.html]
+  expected: ERROR
+
+[get-set.any.worker.html]
diff --git a/tests/wpt/meta-legacy-layout/wasm/jsapi/table/grow.any.js.ini b/tests/wpt/meta-legacy-layout/wasm/jsapi/table/grow.any.js.ini
new file mode 100644
index 00000000000..1d38dfed008
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/wasm/jsapi/table/grow.any.js.ini
@@ -0,0 +1,6 @@
+[grow.any.shadowrealm.html]
+  expected: ERROR
+
+[grow.any.worker.html]
+
+[grow.any.html]
diff --git a/tests/wpt/meta-legacy-layout/wasm/jsapi/table/length.any.js.ini b/tests/wpt/meta-legacy-layout/wasm/jsapi/table/length.any.js.ini
new file mode 100644
index 00000000000..13511ab6d19
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/wasm/jsapi/table/length.any.js.ini
@@ -0,0 +1,6 @@
+[length.any.shadowrealm.html]
+  expected: ERROR
+
+[length.any.html]
+
+[length.any.worker.html]
diff --git a/tests/wpt/meta-legacy-layout/wasm/jsapi/table/toString.any.js.ini b/tests/wpt/meta-legacy-layout/wasm/jsapi/table/toString.any.js.ini
new file mode 100644
index 00000000000..e48f0f7e492
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/wasm/jsapi/table/toString.any.js.ini
@@ -0,0 +1,6 @@
+[toString.any.html]
+
+[toString.any.worker.html]
+
+[toString.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/wasm/jsapi/table/type.tentative.any.js.ini b/tests/wpt/meta-legacy-layout/wasm/jsapi/table/type.tentative.any.js.ini
index a821c23d4a6..5d1026c296d 100644
--- a/tests/wpt/meta-legacy-layout/wasm/jsapi/table/type.tentative.any.js.ini
+++ b/tests/wpt/meta-legacy-layout/wasm/jsapi/table/type.tentative.any.js.ini
@@ -30,3 +30,7 @@
 
   [Non-zero maximum]
     expected: FAIL
+
+
+[type.tentative.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/wasm/jsapi/tag/constructor.tentative.any.js.ini b/tests/wpt/meta-legacy-layout/wasm/jsapi/tag/constructor.tentative.any.js.ini
new file mode 100644
index 00000000000..0f3c34c2a53
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/wasm/jsapi/tag/constructor.tentative.any.js.ini
@@ -0,0 +1,6 @@
+[constructor.tentative.any.worker.html]
+
+[constructor.tentative.any.html]
+
+[constructor.tentative.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/wasm/jsapi/tag/toString.tentative.any.js.ini b/tests/wpt/meta-legacy-layout/wasm/jsapi/tag/toString.tentative.any.js.ini
new file mode 100644
index 00000000000..70a5a10255d
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/wasm/jsapi/tag/toString.tentative.any.js.ini
@@ -0,0 +1,6 @@
+[toString.tentative.any.worker.html]
+
+[toString.tentative.any.html]
+
+[toString.tentative.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/wasm/jsapi/tag/type.tentative.any.js.ini b/tests/wpt/meta-legacy-layout/wasm/jsapi/tag/type.tentative.any.js.ini
index 9bcd3efd2a2..d3c246a07d2 100644
--- a/tests/wpt/meta-legacy-layout/wasm/jsapi/tag/type.tentative.any.js.ini
+++ b/tests/wpt/meta-legacy-layout/wasm/jsapi/tag/type.tentative.any.js.ini
@@ -18,3 +18,7 @@
 
   [[i32 i64 f32 f64\]]
     expected: FAIL
+
+
+[type.tentative.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/webaudio/the-audio-api/the-audioparam-interface/setTargetAtTime-after-event-within-block.html.ini b/tests/wpt/meta-legacy-layout/webaudio/the-audio-api/the-audioparam-interface/setTargetAtTime-after-event-within-block.html.ini
new file mode 100644
index 00000000000..a72c951f5b0
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/webaudio/the-audio-api/the-audioparam-interface/setTargetAtTime-after-event-within-block.html.ini
@@ -0,0 +1,3 @@
+[setTargetAtTime-after-event-within-block.html]
+  [setTargetAtTime() after setTargetAtTime()]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/webmessaging/with-ports/017.html.ini b/tests/wpt/meta-legacy-layout/webmessaging/with-ports/017.html.ini
new file mode 100644
index 00000000000..c7946fc91b4
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/webmessaging/with-ports/017.html.ini
@@ -0,0 +1,4 @@
+[017.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, about:blank]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/webmessaging/without-ports/017.html.ini b/tests/wpt/meta-legacy-layout/webmessaging/without-ports/017.html.ini
new file mode 100644
index 00000000000..c7946fc91b4
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/webmessaging/without-ports/017.html.ini
@@ -0,0 +1,4 @@
+[017.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, about:blank]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/workers/constructors/Worker/same-origin.html.ini b/tests/wpt/meta-legacy-layout/workers/constructors/Worker/same-origin.html.ini
deleted file mode 100644
index 40a980b618b..00000000000
--- a/tests/wpt/meta-legacy-layout/workers/constructors/Worker/same-origin.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[same-origin.html]
-  type: testharness
-  [unsupported_scheme]
-    expected: FAIL
-
diff --git a/tests/wpt/meta-legacy-layout/xhr/xhr-timeout-longtask.any.js.ini b/tests/wpt/meta-legacy-layout/xhr/xhr-timeout-longtask.any.js.ini
new file mode 100644
index 00000000000..36b2068c5a6
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/xhr/xhr-timeout-longtask.any.js.ini
@@ -0,0 +1,6 @@
+[xhr-timeout-longtask.any.worker.html]
+  [Long tasks should not trigger load timeout]
+    expected: FAIL
+
+
+[xhr-timeout-longtask.any.html]
diff --git a/tests/wpt/meta/MANIFEST.json b/tests/wpt/meta/MANIFEST.json
index fa5e955080c..b4f38f5d3d9 100644
--- a/tests/wpt/meta/MANIFEST.json
+++ b/tests/wpt/meta/MANIFEST.json
@@ -36,7 +36,7 @@
       ]
      ],
      "aom-in-destroyed-iframe.html": [
-      "d412892983a48aca624fcffa4100eb94b8109919",
+      "c8f0aca12ebbf8719228e0d857d8e5c799e3b669",
       [
        null,
        {}
@@ -99,21 +99,21 @@
       ]
      ],
      "computed-accessible-child-of-pseudo-element.html": [
-      "5bc1249907480d42ab5bc8a8f342eb456895f142",
+      "b00ee7ba56f2caee01532f62df2dc2d81f8b3bbf",
       [
        null,
        {}
       ]
      ],
      "computed-accessible-text-node.html": [
-      "29b7c2b2fe2d64ecb43ce1b0e1037a82431442e9",
+      "47183ce6ec64a630f0a6c78102337ea3f0667b7d",
       [
        null,
        {}
       ]
      ],
      "computed-node-checked.html": [
-      "a413d26a019c117a6b202d5be689cb13d0a92c1c",
+      "47e715b233884fad02d03a111fe03448b1faa92e",
       [
        null,
        {}
@@ -126,6 +126,13 @@
        {}
       ]
      ],
+     "content-visibility-focusable-scroller-descendant.html": [
+      "e9b027b5c7b94f22d17c1e726a819bb9b573612d",
+      [
+       null,
+       {}
+      ]
+     ],
      "content-visibility-generated-content-removal.html": [
       "b880e244fe17099e829d54ea62d4d53fd434b829",
       [
@@ -140,6 +147,13 @@
        {}
       ]
      ],
+     "display-table-column.html": [
+      "6f34f27fa7efd3e22edc6c76ac9f343487f8b7d6",
+      [
+       null,
+       {}
+      ]
+     ],
      "displaylocked-serialize.html": [
       "04be6ddf71a7f70c6dbd1610df236a118e316374",
       [
@@ -245,6 +259,13 @@
        {}
       ]
      ],
+     "null-node.html": [
+      "dc4a81e6bff3dd7230762b240050ba2d5219a8b0",
+      [
+       null,
+       {}
+      ]
+     ],
      "object-with-unrendered-text-fallback.html": [
       "0128213bfc66aaddb473b8692d622613e6a253b0",
       [
@@ -785,6 +806,13 @@
        {}
       ]
      ],
+     "float-in-inline-widows-orphans-crash.html": [
+      "be8645ddfa16bb0a206ae080821d93219e8e5443",
+      [
+       null,
+       {}
+      ]
+     ],
      "floated-multicol-in-multicol-crash.html": [
       "ba4ae29b12a657bdfd00fa08381466e0e8e56e1c",
       [
@@ -948,6 +976,13 @@
        {}
       ]
      ],
+     "out-of-order-float-in-inline-crash.html": [
+      "0a348cf2665932197a6f18b7f741230bb4616230",
+      [
+       null,
+       {}
+      ]
+     ],
      "overflow-auto-height-with-bottom-padding-crash.html": [
       "e25c8e3f2c15e3148aaf2cdd9b2f3c8dd89693e1",
       [
@@ -1166,6 +1201,13 @@
        {}
       ]
      ],
+     "contain-style-remove-element-crash.html": [
+      "cbf079523ffe5431b3808795d56fa4be4f3f7849",
+      [
+       null,
+       {}
+      ]
+     ],
      "container-queries": {
       "crashtests": {
        "br-crash.html": [
@@ -1217,6 +1259,13 @@
          {}
         ]
        ],
+       "chrome-custom-highlight-crash.html": [
+        "61e5075ed4e1b485019d96b402bbf17926bd1098",
+        [
+         null,
+         {}
+        ]
+       ],
        "chrome-layout-root-crash.html": [
         "e3e709a240bd870250b2747c94fe96880bdf52e3",
         [
@@ -1577,6 +1626,13 @@
          null,
          {}
         ]
+       ],
+       "grid-dynamic.html": [
+        "efc65859611fb04d2c4002fbe688291a221898f7",
+        [
+         null,
+         {}
+        ]
        ]
       },
       "detach-locked-slot-children-crash.html": [
@@ -2272,6 +2328,13 @@
        ]
       ]
      },
+     "list-item-counter-crash.html": [
+      "fc8a38c628026dc190d81e27150d8ebabb130ae2",
+      [
+       null,
+       {}
+      ]
+     ],
      "list-marker-containing-control-char-crash.html": [
       "280ef3426263cc50b1870ae92b4bee55ee88f50a",
       [
@@ -2744,6 +2807,27 @@
         {}
        ]
       ],
+      "oof-in-area-001.html": [
+       "af270569db34af0902940ad931f58646b0a0ee95",
+       [
+        null,
+        {}
+       ]
+      ],
+      "oof-in-area-002.html": [
+       "2d0be3d694ea23fe00eb72f5f2e7fcf56cdda4bf",
+       [
+        null,
+        {}
+       ]
+      ],
+      "oof-in-area-003.html": [
+       "c0c5891ec817915f683d6b2a779c6ddcb0fd3e0c",
+       [
+        null,
+        {}
+       ]
+      ],
       "oof-in-nested-line-float.html": [
        "d4d67763c875bd0a64b8069de73d6d95abb8a740",
        [
@@ -2751,6 +2835,48 @@
         {}
        ]
       ],
+      "oof-in-oof-multicol-in-multicol-spanner-in-multicol.html": [
+       "0331b43c6a1962767af3c4c156fac3c3c2d3579c",
+       [
+        null,
+        {}
+       ]
+      ],
+      "oof-in-oof-multicol-in-relpos-in-oof-in-multicol-in-multicol.html": [
+       "0dd4479bafe6b9b55431a213e38d8bb9dd036be8",
+       [
+        null,
+        {}
+       ]
+      ],
+      "oof-in-oof-multicol-in-spanner-in-multicol-in-spanner-in-nested-multicol.html": [
+       "0ee6ad4d01a5c9cd0766e42ddd95efe3eacf1de5",
+       [
+        null,
+        {}
+       ]
+      ],
+      "oof-in-oof-multicol-in-spanner-in-nested-multicol.html": [
+       "fe44012518d8361f64f29ad644bbf5d8f56dda53",
+       [
+        null,
+        {}
+       ]
+      ],
+      "oof-in-relpos-in-oof-multicol-in-oof-in-relpos-in-oof-multicol-in-multicol.html": [
+       "be73623b0b4c6f9f661e80adbd4db2fc604afa42",
+       [
+        null,
+        {}
+       ]
+      ],
+      "oof-in-relpos-in-oof-multicol-in-relpos-in-oof-multicol-in-relpos-multicol.html": [
+       "1e6845e70ce9df45e3e3f75ff45873aef1edd0d2",
+       [
+        null,
+        {}
+       ]
+      ],
       "oof-nested-multicol-inside-oof.html": [
        "f80225a5c8bf65cdaf8a73ef9d9eaf427240aa32",
        [
@@ -3372,6 +3498,24 @@
       ]
      ]
     },
+    "css-scroll-snap": {
+     "crashtests": {
+      "fractional-covering-area-crash.html": [
+       "6905b0fd394052d7c26e80857a05c212b1a3e7a4",
+       [
+        null,
+        {}
+       ]
+      ]
+     },
+     "scroll-snap-stop-dynamic-crash.html": [
+      "0039a0168e816f37198fec55d19bacd72a36dcde",
+      [
+       null,
+       {}
+      ]
+     ]
+    },
     "css-scrollbars": {
      "multicol-in-orthogonal-writing-mode-crash.html": [
       "5a7378de2ea890fc2eefd91135c6cb299a7464ba",
@@ -4108,7 +4252,28 @@
         {}
        ]
       ]
-     }
+     },
+     "mod-length-degrees-crash.html": [
+      "91d4c65bbb90fc0b1dd150d2399eb04368b23771",
+      [
+       null,
+       {}
+      ]
+     ],
+     "rem-length-degrees-crash.html": [
+      "c62a2e769d3049c8316b9e243c72451486c1376b",
+      [
+       null,
+       {}
+      ]
+     ],
+     "round-length-degrees-crash.html": [
+      "9250c399c5f2e3180aa8953b8db69f7b07b03ea2",
+      [
+       null,
+       {}
+      ]
+     ]
     },
     "css-variables": {
      "long-variable-reference-crash.html": [
@@ -4117,6 +4282,13 @@
        null,
        {}
       ]
+     ],
+     "whitespace-in-fallback-crash.html": [
+      "7e150e8453e4d7875ad4bce08aa3af4385d4ffa4",
+      [
+       null,
+       {}
+      ]
      ]
     },
     "css-view-transitions": {
@@ -4247,6 +4419,13 @@
        {}
       ]
      ],
+     "getComputedStyle-insets-absolute-logical-crash.html": [
+      "1e3ef8ab1216c11a34d2d2de0ec07c5fb7eb0181",
+      [
+       null,
+       {}
+      ]
+     ],
      "removerule-invalidation-crash.html": [
       "a83f43d5faf62338cfb442468a6e9e0e011c79f2",
       [
@@ -4440,6 +4619,17 @@
        {}
       ]
      ]
+    },
+    "zoom": {
+     "tentative": {
+      "scrollbar-crash.html": [
+       "791022407fd624c6cd7b1c1fec17abb3444f89af",
+       [
+        null,
+        {}
+       ]
+      ]
+     }
     }
    },
    "custom-elements": {
@@ -4775,6 +4965,13 @@
        {}
       ]
      ],
+     "insertAdjacentElement-with-DOMSubtreeModified.html": [
+      "4b9533282d1f523872cbc2d506012169f17de63d",
+      [
+       null,
+       {}
+      ]
+     ],
      "insertText-at-end-of-text-in-body.html": [
       "763697314be630a81fd7019e71784bd57f5beaf7",
       [
@@ -5006,6 +5203,13 @@
        {}
       ]
      ],
+     "mozilla-bug-1851730.html": [
+      "ee11f767924c8efd78b0bbfdbdc0987f264de9ad",
+      [
+       null,
+       {}
+      ]
+     ],
      "multiple-execCommand-calls-after-interting-long-text.html": [
       "32d0e38248f251005882f5874dbb3e56996e26d9",
       [
@@ -5355,6 +5559,15 @@
     },
     "dom": {
      "elements": {
+      "global-attributes": {
+       "the-anchor-attribute-003-crash.tentative.html": [
+        "207275d9db01eb43bb630f91bbb76cc109349490",
+        [
+         null,
+         {}
+        ]
+       ]
+      },
       "the-innertext-and-outertext-properties": {
        "innertext-domnoderemoved-crash.html": [
         "94043caf69cc50dc7445ef67448058ba9ffd869b",
@@ -6686,6 +6899,17 @@
      ]
     ]
    },
+   "print": {
+    "crashtests": {
+     "reload-crash.html": [
+      "6741c3c9a9dfb70505c8654f479cec8b46dcbdf4",
+      [
+       null,
+       {}
+      ]
+     ]
+    }
+   },
    "quirks": {
     "crashtests": {
      "list-item-whole-line-quirks-crash.html": [
@@ -6966,6 +7190,13 @@
        {}
       ]
      ],
+     "chrome-bug-1474157.html": [
+      "c852b0aa018571a988e39af8be0d0b742d71038d",
+      [
+       null,
+       {}
+      ]
+     ],
      "firefox-bug-1688293.html": [
       "9ab1a88312683a66798cb52693c2ba4389222ff4",
       [
@@ -9513,7 +9744,7 @@
      ]
     ],
     "aria-haspopup_dialog-manual.html": [
-     "659b9bf37670ff5bf6ea86e47fa728ef9bac6653",
+     "bf893a1c4bd9850d1a0ac7eb9490e48c53cfc40f",
      [
       null,
       {}
@@ -9527,28 +9758,28 @@
      ]
     ],
     "aria-haspopup_listbox-manual.html": [
-     "0ebc1bbb268b88535069e3441b6e5754d221c299",
+     "b940195a04c4017a82c0f9bec87aab6fad54e907",
      [
       null,
       {}
      ]
     ],
     "aria-haspopup_menu-manual.html": [
-     "d9a203a8775551d7c22a680eec0a1e8c0361060a",
+     "f149aaabcc76c5ab2d983ae020040c0b98434bc6",
      [
       null,
       {}
      ]
     ],
     "aria-haspopup_tree-manual.html": [
-     "41de64f47a3753ac7ea4a3b6463ca544a9bf9e96",
+     "db1608659cd68dc27be0b03db6e0fce36723a83d",
      [
       null,
       {}
      ]
     ],
     "aria-haspopup_true-manual.html": [
-     "b9e046cdd7f06e14b08222d979820e04ec554d2d",
+     "659e77cc98476f19dd31b870d53b02be67881f09",
      [
       null,
       {}
@@ -15887,9 +16118,9 @@
        ]
       ]
      },
-     "word-boundary": {
-      "word-boundary-015-manual.html": [
-       "8b7c6d98eeb6f60bc21797a7a00318aa7edf7681",
+     "word-space-transform": {
+      "word-space-transform-015-manual.html": [
+       "b86df3879caac1e554023b30de4067ef43a37a3a",
        [
         null,
         {}
@@ -20135,6 +20366,15 @@
     },
     "canvas": {
      "element": {
+      "canvas-host": {
+       "2d.canvas.host.scaled-manual.html": [
+        "acf3f9c7b344711b38326671a6a8edd332692606",
+        [
+         null,
+         {}
+        ]
+       ]
+      },
       "manual": {
        "drawing-paths-to-the-canvas": {
         "canvas_focus_drawFocusIfNeeded_AAPI_001-manual.html": [
@@ -21224,15 +21464,6 @@
         ]
        ]
       },
-      "the-canvas-element": {
-       "2d.scaled-manual.html": [
-        "28daf0bca5e9c1f3cbc2342085ff188213963ae2",
-        [
-         null,
-         {}
-        ]
-       ]
-      },
       "the-iframe-element": {
        "iframe_sandbox_allow_top_navigation_by_user_activation-manual.html": [
         "0fa9de7c125c3de5599edcddf2692f1f54356c32",
@@ -22264,13 +22495,6 @@
        {}
       ]
      ],
-     "page-visibility-manual.https.html": [
-      "37e48ce9791eb952c7375ee0e6cbd71727e54aa7",
-      [
-       null,
-       {}
-      ]
-     ],
      "screen-upmost-manual.https.html": [
       "560c3e3a1f6bde251197585843263dcd1fc8ed6d",
       [
@@ -22308,13 +22532,6 @@
        {}
       ]
      ],
-     "page-visibility-manual.https.html": [
-      "033f17602b88343313afbd1958805a628a7b3112",
-      [
-       null,
-       {}
-      ]
-     ],
      "t006-manual.https.html": [
       "e41f4634e8bc3d26b9a69d86b6794b922cd5df53",
       [
@@ -22832,6 +23049,78 @@
      ]
     ]
    },
+   "remote-playback": {
+    "event-handlers-manual.html": [
+     "b57a24b9324cb6f8d96e1223f7a41ffea7e7b6b7",
+     [
+      null,
+      {}
+     ]
+    ],
+    "prompt-and-cancel-selection-manual.html": [
+     "89a73730efaf6409572ab407fb248675343da874",
+     [
+      null,
+      {}
+     ]
+    ],
+    "prompt-and-select-device-manual.html": [
+     "77973af6667925d8b984207d5fbe5269cf91d3f5",
+     [
+      null,
+      {}
+     ]
+    ],
+    "prompt-and-watch-availability-no-device-manual.html": [
+     "7d69f09afccf6d4f91c91a80fdf9092c6c13abd9",
+     [
+      null,
+      {}
+     ]
+    ],
+    "prompt-and-watch-availability-with-device-manual.html": [
+     "fa8644931bfcb9e67fd27c54f737821d94dbf82a",
+     [
+      null,
+      {}
+     ]
+    ],
+    "remote-video-control-pausing-manual.html": [
+     "8dfc19bf774ae5fea38f438dffe90ce3b104c16d",
+     [
+      null,
+      {}
+     ]
+    ],
+    "remote-video-control-seek-manual.html": [
+     "56156d987105385dbdb99cb2735e3c413460e2bc",
+     [
+      null,
+      {}
+     ]
+    ],
+    "remote-video-playback-manual.html": [
+     "223a5b4a289000aad3f24f810444758eac75df9a",
+     [
+      null,
+      {}
+     ]
+    ],
+    "state-attribute-changes-when-selecting-device-manual.html": [
+     "90f51af1d7adb2357a41918a096c0aaea76cba91",
+     [
+      null,
+      {}
+     ]
+    ],
+    "state-attribute-changes-with-event-handlers-manual.html": [
+     "725613e413c6a78b16837976cd3e75cdec8fe903",
+     [
+      null,
+      {}
+     ]
+    ]
+   },
    "screen-orientation": {
     "page-visibility-manual.html": [
      "cc63279217806ff261195be2958194a5719cbaa1",
@@ -31268,6 +31557,19 @@
        {}
       ]
      ],
+     "remote-origin-iframe-print.html": [
+      "aba10a2a39952885caa1a04a08e19ed44b02020f",
+      [
+       null,
+       [
+        [
+         "/css/printing/remote-origin-iframe-print-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "subpixel-page-size-001-print.html": [
       "9054cd4513f73edd4a8674a106ba7e6358b2e91b",
       [
@@ -31869,6 +32171,19 @@
        {}
       ]
      ],
+     "svg-use-symbol-width-2-print.html": [
+      "ec08fd98b4dd9a81929227db8e07df293219fe89",
+      [
+       null,
+       [
+        [
+         "/svg/layout/svg-use-symbol-width-print-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "svg-use-symbol-width-print.html": [
       "ae56d68eee25648dafa194fedac07835048cecac",
       [
@@ -32199,7 +32514,7 @@
    },
    "avif": {
     "animated-avif-timeout.html": [
-     "13a5722051ed195cf31dbc5bec85236f690edeee",
+     "0970c994d34c9624ee07f0f7c44c3f5df93b1321",
      [
       null,
       [
@@ -128583,19 +128898,6 @@
        ]
       ]
      },
-     "compositing_simple_div.html": [
-      "44f138b5a6e1bb0d92206a5e0777de98f641fec0",
-      [
-       null,
-       [
-        [
-         "/css/compositing/compositing_simple_div-ref.html",
-         "=="
-        ]
-       ],
-       {}
-      ]
-     ],
      "mix-blend-mode": {
       "mix-blend-mode-animation.html": [
        "55618485d880d20668e7ab9d1379ef8792af5fe2",
@@ -129301,6 +129603,19 @@
         }
        ]
       ],
+      "mix-blend-mode-root-element-group.html": [
+       "8a190b928174c7ab77b029e24e169116a5355f0c",
+       [
+        null,
+        [
+         [
+          "/css/compositing/mix-blend-mode/mix-blend-mode-root-element-group-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "mix-blend-mode-rotated-clip.html": [
        "63db5cbbe1ea1d043e6efbbfad5d654990eda596",
        [
@@ -129512,6 +129827,122 @@
        ]
       ]
      },
+     "root-element-background-image-transparency-001.html": [
+      "1f07d60375ea3350b9f8f596b7fdafc6c390a6cc",
+      [
+       null,
+       [
+        [
+         "/css/compositing/root-element-background-image-transparency-001-ref.html",
+         "=="
+        ]
+       ],
+       {
+        "fuzzy": [
+         [
+          null,
+          [
+           [
+            0,
+            1
+           ],
+           [
+            0,
+            9600
+           ]
+          ]
+         ]
+        ]
+       }
+      ]
+     ],
+     "root-element-background-image-transparency-002.html": [
+      "0da51986f1ca2426cce7383547012e28d096e318",
+      [
+       null,
+       [
+        [
+         "/css/compositing/root-element-background-image-transparency-001-ref.html",
+         "=="
+        ]
+       ],
+       {
+        "fuzzy": [
+         [
+          null,
+          [
+           [
+            0,
+            1
+           ],
+           [
+            0,
+            9600
+           ]
+          ]
+         ]
+        ]
+       }
+      ]
+     ],
+     "root-element-background-image-transparency-003.html": [
+      "0aded929d872c3d95c0ae50b4868d41b52d72d60",
+      [
+       null,
+       [
+        [
+         "/css/compositing/root-element-background-image-transparency-001-ref.html",
+         "=="
+        ]
+       ],
+       {
+        "fuzzy": [
+         [
+          null,
+          [
+           [
+            0,
+            1
+           ],
+           [
+            0,
+            237600
+           ]
+          ]
+         ]
+        ]
+       }
+      ]
+     ],
+     "root-element-background-image-transparency-004.html": [
+      "1bc4b446149bff4639c33480f976f4d1e36c871f",
+      [
+       null,
+       [
+        [
+         "/css/compositing/root-element-background-image-transparency-001-ref.html",
+         "=="
+        ]
+       ],
+       {
+        "fuzzy": [
+         [
+          null,
+          [
+           [
+            0,
+            1
+           ],
+           [
+            0,
+            237600
+           ]
+          ]
+         ]
+        ]
+       }
+      ]
+     ],
      "root-element-background-transparency.html": [
       "910eb08e8d3004da7418f8f00f38d022841262f2",
       [
@@ -129729,6 +130160,224 @@
        ]
       ]
      },
+     "blocks": {
+      "align-content-block-001.html": [
+       "472ecae5765278beb410172af54ee4b1b7bf6864",
+       [
+        null,
+        [
+         [
+          "/css/css-align/blocks/align-content-block-001-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "align-content-block-002.html": [
+       "bad174d86f78c9166070a87947ecd072c0a528d5",
+       [
+        null,
+        [
+         [
+          "/css/css-align/blocks/align-content-block-002-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "align-content-block-003.html": [
+       "9356d2a3ff5b5accd9478c3f9db4b4a209c7109f",
+       [
+        null,
+        [
+         [
+          "/css/css-align/blocks/align-content-block-003-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "align-content-block-004.html": [
+       "38a330909d4aad60214d45c6b7704d8245682ec9",
+       [
+        null,
+        [
+         [
+          "/css/css-align/blocks/align-content-block-004-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "align-content-block-005.html": [
+       "97fe6c97fe978dbf0ae2f73e8c8859f271eacac0",
+       [
+        null,
+        [
+         [
+          "/css/css-align/blocks/align-content-block-003-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "align-content-block-006.html": [
+       "be62e78a706676585614f08b4203a0f946dd49fd",
+       [
+        null,
+        [
+         [
+          "/css/css-align/blocks/align-content-block-004-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "align-content-block-007.html": [
+       "61c4c684cd803f4353e0664851912ebe1f75f72a",
+       [
+        null,
+        [
+         [
+          "/css/css-align/blocks/align-content-block-005-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "align-content-block-008.html": [
+       "e9a861c71487a24def6c08559579d073a50bc3be",
+       [
+        null,
+        [
+         [
+          "/css/css-align/blocks/align-content-block-004-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "align-content-block-009.html": [
+       "0b2e8ec9fc4f5f0326599ff8fd1b922663bafb02",
+       [
+        null,
+        [
+         [
+          "/css/css-align/blocks/align-content-block-005-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "align-content-block-010.html": [
+       "ffb0e9cc4dbd6faf9381d79a24938a9dbd663651",
+       [
+        null,
+        [
+         [
+          "/css/css-align/blocks/align-content-block-004-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "align-content-block-011.html": [
+       "44b8d8987298f236197f1df4d7d453a2362226e1",
+       [
+        null,
+        [
+         [
+          "/css/css-align/blocks/align-content-block-005-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "align-content-block-break-content-010.html": [
+       "27a56a608f4d915327d168ddc6ad8075eed095f4",
+       [
+        null,
+        [
+         [
+          "/css/css-align/blocks/align-content-block-break-content-010-aligned-ref.html",
+          "=="
+         ],
+         [
+          "/css/css-align/blocks/align-content-block-break-content-010-unaligned-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "align-content-block-break-content-020.html": [
+       "83267301b4c1c9d54598b71165a8ddb0fc3ddc44",
+       [
+        null,
+        [
+         [
+          "/css/css-align/blocks/align-content-block-break-content-010-aligned-ref.html",
+          "=="
+         ],
+         [
+          "/css/css-align/blocks/align-content-block-break-content-010-unaligned-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "align-content-block-break-overflow-010.html": [
+       "cde57ad7a32ce14271777af7d0066d857af255b4",
+       [
+        null,
+        [
+         [
+          "/css/css-align/blocks/align-content-block-break-overflow-010-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "align-content-block-break-overflow-020.html": [
+       "5f4b3d9555a0811aeb42bf0312c1dca997afc28e",
+       [
+        null,
+        [
+         [
+          "/css/css-align/blocks/align-content-block-break-overflow-010-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "align-content-block-overflow-000.html": [
+       "c53606a0589af0bbd9c0bd7c513621b88f90687e",
+       [
+        null,
+        [
+         [
+          "/css/css-align/blocks/align-content-block-overflow-000-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ]
+     },
      "content-distribution": {
       "place-content-shorthand-007.html": [
        "be954c9712189d31aeb92914ab6a078f66087d0e",
@@ -137051,7 +137700,7 @@
       ]
      ],
      "border-image-repeat-round-003.html": [
-      "c2cb2372bc71acfc65946d10384a957653216162",
+      "034a5ed98a05a585108847d7bf6be7572df22f54",
       [
        null,
        [
@@ -137122,7 +137771,7 @@
       ]
      ],
      "border-image-repeat-round-stretch-001.html": [
-      "2a23e789f905a2bd07496d805f94426ce51de682",
+      "fa681b22ed3beb78fd184a2087a834e6baf46e89",
       [
        null,
        [
@@ -137413,7 +138062,7 @@
       ]
      ],
      "border-image-repeat-stretch-round-001.html": [
-      "2ac51fecf23c32eba35779bb8ba9f18d43030559",
+      "8c2963a5aec867d90b20692ce0c0dfbdc41cac56",
       [
        null,
        [
@@ -140507,6 +141156,19 @@
        {}
       ]
      ],
+     "border-image-000.html": [
+      "a588830310daa17b5dfe6035e899b731ca79e4f6",
+      [
+       null,
+       [
+        [
+         "/css/css-break/reference/border-image-000-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "borders-000.html": [
       "7c79f4c0d405bf8342987c6e66b759f6937b4485",
       [
@@ -142329,7 +142991,7 @@
        ]
       ],
       "multi-line-column-flex-fragmentation-049.html": [
-       "0ede74a118c4be49056e8b55dd3f0fac89536096",
+       "ae683e938c29a6a8224e506d789284c79ab1ea69",
        [
         null,
         [
@@ -146298,6 +146960,45 @@
        {}
       ]
      ],
+     "inline-with-float-001.html": [
+      "b6a6e1958ff9bb8cd216af572cf3a092fa9a3ac8",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "inline-with-float-002.html": [
+      "d9235b421a16f783ad58505f157682a5a739eae7",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "inline-with-float-004.html": [
+      "6b404d9570005a327bd0943334ca518b479e5175",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "line-after-unbreakable-float-after-padding.html": [
       "d3a4018cd809fc09eb68c1b25f4dda4736e64131",
       [
@@ -148446,6 +149147,19 @@
        {}
       ]
      ],
+     "soft-break-before-margin-001.html": [
+      "6907c33586af3fa6e058fb95560d95d3799bb690",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "svg-with-transform.html": [
       "3aa7facf2d6a08e18a792b8739341b9bcc5014e5",
       [
@@ -148759,6 +149473,19 @@
         {}
        ]
       ],
+      "caption-margin-005.html": [
+       "a77e2d83b8cf19fbae852e1d51edd94fc0a7f830",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "dynamic-caption-child-change-001.html": [
        "c57f4120166b15b3ee177e8b3c64eb25f45ad133",
        [
@@ -150751,6 +151478,19 @@
        {}
       ]
      ],
+     "widows-orphans-019.html": [
+      "cf5ff7572c86779b2c85b86dd61e6de15e77872f",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "will-change-filter.html": [
       "2970ddf37c18ad36312187ec2096285e63d0ad6e",
       [
@@ -151654,6 +152394,19 @@
        {}
       ]
      ],
+     "color-mix-currentcolor-visited.html": [
+      "28db2d6736fe3b5e4b012c758a5b2e1a42bbf674",
+      [
+       null,
+       [
+        [
+         "/css/css-color/color-mix-currentcolor-visited-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "color-mix-non-srgb-001.html": [
       "7563581a4cf6f8438e1ad9a8a25671c3f052ce79",
       [
@@ -151745,6 +152498,19 @@
        {}
       ]
      ],
+     "currentcolor-004.html": [
+      "06a429071ab7dac4f8583ba17a41d73f6d637e3d",
+      [
+       null,
+       [
+        [
+         "/css/css-color/currentcolor-004-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "deprecated-sameas-001.html": [
       "b03af9eb29fb6f4e23a036a927dd35bbf12bf112",
       [
@@ -152656,7 +153422,7 @@
       ]
      ],
      "lch-005.html": [
-      "ed32cb92cb402c6875c9ab95d7d6b523cd63f833",
+      "3986ddc11be587f02064db4ee16404896ce2e718",
       [
        null,
        [
@@ -153071,6 +153837,19 @@
        {}
       ]
      ],
+     "out-of-gamut-legacy-rgb.html": [
+      "e872dec314cba8e0bef568730fc83f36098d97b8",
+      [
+       null,
+       [
+        [
+         "/css/css-color/out-of-gamut-legacy-rgb-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "predefined-001.html": [
       "dff6bd9a11130b4972d5d283d96fb6bc793f5dd2",
       [
@@ -153344,6 +154123,214 @@
        {}
       ]
      ],
+     "relative-currentcolor-a98rgb-01.html": [
+      "b264aff7a4af535e800bc13a53bdad6a6f7e7cf1",
+      [
+       null,
+       [
+        [
+         "/css/css-color/relative-green-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "relative-currentcolor-displayp3-01.html": [
+      "d366da215fa984777a496413cf507db586d651fd",
+      [
+       null,
+       [
+        [
+         "/css/css-color/relative-green-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "relative-currentcolor-hsl-01.html": [
+      "2b5e06322ac03be97cd111d07005aabd15d18fb9",
+      [
+       null,
+       [
+        [
+         "/css/css-color/relative-green-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "relative-currentcolor-hsl-02.html": [
+      "dba5d49350148be67cebdfc656942d258d295249",
+      [
+       null,
+       [
+        [
+         "/css/css-color/relative-green-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "relative-currentcolor-hwb-01.html": [
+      "7c757e1d0f014ae61085f103168a6497838968ea",
+      [
+       null,
+       [
+        [
+         "/css/css-color/relative-green-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "relative-currentcolor-lab-01.html": [
+      "da59cccec124e1c2ea5b1334de290f6a4b8d118c",
+      [
+       null,
+       [
+        [
+         "/css/css-color/relative-green-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "relative-currentcolor-lch-01.html": [
+      "be734812f63ab10915f0616fb1eed6199f735108",
+      [
+       null,
+       [
+        [
+         "/css/css-color/relative-green-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "relative-currentcolor-oklab-01.html": [
+      "94d88d384c158d0e566dde51b54ead58213fc7d8",
+      [
+       null,
+       [
+        [
+         "/css/css-color/relative-green-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "relative-currentcolor-oklch-01.html": [
+      "0582817c60b196985dcf00bb4ebf7cf1810644b0",
+      [
+       null,
+       [
+        [
+         "/css/css-color/relative-green-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "relative-currentcolor-prophoto-01.html": [
+      "973cd9c756ffad8f13822311392678cd2c406518",
+      [
+       null,
+       [
+        [
+         "/css/css-color/relative-green-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "relative-currentcolor-rec2020-01.html": [
+      "820d9faf457e3f89cb78f33a8182fff2be7bc960",
+      [
+       null,
+       [
+        [
+         "/css/css-color/relative-green-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "relative-currentcolor-rec2020-02.html": [
+      "a323370012c4a79af64fe29cd4affdf1422d3cb3",
+      [
+       null,
+       [
+        [
+         "/css/css-color/relative-rec2020-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "relative-currentcolor-rgb-01.html": [
+      "5ad90529c886999cd32ec02ecd0808bc67505ff4",
+      [
+       null,
+       [
+        [
+         "/css/css-color/relative-green-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "relative-currentcolor-rgb-02.html": [
+      "603938d0dbd9037442ac18b4a18b898e5afe079c",
+      [
+       null,
+       [
+        [
+         "/css/css-color/relative-green-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "relative-currentcolor-xyzd50-01.html": [
+      "3caa71c84b58d627b0db5d83807b9affd742c72a",
+      [
+       null,
+       [
+        [
+         "/css/css-color/relative-green-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "relative-currentcolor-xyzd65-01.html": [
+      "7a857ce0cd8ca2514182c59c24c5e751bafa5688",
+      [
+       null,
+       [
+        [
+         "/css/css-color/relative-green-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "rgb-001.html": [
       "3e5900167789039a0497dc87ff1a7277514e745c",
       [
@@ -159958,7 +160945,7 @@
       ]
      ],
      "contain-style-counters-004.html": [
-      "40d68b4641e56af5cb08e725abfd490b6b0d476e",
+      "56e7e3d87e76ed391c57665b2d6a294b5c7d1e3e",
       [
        null,
        [
@@ -160271,7 +161258,7 @@
        ]
       ],
       "dialog-backdrop-create.html": [
-       "f72bb69f682a4cd5750f4721bf0aa4d59cb3eb4b",
+       "ef74973addc2ffa660ee38b84686982cbb889a92",
        [
         null,
         [
@@ -160387,6 +161374,58 @@
         {}
        ]
       ],
+      "pseudo-elements-009.html": [
+       "769a5962ff706db4ba2d5a29afaa348c94061c42",
+       [
+        null,
+        [
+         [
+          "/css/css-contain/container-queries/pseudo-elements-009-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "pseudo-elements-010.html": [
+       "e2e8f8659c500e1d91798cbd03437621d7ae01af",
+       [
+        null,
+        [
+         [
+          "/css/css-contain/container-queries/pseudo-elements-010-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "pseudo-elements-011.html": [
+       "26dabbe1dfe58a3350ec4fbf9a9671943a174a8d",
+       [
+        null,
+        [
+         [
+          "/css/css-contain/container-queries/pseudo-elements-010-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "pseudo-elements-012.html": [
+       "7c36d9270d92be6b017253dd4080b8a1e8c61546",
+       [
+        null,
+        [
+         [
+          "/css/css-contain/container-queries/pseudo-elements-010-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "resize-while-content-visibility-hidden.html": [
        "a3658f7f34fdda98b2d1198fecce3b6e1a5fef38",
        [
@@ -161234,6 +162273,32 @@
         {}
        ]
       ],
+      "content-visibility-animation-and-scroll.html": [
+       "3c4fd9c4fafabad81dddc6d62b946afbf0b5b95d",
+       [
+        null,
+        [
+         [
+          "/css/css-contain/content-visibility/content-visibility-animation-and-scroll-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "content-visibility-animation-becomes-visible.html": [
+       "c81aa70bc2b53ab89dd8c7d5eab1407f02eecb02",
+       [
+        null,
+        [
+         [
+          "/css/css-contain/content-visibility/content-visibility-animation-becomes-visible-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "content-visibility-auto-in-iframe.html": [
        "ba02cac6684d2c283de114c0b00fcd4e6f99f724",
        [
@@ -161626,7 +162691,7 @@
       ]
      },
      "counter-scoping-001.html": [
-      "f7d40dc5a0850919f1b86ca31e9ebd44ec96b72d",
+      "ab948e19081e1383fdc68ef8b27f2b6db0e30e95",
       [
        null,
        [
@@ -181691,6 +182756,19 @@
        {}
       ]
      ],
+     "font-palette-36.html": [
+      "8a0fd7f6b515edd9eaae010f65a3b2d2ec784c1e",
+      [
+       null,
+       [
+        [
+         "/css/css-fonts/font-palette-36-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "font-palette-4.html": [
       "540ba2542190205fbebc43b3b90381ab19a07b5e",
       [
@@ -183948,6 +185026,32 @@
        {}
       ]
      ],
+     "rcap-in-monospace.html": [
+      "def59b074f07b5e05ff944da8c150fac6fd806a6",
+      [
+       null,
+       [
+        [
+         "/css/css-fonts/rcap-in-monospace-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "rch-in-monospace.html": [
+      "86ad1d87326016216ba24eef750d09c7c26352f3",
+      [
+       null,
+       [
+        [
+         "/css/css-fonts/rch-in-monospace-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "rem-in-monospace.html": [
       "0358d811b403e6443ca5d861257a70a19093e5ce",
       [
@@ -183961,6 +185065,32 @@
        {}
       ]
      ],
+     "rex-in-monospace.html": [
+      "89fc9ff9cca2b28fdf3b549adcc7ed18474049fb",
+      [
+       null,
+       [
+        [
+         "/css/css-fonts/rex-in-monospace-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "ric-in-monospace.html": [
+      "1ad6dac924c69c36e4a7691b2c0a15f1a6ebe133",
+      [
+       null,
+       [
+        [
+         "/css/css-fonts/ric-in-monospace-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "rlh-in-monospace.html": [
       "26a57a78a551bdfafc65a893acd1fa5116d678e7",
       [
@@ -184039,6 +185169,19 @@
        {}
       ]
      ],
+     "size-adjust-unicode-range-system-fallback.html": [
+      "9e1a65d0fe7f03909434d7e6000e6a689f543887",
+      [
+       null,
+       [
+        [
+         "/css/css-fonts/size-adjust-unicode-range-system-fallback-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "size-adjust.tentative.html": [
       "9b29610c058502a02b589bca0b9f8ef39cf5823f",
       [
@@ -190820,7 +191963,7 @@
        ]
       ],
       "grid-first-letter-003.html": [
-       "9d9a0c7589d3d62581dba46e008ba0a30235685a",
+       "12b88c3115ba3e20befdb880ffb226a59306e940",
        [
         null,
         [
@@ -190859,7 +192002,7 @@
        ]
       ],
       "grid-first-line-003.html": [
-       "ede9901e8c9e1c0f8b0f94e7b01ea21fcce1e562",
+       "47f727de150c871197978893223efdc18efb0571",
        [
         null,
         [
@@ -190937,7 +192080,7 @@
        ]
       ],
       "grid-inline-first-letter-003.html": [
-       "e3efd51007a8827451dc1632cde32127e866249f",
+       "eea15ab585c6764a57c595448d65faf06d09994d",
        [
         null,
         [
@@ -190976,7 +192119,7 @@
        ]
       ],
       "grid-inline-first-line-003.html": [
-       "2b9c3ca0f639c72627b2af1be82bb5e6ca500f7c",
+       "c76a7f430f979791e358191554c898e2f0fa6819",
        [
         null,
         [
@@ -193372,6 +194515,19 @@
         {}
        ]
       ],
+      "standalone-axis-size-001.html": [
+       "aaa71ddbef27768ccae6601c2b0df7428637469a",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "subgrid-baseline-001.html": [
        "95469c0018e0a97786aff086c0cabaf081ced7b4",
        [
@@ -193655,6 +194811,151 @@
         }
        ]
       ],
+      "custom-highlight-font-metrics-001.html": [
+       "755409c6b18d1585e3ba10896c3e7ee5537a05ea",
+       [
+        null,
+        [
+         [
+          "/css/css-highlight-api/painting/custom-highlight-font-metrics-001-ref.html",
+          "=="
+         ]
+        ],
+        {
+         "fuzzy": [
+          [
+           null,
+           [
+            [
+             0,
+             80
+            ],
+            [
+             0,
+             4
+            ]
+           ]
+          ]
+         ]
+        }
+       ]
+      ],
+      "custom-highlight-font-metrics-002.html": [
+       "48ca92feef0f8bcbaa45371afee9365cbf6ccef7",
+       [
+        null,
+        [
+         [
+          "/css/css-highlight-api/painting/custom-highlight-font-metrics-002-ref.html",
+          "=="
+         ]
+        ],
+        {
+         "fuzzy": [
+          [
+           null,
+           [
+            [
+             0,
+             120
+            ],
+            [
+             0,
+             8
+            ]
+           ]
+          ]
+         ]
+        }
+       ]
+      ],
+      "custom-highlight-font-metrics-003.html": [
+       "d1035ed130e1f008716a64fbb9686bb8e4ba203c",
+       [
+        null,
+        [
+         [
+          "/css/css-highlight-api/painting/custom-highlight-font-metrics-003-ref.html",
+          "=="
+         ]
+        ],
+        {
+         "fuzzy": [
+          [
+           null,
+           [
+            [
+             0,
+             120
+            ],
+            [
+             0,
+             8
+            ]
+           ]
+          ]
+         ]
+        }
+       ]
+      ],
+      "custom-highlight-font-metrics-004.html": [
+       "fec70e97d312f4c27f58b8229de95357c9925358",
+       [
+        null,
+        [
+         [
+          "/css/css-highlight-api/painting/custom-highlight-font-metrics-003-ref.html",
+          "=="
+         ]
+        ],
+        {
+         "fuzzy": [
+          [
+           null,
+           [
+            [
+             0,
+             120
+            ],
+            [
+             0,
+             8
+            ]
+           ]
+          ]
+         ]
+        }
+       ]
+      ],
+      "custom-highlight-font-metrics-005.html": [
+       "5b2eb657730cec1e9873209536d94eebcaf11a63",
+       [
+        null,
+        [
+         [
+          "/css/css-highlight-api/painting/custom-highlight-font-metrics-005-ref.html",
+          "=="
+         ]
+        ],
+        {
+         "fuzzy": [
+          [
+           null,
+           [
+            [
+             0,
+             80
+            ],
+            [
+             0,
+             10
+            ]
+           ]
+          ]
+         ]
+        }
+       ]
+      ],
       "custom-highlight-painting-001.html": [
        "82b61ec6de07c4d45796785f3e7b559e64a6deab",
        [
@@ -194783,7 +196084,7 @@
        ]
       ],
       "gradient-none-interpolation.html": [
-       "a3905b07cee45153b2a2cdd0c73f22a673c9d5cb",
+       "06d7be6e66b6a08132fa9474cd51ea3817300de0",
        [
         null,
         [
@@ -194792,7 +196093,23 @@
           "=="
          ]
         ],
-        {}
+        {
+         "fuzzy": [
+          [
+           null,
+           [
+            [
+             1,
+             1
+            ],
+            [
+             0,
+             5000
+            ]
+           ]
+          ]
+         ]
+        }
        ]
       ],
       "legacy-color-gradient.html": [
@@ -196502,6 +197819,32 @@
        {}
       ]
      ],
+     "normalization-radial-3.html": [
+      "927917ced606cca63ace976c23943fcecab5db64",
+      [
+       null,
+       [
+        [
+         "/css/css-images/reference/100x100-blue.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "normalization-radial-4.html": [
+      "e9d948f062ec70e3e2c73a5211a770facd23b12d",
+      [
+       null,
+       [
+        [
+         "/css/css-images/reference/100x100-blue.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "normalization-radial-degenerate.html": [
       "4fff3ac909a04779a36310fb19c002c6b75d2d3a",
       [
@@ -202342,6 +203685,58 @@
        ]
       ]
      },
+     "counter-001.html": [
+      "46d7eb81df00603eb36db35c1d05e3e11c7f1fcd",
+      [
+       null,
+       [
+        [
+         "/css/css-lists/counter-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "counter-002.html": [
+      "5994802c4520b0d91efdcd0e693eee87f2689246",
+      [
+       null,
+       [
+        [
+         "/css/css-lists/counter-002-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "counter-003.html": [
+      "60164c1c7eb526c917aa62b58eaf936ffe8cc099",
+      [
+       null,
+       [
+        [
+         "/css/css-lists/counter-003-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "counter-004.html": [
+      "4ef2ced3ae98b0eb71472d83119eb4d71fe2f0cc",
+      [
+       null,
+       [
+        [
+         "/css/css-lists/counter-004-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "counter-increment-inside-display-contents.html": [
       "ebfe1774da6a32508796b3bc83f428d78d089aff",
       [
@@ -202433,6 +203828,19 @@
        {}
       ]
      ],
+     "counter-reset-increment-overflow-underflow.html": [
+      "6dc16e25ee73f4b4cbad2af1120761ebcff7b0b1",
+      [
+       null,
+       [
+        [
+         "/css/css-lists/counter-reset-increment-overflow-underflow-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "counter-reset-increment-set-display-contents.html": [
       "6508df0da150a92e42032c546f2cf4ac6c171859",
       [
@@ -202576,6 +203984,110 @@
        {}
       ]
      ],
+     "counters-001.html": [
+      "a6d85fe4d5bc85708bc5a37e707d9f7ee4dd5a79",
+      [
+       null,
+       [
+        [
+         "/css/css-lists/counters-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "counters-002.html": [
+      "9b3618d3bfe56fa53e3dc7b28bfaca7bcae95fe1",
+      [
+       null,
+       [
+        [
+         "/css/css-lists/counters-002-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "counters-003.html": [
+      "1648081a4d39d0078a7d1855fe2edbae95f54f05",
+      [
+       null,
+       [
+        [
+         "/css/css-lists/counters-003-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "counters-004.html": [
+      "6b1b1c850d7159ab850675a1156046fc8116b7df",
+      [
+       null,
+       [
+        [
+         "/css/css-lists/counters-004-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "counters-scope-001.html": [
+      "2ea72753bd984fe93db1872d5f90e72da6cd4966",
+      [
+       null,
+       [
+        [
+         "/css/css-lists/counters-scope-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "counters-scope-002.html": [
+      "8261d55971d3793784ccbec1599ce704543ac49c",
+      [
+       null,
+       [
+        [
+         "/css/css-lists/counters-scope-002-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "counters-scope-003.html": [
+      "f7b94e286356623abb5d90a840d859c9a0a79edd",
+      [
+       null,
+       [
+        [
+         "/css/css-lists/counters-scope-003-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "counters-scope-004.html": [
+      "4a60c4ca0bd007c9de74c3fa8e39208415933f18",
+      [
+       null,
+       [
+        [
+         "/css/css-lists/counters-scope-004-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "foo-counter-reversed-006a.html": [
       "028f1fe19998c8eb70cc1d98d6d6f9ee852b7b03",
       [
@@ -203885,7 +205397,7 @@
      "clip-path": {
       "animations": {
        "clip-path-animation-custom-timing-function-reverse.html": [
-        "d42b2fe5a3292df1e027b5991b97bb748916910b",
+        "5346a4c22421cafde7691356c67b896f22392f76",
         [
          null,
          [
@@ -203901,11 +205413,11 @@
             [
              [
               0,
-              1
+              20
              ],
              [
               0,
-              350
+              692
              ]
             ]
            ]
@@ -204341,7 +205853,7 @@
         ]
        ],
        "clip-path-transition-custom-timing-function.html": [
-        "47b0cd6e751fe8c2282ce8c44746fa01d0340b30",
+        "f8bf6e08fe887af8de59af686b818aa00784a994",
         [
          null,
          [
@@ -204350,7 +205862,23 @@
            "=="
           ]
          ],
-         {}
+         {
+          "fuzzy": [
+           [
+            null,
+            [
+             [
+              0,
+              4
+             ],
+             [
+              0,
+              628
+             ]
+            ]
+           ]
+          ]
+         }
         ]
        ],
        "clip-path-transition.html": [
@@ -204433,7 +205961,7 @@
        ]
       ],
       "clip-path-borderBox-1a.html": [
-       "a15ef09b3bd197b0ee3f43da35486f68ac4de0e0",
+       "c0304a59bb8ae8fec3f0e048b13d69cd43d29d89",
        [
         null,
         [
@@ -204449,7 +205977,7 @@
            [
             [
              0,
-             96
+             100
             ],
             [
              0,
@@ -204491,7 +206019,7 @@
        ]
       ],
       "clip-path-borderBox-1c.html": [
-       "91f3c9da6b78cb731e18e4f1e364273eef9d65b1",
+       "99f6bb0fc978c8c27023c695b355ced6e83ea618",
        [
         null,
         [
@@ -204507,7 +206035,7 @@
            [
             [
              0,
-             64
+             65
             ],
             [
              0,
@@ -204519,6 +206047,48 @@
         }
        ]
       ],
+      "clip-path-borderBox-1d.html": [
+       "3b63d9251f8b9b8ab7f71aa622f05e92fb07f73e",
+       [
+        null,
+        [
+         [
+          "/css/css-masking/clip-path/reference/green-100x100.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "clip-path-borderBox-1e.html": [
+       "17ac0b0d72ceebc57529d298bdf4d28e57151e56",
+       [
+        null,
+        [
+         [
+          "/css/css-masking/clip-path/reference/green-circle-100x100.html",
+          "=="
+         ]
+        ],
+        {
+         "fuzzy": [
+          [
+           null,
+           [
+            [
+             0,
+             126
+            ],
+            [
+             0,
+             400
+            ]
+           ]
+          ]
+         ]
+        }
+       ]
+      ],
       "clip-path-circle-001.html": [
        "e40cdb103a97e4b14c7fda8efcc3d2503fab17f7",
        [
@@ -204836,7 +206406,7 @@
        ]
       ],
       "clip-path-contentBox-1c.html": [
-       "a04aaa21e5a8629dc897e282b7e7b42004b3e5da",
+       "e1b653aaf7f16c00f65a5668b225f1ebbaee6544",
        [
         null,
         [
@@ -204856,7 +206426,49 @@
             ],
             [
              0,
-             355
+             376
+            ]
+           ]
+          ]
+         ]
+        }
+       ]
+      ],
+      "clip-path-contentBox-1d.html": [
+       "1968fc8044112fa19d9f33199c3bbf773fee21f8",
+       [
+        null,
+        [
+         [
+          "/css/css-masking/clip-path/reference/green-100x100.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "clip-path-contentBox-1e.html": [
+       "aa2f961f668691cbbe3a7ef4996a0534da3bea08",
+       [
+        null,
+        [
+         [
+          "/css/css-masking/clip-path/reference/green-circle-100x100.html",
+          "=="
+         ]
+        ],
+        {
+         "fuzzy": [
+          [
+           null,
+           [
+            [
+             0,
+             64
+            ],
+            [
+             0,
+             400
             ]
            ]
           ]
@@ -205188,7 +206800,7 @@
        ]
       ],
       "clip-path-fillBox-1a.html": [
-       "d3733d4332a745db1d26e6e32bf6f70f4738463c",
+       "c14890e9673b012e0fc2937c2093abec8e12532d",
        [
         null,
         [
@@ -205204,11 +206816,11 @@
            [
             [
              0,
-             52
+             79
             ],
             [
              0,
-             355
+             392
             ]
            ]
           ]
@@ -205404,6 +207016,106 @@
         {}
        ]
       ],
+      "clip-path-inline-007.html": [
+       "ffbc83108029e20f35dc4a40851ea1350ef4a2f4",
+       [
+        null,
+        [
+         [
+          "/css/css-masking/clip-path/clip-path-inline-007-ref.html",
+          "=="
+         ]
+        ],
+        {
+         "fuzzy": [
+          [
+           null,
+           [
+            [
+             0,
+             62
+            ],
+            [
+             0,
+             325
+            ]
+           ]
+          ]
+         ]
+        }
+       ]
+      ],
+      "clip-path-inline-008.html": [
+       "911f9cac4dd39ed1f24564c1b1e35e663b0159df",
+       [
+        null,
+        [
+         [
+          "/css/css-masking/clip-path/clip-path-inline-008-ref.html",
+          "=="
+         ]
+        ],
+        {
+         "fuzzy": [
+          [
+           null,
+           [
+            [
+             0,
+             14
+            ],
+            [
+             0,
+             240
+            ]
+           ]
+          ]
+         ]
+        }
+       ]
+      ],
+      "clip-path-inline-009.html": [
+       "6a7fbb549885208c015a4ac65ca6d8a440363e47",
+       [
+        null,
+        [
+         [
+          "/css/css-masking/clip-path/clip-path-inline-009-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "clip-path-inline-010.html": [
+       "dea78b6347f496b5805c8a2220c77f882a11a1c5",
+       [
+        null,
+        [
+         [
+          "/css/css-masking/clip-path/clip-path-inline-010-ref.html",
+          "=="
+         ]
+        ],
+        {
+         "fuzzy": [
+          [
+           null,
+           [
+            [
+             0,
+             43
+            ],
+            [
+             0,
+             319
+            ]
+           ]
+          ]
+         ]
+        }
+       ]
+      ],
       "clip-path-inset-round-percent.html": [
        "cb0e5ec73575c83954253bdcf394290b4f4d200e",
        [
@@ -205459,6 +207171,77 @@
         }
        ]
       ],
+      "clip-path-marginBox-1b.html": [
+       "04f22e84d5c4a7d8cfc8f4de69ab42270bc61e24",
+       [
+        null,
+        [
+         [
+          "/css/css-masking/clip-path/reference/green-100x100.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "clip-path-marginBox-1c.html": [
+       "cfeebeedf38d793f424b55bc6d4d6b8830a8f41d",
+       [
+        null,
+        [
+         [
+          "/css/css-masking/clip-path/reference/green-circle-100x100.html",
+          "=="
+         ]
+        ],
+        {
+         "fuzzy": [
+          [
+           null,
+           [
+            [
+             0,
+             98
+            ],
+            [
+             0,
+             287
+            ]
+           ]
+          ]
+         ]
+        }
+       ]
+      ],
+      "clip-path-marginBox-1d.html": [
+       "39d3c9db5afb39eb20f1ed0260111dfff85468ca",
+       [
+        null,
+        [
+         [
+          "/css/css-masking/clip-path/clip-path-marginBox-1d-ref.html",
+          "=="
+         ]
+        ],
+        {
+         "fuzzy": [
+          [
+           null,
+           [
+            [
+             0,
+             146
+            ],
+            [
+             0,
+             500
+            ]
+           ]
+          ]
+         ]
+        }
+       ]
+      ],
       "clip-path-mix-blend-mode-1.html": [
        "ff0c376905c3ecd329b2bc074aa77cea09cf6c5c",
        [
@@ -205544,7 +207327,7 @@
        ]
       ],
       "clip-path-paddingBox-1c.html": [
-       "bf7b098dbdab3a687e36149d0ebd3806221c4b50",
+       "c3fc5a90af2e1819ad78bcf3cccba165f5f9aa99",
        [
         null,
         [
@@ -205564,7 +207347,49 @@
             ],
             [
              0,
-             355
+             376
+            ]
+           ]
+          ]
+         ]
+        }
+       ]
+      ],
+      "clip-path-paddingBox-1d.html": [
+       "3425c3d2d651de9e92ff4b99f652d7c4bf6f702a",
+       [
+        null,
+        [
+         [
+          "/css/css-masking/clip-path/reference/green-100x100.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "clip-path-paddingBox-1e.html": [
+       "cd0d3987d9f66ce3d83424652988ad9cc9a717a4",
+       [
+        null,
+        [
+         [
+          "/css/css-masking/clip-path/reference/green-circle-100x100.html",
+          "=="
+         ]
+        ],
+        {
+         "fuzzy": [
+          [
+           null,
+           [
+            [
+             0,
+             70
+            ],
+            [
+             0,
+             400
             ]
            ]
           ]
@@ -205742,7 +207567,7 @@
        ]
       ],
       "clip-path-polygon-010.html": [
-       "c60aba2979adfdc8671c8bc01c2645758fe7ab3c",
+       "e74a134082e509e9d9c5ccc94d7b84867cfd313c",
        [
         null,
         [
@@ -205820,7 +207645,7 @@
        ]
       ],
       "clip-path-rect-003.html": [
-       "d61dce8c233c81b08307f4ea364cb49c399bcbd2",
+       "a2d201c1b0fed0390d037a0291309b4bce0390cd",
        [
         null,
         [
@@ -205836,11 +207661,11 @@
            [
             [
              0,
-             2
+             50
             ],
             [
              0,
-             30
+             250
             ]
            ]
           ]
@@ -205927,7 +207752,7 @@
        ]
       ],
       "clip-path-round-zero-size.html": [
-       "32396fa8d24a3316149ef0cd2f3d12073f9fdd95",
+       "59404f81c9dffe5695f31145b3486558f5bc7ab5",
        [
         null,
         [
@@ -205947,7 +207772,7 @@
             ],
             [
              0,
-             28
+             100
             ]
            ]
           ]
@@ -206047,7 +207872,7 @@
        ]
       ],
       "clip-path-strokeBox-1a.html": [
-       "de6d907a78fe1c4cb2f8c9028bfc857e74eef06f",
+       "487f5363b694304923538d0314d3c6d2a685da6b",
        [
         null,
         [
@@ -206063,7 +207888,7 @@
            [
             [
              0,
-             64
+             65
             ],
             [
              0,
@@ -206076,7 +207901,7 @@
        ]
       ],
       "clip-path-strokeBox-1b.html": [
-       "3ac1a834fb0347b7d6be4b9577989d4bb26f2394",
+       "33956e3d47817e974d5882c03db1c7ef36939c80",
        [
         null,
         [
@@ -206096,7 +207921,7 @@
             ],
             [
              0,
-             194
+             260
             ]
            ]
           ]
@@ -206270,7 +208095,7 @@
        ]
       ],
       "clip-path-viewBox-1b.html": [
-       "81bfcb87982160c54973529d00f46a1c67e12eb2",
+       "7d44efb81ea6f5892935cd121b85a712ea03bb2b",
        [
         null,
         [
@@ -206286,11 +208111,11 @@
            [
             [
              0,
-             7
+             36
             ],
             [
              0,
-             150
+             376
             ]
            ]
           ]
@@ -206299,7 +208124,7 @@
        ]
       ],
       "clip-path-viewBox-1c.html": [
-       "adc00493c5e170dc3936215e9804953d13d57fe2",
+       "d46c6d2f03ea8fc93bb3f47d15d36d8a66202573",
        [
         null,
         [
@@ -206315,7 +208140,7 @@
            [
             [
              0,
-             64
+             65
             ],
             [
              0,
@@ -206383,7 +208208,7 @@
        ]
       ],
       "clip-path-xywh-003.html": [
-       "eb87c8ac36ed6862f7feb1e08a24ff584cbbb677",
+       "370e1af9757cb6cc067d911ec58bda41aff5bcff",
        [
         null,
         [
@@ -206403,7 +208228,7 @@
             ],
             [
              0,
-             30
+             32
             ]
            ]
           ]
@@ -207388,7 +209213,7 @@
        ]
       ],
       "clip-path-shape-circle-004.svg": [
-       "be5ad144e5161093be56ded6609397bd8dd52dff",
+       "83f7eec4feca7c0aedad66e1cda194bbf1db64c2",
        [
         null,
         [
@@ -207408,7 +209233,7 @@
             ],
             [
              0,
-             78
+             376
             ]
            ]
           ]
@@ -208141,7 +209966,7 @@
        ]
       ],
       "mask-image-2.html": [
-       "ba6eb37ef6da4f1db3d09d70af330c69bdca446d",
+       "673f55a7e36136ff58f83f0573849c29db7906fb",
        [
         null,
         [
@@ -208157,11 +209982,11 @@
            [
             [
              0,
-             1
+             3
             ],
             [
              0,
-             2400
+             14000
             ]
            ]
           ]
@@ -208261,7 +210086,7 @@
        ]
       ],
       "mask-image-3h.html": [
-       "c7197f45811ed178398897a819d78e1e9a1e3e83",
+       "7d33be438144e02d2b73ab661c53dab57ac7959f",
        [
         null,
         [
@@ -208277,11 +210102,11 @@
            [
             [
              0,
-             6
+             10
             ],
             [
              0,
-             49
+             80
             ]
            ]
           ]
@@ -208342,7 +210167,7 @@
        ]
       ],
       "mask-image-6.html": [
-       "ac31e4cf4ef3b9efdfcded813758ee9279bffdf4",
+       "3132efb0475b5e9b6025bb8900cdafa795b6e7ca",
        [
         null,
         [
@@ -208351,7 +210176,23 @@
           "=="
          ]
         ],
-        {}
+        {
+         "fuzzy": [
+          [
+           null,
+           [
+            [
+             0,
+             255
+            ],
+            [
+             0,
+             70
+            ]
+           ]
+          ]
+         ]
+        }
        ]
       ],
       "mask-image-clip-exclude.html": [
@@ -208422,6 +210263,19 @@
         {}
        ]
       ],
+      "mask-image-inline-sliced-1.html": [
+       "9d09cc00a1f259644125747d1d1d08cbfdce6dd2",
+       [
+        null,
+        [
+         [
+          "/css/css-masking/mask-image/reference/mask-image-inline-sliced-1-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "mask-image-svg-child-will-change.html": [
        "248589d54dd99f1bcaf74d03944d9a8bc36fd047",
        [
@@ -208688,7 +210542,7 @@
        ]
       ],
       "mask-opacity-1d.html": [
-       "6f50b8f6f52ed08ef4c3ec90e4bf677935e0560e",
+       "77eab966cbfb87c8f0a1f3725ac5566fc50658cc",
        [
         null,
         [
@@ -208697,7 +210551,23 @@
           "=="
          ]
         ],
-        {}
+        {
+         "fuzzy": [
+          [
+           null,
+           [
+            [
+             0,
+             5
+            ],
+            [
+             0,
+             5000
+            ]
+           ]
+          ]
+         ]
+        }
        ]
       ],
       "mask-opacity-1e.html": [
@@ -209274,6 +211144,19 @@
         {}
        ]
       ],
+      "mask-with-filter.svg": [
+       "a6028a398ea2ed75f94d2aaea813951c28d57502",
+       [
+        null,
+        [
+         [
+          "/css/css-masking/mask-svg-content/reference/mask-green-square-001-ref.svg",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "mask-with-rotation.svg": [
        "9964fd524a1b8eb2815b8f3ecc01e53e6ce8604c",
        [
@@ -215374,6 +217257,19 @@
        {}
       ]
      ],
+     "overflow-clip-margin-012.html": [
+      "a1b0587a4d5f2a9878ab73205fee310631063415",
+      [
+       null,
+       [
+        [
+         "/css/css-overflow/overflow-clip-margin-007-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "overflow-clip-margin-invalidation.html": [
       "d9c87a34a53f17451b0d3ae8c2071971d1df3a94",
       [
@@ -218187,6 +220083,19 @@
      ]
     },
     "css-position": {
+     "backdrop-inherit-rendered.html": [
+      "98dfe748ed5f7430610a93b93f40056183e85c5b",
+      [
+       null,
+       [
+        [
+         "/css/css-position/backdrop-inherit-rendered-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "change-insets-inside-strict-containment-nested.html": [
       "b70ef0e667be3adb46f261da9e407ae8ecdc1299",
       [
@@ -218544,7 +220453,7 @@
        ]
       ],
       "overlay-transition-backdrop.html": [
-       "30d40e111f9b676831f9b0cad8e4fb0c86ad4e40",
+       "898b6b2e0f0c26e9ed7af687b3471b7e2ade122f",
        [
         null,
         [
@@ -220270,7 +222179,7 @@
        ]
       ],
       "position-sticky-hyperlink.html": [
-       "c8ef07edd17e58efd593a56590ea2bcb04bb8ac4",
+       "cc8de9a822cd786c9703ebe3e2a394f26b81b54c",
        [
         null,
         [
@@ -220279,7 +222188,23 @@
           "=="
          ]
         ],
-        {}
+        {
+         "fuzzy": [
+          [
+           null,
+           [
+            [
+             0,
+             5
+            ],
+            [
+             0,
+             80
+            ]
+           ]
+          ]
+         ]
+        }
        ]
       ],
       "position-sticky-inline.html": [
@@ -221484,6 +223409,19 @@
        {}
       ]
      ],
+     "first-letter-with-preceding-new-line.html": [
+      "5243b042882328443daf07e6f05f1cac68cede84",
+      [
+       null,
+       [
+        [
+         "/css/css-pseudo/reference/first-letter-with-preceding-new-line-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "first-letter-with-quote.html": [
       "9a8e0426bd8d52fcc91ab5472f052812daa92abb",
       [
@@ -221874,8 +223812,37 @@
        {}
       ]
      ],
+     "highlight-cascade-008.html": [
+      "10ca924b8fd1d24089011c71584071a6e84423e4",
+      [
+       null,
+       [
+        [
+         "/css/css-pseudo/highlight-cascade-008-ref.html",
+         "=="
+        ]
+       ],
+       {
+        "fuzzy": [
+         [
+          null,
+          [
+           [
+            0,
+            255
+           ],
+           [
+            0,
+            10
+           ]
+          ]
+         ]
+        ]
+       }
+      ]
+     ],
      "highlight-currentcolor-painting-properties-001.html": [
-      "8f347f119e5a3105c7c80df831d927f32d3cf24c",
+      "9fdf11e739c431cadc98abb41dd01c60055c21b7",
       [
        null,
        [
@@ -221884,11 +223851,27 @@
          "=="
         ]
        ],
-       {}
+       {
+        "fuzzy": [
+         [
+          null,
+          [
+           [
+            0,
+            50
+           ],
+           [
+            0,
+            3
+           ]
+          ]
+         ]
+        ]
+       }
       ]
      ],
      "highlight-currentcolor-painting-properties-002.html": [
-      "bd5d5f4abb8c44a6db5d32975c347ab52d1cfb3b",
+      "8f6673132f13335812f579cab40892fafc418e05",
       [
        null,
        [
@@ -221897,7 +223880,23 @@
          "=="
         ]
        ],
-       {}
+       {
+        "fuzzy": [
+         [
+          null,
+          [
+           [
+            0,
+            50
+           ],
+           [
+            0,
+            3
+           ]
+          ]
+         ]
+        ]
+       }
       ]
      ],
      "highlight-currentcolor-painting-text-shadow-001.html": [
@@ -222005,7 +224004,7 @@
       ]
      ],
      "highlight-painting-003.html": [
-      "b09ef52dd7363424c9ce958b9e4cee58279e50d7",
+      "f479432403729ed8b008ead1b46775d0f567df21",
       [
        null,
        [
@@ -222014,11 +224013,27 @@
          "=="
         ]
        ],
-       {}
+       {
+        "fuzzy": [
+         [
+          null,
+          [
+           [
+            0,
+            50
+           ],
+           [
+            0,
+            50
+           ]
+          ]
+         ]
+        ]
+       }
       ]
      ],
      "highlight-painting-004.html": [
-      "26ded65f871645841d1376ae24d12a4d8c99b29d",
+      "cbf01e832af442f262d5132d05127c769bac1809",
       [
        null,
        [
@@ -222035,7 +224050,23 @@
          "=="
         ]
        ],
-       {}
+       {
+        "fuzzy": [
+         [
+          null,
+          [
+           [
+            0,
+            50
+           ],
+           [
+            0,
+            20
+           ]
+          ]
+         ]
+        ]
+       }
       ]
      ],
      "highlight-painting-currentcolor-005.html": [
@@ -225738,7 +227769,7 @@
        ]
       ],
       "scroll-snap-writing-mode-000.html": [
-       "e5d3dd9358bdab8ed06e0d003a13863d2c42aa2d",
+       "f44317c8585e875d79561993411703d96e4c180b",
        [
         null,
         [
@@ -225961,6 +227992,19 @@
        {}
       ]
      ],
+     "scrollbar-color-dynamic-7.html": [
+      "894db93d6a1a6f08db6a3006a4d356cb19f6c25d",
+      [
+       null,
+       [
+        [
+         "/css/css-scrollbars/scrollbar-color-dynamic-7-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "scrollbar-color-scheme-dynamic-1.html": [
       "71fd97f27419316f5d923dce5673a3f0e0d87633",
       [
@@ -226158,6 +228202,32 @@
      ]
     },
     "css-shadow-parts": {
+     "animation-part.html": [
+      "333785fe6284871ff18358fefcb15e74bedee108",
+      [
+       null,
+       [
+        [
+         "/css/css-shadow-parts/animation-part-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "exportparts-different-scope.html": [
+      "94fce0d3ad57fe71b2fdcd368633fd875b3c7de9",
+      [
+       null,
+       [
+        [
+         "/css/css-shadow-parts/exportparts-different-scope-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "interaction-with-nested-pseudo-class.html": [
       "1061e4b0e3501535d2bebf741e4986a2a6779c1a",
       [
@@ -227691,7 +229761,7 @@
          ]
         ],
         "shape-outside-circle-032.html": [
-         "74e6fff2e57c9aac59eeca516674cd7a0019c638",
+         "d57bb5de4d6da338a9792c978803fc5994d431b2",
          [
           null,
           [
@@ -227700,7 +229770,23 @@
             "=="
            ]
           ],
-          {}
+          {
+           "fuzzy": [
+            [
+             null,
+             [
+              [
+               0,
+               6
+              ],
+              [
+               0,
+               6
+              ]
+             ]
+            ]
+           ]
+          }
          ]
         ],
         "shape-outside-circle-033.html": [
@@ -227743,7 +229829,7 @@
          ]
         ],
         "shape-outside-circle-036.html": [
-         "62e334079d07416aa23ef4d6967133cf7fd6fd9a",
+         "75b8b85a86c1e4fa325c0646daabfffa2ed588f3",
          [
           null,
           [
@@ -227752,11 +229838,27 @@
             "=="
            ]
           ],
-          {}
+          {
+           "fuzzy": [
+            [
+             null,
+             [
+              [
+               0,
+               6
+              ],
+              [
+               0,
+               6
+              ]
+             ]
+            ]
+           ]
+          }
          ]
         ],
         "shape-outside-circle-037.html": [
-         "53d8a5a779146dbce38e8fc31242d78a66645d97",
+         "b868cacbe9b80db883be50eb326c7f25da36fdbe",
          [
           null,
           [
@@ -227765,11 +229867,27 @@
             "=="
            ]
           ],
-          {}
+          {
+           "fuzzy": [
+            [
+             null,
+             [
+              [
+               0,
+               6
+              ],
+              [
+               0,
+               6
+              ]
+             ]
+            ]
+           ]
+          }
          ]
         ],
         "shape-outside-circle-038.html": [
-         "0c4adbf5e6824f68afb131bf548854e4c1e6ec3f",
+         "2c823219ff630b0978286ab1171d3ec6d69be23c",
          [
           null,
           [
@@ -227778,7 +229896,23 @@
             "=="
            ]
           ],
-          {}
+          {
+           "fuzzy": [
+            [
+             null,
+             [
+              [
+               0,
+               6
+              ],
+              [
+               0,
+               6
+              ]
+             ]
+            ]
+           ]
+          }
          ]
         ],
         "shape-outside-circle-041.html": [
@@ -227795,7 +229929,7 @@
          ]
         ],
         "shape-outside-circle-042.html": [
-         "4c0625acf6a0a6b21a0b3ca122f4911161b3031e",
+         "b2a3836d154f8c6d68f888b56df32c1e6ddef802",
          [
           null,
           [
@@ -227804,11 +229938,27 @@
             "=="
            ]
           ],
-          {}
+          {
+           "fuzzy": [
+            [
+             null,
+             [
+              [
+               0,
+               6
+              ],
+              [
+               0,
+               6
+              ]
+             ]
+            ]
+           ]
+          }
          ]
         ],
         "shape-outside-circle-043.html": [
-         "06960c092c846955295f797dc52a14d084954e7f",
+         "3d73f7e9679a7f2147aff337fc65de80a77597c0",
          [
           null,
           [
@@ -227817,11 +229967,27 @@
             "=="
            ]
           ],
-          {}
+          {
+           "fuzzy": [
+            [
+             null,
+             [
+              [
+               0,
+               6
+              ],
+              [
+               0,
+               6
+              ]
+             ]
+            ]
+           ]
+          }
          ]
         ],
         "shape-outside-circle-044.html": [
-         "918c178cb01c0cc704c721673e3733163acaa781",
+         "a6f34cfa1f8bde7ee720a5c8af6a82f751638e85",
          [
           null,
           [
@@ -227830,7 +229996,23 @@
             "=="
            ]
           ],
-          {}
+          {
+           "fuzzy": [
+            [
+             null,
+             [
+              [
+               0,
+               6
+              ],
+              [
+               0,
+               6
+              ]
+             ]
+            ]
+           ]
+          }
          ]
         ],
         "shape-outside-circle-047.html": [
@@ -227847,7 +230029,7 @@
          ]
         ],
         "shape-outside-circle-048.html": [
-         "38f5dd395c2b24722d191e2e3d2ddfe6f05bf998",
+         "4e370a31adcef3e3c93ec61f279e599917a70499",
          [
           null,
           [
@@ -227856,7 +230038,23 @@
             "=="
            ]
           ],
-          {}
+          {
+           "fuzzy": [
+            [
+             null,
+             [
+              [
+               0,
+               6
+              ],
+              [
+               0,
+               6
+              ]
+             ]
+            ]
+           ]
+          }
          ]
         ],
         "shape-outside-circle-049.html": [
@@ -227873,7 +230071,7 @@
          ]
         ],
         "shape-outside-circle-050.html": [
-         "22e85d549221568c6d77b69d9fc9df521fde6ab2",
+         "c3f18190226d10f11e66687cb17a73e9e7cfba8a",
          [
           null,
           [
@@ -227882,7 +230080,23 @@
             "=="
            ]
           ],
-          {}
+          {
+           "fuzzy": [
+            [
+             null,
+             [
+              [
+               0,
+               6
+              ],
+              [
+               0,
+               6
+              ]
+             ]
+            ]
+           ]
+          }
          ]
         ],
         "shape-outside-circle-051.html": [
@@ -227925,7 +230139,7 @@
          ]
         ],
         "shape-outside-circle-054.html": [
-         "5894a800ee20cd4fa1bc11bca0a959cecb1f4a59",
+         "0ee6d036c0c01fade883d9dcb9740e06e5930066",
          [
           null,
           [
@@ -227934,7 +230148,23 @@
             "=="
            ]
           ],
-          {}
+          {
+           "fuzzy": [
+            [
+             null,
+             [
+              [
+               0,
+               6
+              ],
+              [
+               0,
+               6
+              ]
+             ]
+            ]
+           ]
+          }
          ]
         ],
         "shape-outside-circle-055.html": [
@@ -228161,7 +230391,7 @@
          ]
         ],
         "shape-outside-ellipse-032.html": [
-         "22f4a870521944ca9be1f92bb5e256575becd103",
+         "f715148e2b5fbd00f4fa9522286970f504665d3f",
          [
           null,
           [
@@ -228170,7 +230400,23 @@
             "=="
            ]
           ],
-          {}
+          {
+           "fuzzy": [
+            [
+             null,
+             [
+              [
+               0,
+               6
+              ],
+              [
+               0,
+               6
+              ]
+             ]
+            ]
+           ]
+          }
          ]
         ],
         "shape-outside-ellipse-033.html": [
@@ -228213,7 +230459,7 @@
          ]
         ],
         "shape-outside-ellipse-036.html": [
-         "11d0b39f7418554cfe53bf00b8b7eb041fd8038a",
+         "dadfe85872755ac2deede7c349e990617dd5641e",
          [
           null,
           [
@@ -228222,11 +230468,27 @@
             "=="
            ]
           ],
-          {}
+          {
+           "fuzzy": [
+            [
+             null,
+             [
+              [
+               0,
+               6
+              ],
+              [
+               0,
+               6
+              ]
+             ]
+            ]
+           ]
+          }
          ]
         ],
         "shape-outside-ellipse-037.html": [
-         "6cb2fb2b6b33311e983fc9002068ea0c565209b0",
+         "c7ed856513b386bd6966d8008b2d34ad4a1c742c",
          [
           null,
           [
@@ -228235,11 +230497,27 @@
             "=="
            ]
           ],
-          {}
+          {
+           "fuzzy": [
+            [
+             null,
+             [
+              [
+               0,
+               6
+              ],
+              [
+               0,
+               6
+              ]
+             ]
+            ]
+           ]
+          }
          ]
         ],
         "shape-outside-ellipse-038.html": [
-         "40d43c7e06f5a5820f85f311bfbb4d59531f2b8f",
+         "82e8b177498ff942691614a052792dfb8a5d51fa",
          [
           null,
           [
@@ -228248,11 +230526,27 @@
             "=="
            ]
           ],
-          {}
+          {
+           "fuzzy": [
+            [
+             null,
+             [
+              [
+               0,
+               6
+              ],
+              [
+               0,
+               6
+              ]
+             ]
+            ]
+           ]
+          }
          ]
         ],
         "shape-outside-ellipse-039.html": [
-         "852631b3e25a5849a1f7403a295231af021d249c",
+         "b6ea86c3253c0899276db9c8d078a75e23ee622b",
          [
           null,
           [
@@ -228261,7 +230555,23 @@
             "=="
            ]
           ],
-          {}
+          {
+           "fuzzy": [
+            [
+             null,
+             [
+              [
+               0,
+               6
+              ],
+              [
+               0,
+               6
+              ]
+             ]
+            ]
+           ]
+          }
          ]
         ],
         "shape-outside-ellipse-040.html": [
@@ -228540,7 +230850,7 @@
          ]
         ],
         "shape-outside-inset-020.html": [
-         "d08b91e32aefde22513fd199702cf4a6fddca9f2",
+         "929882733370e26f0adf10d9b0d5c92b0b050ec4",
          [
           null,
           [
@@ -228549,7 +230859,23 @@
             "=="
            ]
           ],
-          {}
+          {
+           "fuzzy": [
+            [
+             null,
+             [
+              [
+               0,
+               6
+              ],
+              [
+               0,
+               6
+              ]
+             ]
+            ]
+           ]
+          }
          ]
         ],
         "shape-outside-inset-021.html": [
@@ -228579,7 +230905,7 @@
          ]
         ],
         "shape-outside-inset-023.html": [
-         "6e01d0fb4d0e31d947088381a5034269411b5fb3",
+         "3a97f8327eb03a87a3e0f667942124c4ba94a8b8",
          [
           null,
           [
@@ -228588,11 +230914,27 @@
             "=="
            ]
           ],
-          {}
+          {
+           "fuzzy": [
+            [
+             null,
+             [
+              [
+               0,
+               6
+              ],
+              [
+               0,
+               6
+              ]
+             ]
+            ]
+           ]
+          }
          ]
         ],
         "shape-outside-inset-024.html": [
-         "ec02241e9b5b6dda1586e410355ba70897214081",
+         "5de0dad9ebc8ed851eb9df11f6188ed8af093f52",
          [
           null,
           [
@@ -228601,7 +230943,23 @@
             "=="
            ]
           ],
-          {}
+          {
+           "fuzzy": [
+            [
+             null,
+             [
+              [
+               0,
+               6
+              ],
+              [
+               0,
+               6
+              ]
+             ]
+            ]
+           ]
+          }
          ]
         ],
         "shape-outside-inset-025.html": [
@@ -235377,6 +237735,19 @@
         ],
         {}
        ]
+      ],
+      "row-background-paint-remove-last-cell.html": [
+       "e61b5d4fea02a815edb6d00e87e295d3a252959a",
+       [
+        null,
+        [
+         [
+          "/css/css-tables/paint/row-background-paint-remove-last-cell-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
       ]
      },
      "percent-height-overflow-auto-in-unrestricted-block-size-cell.tentative.html": [
@@ -236144,6 +238515,19 @@
         {}
        ]
       ],
+      "hanging-punctuation-first-002.html": [
+       "a2dd69f3a47d1786a34f6521d719b85ac2566b56",
+       [
+        null,
+        [
+         [
+          "/css/css-text/hanging-punctuation/reference/hanging-punctuation-first-002-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "hanging-punctuation-force-end-001.xht": [
        "a39b5f81deb25db53378c8da7fa237b6260b03c8",
        [
@@ -243257,7 +245641,7 @@
      },
      "tab-size": {
       "tab-min-rendered-width-1.html": [
-       "6b014260e3678e579110cf16cfed5413a02c3d01",
+       "e4cd2afaf1f6d613789c6229e400432527b89a26",
        [
         null,
         [
@@ -243373,6 +245757,19 @@
         {}
        ]
       ],
+      "tab-size-integer-005.html": [
+       "a58e4ea23a7c59253b0d5c6a57210c92e4df3c5f",
+       [
+        null,
+        [
+         [
+          "/css/css-text/tab-size/tab-size-integer-005-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "tab-size-length-001.html": [
        "2e466da025959ae1e82d773240116aa87a7e51fe",
        [
@@ -244661,6 +247058,81 @@
        ]
       ]
      },
+     "text-autospace": {
+      "text-autospace-break-001.html": [
+       "337d3c7624fbb382a948542b1b345bec8d1b9c60",
+       [
+        null,
+        [
+         [
+          "/css/css-text/text-autospace/text-autospace-break-001-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-autospace-dynamic-001.html": [
+       "db718eca8da2ea4ae5135da1e76dca672213734d",
+       [
+        null,
+        [
+         [
+          "/css/css-text/text-autospace/text-autospace-no-001-ref.html",
+          "=="
+         ],
+         [
+          "/css/css-text/text-autospace/text-autospace-no-001-mismatch-ref.html",
+          "!="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-autospace-no-001.html": [
+       "6b5fd6132d8240ddb7991f461944a55055a09444",
+       [
+        null,
+        [
+         [
+          "/css/css-text/text-autospace/text-autospace-no-001-ref.html",
+          "=="
+         ],
+         [
+          "/css/css-text/text-autospace/text-autospace-no-001-mismatch-ref.html",
+          "!="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-autospace-vertical-combine-001.html": [
+       "bed306e159774446ac23ae5238fa654511a27067",
+       [
+        null,
+        [
+         [
+          "/css/css-text/text-autospace/text-autospace-vertical-combine-001-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-autospace-vertical-upright-001.html": [
+       "21d454e7133c1d979e7a666249533629562d9662",
+       [
+        null,
+        [
+         [
+          "/css/css-text/text-autospace/text-autospace-vertical-upright-001-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ]
+     },
      "text-encoding": {
       "shaping-join-001.html": [
        "c4a4d00c92fc64b9a5506399fac2876c818d4899",
@@ -244992,7 +247464,7 @@
        ]
       ],
       "text-indent-overflow.html": [
-       "c8678bf8aa85513a2d883341dd6bde7d53380ec2",
+       "faefbf628f85118cc116cc50a7a98a91918c4dff",
        [
         null,
         [
@@ -245070,7 +247542,7 @@
        ]
       ],
       "text-indent-text-align-end.html": [
-       "df37463ae7b04a06c3267395df1d9aafa9fa3356",
+       "6afda2b5ab4d12e208d79aa719f8de6a3c819e52",
        [
         null,
         [
@@ -245278,6 +247750,226 @@
        ]
       ]
      },
+     "text-spacing-trim": {
+      "text-spacing-trim-001.html": [
+       "28f11c62261c94d6f663728b75d2d4fbf20319cf",
+       [
+        "css/css-text/text-spacing-trim/text-spacing-trim-001.html?class=chws,htb",
+        [
+         [
+          "/css/css-text/text-spacing-trim/reference/text-spacing-trim-001-ref.html?class=chws,htb",
+          "=="
+         ]
+        ],
+        {}
+       ],
+       [
+        "css/css-text/text-spacing-trim/text-spacing-trim-001.html?class=chws,vrl",
+        [
+         [
+          "/css/css-text/text-spacing-trim/reference/text-spacing-trim-001-ref.html?class=chws,vrl",
+          "=="
+         ]
+        ],
+        {}
+       ],
+       [
+        "css/css-text/text-spacing-trim/text-spacing-trim-001.html?class=halt,htb",
+        [
+         [
+          "/css/css-text/text-spacing-trim/reference/text-spacing-trim-001-ref.html?class=halt,htb",
+          "=="
+         ]
+        ],
+        {}
+       ],
+       [
+        "css/css-text/text-spacing-trim/text-spacing-trim-001.html?class=halt,vrl",
+        [
+         [
+          "/css/css-text/text-spacing-trim/reference/text-spacing-trim-001-ref.html?class=halt,vrl",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-spacing-trim-colon-001.html": [
+       "31df6093b95495b0f7205b51046275a677588337",
+       [
+        "css/css-text/text-spacing-trim/text-spacing-trim-colon-001.html?class=chws,htb",
+        [
+         [
+          "/css/css-text/text-spacing-trim/reference/text-spacing-trim-colon-001-ref.html?class=chws,htb",
+          "=="
+         ]
+        ],
+        {}
+       ],
+       [
+        "css/css-text/text-spacing-trim/text-spacing-trim-colon-001.html?class=chws,vrl",
+        [
+         [
+          "/css/css-text/text-spacing-trim/reference/text-spacing-trim-colon-001-ref.html?class=chws,vrl",
+          "=="
+         ]
+        ],
+        {}
+       ],
+       [
+        "css/css-text/text-spacing-trim/text-spacing-trim-colon-001.html?class=halt,htb",
+        [
+         [
+          "/css/css-text/text-spacing-trim/reference/text-spacing-trim-colon-001-ref.html?class=halt,htb",
+          "=="
+         ]
+        ],
+        {}
+       ],
+       [
+        "css/css-text/text-spacing-trim/text-spacing-trim-colon-001.html?class=halt,vrl",
+        [
+         [
+          "/css/css-text/text-spacing-trim/reference/text-spacing-trim-colon-001-ref.html?class=halt,vrl",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-spacing-trim-dot-001.html": [
+       "4ce1e047771a580cb5a4ac69a2db220293dbc8ec",
+       [
+        "css/css-text/text-spacing-trim/text-spacing-trim-dot-001.html?class=chws,htb",
+        [
+         [
+          "/css/css-text/text-spacing-trim/reference/text-spacing-trim-dot-001-ref.html?class=chws,htb",
+          "=="
+         ]
+        ],
+        {}
+       ],
+       [
+        "css/css-text/text-spacing-trim/text-spacing-trim-dot-001.html?class=chws,vrl",
+        [
+         [
+          "/css/css-text/text-spacing-trim/reference/text-spacing-trim-dot-001-ref.html?class=chws,vrl",
+          "=="
+         ]
+        ],
+        {}
+       ],
+       [
+        "css/css-text/text-spacing-trim/text-spacing-trim-dot-001.html?class=halt,htb",
+        [
+         [
+          "/css/css-text/text-spacing-trim/reference/text-spacing-trim-dot-001-ref.html?class=halt,htb",
+          "=="
+         ]
+        ],
+        {}
+       ],
+       [
+        "css/css-text/text-spacing-trim/text-spacing-trim-dot-001.html?class=halt,vrl",
+        [
+         [
+          "/css/css-text/text-spacing-trim/reference/text-spacing-trim-dot-001-ref.html?class=halt,vrl",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-spacing-trim-dynamic-001.html": [
+       "3fc949efd1c157ef00926e46a5fce8d8aad14bc2",
+       [
+        "css/css-text/text-spacing-trim/text-spacing-trim-dynamic-001.html?class=chws",
+        [
+         [
+          "/css/css-text/text-spacing-trim/text-spacing-trim-space-all-001-ref.html?class=chws",
+          "=="
+         ]
+        ],
+        {}
+       ],
+       [
+        "css/css-text/text-spacing-trim/text-spacing-trim-dynamic-001.html?class=halt",
+        [
+         [
+          "/css/css-text/text-spacing-trim/text-spacing-trim-space-all-001-ref.html?class=halt",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-spacing-trim-space-all-001.html": [
+       "20e59c5a01aa5362a03c3fa021b5316be9f729d8",
+       [
+        "css/css-text/text-spacing-trim/text-spacing-trim-space-all-001.html?class=chws",
+        [
+         [
+          "/css/css-text/text-spacing-trim/text-spacing-trim-space-all-001-ref.html?class=chws",
+          "=="
+         ]
+        ],
+        {}
+       ],
+       [
+        "css/css-text/text-spacing-trim/text-spacing-trim-space-all-001.html?class=halt",
+        [
+         [
+          "/css/css-text/text-spacing-trim/text-spacing-trim-space-all-001-ref.html?class=halt",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-spacing-trim-trim-all-001.html": [
+       "daec2fc4d239a48252aa768878c774963079a9c8",
+       [
+        "css/css-text/text-spacing-trim/text-spacing-trim-trim-all-001.html?class=chws,htb",
+        [
+         [
+          "/css/css-text/text-spacing-trim/reference/text-spacing-trim-trim-all-001-ref.html?class=chws,htb",
+          "=="
+         ]
+        ],
+        {}
+       ],
+       [
+        "css/css-text/text-spacing-trim/text-spacing-trim-trim-all-001.html?class=chws,vrl",
+        [
+         [
+          "/css/css-text/text-spacing-trim/reference/text-spacing-trim-trim-all-001-ref.html?class=chws,vrl",
+          "=="
+         ]
+        ],
+        {}
+       ],
+       [
+        "css/css-text/text-spacing-trim/text-spacing-trim-trim-all-001.html?class=halt,htb",
+        [
+         [
+          "/css/css-text/text-spacing-trim/reference/text-spacing-trim-trim-all-001-ref.html?class=halt,htb",
+          "=="
+         ]
+        ],
+        {}
+       ],
+       [
+        "css/css-text/text-spacing-trim/text-spacing-trim-trim-all-001.html?class=halt,vrl",
+        [
+         [
+          "/css/css-text/text-spacing-trim/reference/text-spacing-trim-trim-all-001-ref.html?class=halt,vrl",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ]
+     },
      "text-stroke-width-subpixel.html": [
       "97cbc3f44de91ceb094283de84f7fb9a9e018d36",
       [
@@ -245580,6 +248272,19 @@
         {}
        ]
       ],
+      "text-transform-capitalize-035.html": [
+       "8b979ab2d80054716b19d73aeb05ef1f6f9735fa",
+       [
+        null,
+        [
+         [
+          "/css/css-text/text-transform/text-transform-capitalize-035-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "text-transform-full-size-kana-001.html": [
        "8c532ff7238a08ac8062ab9c24e12571fbdf121e",
        [
@@ -245671,6 +248376,19 @@
         {}
        ]
       ],
+      "text-transform-full-size-kana-008.html": [
+       "5b1cdde7b39a393b0dc8778c4ba7eed94a673b88",
+       [
+        null,
+        [
+         [
+          "/css/css-text/text-transform/reference/text-transform-full-size-kana-008-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "text-transform-fullwidth-001.xht": [
        "355aace0a8e91c5394fe5a46825ad7f1851bdbce",
        [
@@ -249603,45 +252321,6 @@
         {}
        ]
       ],
-      "text-space-collapse-discard-001.xht": [
-       "4216b6292c33ac94b32eccaf36f65c75a0220231",
-       [
-        null,
-        [
-         [
-          "/css/css-text/white-space/reference/text-space-collapse-discard-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "text-space-collapse-preserve-breaks-001.xht": [
-       "7f18d9a4cd3681ab7dd737e2685d80bb1a099dc1",
-       [
-        null,
-        [
-         [
-          "/css/css-text/white-space/reference/text-space-collapse-preserve-breaks-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "text-space-trim-trim-inner-001.xht": [
-       "b8f84b9eb8f07b93ac14d01f4fa47028ea2cfb9f",
-       [
-        null,
-        [
-         [
-          "/css/css-text/white-space/reference/text-space-trim-trim-inner-001-ref.xht",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
       "text-wrap-balance-002.html": [
        "cae9d54de0e60c42047f7bffafe729f8aae2b740",
        [
@@ -249681,6 +252360,71 @@
         {}
        ]
       ],
+      "text-wrap-balance-float-001.html": [
+       "3f00fdfbf445844c2a9a0e4a3f76daa2dc125e4f",
+       [
+        null,
+        [
+         [
+          "/css/css-text/white-space/reference/text-wrap-balance-float-001-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-wrap-balance-float-002.html": [
+       "b611b8d7964c8ac4009cee89df40042330fa6ad1",
+       [
+        null,
+        [
+         [
+          "/css/css-text/white-space/reference/text-wrap-balance-float-002-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-wrap-balance-float-003.html": [
+       "b2a4c7a43b3cad110fc08ae3b081b133078e64bc",
+       [
+        null,
+        [
+         [
+          "/css/css-text/white-space/reference/text-wrap-balance-float-001-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-wrap-balance-float-004.html": [
+       "b39f329255c598aa562ae6951c2b75f250d4abea",
+       [
+        null,
+        [
+         [
+          "/css/css-text/white-space/reference/text-wrap-balance-float-002-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "text-wrap-balance-float-005.html": [
+       "177be0e10ac41b0896b5d1fb98cdecc9e102a55c",
+       [
+        null,
+        [
+         [
+          "/css/css-text/white-space/reference/text-wrap-balance-float-005-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "text-wrap-balance-line-clamp-001.html": [
        "f104a5261bc9837ad0f9af675ba44de28421b824",
        [
@@ -250832,6 +253576,32 @@
         {}
        ]
       ],
+      "white-space-collapse-discard-001.xht": [
+       "dc7e5e5708ab9f34780077952a308ed29db286d5",
+       [
+        null,
+        [
+         [
+          "/css/css-text/white-space/reference/white-space-collapse-discard-001-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "white-space-collapse-preserve-breaks-001.xht": [
+       "50113eade1fd6c0d53e18a8ef7052cbedd70faf5",
+       [
+        null,
+        [
+         [
+          "/css/css-text/white-space/reference/white-space-collapse-preserve-breaks-001-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "white-space-empty-text-sibling.html": [
        "50439df433cea8d4191989cb3d5444ff9f8d15c1",
        [
@@ -251494,6 +254264,19 @@
         {}
        ]
       ],
+      "white-space-trim-discard-inner-001.xht": [
+       "e8e53074a9858ca404580e6739687bff2f0c2f85",
+       [
+        null,
+        [
+         [
+          "/css/css-text/white-space/reference/white-space-trim-discard-inner-001-ref.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "white-space-vs-joiners-001.html": [
        "88c11f11549283082330e546c2cf5b6e006f2ace",
        [
@@ -251742,588 +254525,171 @@
        ]
       ]
      },
-     "word-boundary": {
-      "word-boundary-001.html": [
-       "08ad0d1a9883d961199cdd571623883f006752b4",
-       [
-        null,
-        [
-         [
-          "/css/css-text/word-boundary/reference/word-boundary-001-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "word-boundary-002.html": [
-       "58dede44b2c844b52a74e5fab831371a61e58cc5",
-       [
-        null,
-        [
-         [
-          "/css/css-text/word-boundary/reference/word-boundary-002-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "word-boundary-003.html": [
-       "41151753f92227b65f9c64b4348cc8f96b235bab",
-       [
-        null,
-        [
-         [
-          "/css/css-text/word-boundary/reference/word-boundary-001-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "word-boundary-004.html": [
-       "ad7f19fdb995ab17f34cdd3b752a58ae9643432c",
-       [
-        null,
-        [
-         [
-          "/css/css-text/word-boundary/reference/word-boundary-004-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "word-boundary-005.html": [
-       "f124c3737ca138f6cf002ac8809d686737037929",
-       [
-        null,
-        [
-         [
-          "/css/css-text/word-boundary/reference/word-boundary-004-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "word-boundary-006.html": [
-       "587847b75cd6659b14f808fb05e8cacaa457ca3b",
-       [
-        null,
-        [
-         [
-          "/css/css-text/word-boundary/reference/word-boundary-002-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "word-boundary-007.html": [
-       "912188c7404cbf443672eeb0ad86308765131cb3",
-       [
-        null,
-        [
-         [
-          "/css/css-text/word-boundary/reference/word-boundary-007-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "word-boundary-008.html": [
-       "a1dfb828f256326f8971d3ff257d594d02dab7d5",
-       [
-        null,
-        [
-         [
-          "/css/css-text/word-boundary/reference/word-boundary-008-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "word-boundary-009.html": [
-       "cb8ec84fc2b2954ba10748223c7ca6f8c2283cd1",
-       [
-        null,
-        [
-         [
-          "/css/css-text/word-boundary/reference/word-boundary-009-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "word-boundary-010.html": [
-       "6e1cc1ccf2749d57097facb10fe3e447a1958fdc",
-       [
-        null,
-        [
-         [
-          "/css/css-text/word-boundary/reference/word-boundary-010-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "word-boundary-011.html": [
-       "4da3a7a5c9d59e5e39ff9ff39c5ab63bef7f34b2",
-       [
-        null,
-        [
-         [
-          "/css/css-text/word-boundary/reference/word-boundary-011-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "word-boundary-012.html": [
-       "aabc8d6861eb1c1f09bb0ae14d12d06dcf77d610",
-       [
-        null,
-        [
-         [
-          "/css/css-text/word-boundary/reference/word-boundary-012-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "word-boundary-013.html": [
-       "f0d9641798742840df7393ce1ab6579bd72b5792",
-       [
-        null,
-        [
-         [
-          "/css/css-text/word-boundary/reference/word-boundary-013-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "word-boundary-014.html": [
-       "f440064798519237e26b82600974d6eb270d3f37",
-       [
-        null,
-        [
-         [
-          "/css/css-text/word-boundary/reference/word-boundary-014-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "word-boundary-101.html": [
-       "40a66a4271a18dfbb33dd05c6198fc9178da065c",
-       [
-        null,
-        [
-         [
-          "/css/css-text/word-boundary/reference/word-boundary-101-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "word-boundary-102.html": [
-       "e3f9828f320f88f663ecb2d6e434078d10f6b985",
-       [
-        null,
-        [
-         [
-          "/css/css-text/word-boundary/reference/word-boundary-102-ref.html",
-          "!="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "word-boundary-103.html": [
-       "114c6f1367c0ff6acfb97103d8fe2c85df948f6f",
-       [
-        null,
-        [
-         [
-          "/css/css-text/word-boundary/reference/word-boundary-103-ref.html",
-          "!="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "word-boundary-104.html": [
-       "a7a2f38fda118078d4b0f374f594b717af04fd3d",
-       [
-        null,
-        [
-         [
-          "/css/css-text/word-boundary/reference/word-boundary-104-ref.html",
-          "!="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "word-boundary-105.html": [
-       "fa991221e52814bc7f93b8b51a8c08766e982bee",
-       [
-        null,
-        [
-         [
-          "/css/css-text/word-boundary/reference/word-boundary-105-ref.html",
-          "!="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "word-boundary-106.html": [
-       "a968af7767217318d67b9045b434d3eeee2c07b5",
-       [
-        null,
-        [
-         [
-          "/css/css-text/word-boundary/reference/word-boundary-106-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "word-boundary-107.html": [
-       "591c1afb8d4cafccbaf02037c818d504c133d3d6",
-       [
-        null,
-        [
-         [
-          "/css/css-text/word-boundary/reference/word-boundary-107-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "word-boundary-108.html": [
-       "c23a6fe2b2be64a4de14ad311ca96a8753f37b00",
-       [
-        null,
-        [
-         [
-          "/css/css-text/word-boundary/reference/word-boundary-108-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "word-boundary-109.html": [
-       "c5694cc153febfbb60bf992f9e83ff6835e6359d",
-       [
-        null,
-        [
-         [
-          "/css/css-text/word-boundary/reference/word-boundary-109-a-ref.html",
-          "=="
-         ],
-         [
-          "/css/css-text/word-boundary/reference/word-boundary-109-b-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "word-boundary-110.html": [
-       "bdfedf19e6133e2b371627ce2dac04a36b8757cc",
-       [
-        null,
-        [
-         [
-          "/css/css-text/word-boundary/reference/word-boundary-110-a-ref.html",
-          "=="
-         ],
-         [
-          "/css/css-text/word-boundary/reference/word-boundary-110-b-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "word-boundary-111.html": [
-       "d2d3df27085265cee2abbeba7b83cad0d3500b6d",
-       [
-        null,
-        [
-         [
-          "/css/css-text/word-boundary/reference/word-boundary-111-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "word-boundary-112.html": [
-       "73c2763d8363415efd2401836dae74aebf6d3ced",
-       [
-        null,
-        [
-         [
-          "/css/css-text/word-boundary/reference/word-boundary-112-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "word-boundary-113.html": [
-       "f5e0cdf046db1be6788c2799540039bebdfb5888",
-       [
-        null,
-        [
-         [
-          "/css/css-text/word-boundary/reference/word-boundary-113-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "word-boundary-114.html": [
-       "b18e1e53cafcb48a08779c1e302ae1643ab66169",
-       [
-        null,
-        [
-         [
-          "/css/css-text/word-boundary/reference/word-boundary-114-a-ref.html",
-          "=="
-         ],
-         [
-          "/css/css-text/word-boundary/reference/word-boundary-114-b-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "word-boundary-115.html": [
-       "b1266c53dbd9f150b1bc9cae907c01d7f7ee1198",
-       [
-        null,
-        [
-         [
-          "/css/css-text/word-boundary/reference/word-boundary-115-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "word-boundary-116.html": [
-       "4b152173b7c0d14db3e5885db6a34b27edac9484",
-       [
-        null,
-        [
-         [
-          "/css/css-text/word-boundary/reference/word-boundary-116-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "word-boundary-117.html": [
-       "558b6a981f03addbfaa60071da68d5c462f6b074",
-       [
-        null,
-        [
-         [
-          "/css/css-text/word-boundary/reference/word-boundary-117-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "word-boundary-118.html": [
-       "e20bc354105d4ec7d1cec7ec31e5ee942127788b",
-       [
-        null,
-        [
-         [
-          "/css/css-text/word-boundary/reference/word-boundary-117-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "word-boundary-119.html": [
-       "fb3aaebc92ada8cd7f31fcba2a76b4dcf78f1012",
-       [
-        null,
-        [
-         [
-          "/css/css-text/word-boundary/reference/word-boundary-119-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "word-boundary-120.html": [
-       "8f2bff5b229342a7bbc77062c3de2033e7d3a5ff",
-       [
-        null,
-        [
-         [
-          "/css/css-text/word-boundary/reference/word-boundary-120-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "word-boundary-121.html": [
-       "667e1e068e2673af25f65bd85915e3cdb87977bc",
-       [
-        null,
-        [
-         [
-          "/css/css-text/word-boundary/reference/word-boundary-121-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "word-boundary-122.html": [
-       "a9d3a9993078fbf9ac6bafb317d80fc04438a7bf",
-       [
-        null,
-        [
-         [
-          "/css/css-text/word-boundary/reference/word-boundary-122-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "word-boundary-123.html": [
-       "bcf1f0245e8d914eadaf527c33bc7c248fd0f6c7",
-       [
-        null,
-        [
-         [
-          "/css/css-text/word-boundary/reference/word-boundary-123-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "word-boundary-124.html": [
-       "a4a4902ba29db137b966dd509d038ab3b566919d",
-       [
-        null,
-        [
-         [
-          "/css/css-text/word-boundary/reference/word-boundary-124-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "word-boundary-125.html": [
-       "a04ec4f075cfc4580f2dc5db894da85cf2c9f11b",
-       [
-        null,
-        [
-         [
-          "/css/css-text/word-boundary/reference/word-boundary-125-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "word-boundary-126.html": [
-       "e4a5c6b0fb454135dc257a0e82ab70c57edfc34f",
-       [
-        null,
-        [
-         [
-          "/css/css-text/word-boundary/reference/word-boundary-126-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "word-boundary-127.html": [
-       "21f00e664b7726d88060fb7691edfd44704b2984",
-       [
-        null,
-        [
-         [
-          "/css/css-text/word-boundary/reference/word-boundary-127-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "word-boundary-128.html": [
-       "cb2d1ee4e78c1603d000bd5de71d8fcf2eb38b67",
-       [
-        null,
-        [
-         [
-          "/css/css-text/word-boundary/reference/word-boundary-128-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "word-boundary-129.html": [
-       "6e137177029f7bfac006c32152ef7e2611f8fe24",
-       [
-        null,
-        [
-         [
-          "/css/css-text/word-boundary/reference/word-boundary-129-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ]
-     },
      "word-break": {
       "auto-phrase": {
-       "word-break-auto-phrase-intrinsic-001.html": [
-        "a16f9fb0b128d41bfb8714f431b2c63b7c9a6d8f",
+       "word-break-auto-phrase-001.html": [
+        "ce837a1d5d882e8b7d583875e4f02de185795709",
         [
          null,
          [
           [
-           "/css/css-text/word-break/auto-phrase/word-break-auto-phrase-intrinsic-001-ref.html",
+           "/css/css-text/word-break/auto-phrase/reference/word-break-auto-phrase-001-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "word-break-auto-phrase-002.html": [
+        "c4f437e99d0d9e0eb0c61964e2120c36465681db",
+        [
+         null,
+         [
+          [
+           "/css/css-text/word-break/auto-phrase/reference/word-break-auto-phrase-002-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "word-break-auto-phrase-003.html": [
+        "6ff8d959f8b27a311c507501714af452e92a4999",
+        [
+         null,
+         [
+          [
+           "/css/css-text/word-break/auto-phrase/reference/word-break-auto-phrase-003-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "word-break-auto-phrase-004.html": [
+        "4e455091de4cf5b696c4f8b778f8679c1ca940ef",
+        [
+         null,
+         [
+          [
+           "/css/css-text/word-break/auto-phrase/reference/word-break-auto-phrase-004-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "word-break-auto-phrase-005.html": [
+        "5183d3bc13d59c7fec0b327678844e32102a88c4",
+        [
+         null,
+         [
+          [
+           "/css/css-text/word-break/auto-phrase/reference/word-break-auto-phrase-005-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "word-break-auto-phrase-006.html": [
+        "9fca535a7a1b17217f4d173bd07a5fbf89651a74",
+        [
+         null,
+         [
+          [
+           "/css/css-text/word-break/auto-phrase/reference/word-break-auto-phrase-006-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "word-break-auto-phrase-007.html": [
+        "154fb8c447e4535cc1e87a5bb53071704c17acd5",
+        [
+         null,
+         [
+          [
+           "/css/css-text/word-break/auto-phrase/reference/word-break-auto-phrase-007-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "word-break-auto-phrase-008.html": [
+        "68af0f5f190c04484d7f3ce0d0c8d00a4cd3b439",
+        [
+         null,
+         [
+          [
+           "/css/css-text/word-break/auto-phrase/reference/word-break-auto-phrase-008-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "word-break-auto-phrase-009.html": [
+        "6f0c736183ed3998787829f325fc675dcf9a6b7f",
+        [
+         null,
+         [
+          [
+           "/css/css-text/word-break/auto-phrase/reference/word-break-auto-phrase-009-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "word-break-auto-phrase-fallback-001.html": [
+        "02a33734e59bf5b98600cffd78e76ff372961890",
+        [
+         null,
+         [
+          [
+           "/css/css-text/word-break/auto-phrase/reference/word-break-auto-phrase-fallback-001-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "word-break-auto-phrase-fallback-002.html": [
+        "e2905f1d5a72332f9439e15bf05a7755d4a8e7f2",
+        [
+         null,
+         [
+          [
+           "/css/css-text/word-break/auto-phrase/reference/word-break-auto-phrase-fallback-002-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "word-break-auto-phrase-fallback-003.html": [
+        "cea15820bd1212312ea0adaba0aecaac81e3a011",
+        [
+         null,
+         [
+          [
+           "/css/css-text/word-break/auto-phrase/reference/word-break-auto-phrase-fallback-003-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "word-break-auto-phrase-intrinsic-001.html": [
+        "ebb07cf3b533f3cc239087de05c7acd22b1e46b7",
+        [
+         null,
+         [
+          [
+           "/css/css-text/word-break/auto-phrase/reference/word-break-auto-phrase-intrinsic-001-ref.html",
            "=="
           ]
          ],
@@ -252331,12 +254697,12 @@
         ]
        ],
        "word-break-auto-phrase-overflow-001.html": [
-        "7677441c9a82c4f6b39037f5f0cbb21d49ed3e68",
+        "fcd17528ac0137cc2174f8de4c5e2bdf00b122da",
         [
          null,
          [
           [
-           "/css/css-text/word-break/auto-phrase/word-break-auto-phrase-overflow-001-ref.html",
+           "/css/css-text/word-break/auto-phrase/reference/word-break-auto-phrase-overflow-001-ref.html",
            "=="
           ]
          ],
@@ -252344,12 +254710,12 @@
         ]
        ],
        "word-break-auto-phrase-wbr-nobr-001.html": [
-        "76944730d5c27cc2e709715c0819d4b2a4d0066f",
+        "b8e55200462699e3badd5cbb8f618e0edcae5f53",
         [
          null,
          [
           [
-           "/css/css-text/word-break/auto-phrase/word-break-auto-phrase-wbr-nobr-001-ref.html",
+           "/css/css-text/word-break/auto-phrase/reference/word-break-auto-phrase-wbr-nobr-001-ref.html",
            "=="
           ]
          ],
@@ -252357,12 +254723,12 @@
         ]
        ],
        "word-break-auto-phrase-wbr-nobr-002.html": [
-        "9b4e55623c5b5fc89ec973ce72376e949a30c70d",
+        "85061923cad197cfb347ed59c84c90c4d75ed409",
         [
          null,
          [
           [
-           "/css/css-text/word-break/auto-phrase/word-break-auto-phrase-wbr-nobr-002-ref.html",
+           "/css/css-text/word-break/auto-phrase/reference/word-break-auto-phrase-wbr-nobr-002-ref.html",
            "=="
           ]
          ],
@@ -253128,6 +255494,19 @@
         {}
        ]
       ],
+      "word-break-manual-001.html": [
+       "09d803b0fc1f75f2f253687c5c9dc3305d77616f",
+       [
+        null,
+        [
+         [
+          "/css/css-text/word-break/reference/word-break-manual-001-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "word-break-min-content-001.html": [
        "c314c4a5c75f74c2cfb2124d38cb69e742ce67ba",
        [
@@ -253232,6 +255611,32 @@
         {}
        ]
       ],
+      "word-break-normal-002.html": [
+       "c988928eb8f4a7081842c4468c74e2435e7df09c",
+       [
+        null,
+        [
+         [
+          "/css/css-text/word-break/reference/word-break-normal-002-ref.html",
+          "!="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-break-normal-003.html": [
+       "bb6c2b477a16810f17e4096edf497a355c7f2815",
+       [
+        null,
+        [
+         [
+          "/css/css-text/word-break/reference/word-break-normal-003-ref.html",
+          "!="
+         ]
+        ],
+        {}
+       ]
+      ],
       "word-break-normal-ar-000.html": [
        "9faf32525c32b4fa97c47e2d615bebd6bb3d4486",
        [
@@ -253427,6 +255832,19 @@
         {}
        ]
       ],
+      "word-break-normal-th-001.html": [
+       "919dcc22a31856257d830f478ed6b15ceb84b67d",
+       [
+        null,
+        [
+         [
+          "/css/css-text/word-break/reference/word-break-normal-th-001-ref.html",
+          "!="
+         ]
+        ],
+        {}
+       ]
+      ],
       "word-break-normal-zh-000.html": [
        "e1a67bb1dc7d157d4bf57e1af40c039d67001923",
        [
@@ -253441,6 +255859,393 @@
        ]
       ]
      },
+     "word-space-transform": {
+      "word-space-transform-001.html": [
+       "5378808efe56b2953ec25788148f588623ea5179",
+       [
+        null,
+        [
+         [
+          "/css/css-text/word-space-transform/reference/word-space-transform-001-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-space-transform-002.html": [
+       "5cad18ef476a60e424dda910632768df8dae82d9",
+       [
+        null,
+        [
+         [
+          "/css/css-text/word-space-transform/reference/word-space-transform-002-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-space-transform-003.html": [
+       "f7e4f5c9e240d594fb7f479bba0bc433c50a6d2a",
+       [
+        null,
+        [
+         [
+          "/css/css-text/word-space-transform/reference/word-space-transform-001-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-space-transform-004.html": [
+       "082824542f1dfc1bd82c9e2011dd727aeb485c82",
+       [
+        null,
+        [
+         [
+          "/css/css-text/word-space-transform/reference/word-space-transform-004-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-space-transform-005.html": [
+       "fc994ebbe66a66d3654094cd900937fbfa14b649",
+       [
+        null,
+        [
+         [
+          "/css/css-text/word-space-transform/reference/word-space-transform-004-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-space-transform-006.html": [
+       "6fdd0abbe9a135caeebf83ae9b33e98d56db38f5",
+       [
+        null,
+        [
+         [
+          "/css/css-text/word-space-transform/reference/word-space-transform-002-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-space-transform-007.html": [
+       "5d021684de477711b2599b3d3d38fe47198e3aca",
+       [
+        null,
+        [
+         [
+          "/css/css-text/word-space-transform/reference/word-space-transform-007-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-space-transform-008.html": [
+       "8808d936f005f04ee2137b1f81b5c5400c2d1e78",
+       [
+        null,
+        [
+         [
+          "/css/css-text/word-space-transform/reference/word-space-transform-008-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-space-transform-009.html": [
+       "5c0df04d1dabed892d4815fad51f1a134ecce881",
+       [
+        null,
+        [
+         [
+          "/css/css-text/word-space-transform/reference/word-space-transform-009-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-space-transform-010.html": [
+       "b91f2d24996f1bbfc83b8cb1e82fbb245698c332",
+       [
+        null,
+        [
+         [
+          "/css/css-text/word-space-transform/reference/word-space-transform-010-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-space-transform-011.html": [
+       "9df80d707324625537a33061b98c65216e3dc177",
+       [
+        null,
+        [
+         [
+          "/css/css-text/word-space-transform/reference/word-space-transform-011-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-space-transform-012.html": [
+       "5aa86fe4d41c1af090d225eee2ef4636c3c4f34b",
+       [
+        null,
+        [
+         [
+          "/css/css-text/word-space-transform/reference/word-space-transform-012-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-space-transform-013.html": [
+       "2f3fe9c661dbae86e968bc1bd0aadd1eca217c33",
+       [
+        null,
+        [
+         [
+          "/css/css-text/word-space-transform/reference/word-space-transform-013-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-space-transform-014.html": [
+       "9ab350c7b8426593d6a646e1a4d94b7f3a216a90",
+       [
+        null,
+        [
+         [
+          "/css/css-text/word-space-transform/reference/word-space-transform-014-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-space-transform-016.html": [
+       "c76acf7bf6e10a806a3b78d6369fd384101562e6",
+       [
+        null,
+        [
+         [
+          "/css/css-text/word-space-transform/reference/word-space-transform-016-a-ref.html",
+          "=="
+         ],
+         [
+          "/css/css-text/word-space-transform/reference/word-space-transform-016-b-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-space-transform-017.html": [
+       "3a50355153c24084125dc60729b7db463d23b39b",
+       [
+        null,
+        [
+         [
+          "/css/css-text/word-space-transform/reference/word-space-transform-017-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-space-transform-018.html": [
+       "53703bb7ba627f954c7e03958951cc69b5906a41",
+       [
+        null,
+        [
+         [
+          "/css/css-text/word-space-transform/reference/word-space-transform-018-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-space-transform-019.html": [
+       "d52fcdabd9b6280a48c3e1c1607b2a65020506eb",
+       [
+        null,
+        [
+         [
+          "/css/css-text/word-space-transform/reference/word-space-transform-019-a-ref.html",
+          "=="
+         ],
+         [
+          "/css/css-text/word-space-transform/reference/word-space-transform-019-b-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-space-transform-020.html": [
+       "fac894ab0ab05d387bbca3c0512ecf2d6666bf79",
+       [
+        null,
+        [
+         [
+          "/css/css-text/word-space-transform/reference/word-space-transform-020-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-space-transform-021.html": [
+       "d77e6e41bac5217b1188f698a3eed036091d7912",
+       [
+        null,
+        [
+         [
+          "/css/css-text/word-space-transform/reference/word-space-transform-021-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-space-transform-022.html": [
+       "3e17a5bc8c586eaeb0023ec3a49ead79e5d1e54f",
+       [
+        null,
+        [
+         [
+          "/css/css-text/word-space-transform/reference/word-space-transform-022-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-space-transform-023.html": [
+       "044c3b18b674dc40460dd01a5aeb65443d19b8a2",
+       [
+        null,
+        [
+         [
+          "/css/css-text/word-space-transform/reference/word-space-transform-022-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-space-transform-024.html": [
+       "644ee08e5e043f1f4322ccefecfcc583b484361f",
+       [
+        null,
+        [
+         [
+          "/css/css-text/word-space-transform/reference/word-space-transform-024-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-space-transform-025.html": [
+       "704081ac13ebc74454f7800a9fe26959ffbb1216",
+       [
+        null,
+        [
+         [
+          "/css/css-text/word-space-transform/reference/word-space-transform-025-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-space-transform-026.html": [
+       "30531bfc4b238e3708bb24abbbc97714e20e22b6",
+       [
+        null,
+        [
+         [
+          "/css/css-text/word-space-transform/reference/word-space-transform-026-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-space-transform-027.html": [
+       "325daa12c4fe294e00ff50b188efd28350be8b92",
+       [
+        null,
+        [
+         [
+          "/css/css-text/word-space-transform/reference/word-space-transform-027-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-space-transform-028.html": [
+       "e334449a70e6bf35fc0d8591ee10afafd69697e7",
+       [
+        null,
+        [
+         [
+          "/css/css-text/word-space-transform/reference/word-space-transform-028-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-space-transform-029.html": [
+       "8eb25c13511ce49d7e2d7695a00e2907265dfc41",
+       [
+        null,
+        [
+         [
+          "/css/css-text/word-space-transform/reference/word-space-transform-029-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-space-transform-030.html": [
+       "9c1ba11fd56c5d2d6f67b3cf728f7e50c342411c",
+       [
+        null,
+        [
+         [
+          "/css/css-text/word-space-transform/reference/word-space-transform-030-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ]
+     },
      "word-spacing": {
       "word-spacing-001.html": [
        "f9ffc9c323d2b46c69ad181f61244bb95b3cc30e",
@@ -253539,6 +256344,32 @@
     },
     "css-text-decor": {
      "invalidation": {
+      "selection-pseudo-with-decoration-invalidation-001.html": [
+       "a2dfbb3f77e250a5442304a9de234c46739e45b2",
+       [
+        null,
+        [
+         [
+          "/css/css-text-decor/invalidation/reference/selection-pseudo-with-decoration-invalidation-001-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "selection-pseudo-with-decoration-invalidation-002.html": [
+       "2abe8c621400611571b661902810c1f62e189faf",
+       [
+        null,
+        [
+         [
+          "/css/css-text-decor/invalidation/reference/selection-pseudo-with-decoration-invalidation-002-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "text-decoration-invalidation-dashed.html": [
        "b92f3ddcccb407aff29d486c8c3221626617a597",
        [
@@ -254473,6 +257304,19 @@
        {}
       ]
      ],
+     "text-decoration-thickness-non-inherit.html": [
+      "c0aabdfde2dd4ab333d92c1c25c0d97076ccf1ac",
+      [
+       null,
+       [
+        [
+         "/css/css-text-decor/reference/text-decoration-thickness-non-inherit-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "text-decoration-thickness-overline-001.html": [
       "325811c96fd45463cc4802232fc6e5f5df6fd652",
       [
@@ -257295,7 +260139,7 @@
        }
       ]
      ],
-     "backface-visibility-hidden-002.tentative.html": [
+     "backface-visibility-hidden-002.html": [
       "d30ba64ebb867833f4d93912ac27abb29b416b71",
       [
        null,
@@ -257308,8 +260152,8 @@
        {}
       ]
      ],
-     "backface-visibility-hidden-003.tentative.html": [
-      "d104662b26eeb982aa98efd3482774fc4cb3c1d1",
+     "backface-visibility-hidden-003.html": [
+      "bda82b697abb47892c2be905ea3d9f39ff2b2279",
       [
        null,
        [
@@ -257321,26 +260165,26 @@
        {}
       ]
      ],
-     "backface-visibility-hidden-004.tentative.html": [
-      "1fb3fffd3d1de3ed55e8b18d21d23e0f47fcdeef",
+     "backface-visibility-hidden-004.html": [
+      "8a8834c39e49364429ab62e530df0e0172708ac4",
       [
        null,
        [
         [
-         "/css/css-transforms/backface-visibility-hidden-004-ref.html",
+         "/css/css-transforms/backface-visibility-hidden-003-ref.html",
          "=="
         ]
        ],
        {}
       ]
      ],
-     "backface-visibility-hidden-005.tentative.html": [
-      "d53ee1c606f01a70a9f864e648b2b8ffc0ec960a",
+     "backface-visibility-hidden-005.html": [
+      "4a77466fe40f20e27e0b5971874223552601fcf3",
       [
        null,
        [
         [
-         "/css/css-transforms/backface-visibility-hidden-005-ref.html",
+         "/css/css-transforms/backface-visibility-hidden-003-ref.html",
          "=="
         ]
        ],
@@ -257373,19 +260217,6 @@
        {}
       ]
      ],
-     "backface-visibility-hidden-animated-002.html": [
-      "107b79946de4f7930c6776e03060295763369fc4",
-      [
-       null,
-       [
-        [
-         "/css/css-transforms/backface-visibility-hidden-004-ref.html",
-         "=="
-        ]
-       ],
-       {}
-      ]
-     ],
      "backface-visibility-hidden-child-translate.html": [
       "f03d88f0187b746379e0a882b291411cb36ee1ad",
       [
@@ -262473,12 +265304,12 @@
        ]
       ],
       "stroke-box-mutation-001.html": [
-       "c27238498179f1976625fb89a8dc063ad4938741",
+       "8c64e5406af04f60589fdb615223544d6ff2788c",
        [
         null,
         [
          [
-          "/css/css-transforms/transform-box/reference/svgbox-ref.html",
+          "/css/css-transforms/transform-box/reference/svgbox-rect-ref.html",
           "=="
          ]
         ],
@@ -262486,12 +265317,12 @@
        ]
       ],
       "stroke-box-mutation-002.html": [
-       "f460b8e26a263122cec50d806653e1d03842ea99",
+       "3884b98a89abed2fd7513ce53bce94c9f4281fbf",
        [
         null,
         [
          [
-          "/css/css-transforms/transform-box/reference/svgbox-ref.html",
+          "/css/css-transforms/transform-box/reference/svgbox-rect-ref.html",
           "=="
          ]
         ],
@@ -262499,12 +265330,12 @@
        ]
       ],
       "stroke-box-mutation-003.html": [
-       "f82bf5acbcff1ec79be29affb9c9a0b6bd3dc464",
+       "717cf170f1043e79e6869446768f6c43f181d681",
        [
         null,
         [
          [
-          "/css/css-transforms/transform-box/reference/svgbox-ref.html",
+          "/css/css-transforms/transform-box/reference/svgbox-rect-ref.html",
           "=="
          ]
         ],
@@ -262512,12 +265343,12 @@
        ]
       ],
       "stroke-box-mutation-004.html": [
-       "51df8ebb91c54816968f00c0578d7b44b7473c8f",
+       "ace6b6252aee6bb7e74d6abb8964b5401327a69a",
        [
         null,
         [
          [
-          "/css/css-transforms/transform-box/reference/svgbox-ref.html",
+          "/css/css-transforms/transform-box/reference/svgbox-rect-ref.html",
           "=="
          ]
         ],
@@ -262525,12 +265356,12 @@
        ]
       ],
       "svgbox-border-box.html": [
-       "921dba1d73881554b74e30deccd47f8696d6ad1b",
+       "b848dbf238abccf3467fb9e67081b94eeb2991b6",
        [
         null,
         [
          [
-          "/css/css-transforms/transform-box/reference/svgbox-ref.html",
+          "/css/css-transforms/transform-box/reference/svgbox-rect-ref.html",
           "=="
          ]
         ],
@@ -262577,12 +265408,12 @@
        ]
       ],
       "svgbox-stroke-box-001.html": [
-       "d2ca1411ae833fa87323c8e628b4cb6a5f414db4",
+       "2687d933b1a3e1a54870241821db2fb28fd12ae0",
        [
         null,
         [
          [
-          "/css/css-transforms/transform-box/reference/svgbox-ref.html",
+          "/css/css-transforms/transform-box/reference/svgbox-rect-ref.html",
           "=="
          ]
         ],
@@ -262590,12 +265421,12 @@
        ]
       ],
       "svgbox-stroke-box-002.html": [
-       "dd7d656eacfb382727f274716785947b426ddeb5",
+       "50afbae813ded5c56e744fcc7052904a2217c1b8",
        [
         null,
         [
          [
-          "/css/css-transforms/transform-box/reference/svgbox-dasharray-ref.html",
+          "/css/css-transforms/transform-box/reference/svgbox-rect-dasharray-ref.html",
           "=="
          ]
         ],
@@ -263449,7 +266280,7 @@
       ]
      ],
      "transform-input-009.html": [
-      "cde6397c77ac42fd1573a9f51763345a3fbbae85",
+      "0295be5ded43872d164f76fbd8ac474c6430251d",
       [
        null,
        [
@@ -263458,23 +266289,7 @@
          "=="
         ]
        ],
-       {
-        "fuzzy": [
-         [
-          null,
-          [
-           [
-            0,
-            129
-           ],
-           [
-            0,
-            1340
-           ]
-          ]
-         ]
-        ]
-       }
+       {}
       ]
      ],
      "transform-input-010.html": [
@@ -267087,7 +269902,7 @@
       ]
      ],
      "transform3d-preserve3d-001.html": [
-      "dbebc64139a27824ab212316015c52928db2df53",
+      "9459381760a51d3266a8fff068261dbf527e54e0",
       [
        null,
        [
@@ -279416,7 +282231,7 @@
       ]
      },
      "compute-kind-widget-no-fallback-props-001.html": [
-      "0533da654ff80145e5706bbd5e0fc048d9b49cbb",
+      "bda712ec50de76607aac917a661f203434dc3431",
       [
        null,
        [
@@ -279425,7 +282240,23 @@
          "=="
         ]
        ],
-       {}
+       {
+        "fuzzy": [
+         [
+          null,
+          [
+           [
+            0,
+            65
+           ],
+           [
+            0,
+            100
+           ]
+          ]
+         ]
+        ]
+       }
       ]
      ],
      "input-security-auto-sensitive-text-input.html": [
@@ -279467,6 +282298,19 @@
        {}
       ]
      ],
+     "negative-outline-offset.html": [
+      "3d20df08539d917f91fada7063ded4bc541936b5",
+      [
+       null,
+       [
+        [
+         "/css/css-ui/negative-outline-offset-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "outline-001.html": [
       "e669e2313683ca898aaa0294ddfde1eb06508b90",
       [
@@ -279548,19 +282392,6 @@
        }
       ]
      ],
-     "outline-006.html": [
-      "29f0ea66d51668946d324f12b892eaa766e168f3",
-      [
-       null,
-       [
-        [
-         "/css/css-ui/reference/outline-006-ref.html",
-         "=="
-        ]
-       ],
-       {}
-      ]
-     ],
      "outline-007.html": [
       "a805ae2553df1c94299418bc800c6c473ffa4fcb",
       [
@@ -280943,6 +283774,19 @@
        {}
       ]
      ],
+     "attr-notype-fallback.html": [
+      "b88f3de4b571136c53c74486e6b63682bbd3291c",
+      [
+       null,
+       [
+        [
+         "/css/css-values/attr-notype-fallback-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "attr-px-invalid-cast.html": [
       "54b43b4076d3bef14fbd0c76a42e21a1b7105c27",
       [
@@ -281035,7 +283879,7 @@
       ]
      ],
      "calc-border-radius-1.html": [
-      "05e98505e51b09302d1a977bb00579275c7cc158",
+      "f94bdf2cb9451d5ac39daa3a909f9530081cf69d",
       [
        null,
        [
@@ -281044,7 +283888,23 @@
          "=="
         ]
        ],
-       {}
+       {
+        "fuzzy": [
+         [
+          null,
+          [
+           [
+            0,
+            5
+           ],
+           [
+            0,
+            5
+           ]
+          ]
+         ]
+        ]
+       }
       ]
      ],
      "calc-ch-ex-lang.html": [
@@ -281594,7 +284454,7 @@
       ]
      ],
      "ch-unit-004.html": [
-      "1c2f818ce68958cd8968ec386d93f41251e2d536",
+      "82ebb1b037544d5e3e76addec9cdec4ca103098f",
       [
        null,
        [
@@ -281603,7 +284463,23 @@
          "=="
         ]
        ],
-       {}
+       {
+        "fuzzy": [
+         [
+          null,
+          [
+           [
+            0,
+            28
+           ],
+           [
+            0,
+            9
+           ]
+          ]
+         ]
+        ]
+       }
       ]
      ],
      "ch-unit-008.html": [
@@ -284947,7 +287823,7 @@
       ]
      ],
      "content-with-clip.html": [
-      "c477540957007622247c1f3d04a636b5a2a927b0",
+      "28bfa86875252497b11b9d69f2e9547f492a51a9",
       [
        null,
        [
@@ -285580,6 +288456,19 @@
        {}
       ]
      ],
+     "inline-element-size.html": [
+      "c9f0d48942c400677083531ac6c7e8f2abecee73",
+      [
+       null,
+       [
+        [
+         "/css/css-view-transitions/inline-element-size-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "japanese-tag.html": [
       "976dcab4fca8f8cf17fbdedbf7af0a162036eb37",
       [
@@ -287661,6 +290550,39 @@
        }
       ]
      ],
+     "snapshot-containing-block-includes-scrollbar-gutter.html": [
+      "6e9bf568f67cc3c6bb2a915b45bf0c9d86367a6a",
+      [
+       null,
+       [
+        [
+         "/css/css-view-transitions/snapshot-containing-block-includes-scrollbar-gutter-ref.html",
+         "=="
+        ]
+       ],
+       {
+        "fuzzy": [
+         [
+          [
+           "/css/css-view-transitions/snapshot-containing-block-includes-scrollbar-gutter.html",
+           "/css/css-view-transitions/snapshot-containing-block-includes-scrollbar-gutter-ref.html",
+           "=="
+          ],
+          [
+           [
+            0,
+            20
+           ],
+           [
+            0,
+            100
+           ]
+          ]
+         ]
+        ]
+       }
+      ]
+     ],
      "snapshot-containing-block-static.html": [
       "5e03480c27e714c29d0a883b98bf58f4bdb07c97",
       [
@@ -287694,6 +290616,52 @@
        }
       ]
      ],
+     "span-with-overflowing-text-hidden.html": [
+      "65b1497c700599964efaa3e802794f2d16d5fbbf",
+      [
+       null,
+       [
+        [
+         "/css/css-view-transitions/span-with-overflowing-text-hidden-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "span-with-overflowing-text.html": [
+      "4abee4e6e00728487c834c266e9bbfddf782c2a0",
+      [
+       null,
+       [
+        [
+         "/css/css-view-transitions/span-with-overflowing-text-ref.html",
+         "=="
+        ]
+       ],
+       {
+        "fuzzy": [
+         [
+          [
+           "/css/css-view-transitions/span-with-overflowing-text.html",
+           "/css/css-view-transitions/span-with-overflowing-text-ref.html",
+           "=="
+          ],
+          [
+           [
+            0,
+            2
+           ],
+           [
+            0,
+            1100
+           ]
+          ]
+         ]
+        ]
+       }
+      ]
+     ],
      "transform-origin-view-transition-group.html": [
       "17a8218b76964d899c548dbae3e11292f8feffa7",
       [
@@ -303475,7 +306443,7 @@
       ]
      ],
      "backdrop-filters-brightness.html": [
-      "dfb8ba248eea15f75b9f38398bea76cdd7fc383a",
+      "cb74e0a88634b8260ab9386104f11ce4b0c5b368",
       [
        null,
        [
@@ -303484,11 +306452,27 @@
          "=="
         ]
        ],
-       {}
+       {
+        "fuzzy": [
+         [
+          null,
+          [
+           [
+            0,
+            1
+           ],
+           [
+            37500,
+            37500
+           ]
+          ]
+         ]
+        ]
+       }
       ]
      ],
      "backdrop-filters-contrast.html": [
-      "e3150d1e8d5dbcfd58938610827d1d13605ae8ae",
+      "e2f5ccdd8bf67531684c84e449b5b0d8c5bc0d98",
       [
        null,
        [
@@ -303497,7 +306481,23 @@
          "=="
         ]
        ],
-       {}
+       {
+        "fuzzy": [
+         [
+          null,
+          [
+           [
+            0,
+            1
+           ],
+           [
+            0,
+            7500
+           ]
+          ]
+         ]
+        ]
+       }
       ]
      ],
      "backdrop-filters-grayscale-001.html": [
@@ -303553,7 +306553,7 @@
       ]
      ],
      "backdrop-filters-invert.html": [
-      "7e0dea647399469125505013e0199218fcd48c39",
+      "b652946818604dc1cb3bc815f5a7233bba1b99e8",
       [
        null,
        [
@@ -303562,7 +306562,23 @@
          "=="
         ]
        ],
-       {}
+       {
+        "fuzzy": [
+         [
+          null,
+          [
+           [
+            0,
+            1
+           ],
+           [
+            0,
+            37500
+           ]
+          ]
+         ]
+        ]
+       }
       ]
      ],
      "backdrop-filters-opacity.html": [
@@ -303579,7 +306595,7 @@
       ]
      ],
      "backdrop-filters-saturate.html": [
-      "2b7d33b23238e65c52a8d0493826fb18b6e16bd8",
+      "4a5de5b560fbd3602c90d1351db247b3b5b7c92c",
       [
        null,
        [
@@ -303588,7 +306604,23 @@
          "=="
         ]
        ],
-       {}
+       {
+        "fuzzy": [
+         [
+          null,
+          [
+           [
+            0,
+            4
+           ],
+           [
+            0,
+            37500
+           ]
+          ]
+         ]
+        ]
+       }
       ]
      ],
      "backdrop-filters-sepia.html": [
@@ -304013,6 +307045,32 @@
        {}
       ]
      ],
+     "drop-shadow-currentcolor-dynamic-001.html": [
+      "9c70274d5d85878737414d18515f2eb384bd3070",
+      [
+       null,
+       [
+        [
+         "/css/filter-effects/reference/green-100x100.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "drop-shadow-currentcolor-dynamic-002.html": [
+      "3f17b5d634e03402048f9284e7f85621d92d72bb",
+      [
+       null,
+       [
+        [
+         "/css/filter-effects/reference/green-100x100.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "dynamic-filter-changes-001.html": [
       "e2a28a3fe45ba90ad512e47b8756a01680b36511",
       [
@@ -306871,7 +309929,7 @@
       ]
      ],
      "offset-path-coord-box-001.html": [
-      "15f378e038615dafa6b6ddbf00ca3155f81686b9",
+      "a8f7d98b22a43f3e90558f442a9502488c6cd269",
       [
        null,
        [
@@ -306887,11 +309945,11 @@
           [
            [
             0,
-            20
+            100
            ],
            [
             0,
-            200
+            450
            ]
           ]
          ]
@@ -306939,7 +309997,7 @@
       ]
      ],
      "offset-path-ray-001.html": [
-      "39c10330f4b7c360629322da8a9e2bccc0d6d3ef",
+      "1820eb6cfa674d6ad313353c82ac0ce0dfc460b0",
       [
        null,
        [
@@ -306948,11 +310006,27 @@
          "=="
         ]
        ],
-       {}
+       {
+        "fuzzy": [
+         [
+          null,
+          [
+           [
+            0,
+            1
+           ],
+           [
+            0,
+            10
+           ]
+          ]
+         ]
+        ]
+       }
       ]
      ],
      "offset-path-ray-002.html": [
-      "4af6394ef2d53d27b14812d2392772f7a1e19f05",
+      "adfac939f37649ecfbbd0c2cf6190f2a84499de6",
       [
        null,
        [
@@ -306961,7 +310035,23 @@
          "=="
         ]
        ],
-       {}
+       {
+        "fuzzy": [
+         [
+          null,
+          [
+           [
+            0,
+            1
+           ],
+           [
+            0,
+            10
+           ]
+          ]
+         ]
+        ]
+       }
       ]
      ],
      "offset-path-ray-003.html": [
@@ -307056,7 +310146,7 @@
       ]
      ],
      "offset-path-ray-010.html": [
-      "da0935019b6a75ba8a949139c209824f1f00b75a",
+      "9e99898222f101fa488047fbab53a53528498d5e",
       [
        null,
        [
@@ -307065,7 +310155,23 @@
          "=="
         ]
        ],
-       {}
+       {
+        "fuzzy": [
+         [
+          null,
+          [
+           [
+            0,
+            1
+           ],
+           [
+            0,
+            10
+           ]
+          ]
+         ]
+        ]
+       }
       ]
      ],
      "offset-path-ray-011.html": [
@@ -307172,6 +310278,58 @@
        {}
       ]
      ],
+     "offset-path-ray-019.html": [
+      "31681fd43c2176e3b80b188576e89634e51a53fe",
+      [
+       null,
+       [
+        [
+         "/css/motion/offset-path-ray-019-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "offset-path-ray-020.html": [
+      "b332453af9c3fe1b58ce6cbc5926f003b0004e3c",
+      [
+       null,
+       [
+        [
+         "/css/motion/offset-path-ray-007-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "offset-path-ray-021.html": [
+      "f0a18ea4cb992284a576a9473ed4e32859e3a3a9",
+      [
+       null,
+       [
+        [
+         "/css/motion/offset-path-ray-007-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "offset-path-ray-022.html": [
+      "c264076c91ac47595ce573b4628813ac1c5838ea",
+      [
+       null,
+       [
+        [
+         "/css/motion/offset-path-ray-022-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "offset-path-ray-contain-001.html": [
       "dc3cb4d52b1f8a036ebae1e7b0b768e38b16bade",
       [
@@ -307254,7 +310412,7 @@
       ]
      ],
      "offset-path-shape-circle-001.html": [
-      "2205d9d3f69b24c29347f92c870bfc014c648e93",
+      "5b05cb8811ba3c202790b00fd01065cd9c08ec18",
       [
        null,
        [
@@ -307270,11 +310428,11 @@
           [
            [
             0,
-            35
+            150
            ],
            [
             0,
-            200
+            300
            ]
           ]
          ]
@@ -307296,7 +310454,7 @@
       ]
      ],
      "offset-path-shape-circle-003.html": [
-      "ef69e7e41b623e00663e3512cab838d4abf4a4ae",
+      "390b587de5704c7251cfae2e3e59afafd65afa72",
       [
        null,
        [
@@ -307312,11 +310470,11 @@
           [
            [
             0,
-            110
+            170
            ],
            [
             0,
-            500
+            550
            ]
           ]
          ]
@@ -307325,7 +310483,7 @@
       ]
      ],
      "offset-path-shape-circle-004.html": [
-      "d22665636e62e7369b50b97da768e55c3d3f1918",
+      "6c8bbcc1706d8042a9806c01feec702c93545e82",
       [
        null,
        [
@@ -307341,11 +310499,11 @@
           [
            [
             0,
-            80
+            300
            ],
            [
             0,
-            310
+            500
            ]
           ]
          ]
@@ -307354,7 +310512,7 @@
       ]
      ],
      "offset-path-shape-circle-005.html": [
-      "2ba5bc1650a4e497124a948b3b5ceefa22ec84ee",
+      "e35ab294919ba8da2e0c614efb2f996e3d36a4ee",
       [
        null,
        [
@@ -307370,11 +310528,69 @@
           [
            [
             0,
-            18
+            100
            ],
            [
             0,
-            400
+            500
+           ]
+          ]
+         ]
+        ]
+       }
+      ]
+     ],
+     "offset-path-shape-circle-006.html": [
+      "f94af711bdd3d263462f9a4b1b335c2121ea1490",
+      [
+       null,
+       [
+        [
+         "/css/motion/offset-path-shape-circle-005-ref.html",
+         "=="
+        ]
+       ],
+       {
+        "fuzzy": [
+         [
+          null,
+          [
+           [
+            0,
+            100
+           ],
+           [
+            0,
+            500
+           ]
+          ]
+         ]
+        ]
+       }
+      ]
+     ],
+     "offset-path-shape-circle-007.html": [
+      "ea292e5605591d5a9b75ae65527408acd2d0b47d",
+      [
+       null,
+       [
+        [
+         "/css/motion/offset-path-shape-circle-003-ref.html",
+         "=="
+        ]
+       ],
+       {
+        "fuzzy": [
+         [
+          null,
+          [
+           [
+            0,
+            170
+           ],
+           [
+            0,
+            550
            ]
           ]
          ]
@@ -307383,7 +310599,7 @@
       ]
      ],
      "offset-path-shape-ellipse-001.html": [
-      "be3ade57c6ddcfed63b9796c3c3eb0b32530fb26",
+      "ec152e323c52a02f441556ecc12b77b528e1f0b5",
       [
        null,
        [
@@ -307399,11 +310615,11 @@
           [
            [
             0,
-            24
+            100
            ],
            [
             0,
-            200
+            400
            ]
           ]
          ]
@@ -307425,7 +310641,7 @@
       ]
      ],
      "offset-path-shape-ellipse-003.html": [
-      "1831af7019d18eb0450b79000a13c19c3ae8b0dd",
+      "ead222914339d15151145dd6fcea11971dbc0244",
       [
        null,
        [
@@ -307441,11 +310657,11 @@
           [
            [
             0,
-            25
+            150
            ],
            [
             0,
-            473
+            530
            ]
           ]
          ]
@@ -307454,7 +310670,7 @@
       ]
      ],
      "offset-path-shape-ellipse-004.html": [
-      "0ed4816e3d0706730004f98bb2c7c0cbc644865a",
+      "af178eb14ef3127dd0265de8600067ed196a927b",
       [
        null,
        [
@@ -307463,11 +310679,27 @@
          "=="
         ]
        ],
-       {}
+       {
+        "fuzzy": [
+         [
+          null,
+          [
+           [
+            0,
+            250
+           ],
+           [
+            0,
+            500
+           ]
+          ]
+         ]
+        ]
+       }
       ]
      ],
      "offset-path-shape-ellipse-005.html": [
-      "2b2c0abeff95564680680bd231752a8a0fa46544",
+      "7364728df1ffa47e51a4d91eec6ef59a4cbfa887",
       [
        null,
        [
@@ -307483,11 +310715,40 @@
           [
            [
             0,
-            18
+            100
            ],
            [
             0,
-            400
+            500
+           ]
+          ]
+         ]
+        ]
+       }
+      ]
+     ],
+     "offset-path-shape-ellipse-006.html": [
+      "6ec56ff496210d96902872163ad09d2c12d21e4e",
+      [
+       null,
+       [
+        [
+         "/css/motion/offset-path-shape-ellipse-003-ref.html",
+         "=="
+        ]
+       ],
+       {
+        "fuzzy": [
+         [
+          null,
+          [
+           [
+            0,
+            150
+           ],
+           [
+            0,
+            530
            ]
           ]
          ]
@@ -307496,7 +310757,7 @@
       ]
      ],
      "offset-path-shape-inset-001.html": [
-      "27f5e3fc7d6a24fdfdd973cddf528d732a7b04b6",
+      "8d90aef2e1971ed8132e1302ff990f7de1347d5c",
       [
        null,
        [
@@ -307512,11 +310773,11 @@
           [
            [
             0,
-            30
+            80
            ],
            [
             0,
-            200
+            230
            ]
           ]
          ]
@@ -307525,7 +310786,7 @@
       ]
      ],
      "offset-path-shape-inset-002.html": [
-      "5ca502e8b1c30124204d9fd61d2db9fdcb630312",
+      "ceafdd8cd2389de91e78ceeec7ea00723dcf4fa3",
       [
        null,
        [
@@ -307541,7 +310802,7 @@
           [
            [
             0,
-            75
+            170
            ],
            [
             0,
@@ -307554,7 +310815,7 @@
       ]
      ],
      "offset-path-shape-polygon-001.html": [
-      "7e9ccdbfda91bf82a30fe696dba6c8eb4fb3af1a",
+      "fcb31f245252de3db5c38e18708e46a96f47eb71",
       [
        null,
        [
@@ -307563,7 +310824,23 @@
          "=="
         ]
        ],
-       {}
+       {
+        "fuzzy": [
+         [
+          null,
+          [
+           [
+            0,
+            20
+           ],
+           [
+            0,
+            100
+           ]
+          ]
+         ]
+        ]
+       }
       ]
      ],
      "offset-path-shape-polygon-002.html": [
@@ -307622,7 +310899,7 @@
       ]
      ],
      "offset-path-shape-rect-002.html": [
-      "114143b18d1440caa926f54ca8ac35d57c0d3457",
+      "204eadcfc34ea4ef895e0501319b3a22f006dcb3",
       [
        null,
        [
@@ -307638,11 +310915,11 @@
           [
            [
             0,
-            96
+            160
            ],
            [
             0,
-            440
+            520
            ]
           ]
          ]
@@ -307677,7 +310954,7 @@
       ]
      ],
      "offset-path-shape-xywh-002.html": [
-      "4c4f4ac86c1bab87b5a11678013a3470c7f733c0",
+      "ef6a9e6324249621a112498e9b8075e98cae53e8",
       [
        null,
        [
@@ -307693,11 +310970,11 @@
           [
            [
             0,
-            130
+            140
            ],
            [
             0,
-            250
+            500
            ]
           ]
          ]
@@ -308254,7 +311531,7 @@
       ]
      ],
      "dir-style-01a.html": [
-      "e362cd838d5b96d6011c4ecba34b9b7980ec76cd",
+      "f379d14e1896d4d3127d184cbac7278ee96c98ec",
       [
        null,
        [
@@ -308274,7 +311551,7 @@
            ],
            [
             0,
-            20
+            30
            ]
           ]
          ]
@@ -308283,7 +311560,7 @@
       ]
      ],
      "dir-style-01b.html": [
-      "109a7bc646d1dd7e169164c48135e38a7dbe4ae4",
+      "37ad9406cfd7df45eb52f87d0e63c0c95f579eda",
       [
        null,
        [
@@ -308303,7 +311580,7 @@
            ],
            [
             0,
-            20
+            30
            ]
           ]
          ]
@@ -308364,7 +311641,7 @@
       ]
      ],
      "dir-style-04.html": [
-      "d0a458c8498c2c34a2f604a559b6351d34064396",
+      "cbfe1307d43185998a3b476fce6701f189f2ee2f",
       [
        null,
        [
@@ -308373,7 +311650,23 @@
          "=="
         ]
        ],
-       {}
+       {
+        "fuzzy": [
+         [
+          null,
+          [
+           [
+            0,
+            70
+           ],
+           [
+            0,
+            180
+           ]
+          ]
+         ]
+        ]
+       }
       ]
      ],
      "first-letter-flag-001.html": [
@@ -309328,6 +312621,19 @@
         {}
        ]
       ],
+      "part-pseudo.html": [
+       "a409271762fb41a3c4d4243e1759aa5f8cd3c54b",
+       [
+        null,
+        [
+         [
+          "/css/selectors/invalidation/part-pseudo-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "sheet-going-away-002.html": [
        "189abbe0808a613eaab0e918fe82a4982fbcfa63",
        [
@@ -311816,6 +315122,49 @@
        {}
       ]
      ]
+    },
+    "zoom": {
+     "tentative": {
+      "basic.html": [
+       "fcd1761cfad478bba33b2f9ce312eec297a6886b",
+       [
+        null,
+        [
+         [
+          "/css/zoom/tentative/basic-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "inherited-length.html": [
+       "2bc04ff0cbe8e87e06919b8cdee371bf3f90faa0",
+       [
+        null,
+        [
+         [
+          "/css/zoom/tentative/green-square-100px.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "inherited.html": [
+       "baa7f7ed8ac4afd85f42b976bc3a7eee1b7b74fa",
+       [
+        null,
+        [
+         [
+          "/css/zoom/tentative/basic-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ]
+     }
     }
    },
    "custom-elements": {
@@ -312946,7 +316295,7 @@
      ]
     ],
     "forced-colors-mode-53.html": [
-     "4726c4bb0a5524f3c8319863511939cb9fd26b88",
+     "3b31a5999b38f3fa554cc143ca3157c5c7c6ac87",
      [
       null,
       [
@@ -312955,7 +316304,23 @@
         "=="
        ]
       ],
-      {}
+      {
+       "fuzzy": [
+        [
+         null,
+         [
+          [
+           0,
+           5
+          ],
+          [
+           0,
+           3
+          ]
+         ]
+        ]
+       ]
+      }
      ]
     ]
    },
@@ -313051,6 +316416,32 @@
        ]
       },
       "layers": {
+       "2d.layer.blur-from-outside-canvas.no-clipping.html": [
+        "b689ad39fe160d85725f67fa2fe7ebf03349d4dc",
+        [
+         null,
+         [
+          [
+           "/html/canvas/element/layers/2d.layer.blur-from-outside-canvas.no-clipping-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "2d.layer.blur-from-outside-canvas.with-clipping.html": [
+        "9e8161019aa116c00d732d299134cc8c59dbfbbf",
+        [
+         null,
+         [
+          [
+           "/html/canvas/element/layers/2d.layer.blur-from-outside-canvas.with-clipping-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
        "2d.layer.cross-layer-paths.html": [
         "7feebfdce6d1b8a712636654925fb6a143a8a839",
         [
@@ -313564,6 +316955,58 @@
          }
         ]
        ],
+       "2d.layer.shadow-from-outside-canvas.long-distance-with-clipping.html": [
+        "88a3a67c7b38f2270c7e5cb619b33e695e197632",
+        [
+         null,
+         [
+          [
+           "/html/canvas/element/layers/2d.layer.shadow-from-outside-canvas.long-distance-with-clipping-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "2d.layer.shadow-from-outside-canvas.long-distance.html": [
+        "8ade08bec5f0ae057858b570f8425ff0a7a8eb15",
+        [
+         null,
+         [
+          [
+           "/html/canvas/element/layers/2d.layer.shadow-from-outside-canvas.long-distance-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "2d.layer.shadow-from-outside-canvas.short-distance-with-clipping.html": [
+        "7ced4481445c78aaa68e141b7a50527e14471fce",
+        [
+         null,
+         [
+          [
+           "/html/canvas/element/layers/2d.layer.shadow-from-outside-canvas.short-distance-with-clipping-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "2d.layer.shadow-from-outside-canvas.short-distance.html": [
+        "37398400d18b82dc37ff91c4b1e9f761313631e0",
+        [
+         null,
+         [
+          [
+           "/html/canvas/element/layers/2d.layer.shadow-from-outside-canvas.short-distance-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
        "2d.layer.unclosed-nested.html": [
         "c02aae4af116be203af40610444db1cf7b91624b",
         [
@@ -314586,6 +318029,84 @@
        ]
       },
       "reset": {
+       "2d.reset.render.drop_shadow.html": [
+        "264355c8b315b8a69b9d5007a2d450fa5a91e075",
+        [
+         null,
+         [
+          [
+           "/html/canvas/element/reset/2d.reset.render.drop_shadow-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "2d.reset.render.global_composite_operation.html": [
+        "fc851b84b8e774f488c4a29338aa109e7d71d4d4",
+        [
+         null,
+         [
+          [
+           "/html/canvas/element/reset/2d.reset.render.global_composite_operation-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "2d.reset.render.line.html": [
+        "0dda7c7a7e628aca9fb3b951a82dbeda4e36ca34",
+        [
+         null,
+         [
+          [
+           "/html/canvas/element/reset/2d.reset.render.line-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "2d.reset.render.misc.html": [
+        "61d2dbe2f05fbfeb79b9d64a2e98fa5b014623fb",
+        [
+         null,
+         [
+          [
+           "/html/canvas/element/reset/2d.reset.render.misc-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "2d.reset.render.miter_limit.html": [
+        "f6eaed00f6fd88989a168e2814a7b81b6cf3172a",
+        [
+         null,
+         [
+          [
+           "/html/canvas/element/reset/2d.reset.render.miter_limit-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "2d.reset.render.text.html": [
+        "3d76ddf2920f53a85e57af510f4fba3d2319809a",
+        [
+         null,
+         [
+          [
+           "/html/canvas/element/reset/2d.reset.render.text-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
        "2d.reset.state.clip.html": [
         "ab3fa1081ca9be4e21fc751fd44e1b69324d4318",
         [
@@ -314602,7 +318123,7 @@
       },
       "text": {
        "2d.text.fontVariantCaps1.html": [
-        "b610c2240ffe96c7fe747a0db55c5bda51802e38",
+        "56acfc61f47c32092db1793eb2f4a9966fde04ef",
         [
          null,
          [
@@ -314614,21 +318135,8 @@
          {}
         ]
        ],
-       "2d.text.fontVariantCaps2.html": [
-        "f9d42ac3a60eb9f2a62ea2343c9f17a450713b71",
-        [
-         null,
-         [
-          [
-           "/html/canvas/element/text/2d.text.fontVariantCaps2-unexpected.html",
-           "!="
-          ]
-         ],
-         {}
-        ]
-       ],
        "2d.text.fontVariantCaps3.html": [
-        "a90e0c29b3dd1aa0176dabb653cd36d07abfadf4",
+        "c3d80d3e56caf84b9e5e1d7ab294300d722275cb",
         [
          null,
          [
@@ -314641,7 +318149,7 @@
         ]
        ],
        "2d.text.fontVariantCaps4.html": [
-        "b598fb60baf2d5126571eb020306cc57fd603464",
+        "1ee9053b4d9bc06343394cdae54950283873ed44",
         [
          null,
          [
@@ -314654,7 +318162,7 @@
         ]
        ],
        "2d.text.fontVariantCaps5.html": [
-        "b871f7c062409ffc0b263594c495bc0d5bde3896",
+        "d80de4ea31873274d14761cb9b1f171a4eb9b208",
         [
          null,
          [
@@ -314667,7 +318175,7 @@
         ]
        ],
        "2d.text.fontVariantCaps6.html": [
-        "e7bbd29341dcc6755848672047c3263cf4196fdd",
+        "c17fac18b773da2e581c5e55fb0d04dc64deafab",
         [
          null,
          [
@@ -314750,6 +318258,58 @@
        ]
       },
       "layers": {
+       "2d.layer.blur-from-outside-canvas.no-clipping.html": [
+        "3cd1c674a131f1e81c960ff4059a59cc7b38e1c5",
+        [
+         null,
+         [
+          [
+           "/html/canvas/offscreen/layers/2d.layer.blur-from-outside-canvas.no-clipping-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "2d.layer.blur-from-outside-canvas.no-clipping.w.html": [
+        "90b013c077c85fbb247dff02477930dc07bd6526",
+        [
+         null,
+         [
+          [
+           "/html/canvas/offscreen/layers/2d.layer.blur-from-outside-canvas.no-clipping-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "2d.layer.blur-from-outside-canvas.with-clipping.html": [
+        "76477445e57bdeb8ebd8f31f191838f26e019770",
+        [
+         null,
+         [
+          [
+           "/html/canvas/offscreen/layers/2d.layer.blur-from-outside-canvas.with-clipping-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "2d.layer.blur-from-outside-canvas.with-clipping.w.html": [
+        "cf5570c932d22e29fc0407ed5b4c63ea1efd86a6",
+        [
+         null,
+         [
+          [
+           "/html/canvas/offscreen/layers/2d.layer.blur-from-outside-canvas.with-clipping-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
        "2d.layer.cross-layer-paths.html": [
         "f167ae00bdf18f985cab62f350466bc903dbddaf",
         [
@@ -315750,6 +319310,110 @@
          }
         ]
        ],
+       "2d.layer.shadow-from-outside-canvas.long-distance-with-clipping.html": [
+        "98262f53b61e93ccd30f5cdf323f15b072f13d2e",
+        [
+         null,
+         [
+          [
+           "/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.long-distance-with-clipping-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "2d.layer.shadow-from-outside-canvas.long-distance-with-clipping.w.html": [
+        "90b4332f94b154b3a1a48cfd2a9e448972c1c3ff",
+        [
+         null,
+         [
+          [
+           "/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.long-distance-with-clipping-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "2d.layer.shadow-from-outside-canvas.long-distance.html": [
+        "eea9b5dc25f940e1ae6c98794b9604cd79be664b",
+        [
+         null,
+         [
+          [
+           "/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.long-distance-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "2d.layer.shadow-from-outside-canvas.long-distance.w.html": [
+        "e4422558cf024eb8bcdf6b2b85b3241bd0b28ace",
+        [
+         null,
+         [
+          [
+           "/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.long-distance-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "2d.layer.shadow-from-outside-canvas.short-distance-with-clipping.html": [
+        "d5f5b0c8ff91cf2a05830c90af8be5929433b1d1",
+        [
+         null,
+         [
+          [
+           "/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.short-distance-with-clipping-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "2d.layer.shadow-from-outside-canvas.short-distance-with-clipping.w.html": [
+        "acbf09edec180b53913291397a707c905d76193c",
+        [
+         null,
+         [
+          [
+           "/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.short-distance-with-clipping-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "2d.layer.shadow-from-outside-canvas.short-distance.html": [
+        "a1c4689f7e59bceaeaef8f792aa299d9300dd8eb",
+        [
+         null,
+         [
+          [
+           "/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.short-distance-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "2d.layer.shadow-from-outside-canvas.short-distance.w.html": [
+        "2e39091f3d4ada95b3dc824b06114754df084364",
+        [
+         null,
+         [
+          [
+           "/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.short-distance-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
        "2d.layer.unclosed-nested.html": [
         "b7be6d82423805c7d138ea3ee53561a2a9cc9433",
         [
@@ -315804,6 +319468,162 @@
        ]
       },
       "reset": {
+       "2d.reset.render.drop_shadow.html": [
+        "e6decd1687e8dcf78036fdeb3cbfa866738db1ae",
+        [
+         null,
+         [
+          [
+           "/html/canvas/offscreen/reset/2d.reset.render.drop_shadow-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "2d.reset.render.drop_shadow.w.html": [
+        "0ceba2f91d243fad1fb3bb37635a28fa63ffbf62",
+        [
+         null,
+         [
+          [
+           "/html/canvas/offscreen/reset/2d.reset.render.drop_shadow-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "2d.reset.render.global_composite_operation.html": [
+        "4ddcc8d8f0b77494927572c776e49f970d527192",
+        [
+         null,
+         [
+          [
+           "/html/canvas/offscreen/reset/2d.reset.render.global_composite_operation-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "2d.reset.render.global_composite_operation.w.html": [
+        "6df07a47e2f08ca930a0c90459cc7be0fa267dd6",
+        [
+         null,
+         [
+          [
+           "/html/canvas/offscreen/reset/2d.reset.render.global_composite_operation-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "2d.reset.render.line.html": [
+        "0e478cbf9d4b4337fbf8ed294b060f5c7a4e1162",
+        [
+         null,
+         [
+          [
+           "/html/canvas/offscreen/reset/2d.reset.render.line-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "2d.reset.render.line.w.html": [
+        "e85f155b328a5f2bb3d82469c389f431f558147e",
+        [
+         null,
+         [
+          [
+           "/html/canvas/offscreen/reset/2d.reset.render.line-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "2d.reset.render.misc.html": [
+        "b471327d989fb6c2e1623f945c8af926bb4603e1",
+        [
+         null,
+         [
+          [
+           "/html/canvas/offscreen/reset/2d.reset.render.misc-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "2d.reset.render.misc.w.html": [
+        "eef646df663992245b7c9728ec838386042fb0da",
+        [
+         null,
+         [
+          [
+           "/html/canvas/offscreen/reset/2d.reset.render.misc-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "2d.reset.render.miter_limit.html": [
+        "c00284bbc23bc83078a95ed44f7191d5a4f7a315",
+        [
+         null,
+         [
+          [
+           "/html/canvas/offscreen/reset/2d.reset.render.miter_limit-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "2d.reset.render.miter_limit.w.html": [
+        "1f98606b55ee4d5ce5caba4cf90c4a26302ff3d7",
+        [
+         null,
+         [
+          [
+           "/html/canvas/offscreen/reset/2d.reset.render.miter_limit-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "2d.reset.render.text.html": [
+        "31e35db71cbe2ed0b89f7f6c7c5b6a7c1d53c6af",
+        [
+         null,
+         [
+          [
+           "/html/canvas/offscreen/reset/2d.reset.render.text-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "2d.reset.render.text.w.html": [
+        "6ddfd9fd9d99642aeccc6b9508168948ebdcb278",
+        [
+         null,
+         [
+          [
+           "/html/canvas/offscreen/reset/2d.reset.render.text-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
        "2d.reset.state.clip.html": [
         "2f53da7a496c57a7148a0d252bcdf7788095ca06",
         [
@@ -315833,7 +319653,7 @@
       },
       "text": {
        "2d.text.fontVariantCaps1.html": [
-        "a2da7f557ce7c10d4b4dac0d9cd351fe11c062f1",
+        "3c216f07daac09924ae79221b05665ea0510000b",
         [
          null,
          [
@@ -315845,21 +319665,34 @@
          {}
         ]
        ],
-       "2d.text.fontVariantCaps2.html": [
-        "8a644fbb616bc42d223093b70a54fb6653c6b6d4",
+       "2d.text.fontVariantCaps1.w.html": [
+        "4bc1b36e17576a6ef35f75783e5ffd4fb16c0ffb",
         [
          null,
          [
           [
-           "/html/canvas/offscreen/text/2d.text.fontVariantCaps2-unexpected.html",
-           "!="
+           "/html/canvas/offscreen/text/2d.text.fontVariantCaps1-expected.html",
+           "=="
           ]
          ],
          {}
         ]
        ],
        "2d.text.fontVariantCaps3.html": [
-        "665a176087fba458e1b7708486d869ebd6862ce1",
+        "48699a640fe1f792ed275908b3b167e5e19aa01b",
+        [
+         null,
+         [
+          [
+           "/html/canvas/offscreen/text/2d.text.fontVariantCaps3-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "2d.text.fontVariantCaps3.w.html": [
+        "cd5c1db818fcbf9c827cf3554d1ddd767ce2dac2",
         [
          null,
          [
@@ -315872,7 +319705,20 @@
         ]
        ],
        "2d.text.fontVariantCaps4.html": [
-        "84c5fbb4469f1ce6c844850dce34f79dbee62870",
+        "b1b81b81e28747f9ec671a63eefcc2cb13d3c5bd",
+        [
+         null,
+         [
+          [
+           "/html/canvas/offscreen/text/2d.text.fontVariantCaps4-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "2d.text.fontVariantCaps4.w.html": [
+        "0bae66fcd46b3e2903a1ce2350f571224efeb591",
         [
          null,
          [
@@ -315885,7 +319731,20 @@
         ]
        ],
        "2d.text.fontVariantCaps5.html": [
-        "877d890ccc6d114fb70fa3df850366bd9a5bbe14",
+        "2a6f7b5f737ca8c549ae88d413241ada90543049",
+        [
+         null,
+         [
+          [
+           "/html/canvas/offscreen/text/2d.text.fontVariantCaps5-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "2d.text.fontVariantCaps5.w.html": [
+        "8c59f5b517d4b8bd07b2d057a44792614eb55103",
         [
          null,
          [
@@ -315898,7 +319757,20 @@
         ]
        ],
        "2d.text.fontVariantCaps6.html": [
-        "08c70a3a2e2fd0b60020a21877575d10108a06c0",
+        "c33684d38869cd1fed409d44dc6bb1c6cfecf3e5",
+        [
+         null,
+         [
+          [
+           "/html/canvas/offscreen/text/2d.text.fontVariantCaps6-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "2d.text.fontVariantCaps6.w.html": [
+        "47f70d812b6664c19fb424102df09d4960caad97",
         [
          null,
          [
@@ -316113,21 +319985,8 @@
          {}
         ]
        ],
-       "dir_auto-N-EN-ref.html": [
-        "154d56aaf9a574bb63ee32c08b328b4d30fc52be",
-        [
-         null,
-         [
-          [
-           "/html/dom/elements/global-attributes/dir_auto-N-EN-L-ref.html",
-           "=="
-          ]
-         ],
-         {}
-        ]
-       ],
        "dir_auto-N-EN.html": [
-        "5d948d34568aa5481ffc6f438190d1677ee0839e",
+        "467b4d093943953da64513d8344598f4c239fd80",
         [
          null,
          [
@@ -319889,6 +323748,19 @@
         {}
        ]
       ],
+      "details-pseudo-elements-002.tentative.html": [
+       "e149395665171e1ba7068422857f11d75c54f566",
+       [
+        null,
+        [
+         [
+          "/html/rendering/the-details-element/details-pseudo-elements-002-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "details-revert.html": [
        "760cc8281e820d2ef256eb22d88d7aa8f090b821",
        [
@@ -320902,7 +324774,7 @@
         ]
        ],
        "img-with-containment-and-size.html": [
-        "a095adc7cf6775e9c9b63832c0c5c9df23756b6c",
+        "bdeae0ac2ead8d0ff4113fbfa33b4b594cea5196",
         [
          null,
          [
@@ -321054,6 +324926,19 @@
      },
      "forms": {
       "the-input-element": {
+       "auto-direction-dynamic.html": [
+        "68ea51185c07833a8cd197f35cbcd6c5ee9c184a",
+        [
+         null,
+         [
+          [
+           "/html/semantics/forms/the-input-element/auto-direction-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
        "image01.html": [
         "e9028dceec736da67b8c8814cb103cfecbc518a0",
         [
@@ -321364,6 +325249,45 @@
        ]
       },
       "the-selectlist-element": {
+       "button-type-selectlist-appearance.tentative.html": [
+        "3ab7044366e54bf1640dcb287491389db0523c82",
+        [
+         null,
+         [
+          [
+           "/html/semantics/forms/the-selectlist-element/button-type-selectlist-appearance-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "selectlist-button-type-appearance.tentative.html": [
+        "50ad339b0568c2f0fd641ad6241d464b66421fcb",
+        [
+         null,
+         [
+          [
+           "/html/semantics/forms/the-selectlist-element/selectlist-button-type-appearance-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "selectlist-default-button-slot.tentative.html": [
+        "d8688d5957d211d2b475a20579038455b7d90d18",
+        [
+         null,
+         [
+          [
+           "/html/semantics/forms/the-selectlist-element/selectlist-default-button-slot-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
        "selectlist-explicit-size.tentative.html": [
         "d9e52a9fff74ab91b6a33cc10d70a7055a54e48e",
         [
@@ -321390,6 +325314,19 @@
          {}
         ]
        ],
+       "selectlist-listbox-element.tentative.html": [
+        "14223633b90eba2c49234a3e2ec4edc68f0df187",
+        [
+         null,
+         [
+          [
+           "/html/semantics/forms/the-selectlist-element/selectlist-listbox-element-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
        "selectlist-marker-end-aligned.tentative.html": [
         "c2540acb368c7b945f13b454d1190c8780c27a48",
         [
@@ -321533,6 +325470,32 @@
          {}
         ]
        ],
+       "selectlist-selectedoption-element-cloning.tentative.html": [
+        "5d273c21bffb71372efd35469372878284fff742",
+        [
+         null,
+         [
+          [
+           "/html/semantics/forms/the-selectlist-element/selectlist-selectedoption-element-cloning-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "selectlist-text-only.tentative.html": [
+        "ceefeca6087fb8252383022cae60c032048d8d93",
+        [
+         null,
+         [
+          [
+           "/html/semantics/forms/the-selectlist-element/selectlist-text-only-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
        "selectlist-writingmode-lr.tentative.html": [
         "9973696ddd75f568af09d0c89639bdb9fbbc83b6",
         [
@@ -322070,7 +326033,7 @@
       },
       "the-dialog-element": {
        "backdrop-descendant-selector.html": [
-        "3e2ac6afa169fb82a6e2623358ead663b5f08643",
+        "73706548eafa1a49df59d19932ab728353b0860b",
         [
          null,
          [
@@ -322082,19 +326045,6 @@
          {}
         ]
        ],
-       "backdrop-does-not-inherit.html": [
-        "44085b9c31d892d3c827591ccf98f6f68a48cbb3",
-        [
-         null,
-         [
-          [
-           "/html/semantics/interactive-elements/the-dialog-element/backdrop-does-not-inherit-ref.html",
-           "=="
-          ]
-         ],
-         {}
-        ]
-       ],
        "backdrop-dynamic-display-none.html": [
         "bcf100b36898f0d1bb57822e8a7ac1699f4bcc4e",
         [
@@ -322109,7 +326059,7 @@
         ]
        ],
        "backdrop-dynamic-style-change.html": [
-        "19297b8c1712a24de2c67b57c131f82bc5873146",
+        "6c609a769cc257ffda7513856f04de30b579d099",
         [
          null,
          [
@@ -322122,7 +326072,7 @@
         ]
        ],
        "backdrop-in-flow.html": [
-        "7201ebbc0225d9f8f8032d6de85ba8824700cfd3",
+        "06f790979eb8118a52ffa0f0481a64d1686f46f0",
         [
          null,
          [
@@ -322134,6 +326084,19 @@
          {}
         ]
        ],
+       "backdrop-inherits.html": [
+        "458320f0196b029c362517e8192540eb48912a41",
+        [
+         null,
+         [
+          [
+           "/html/semantics/interactive-elements/the-dialog-element/backdrop-inherits-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
        "backdrop-stacking-order.html": [
         "897f54a53fbaeaa8c3d62da28ed810902193e631",
         [
@@ -325424,6 +329387,19 @@
         {}
        ]
       ],
+      "non-spacing-accent-1.xhtml": [
+       "6061b96bc5192f7ef8ace55ecf9fb2f3feb36181",
+       [
+        null,
+        [
+         [
+          "/mathml/presentation-markup/operators/non-spacing-accent-1-ref.xhtml",
+          "!="
+         ]
+        ],
+        {}
+       ]
+      ],
       "op-dict-1.html": [
        "cdfcca4a576147301fcd5869b99539bd440244cf",
        [
@@ -325618,6 +329594,19 @@
         ],
         {}
        ]
+      ],
+      "stretchy-underbar-1.xhtml": [
+       "63bf7391c673a9580d3503b416d31db4e7da9ef4",
+       [
+        null,
+        [
+         [
+          "/mathml/presentation-markup/operators/stretchy-underbar-1-ref.xhtml",
+          "!="
+         ]
+        ],
+        {}
+       ]
       ]
      },
      "radicals": {
@@ -326383,6 +330372,19 @@
         {}
        ]
       ],
+      "dynamic-mtext-like-002.html": [
+       "f04504bb8cc038169a333d530769494cafff5da5",
+       [
+        null,
+        [
+         [
+          "/mathml/presentation-markup/tokens/dynamic-mtext-like-001-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "mi-mathvariant-1.xhtml": [
        "04fe19194ee430cf38f044322f52a39e3355607c",
        [
@@ -327801,7 +331803,7 @@
       ]
      ],
      "animation-inactive-outside-range-test.html": [
-      "a17cdb04a9de125ac6a4c51ea4dcf7bede359aee",
+      "8034e451be59b5fea4f134744a11f5920010bf05",
       [
        null,
        [
@@ -328535,6 +332537,19 @@
         ],
         {}
        ]
+      ],
+      "clear-mapped-animation.svg": [
+       "518fe6129faa2e00de0e30442eacc59dbee37527",
+       [
+        null,
+        [
+         [
+          "/svg/embedded/reference/green-rect-100x100.svg",
+          "=="
+         ]
+        ],
+        {}
+       ]
       ]
      },
      "use-animate-display-none-symbol.html": [
@@ -329561,6 +333576,19 @@
      }
     },
     "painting": {
+     "color-interpolation-001.svg": [
+      "78f0cd4084fdd6d5b3bc71f9699dc53903e5cd52",
+      [
+       null,
+       [
+        [
+         "/svg/struct/reftests/reference/green-100x100.svg",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "color-mix-currentcolor-fill-stroke-repaint.html": [
       "216948038ca866c615409c73bb7bb4b4bc7fef1f",
       [
@@ -331104,6 +335132,19 @@
         {}
        ]
       ],
+      "svg-getIntersectionList-001.svg": [
+       "20958dd76b88d3256460ed3434ab64ad66a08d6d",
+       [
+        null,
+        [
+         [
+          "/svg/struct/reftests/reference/green-100x100.svg",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "use-a.svg": [
        "40d4c83f21faccfddb50c683c2a0b0c42a585935",
        [
@@ -335395,7 +339436,7 @@
   },
   "support": {
    ".azure-pipelines.yml": [
-    "75a87df90f082ba787fbf1d5c00f4148867d03db",
+    "54b38dbd1c46edbf103ecdd873a99720f57309f4",
     []
    ],
    ".gitattributes": [
@@ -335413,23 +339454,23 @@
     ],
     "workflows": {
      "documentation.yml": [
-      "0d72edd3e7eb9fbbafcd0ab378edb397ea739d9b",
+      "00c7bb226279e9a3a9dfddbe224edfe55a8688b3",
       []
      ],
      "epochs.yml": [
-      "a9590cbc8709bbfa0111c7e6afd048e4a8256f99",
+      "840d08ffe154599aa0d601e996dca1e65dc7684b",
       []
      ],
      "interfaces.yml": [
-      "2e55ab28e1804b8800c0e4a1adbf43b5be014afa",
+      "04636e0bb3d5f923321f7979b829c01785465017",
       []
      ],
      "manifest.yml": [
-      "a6e5e43caac28ac748382d0af559dcfdb522610d",
+      "e86ced78f60b832a74c014cfeee40ddbf331404e",
       []
      ],
      "regen_certs.yml": [
-      "4b5549d3aac86ac59493b2ca70dd650847ee4eee",
+      "4b3565c0d6c45f67606324627bb5aa2f77173cb2",
       []
      ]
     }
@@ -335451,6 +339492,14 @@
      "dde8aa232e3e45e1a19aacd73cc8911604560089",
      []
     ],
+    "aggregation-service": {
+     "v1": {
+      "public-keys": [
+       "4a9578fdf3524b3e41d2c5abdf365be3491aa55c",
+       []
+      ]
+     }
+    },
     "attribution-reporting": {
      "debug": {
       "report-aggregate-attribution": [
@@ -335544,7 +339593,7 @@
      }
     },
     "META.yml": [
-     "506a59fec1eb33661658850254344e264c323c2e",
+     "66227c8224bc46739a6f2fb9229a4263ab4e7d15",
      []
     ],
     "file": {
@@ -335644,7 +339693,7 @@
    },
    "IndexedDB": {
     "META.yml": [
-     "89cbe2be26d9ae56d5fb0a3b5189e9c06b12eb35",
+     "7c5448e3f047e251cca35898034126396c2b01f1",
      []
     ],
     "README.md": [
@@ -335857,7 +339906,7 @@
     },
     "util": {
      "helpers.js": [
-      "ce240a1549cb21d7259438abdef6c758b7e792c9",
+      "bda97003263ff4ac5a61c0941a144513e66ea9b0",
       []
      ],
      "worker-report-crypto-subtle-presence.js": [
@@ -338212,7 +342261,7 @@
      []
     ],
     "animated-avif-timeout-ref.html": [
-     "0eecb3774092e258add6261dc2adcb95fd5dabb5",
+     "52374220c9155eda3442d0b9d92a896b6d20eebf",
      []
     ]
    },
@@ -338623,7 +342672,7 @@
       []
      ],
      "test_utils.sub.js": [
-      "712c57cbb7ebd7c2e48c9ccd9577e4028f1651bf",
+      "71fc79c420afd8ee2694373688bfd1683d3ad266",
       []
      ]
     }
@@ -338635,12 +342684,12 @@
     ],
     "accept-ch": {
      "__dir__.headers": [
-      "f233c2e9d64964de469b36a66a6aae6185b99678",
+      "4d4739028d3d243db6d302fa7e56e25b6c155c89",
       []
      ],
      "feature-policy-navigation": {
       "__dir__.headers": [
-       "f233c2e9d64964de469b36a66a6aae6185b99678",
+       "4d4739028d3d243db6d302fa7e56e25b6c155c89",
        []
       ],
       "feature-policy.https.html.headers": [
@@ -338649,7 +342698,7 @@
       ]
      },
      "feature-policy.sub.https.html.headers": [
-      "d968517a3ad9d279164dd6d9ca366ffbb6285c75",
+      "6e6b89e923040e68b39011017eb46036afc72dd4",
       []
      ]
     },
@@ -339015,11 +343064,11 @@
       []
      ],
      "clienthintslist.py": [
-      "3d1f7caf4680fcdff15995aa08a31630f547e8f6",
+      "badf716c02405d7595cb8f4c0f13d73130c8f35b",
       []
      ],
      "echo-client-hints-received.py": [
-      "190cd8628928a1534b1b9de698d728a254e38165",
+      "0aa5bfb25c8c76595e3c59303b5b55f4f5cc464c",
       []
      ],
      "echo-ua-client-hints-received.py": [
@@ -339043,7 +343092,7 @@
       []
      ],
      "export.js": [
-      "57caba1c5f4fcdacbf17b0e61bb0155dcc8f135f",
+      "e2596e1c6f709a1ad3dde45bbc285f0aa756e23e",
       []
      ],
      "feature-policy-navigation.js": [
@@ -339081,7 +343130,7 @@
     },
     "sandbox": {
      "__dir__.headers": [
-      "f233c2e9d64964de469b36a66a6aae6185b99678",
+      "4d4739028d3d243db6d302fa7e56e25b6c155c89",
       []
      ],
      "iframe-csp-same-origin.https.html.headers": [
@@ -339112,7 +343161,7 @@
      }
     },
     "sec-ch-quotes.https.html.headers": [
-     "60ab0f2024c940b112d0eae08f33020ee4efd768",
+     "1d6f8f26fb80490a36cda6da85f937830f5f54a4",
      []
     ],
     "service-workers": {
@@ -339292,7 +343341,7 @@
      []
     ],
     "META.yml": [
-     "ca4d2e523c08662078e7d04018acf6a25508821f",
+     "963dff9d1f1ecfb91a3f0704af11b95b22553d07",
      []
     ],
     "PrefixedLocalStorage.js": [
@@ -360330,6 +364379,22 @@
       "57a45167f0b788f101189501ee3c8badd77045c1",
       []
      ]
+    },
+    "third-party-cookies": {
+     "resources": {
+      "test-helpers.js": [
+       "2ae2c46a37193244e9e5d1e921fb9ac2e3c81935",
+       []
+      ],
+      "third-party-cookies-cross-site-embed.html": [
+       "2d579c91bed92b69235c357dafb51ef98490dab6",
+       []
+      ],
+      "third-party-cookies-cross-site-window.html": [
+       "99418a67491e896bcc4caf6f73d0465390ecef4a",
+       []
+      ]
+     }
     }
    },
    "core-aam": {
@@ -360344,7 +364409,7 @@
    },
    "cors": {
     "META.yml": [
-     "08dc73704f93a90be061f0d5e01b95938492cc05",
+     "3187818d44d2da8fbee207a8a1c6086a5f939787",
      []
     ],
     "README.md": [
@@ -360446,11 +364511,11 @@
      ],
      "fedcm": {
       "accounts.py": [
-       "dabc2c6f9f923ac23543787733951cec99a96e55",
+       "3989de7f17c6da82f8e7a41aba7947dac051df1a",
        []
       ],
       "client_metadata.py": [
-       "61d8aaf2367fc6dfaf1da062ee7b6837d0477818",
+       "72ddcc5cd62569fa280adcab9490e84b851e6780",
        []
       ],
       "client_metadata.py.headers": [
@@ -360470,35 +364535,43 @@
        []
       ],
       "manifest-not-in-list.json": [
-       "c66903cfd22d8ff80d91f9211a5d7e15ba24b1f9",
+       "e6f5a1bbf32cc3fc148bf43af17fd785bf7d86d6",
        []
       ],
       "manifest.py": [
-       "8a8fff74bc955c965e8874e9a84a4d8378c3e579",
+       "f8dced8f56164fd53295eb87af993782e59fa2da",
        []
       ],
       "manifest_redirect_accounts.json": [
-       "590704cfeb169d534199b95c6a582ef31526d5a2",
+       "4a8a5469fa96cfb532e4f9f9da973a7af4e16e15",
        []
       ],
       "manifest_redirect_token.json": [
-       "190420736dfbd6aaaa468656c236209c25ed11f5",
+       "35e75d10c224b399924fede19c160ea0018764a5",
+       []
+      ],
+      "manifest_with_account_auto_selected_flag.json": [
+       "e3f38b7983f5d2f0d1ceb0583032c7ad9686479b",
        []
       ],
       "manifest_with_no_accounts.json": [
-       "ad3f295ea8543a94401d346cbe4a407de38522a4",
+       "761a38b43774c3e7db03499ca8b4da891b857528",
        []
       ],
       "manifest_with_single_account.json": [
-       "15a657c679df7b0dfb0be1058e7086b439781762",
+       "72b0d6bcb7effedb5f3973cd519836e675e92da7",
        []
       ],
       "manifest_with_two_accounts.json": [
-       "932fb85dac34646c5081558c36c0367455380e39",
+       "00ae4cbe62c6f682d1501156a64d21e0fb6c1663",
        []
       ],
       "no_accounts.py": [
-       "e3948084df19c878d2251b57894872d7e262aa48",
+       "8767c50afb470d994b67b0486791b6835a8f558f",
+       []
+      ],
+      "request-params-check.py": [
+       "b5fdac00bf4645313013892c04f28e37a975e83f",
        []
       ],
       "select_manifest_in_root_manifest.py": [
@@ -360510,19 +364583,23 @@
        []
       ],
       "single_account.py": [
-       "5f05dc4be50d8c98b9b8d48600f316200ef954a5",
+       "7c8906ae7b97d281b22049266076c0ff72f62385",
        []
       ],
       "token.py": [
-       "54150325524728ab3c86bea5731d2a0f8b708ddf",
+       "b914eb2d9656cb4a892c8b51dc1754748b86d5c5",
+       []
+      ],
+      "token_with_account_auto_selected_flag.py": [
+       "6de26fe5aab4fdc28bd35c8e4daff065c10b9e4b",
        []
       ],
       "token_with_account_id.py": [
-       "4b8ae9a5651105d53b7e36ac242055c6edc52848",
+       "52fb20184bc081186e7f9aaab7561dc87c8906bd",
        []
       ],
       "two_accounts.py": [
-       "75ebf51056ca02b05185a8564ab9b128b08a9c0e",
+       "4ea6d76a7eb2ea489410c672494ff7500e4046f0",
        []
       ],
       "userinfo-iframe.html": [
@@ -378880,15 +382957,15 @@
        ]
       }
      },
-     "compositing_simple_div-ref.html": [
-      "2f462178120a1a625e85905f7855881d9ab3e141",
-      []
-     ],
      "line-with-svg-background-ref.html": [
       "0d992bc75a7166e9b46c53c1aba7dd604590355b",
       []
      ],
      "mix-blend-mode": {
+      "mix-blend-mode-root-element-group-ref.html": [
+       "a661c4663a378ef6f7e3c2ade9d510b2eceb229a",
+       []
+      ],
       "reference": {
        "green-square.html": [
         "bfc4f715efe571e47ba2b07df57797059b3d7498",
@@ -379094,6 +383171,10 @@
        ]
       }
      },
+     "root-element-background-image-transparency-001-ref.html": [
+      "b07685d951735d521418a98e2b7bf283a068019b",
+      []
+     ],
      "root-element-background-transparency-ref.html": [
       "4671d44c1c3f3e2ff16149cbaabebb0433aef3e5",
       []
@@ -379119,6 +383200,10 @@
        "a5d1a34d7ff9afc19a4bdc2bde26a0c794a01cd5",
        []
       ],
+      "transform-triangle-left.svg": [
+       "e0bf2665687dbd56cde5c7d4a6b837e03bd5233e",
+       []
+      ],
       "utils.js": [
        "eb369ce2e58f0a25e1ff543b2ed53e2e2ac99b06",
        []
@@ -379192,6 +383277,56 @@
        []
       ]
      },
+     "blocks": {
+      "align-content-block-001-ref.html": [
+       "6a454d60d7689bcd3e7f028d8357032f545a19c4",
+       []
+      ],
+      "align-content-block-002-ref.html": [
+       "d7bde74e9eb000fc20174fda459b59b919df08d3",
+       []
+      ],
+      "align-content-block-003-ref.html": [
+       "34414804bfa93627ba54a51ae5ccd6d4cb456c79",
+       []
+      ],
+      "align-content-block-004-ref.html": [
+       "ba1182b643d45064db6e0b7781aa1339ea7c6ad9",
+       []
+      ],
+      "align-content-block-005-ref.html": [
+       "c3712610dcd1cc2202ade91d627b7db20b32336d",
+       []
+      ],
+      "align-content-block-break-content-010-aligned-ref.html": [
+       "4c92cc9b45fccb0e71446c78d443cac25ce5af60",
+       []
+      ],
+      "align-content-block-break-content-010-unaligned-ref.html": [
+       "458fcf289373ccb7b84fcfd6f0726f260404a004",
+       []
+      ],
+      "align-content-block-break-content-020-aligned-ref.html": [
+       "6a0e3871496869ccf983d9cb595103bf3718ae94",
+       []
+      ],
+      "align-content-block-break-content-020-unaligned-ref.html": [
+       "730c8741d700d9953039b6c6a8d8f9b9bad66de0",
+       []
+      ],
+      "align-content-block-break-overflow-010-ref.html": [
+       "68af3244e533bec565f21924fceee2a6473798a4",
+       []
+      ],
+      "align-content-block-break-overflow-020-ref.html": [
+       "7b27284cdf42896765b1cf05c1e8ab74d1ab3649",
+       []
+      ],
+      "align-content-block-overflow-000-ref.html": [
+       "8ca5407e4ca0a65d3a98e322c90d4cada8fef15b",
+       []
+      ]
+     },
      "content-distribution": {
       "place-content-shorthand-007-ref.html": [
        "67727f4fd26fb9e9e531f2f10ab745030fdcca05",
@@ -380266,11 +384401,11 @@
      ],
      "box-shadow": {
       "slice-block-fragmentation-001-ref.html": [
-       "7e64fa9f63b2d6da6b0e2adbcd7ee786db991394",
+       "66951d44b75bca0599e42037e2836110c49770f0",
        []
       ],
       "slice-block-fragmentation-002-ref.html": [
-       "2c148d8a52cd591ac235ef14bb044304c7a955b7",
+       "1453d544c23ad01177b7eb32fc786e316b1fe7ca",
        []
       ],
       "slice-block-fragmentation-003-ref.html": [
@@ -380278,11 +384413,11 @@
        []
       ],
       "slice-inline-fragmentation-001-ref.html": [
-       "171e4935eddde185f761ff2b65063c24cc5568fe",
+       "e116d81691c689b7d9be1727b7be839ed040e5cb",
        []
       ],
       "slice-inline-fragmentation-002-ref.html": [
-       "baf297fe2c6ddf3b58a1569f6ac76ef64c7b6ba6",
+       "01bbf5421257773c8de39490653326940e3b8a5c",
        []
       ],
       "slice-inline-fragmentation-003-ref.html": [
@@ -381727,6 +385862,10 @@
       []
      ],
      "reference": {
+      "border-image-000-ref.html": [
+       "70af9921ca58fa85a9e992707c91a7c5ed77474b",
+       []
+      ],
       "widows-001-ref.html": [
        "4f822f8fd67aed18355177a5e9de18d8a63f895e",
        []
@@ -382092,6 +386231,10 @@
       "0d2f49c2e226b88ba413f4f8bf776bb4781c2f9b",
       []
      ],
+     "color-mix-currentcolor-visited-ref.html": [
+      "35376a2ccf6cf624d2249e7bf31281735b2221a3",
+      []
+     ],
      "color-mix-non-srgb-001-ref.html": [
       "15556737c7f8b10e80bcaec6bf550403050dd990",
       []
@@ -382108,6 +386251,10 @@
       "7cabf85f3b4f95449bd8cd3af847283a61de58eb",
       []
      ],
+     "currentcolor-004-ref.html": [
+      "835e4b81e62f9b0c95c81e87f4e9eac311dc8edd",
+      []
+     ],
      "deprecated-sameas-ButtonBorder-ref.html": [
       "99359aa4a776757973814748a9b74032b55cb8d8",
       []
@@ -382193,7 +386340,7 @@
       []
      ],
      "lch-005-ref.html": [
-      "3636541afde40b85dee9132f537518aa09bfe24c",
+      "d2164159fe4ad4994c932ef3192318e9f9513fa9",
       []
      ],
      "lch-006-ref.html": [
@@ -382252,6 +386399,10 @@
       "bab1f80f685f9e52ea74b8b98f5153dcd9516624",
       []
      ],
+     "out-of-gamut-legacy-rgb-ref.html": [
+      "4b1079569f10e26d9ede14a535a0e658d7047af1",
+      []
+     ],
      "prophoto-rgb-003-ref.html": [
       "e938de60345bf348d9092d03af79c16bccec9929",
       []
@@ -382282,6 +386433,14 @@
        []
       ]
      },
+     "relative-green-ref.html": [
+      "09428a288b2caba8bdb5e3451a3042048079c2a7",
+      []
+     ],
+     "relative-rec2020-ref.html": [
+      "c2dbdccd85ce8a713d824294f6e35790d72174e2",
+      []
+     ],
      "srgb-linear-003-ref.html": [
       "9de25f6ba06ba86bb2be724d5955778376802819",
       []
@@ -382925,6 +387084,14 @@
        "5783b77fec394dbee9fe97bfd0925ffc1043dacb",
        []
       ],
+      "pseudo-elements-009-ref.html": [
+       "fe6fbb140b387701bbfbb6f82e65845c96715896",
+       []
+      ],
+      "pseudo-elements-010-ref.html": [
+       "a98a4023284ae0c489d8a6cb161e1b1f67ee4cf4",
+       []
+      ],
       "resize-while-content-visibility-hidden-ref.html": [
        "2a87df85b7aba82588c984e7c41132feb777f427",
        []
@@ -383061,6 +387228,14 @@
        "83a2206be2fdf94e144f9d3363ccceb13d67479b",
        []
       ],
+      "content-visibility-animation-and-scroll-ref.html": [
+       "548970812b6df963ab9cfb9ed206e612a16aa8ca",
+       []
+      ],
+      "content-visibility-animation-becomes-visible-ref.html": [
+       "f927a02ca8cc6c7ad097401725d2977f6d9d218f",
+       []
+      ],
       "content-visibility-auto-in-iframe-ref.html": [
        "03a2875b75a7de0cb2fad0284da20bd6420c3f49",
        []
@@ -383418,11 +387593,11 @@
        []
       ],
       "contain-style-counters-004-ref.html": [
-       "afe60666c02e726ab3c3f2a7f603255168a03b14",
+       "c362dbbf5330f17e06e6d70daa5de20f6d46992f",
        []
       ],
       "contain-style-counters-005-ref.html": [
-       "1ea1ae3f08aef61921f3b1828b8524ec026c02a4",
+       "9b2868b62d0c346c64fd908b332489d1b252b709",
        []
       ],
       "contain-style-ol-ordinal-li-container-ref.html": [
@@ -385331,7 +389506,7 @@
       []
      ],
      "flexbox-align-self-baseline-horiz-006-ref.xhtml": [
-      "248ca88a2f2dfb1627bf99b06585f3e2c6986dae",
+      "9b38d0955b6cf2f70151268454f0753d5f219021",
       []
      ],
      "flexbox-align-self-baseline-horiz-007-ref.xhtml": [
@@ -387672,6 +391847,10 @@
       "45c5a9873ead0fade7465b0ab9a058800bc4ac6d",
       []
      ],
+     "font-palette-36-ref.html": [
+      "a82be2072aea5e8e4622062e77e907bc11f455da",
+      []
+     ],
      "font-palette-4-notref.html": [
       "31dbd232efb041c11d6188a4e152a2f545dff870",
       []
@@ -388292,6 +392471,14 @@
       "70e2d50cd83f61017f0f22da14065c7afa76e1d1",
       []
      ],
+     "rcap-in-monospace-ref.html": [
+      "1dcb4ac010a97f71cab0b6cc457d661c0578cf0a",
+      []
+     ],
+     "rch-in-monospace-ref.html": [
+      "1bea172a0eb0cf63a07a311c90e0c29ea185eb0d",
+      []
+     ],
      "rem-in-monospace-ref.html": [
       "5acb0522019e342eff9a955ae6b15b8d4c235000",
       []
@@ -388334,6 +392521,14 @@
        []
       ]
      },
+     "rex-in-monospace-ref.html": [
+      "27972869e6cf3b8c5cd57670b9b7c3533353a01e",
+      []
+     ],
+     "ric-in-monospace-ref.html": [
+      "4871e3baeaf18750a0a1a32a0f22d6550b1cae5e",
+      []
+     ],
      "rlh-in-monospace-ref.html": [
       "e60a59d71916ebef84299552e6524cd823f12e29",
       []
@@ -388362,6 +392557,10 @@
       "1cf10862ad60865a2095789625f104f9db7b4ba7",
       []
      ],
+     "size-adjust-unicode-range-system-fallback-ref.html": [
+      "46586c6f5386402a28888a4b721ec72f9741ab38",
+      []
+     ],
      "standard-font-family-10-notref.html": [
       "e977fdaf7647400d18b975247d42b239a37e540c",
       []
@@ -396389,6 +400588,26 @@
        "5e9ef64579800a922d225ab9ca458555fe067dcc",
        []
       ],
+      "custom-highlight-font-metrics-001-ref.html": [
+       "76b7317caabe5bedf10a98bef5cade11a4f6458e",
+       []
+      ],
+      "custom-highlight-font-metrics-002-ref.html": [
+       "13b38d8bbf8accc4d9934738118b551157b1dde9",
+       []
+      ],
+      "custom-highlight-font-metrics-003-ref.html": [
+       "c1a04b0803a080d41645d3439c4260b0459e499c",
+       []
+      ],
+      "custom-highlight-font-metrics-004-ref.html": [
+       "c1a04b0803a080d41645d3439c4260b0459e499c",
+       []
+      ],
+      "custom-highlight-font-metrics-005-ref.html": [
+       "bbfc952116f2f2c86009d8ce6d301d635d71f6e8",
+       []
+      ],
       "custom-highlight-painting-001-ref.html": [
        "b058789f6de04c017dec9a37d8955485dcd6b7e9",
        []
@@ -396550,7 +400769,7 @@
        []
       ],
       "gradient-none-interpolation-ref.html": [
-       "e1503d3f122217dc383c4dd77e899153d138378a",
+       "89a1929e275bac96c2a2e845124e0bd9cecd3cfa",
        []
       ],
       "oklab-gradient-ref.html": [
@@ -397988,6 +402207,22 @@
        []
       ]
      },
+     "counter-001-ref.html": [
+      "2dd80aa3a4792e31de199ab171180a8c4d93c6e4",
+      []
+     ],
+     "counter-002-ref.html": [
+      "621e42e26ea7ae70ca1064ccf3484938c23fdb43",
+      []
+     ],
+     "counter-003-ref.html": [
+      "39d0bb3d143cad9e3c49774d7aeabd2c023ac6e4",
+      []
+     ],
+     "counter-004-ref.html": [
+      "a0e65d480c99d3b0613684496adb33e57b30241d",
+      []
+     ],
      "counter-10-ref.html": [
       "b5d15ffa9924cb8e82dccba221bbff22a57a8ef6",
       []
@@ -398016,6 +402251,10 @@
       "a876204f6662323754546406e557a934807571ca",
       []
      ],
+     "counter-reset-increment-overflow-underflow-ref.html": [
+      "cb86d5713a1d1070371508a25a3afcaf12ece3bd",
+      []
+     ],
      "counter-set-001-ref.html": [
       "301197904a5af79eb5024bb7d97ac161e5ada3ad",
       []
@@ -398032,6 +402271,38 @@
       "c78bb263a935e905a07e6405de367b0a162dae2b",
       []
      ],
+     "counters-001-ref.html": [
+      "7084485013b5b1bd0d40aea31b692052aaa295e9",
+      []
+     ],
+     "counters-002-ref.html": [
+      "25b542f3e5a2ff545d5b8946265eab42d08f2401",
+      []
+     ],
+     "counters-003-ref.html": [
+      "75655e2dfb1d7f893791aa0fb0d45c5a06a40824",
+      []
+     ],
+     "counters-004-ref.html": [
+      "070c7047386818eb8b6d8b08faac8516b6e70018",
+      []
+     ],
+     "counters-scope-001-ref.html": [
+      "e7c3abf51014e2f698c42a1de2830bff55da6461",
+      []
+     ],
+     "counters-scope-002-ref.html": [
+      "5d3b3bdefdb3ce51adbbbdc1c7042575ad1d62e5",
+      []
+     ],
+     "counters-scope-003-ref.html": [
+      "d391da8c729219aa1690be5bd1702b1776e953ba",
+      []
+     ],
+     "counters-scope-004-ref.html": [
+      "468739cfcb389638e9cc9880fcc31bd7022e12e6",
+      []
+     ],
      "inline-block-list-marker-ref.html": [
       "6deadbfc9b65c7f89d8c428e1da6c75f1adc3d82",
       []
@@ -398481,6 +402752,22 @@
        "9dfce3f7fae6e3c9c49661eb432d8df4363afc4c",
        []
       ],
+      "clip-path-inline-007-ref.html": [
+       "981482ff7230acaf9d4f70643beb9ac56f177ca7",
+       []
+      ],
+      "clip-path-inline-008-ref.html": [
+       "981482ff7230acaf9d4f70643beb9ac56f177ca7",
+       []
+      ],
+      "clip-path-inline-009-ref.html": [
+       "26da94d8f3b3c1cb9e8d7004e72b2f60d684ccdc",
+       []
+      ],
+      "clip-path-inline-010-ref.html": [
+       "981482ff7230acaf9d4f70643beb9ac56f177ca7",
+       []
+      ],
       "clip-path-inset-round-percent-ref.html": [
        "597481d7dbe99afb764ad5f1e5603c5dd0240bee",
        []
@@ -398489,6 +402776,10 @@
        "d605e046fc2dda5e63f808a10dd42b35342d998d",
        []
       ],
+      "clip-path-marginBox-1d-ref.html": [
+       "cd78d2009a3642b6fc4f218da318f4ffd9e89d77",
+       []
+      ],
       "clip-path-mix-blend-mode-1-ref.html": [
        "12bfbda589cfcf6717257d4b8f09f8ce321801ae",
        []
@@ -398654,6 +402945,10 @@
         "f718ea6abfbab54333ba674ff0dcd320d8672bcd",
         []
        ],
+       "green-circle-100x100.html": [
+        "e1bd7e5f2f2ffbf30f49f586fba02d9470e33248",
+        []
+       ],
        "reference-local-url-with-base-001-ref.html": [
         "f718ea6abfbab54333ba674ff0dcd320d8672bcd",
         []
@@ -398966,6 +403261,10 @@
         "e5c09f9449d59e3f8bca900db2705d5f4dfb8d78",
         []
        ],
+       "mask-image-inline-sliced-1-ref.html": [
+        "4e540c2011a60fd0594ad5287316d154114faced",
+        []
+       ],
        "mask-image-ref.html": [
         "4e121163f9d093b468e710882cb164bb965d9aa8",
         []
@@ -401220,6 +405519,10 @@
       "c1ce1ff602eee4668b9cb5d0168c4372193a8d3a",
       []
      ],
+     "backdrop-inherit-rendered-ref.html": [
+      "6343f8d1410ae90dba9be945504478ac00207b0f",
+      []
+     ],
      "containing-block-change-button-ref.html": [
       "c5beee9359c83c9188d9cdf027636ebf7a3a8d26",
       []
@@ -401812,6 +406115,10 @@
       "df0a56123e033dd4536bc0425353c82bd2d0156b",
       []
      ],
+     "highlight-cascade-008-ref.html": [
+      "c87ddcf93c9ae7f0a63fe305e5155e3549fc9ee7",
+      []
+     ],
      "highlight-currentcolor-painting-properties-001-ref.html": [
       "93e2002f4aa2bde2c0d1adbb13e0dfd2abf82421",
       []
@@ -402185,6 +406492,10 @@
        "4eef817d7062a58066cf952c0c7f830f0fc87d37",
        []
       ],
+      "first-letter-with-preceding-new-line-ref.html": [
+       "e3d6b0aa2853612afa764ec0441a85a0f93c4c1a",
+       []
+      ],
       "first-line-with-inline-block-ref.html": [
        "31717d4171bad4c98b272e4ce70ee6578780b10b",
        []
@@ -402738,7 +407049,7 @@
        []
       ],
       "scroll-snap-writing-mode-000-ref.html": [
-       "26b622e718c1c38110d45bf99de598dfbc2492b6",
+       "428eb3facb5256147f525f0101205d15badb3789",
        []
       ],
       "snap-after-initial-layout-ref.html": [
@@ -402752,7 +407063,7 @@
        []
       ],
       "common.js": [
-       "2eb7f3c3a84d43589fbf0bac27cb9364a91b2640",
+       "c7800b95f1468e072579b5b9e7834487be6b9688",
        []
       ],
       "scroll-target-align-001-iframe.html": [
@@ -402868,6 +407179,10 @@
       "d4c6a169817e916b758e818121bcdc7628a9a9ce",
       []
      ],
+     "scrollbar-color-dynamic-7-ref.html": [
+      "b431edf4240257aee7df076805baf93a7d19d1ae",
+      []
+     ],
      "scrollbar-color-scheme-dynamic-1-ref.html": [
       "ec54bc08a721f2b6d4eff3a6422fdc816a4cbeae",
       []
@@ -402944,6 +407259,14 @@
       "6cce42664a64778f548edb53ec86ae61531812f0",
       []
      ],
+     "animation-part-ref.html": [
+      "c0c8ff040c9d70abb569f058842c99902ff9e2bd",
+      []
+     ],
+     "exportparts-different-scope-ref.html": [
+      "d497566c45ce000be904315c221458380d7b965e",
+      []
+     ],
      "interaction-with-nested-pseudo-class-ref.html": [
       "e3b99d43a69e6ff44899e6512237978883df06cf",
       []
@@ -403586,7 +407909,7 @@
       "values": {
        "support": {
         "parsing-utils.js": [
-         "354a64b53f538b2b1e8366b30961034e4b5d7fdd",
+         "9c13a213e96bc80ad130f7db10fcdba81f866c96",
          []
         ]
        }
@@ -404704,6 +409027,10 @@
       "col-paint-vrl-rtl-ref.html": [
        "a651e03b1c33a9428a379f42f64409eaefd0244a",
        []
+      ],
+      "row-background-paint-remove-last-cell-ref.html": [
+       "57beaedd479c3093f73dc52ed5957f2c576a959f",
+       []
       ]
      },
      "reference": {
@@ -404924,6 +409251,10 @@
         "1949939eb8b854e6ffdc8d21121f4f5f05e0e9ad",
         []
        ],
+       "hanging-punctuation-first-002-ref.html": [
+        "5f2070fdf5007fb08ad92f07524c8ea3a1624a52",
+        []
+       ],
        "hanging-punctuation-force-end-001-ref.xht": [
         "a9e7e0c1c3e53559b82bd3e10024bf24ad6d45d5",
         []
@@ -406719,6 +411050,10 @@
        "5d6942be69931f1edccdf573cfe7ef64962c6510",
        []
       ],
+      "get-char-advances.js": [
+       "846a39a2b76ca34685014c29bc764af38cc4abd9",
+       []
+      ],
       "pattern-grg-rgr-grg.png": [
        "9b88fbd81149891234185f54f8b4a0431759f181",
        []
@@ -406832,7 +411167,7 @@
      },
      "tab-size": {
       "tab-min-rendered-width-1-ref.html": [
-       "7623adb59e65bed4787a9105ce54caa8fed63fa8",
+       "e154e0ca6265c9c1a30119448d69d241c5257f42",
        []
       ],
       "tab-size-block-ancestor-ref.html": [
@@ -406859,6 +411194,10 @@
        "0f29998d2387462262b5b00c988d143c64cce7c6",
        []
       ],
+      "tab-size-integer-005-ref.html": [
+       "3e0a04b957fb21ce007b0c38c883c580f3e84f50",
+       []
+      ],
       "tab-size-length-001-ref.html": [
        "8b574c694f3122059fb25777dfd19962df2aaee5",
        []
@@ -407084,6 +411423,32 @@
        []
       ]
      },
+     "text-autospace": {
+      "text-autospace-break-001-ref.html": [
+       "80c82714c3a39a8051a2d5a840422a27d792b172",
+       []
+      ],
+      "text-autospace-dynamic-text-001-ref.html": [
+       "d26fae09b03fc19fc561abcc4ab4487b3be91b3f",
+       []
+      ],
+      "text-autospace-no-001-mismatch-ref.html": [
+       "b249fd63c67f0358b1d89f8050c21f27739f5c0e",
+       []
+      ],
+      "text-autospace-no-001-ref.html": [
+       "e7064057723e95f4bdc43e6931f39af90adbc0b0",
+       []
+      ],
+      "text-autospace-vertical-combine-001-ref.html": [
+       "36c1cb45a1e808a8fbea68061de40b87eaa9ff08",
+       []
+      ],
+      "text-autospace-vertical-upright-001-ref.html": [
+       "1c9caec112a3f9e132a8b612f748a23556a56de2",
+       []
+      ]
+     },
      "text-encoding": {
       "reference": {
        "shaping-join-001-ref.html": [
@@ -407256,6 +411621,36 @@
        []
       ]
      },
+     "text-spacing-trim": {
+      "reference": {
+       "text-spacing-trim-001-ref.html": [
+        "d49abab38080591acb8ca3734382a03df3ce9fdf",
+        []
+       ],
+       "text-spacing-trim-colon-001-ref.html": [
+        "f36743fd1c6e644c812127ba0cd51cbcbf0d3378",
+        []
+       ],
+       "text-spacing-trim-dot-001-ref.html": [
+        "acbf37f25060930a82e7c1381b226ff4fa4c80c0",
+        []
+       ],
+       "text-spacing-trim-trim-all-001-ref.html": [
+        "d541fcc5f810629f4eb8d0d97bc6f0b6db8adba3",
+        []
+       ]
+      },
+      "support": {
+       "variant-class.js": [
+        "d1ca547cfd79bfa1dc1a8f64f62e63099b9c6cce",
+        []
+       ]
+      },
+      "text-spacing-trim-space-all-001-ref.html": [
+       "d33e3b62edd31029751ac32bcbdb6178df90d563",
+       []
+      ]
+     },
      "text-stroke-width-subpixel-notref.html": [
       "ba5e8d90f3e9ea0681610b0c83cd8d32fee834d8",
       []
@@ -407372,6 +411767,10 @@
         "b07e9197fdafeda471f87bba62e51d40529f0b70",
         []
        ],
+       "text-transform-full-size-kana-008-ref.html": [
+        "42fc5104accd15acac9253b0fe7ad43fc5a19405",
+        []
+       ],
        "text-transform-fullwidth-001-ref.xht": [
         "e8a5f1acc3cea9f84cd038b71fd6dbe16ce1c85f",
         []
@@ -407633,6 +412032,10 @@
        "c71e7d50eeca1f5624dbefc397e22e7dc82c94a8",
        []
       ],
+      "text-transform-capitalize-035-ref.html": [
+       "7993386715de59b323bd8a32c9178f64cc29b7e6",
+       []
+      ],
       "text-transform-fullwidth-002-ref.xht": [
        "157a06d23bfc2c4c70fb12c74ba004c55062b25e",
        []
@@ -407792,18 +412195,6 @@
         "35c568bbcac27aab56cf283a366969a9799b921b",
         []
        ],
-       "text-space-collapse-discard-001-ref.xht": [
-        "b07483773f14211db10bbdd83d1735ca07b9ea6e",
-        []
-       ],
-       "text-space-collapse-preserve-breaks-001-ref.xht": [
-        "3fa9f07ed13d146517d221c6e04012a3d5b433c7",
-        []
-       ],
-       "text-space-trim-trim-inner-001-ref.xht": [
-        "19e42688a2d94abe4444bff9b573210ac73978c5",
-        []
-       ],
        "text-wrap-balance-002-ref.html": [
         "d8c1834d9572e33a8f4b5306871fb725dbd9ce5d",
         []
@@ -407816,6 +412207,18 @@
         "43202e4d97f03c1694176f5c6a95b4a48e938a96",
         []
        ],
+       "text-wrap-balance-float-001-ref.html": [
+        "0e3e5c7967703c510da5a9d21546fb61621a86c9",
+        []
+       ],
+       "text-wrap-balance-float-002-ref.html": [
+        "fc068905f2f958c8aaed65d03bf73b8568378ac4",
+        []
+       ],
+       "text-wrap-balance-float-005-ref.html": [
+        "b28426f5754fefc12862c8cddf8643be7c866906",
+        []
+       ],
        "text-wrap-balance-line-clamp-001-ref.html": [
         "4e465be7ccf97dfe4e8523f92aa6aec4470acbe2",
         []
@@ -407928,6 +412331,14 @@
         "dece5f7394470d5bbc393c4318fa412ea25f9b4e",
         []
        ],
+       "white-space-collapse-discard-001-ref.xht": [
+        "02649bebce05176783ca531273d4ea10b7de182d",
+        []
+       ],
+       "white-space-collapse-preserve-breaks-001-ref.xht": [
+        "462c2fc4264aef04cc0a6003c30e16a51b3e5ae9",
+        []
+       ],
        "white-space-intrinsic-size-001-ref.html": [
         "3fbc32b1b1e654068ae8ce28b547f27acde1a458",
         []
@@ -408040,6 +412451,10 @@
         "0faae57a3e7f19e0a5908866e134eb1ba451a7d1",
         []
        ],
+       "white-space-trim-discard-inner-001-ref.xht": [
+        "64be70b5f1527cb313a033df65cd8781b3ff1531",
+        []
+       ],
        "white-space-vs-joiners-001-ref.html": [
         "cab555640698e3bcbb602e96e6eccb7e034db154",
         []
@@ -408084,196 +412499,74 @@
        ]
       }
      },
-     "word-boundary": {
-      "reference": {
-       "word-boundary-001-ref.html": [
-        "620079f6ad48bba3d65a9bcd92edfd717228b973",
-        []
-       ],
-       "word-boundary-002-ref.html": [
-        "70a1a6528e704b26ef5afdec938741ff30a962f4",
-        []
-       ],
-       "word-boundary-004-ref.html": [
-        "fbe74942b14ef5cdffbace68f64beae61de5bf9e",
-        []
-       ],
-       "word-boundary-007-ref.html": [
-        "b0cb8913084fee3c86ff549fec616f19086630f9",
-        []
-       ],
-       "word-boundary-008-ref.html": [
-        "ff73104a004eafca18c2b7311edbf6469e329bc9",
-        []
-       ],
-       "word-boundary-009-ref.html": [
-        "815fe800e3de5cc663fa892284ca1947f3e115d1",
-        []
-       ],
-       "word-boundary-010-ref.html": [
-        "2ca6b8db7e4d7c6a01de6eca1c2048301bfe5788",
-        []
-       ],
-       "word-boundary-011-ref.html": [
-        "e1af62ffdf0f3de49d90a058e367b7a0296b6fc9",
-        []
-       ],
-       "word-boundary-012-ref.html": [
-        "016dc5968c0a85401f15715381daa7d95ab95c15",
-        []
-       ],
-       "word-boundary-013-ref.html": [
-        "9490e52d1ba6d4ad4a0e62528f9688efebc4a091",
-        []
-       ],
-       "word-boundary-014-ref.html": [
-        "dbec99b082719a1d9153ca75fa24c3b859dddd00",
-        []
-       ],
-       "word-boundary-101-ref.html": [
-        "f51208ab95fd4aaa804684673f09acf1492ded4d",
-        []
-       ],
-       "word-boundary-102-ref.html": [
-        "df308cee75cde74f3f71c8f0fa8d912a598de54f",
-        []
-       ],
-       "word-boundary-103-ref.html": [
-        "64f2b231c042b497c51375ef1cdc1ab3a8bfaed6",
-        []
-       ],
-       "word-boundary-104-ref.html": [
-        "15843b7296ef70a33f2e8a167330174c019f4b66",
-        []
-       ],
-       "word-boundary-105-ref.html": [
-        "3ba4c6f143c4f50b49f923028c1c53a4871573e5",
-        []
-       ],
-       "word-boundary-106-ref.html": [
-        "04d54ca20a8ce7fb11594762fa601eb72a11b92d",
-        []
-       ],
-       "word-boundary-107-ref.html": [
-        "2decfe1cc090c3924409b4794ddb8b8bf5284aac",
-        []
-       ],
-       "word-boundary-108-ref.html": [
-        "45497690fe4e7fdf8a3d307f0138c3e10929c6f9",
-        []
-       ],
-       "word-boundary-109-a-ref.html": [
-        "3cf81f6175ded80e3a0603ff60c5118cf9a23f36",
-        []
-       ],
-       "word-boundary-109-b-ref.html": [
-        "3b787b91581dad3650d6ec94b67d68413948278d",
-        []
-       ],
-       "word-boundary-110-a-ref.html": [
-        "3347778df6fa08e1a07235fb54dd322aa3bbfd22",
-        []
-       ],
-       "word-boundary-110-b-ref.html": [
-        "550c9e88880f6335351bd2f2cae1355697e0c5e5",
-        []
-       ],
-       "word-boundary-111-ref.html": [
-        "fbb536e56596271754362f645bb703f21f2eeffd",
-        []
-       ],
-       "word-boundary-112-ref.html": [
-        "f7f793908104d0da46306d3e9748936de97605b7",
-        []
-       ],
-       "word-boundary-113-ref.html": [
-        "738c600f5b46ae1d8b3b67fe0ce76fcb08f04696",
-        []
-       ],
-       "word-boundary-114-a-ref.html": [
-        "4ff39ee4f3f790ee64ebeda3218916f84c51aa11",
-        []
-       ],
-       "word-boundary-114-b-ref.html": [
-        "5b58e078dcf40432187a52836a2e589c08ac5acd",
-        []
-       ],
-       "word-boundary-115-ref.html": [
-        "a7d1dffcd9f18226763a65af359d44dea3c24b1d",
-        []
-       ],
-       "word-boundary-116-ref.html": [
-        "62d26d6a4b5b41dcedacc1d81b3c9463398a5205",
-        []
-       ],
-       "word-boundary-117-ref.html": [
-        "81d1f0601dd1f6f0f3527e5b1c6d277e04a0593d",
-        []
-       ],
-       "word-boundary-119-ref.html": [
-        "e198dafafa11666c4038f396ce0a1ba9f8ab5953",
-        []
-       ],
-       "word-boundary-120-ref.html": [
-        "e9cecd792b0a9aedb440ff0622148d0cd345930e",
-        []
-       ],
-       "word-boundary-121-ref.html": [
-        "86ecdba91291062da86789bf22ca07956a6bc8fd",
-        []
-       ],
-       "word-boundary-122-ref.html": [
-        "271705534689adbce52ed5dfcd6eb9edd4e2d1ef",
-        []
-       ],
-       "word-boundary-123-ref.html": [
-        "35b0e5f05a74624385b6f07e493294409434eb75",
-        []
-       ],
-       "word-boundary-124-ref.html": [
-        "fd732b44ec4ed087a9a652db665cb2165b8be680",
-        []
-       ],
-       "word-boundary-125-ref.html": [
-        "aad7d3d4d95b7184082042ac2784bc0fad01cb79",
-        []
-       ],
-       "word-boundary-126-ref.html": [
-        "91f2ec7b1936070b414e77b67f98d119b46b5e7e",
-        []
-       ],
-       "word-boundary-127-ref.html": [
-        "b354a4f12dc601d1d1bd938c2d3437a6fc78e493",
-        []
-       ],
-       "word-boundary-128-ref.html": [
-        "8dcabb01e29861d6bd830e5ce0c48cc2282ace18",
-        []
-       ],
-       "word-boundary-129-ref.html": [
-        "5d7d5577aec739f252b7a456c9ad98caa1b0b149",
-        []
-       ]
-      }
-     },
      "word-break": {
       "auto-phrase": {
-       "word-break-auto-phrase-intrinsic-001-ref.html": [
-        "52a743910aa8f28757439111f9de47818d2c06c0",
-        []
-       ],
-       "word-break-auto-phrase-overflow-001-ref.html": [
-        "d75b50d05d88d3c1d88bf9bcfa192072e0587bfe",
-        []
-       ],
-       "word-break-auto-phrase-wbr-nobr-001-ref.html": [
-        "dbc18b8e2918ce3053e8c8e5b4a796eb3234c731",
-        []
-       ],
-       "word-break-auto-phrase-wbr-nobr-002-ref.html": [
-        "72d89af9bf7169214556b61b877b1167a9b5a08c",
-        []
-       ]
+       "reference": {
+        "word-break-auto-phrase-001-ref.html": [
+         "51f96868f170b489caf25a12c87b6661c66057df",
+         []
+        ],
+        "word-break-auto-phrase-002-ref.html": [
+         "9f63cc951f0b71b448ca45ba857122a49437af32",
+         []
+        ],
+        "word-break-auto-phrase-003-ref.html": [
+         "5868eed30ad2b3b9fe91b8cc94a697622ae96412",
+         []
+        ],
+        "word-break-auto-phrase-004-ref.html": [
+         "81d075dc119c6c945af498c1273c2d2e219e6912",
+         []
+        ],
+        "word-break-auto-phrase-005-ref.html": [
+         "cecc0706375c572a7b7e71d0d78a1bf88911bc2c",
+         []
+        ],
+        "word-break-auto-phrase-006-ref.html": [
+         "662351aa8ba03a7eda23093a1795d00930fa1eb0",
+         []
+        ],
+        "word-break-auto-phrase-007-ref.html": [
+         "4a5553320756bd68d552097c860f96399c694b82",
+         []
+        ],
+        "word-break-auto-phrase-008-ref.html": [
+         "24f54429de8a48dcd376d04c3f61c4e9679cb4ed",
+         []
+        ],
+        "word-break-auto-phrase-009-ref.html": [
+         "31f344c6c05e5f914b91754eb51538d43af34fc0",
+         []
+        ],
+        "word-break-auto-phrase-fallback-001-ref.html": [
+         "5e65b27e2e6fbb47dc02dd193168e2e0c37aa663",
+         []
+        ],
+        "word-break-auto-phrase-fallback-002-ref.html": [
+         "9010ebb5d555e9e997bfeb78507c9acf37cc2bd6",
+         []
+        ],
+        "word-break-auto-phrase-fallback-003-ref.html": [
+         "bd29d09cadfabe475919e9723259ae1a9362a039",
+         []
+        ],
+        "word-break-auto-phrase-intrinsic-001-ref.html": [
+         "52a743910aa8f28757439111f9de47818d2c06c0",
+         []
+        ],
+        "word-break-auto-phrase-overflow-001-ref.html": [
+         "07bbb230c7051f8ed1fbfc4fe8ff12fe8ba5d3c1",
+         []
+        ],
+        "word-break-auto-phrase-wbr-nobr-001-ref.html": [
+         "4edf83be94f342e374d56f1454277fbf2539b5df",
+         []
+        ],
+        "word-break-auto-phrase-wbr-nobr-002-ref.html": [
+         "8760565c1b19162004641c32075ac3fc9e331631",
+         []
+        ]
+       }
       },
       "reference": {
        "break-boundary-2-chars-001-ref.html": [
@@ -408412,6 +412705,18 @@
         "cbfd3476089a962634e21ead1122f105f3f58c92",
         []
        ],
+       "word-break-manual-001-ref.html": [
+        "f51208ab95fd4aaa804684673f09acf1492ded4d",
+        []
+       ],
+       "word-break-normal-002-ref.html": [
+        "64f2b231c042b497c51375ef1cdc1ab3a8bfaed6",
+        []
+       ],
+       "word-break-normal-003-ref.html": [
+        "15843b7296ef70a33f2e8a167330174c019f4b66",
+        []
+       ],
        "word-break-normal-ar-ref-000.html": [
         "f7479d69176f4ee62a2abdb374bb73996fe733b8",
         []
@@ -408472,6 +412777,10 @@
         "7b7c2b6591683c71b02b530ace5d9cf765e859af",
         []
        ],
+       "word-break-normal-th-001-ref.html": [
+        "df308cee75cde74f3f71c8f0fa8d912a598de54f",
+        []
+       ],
        "word-break-normal-th-ref-000.html": [
         "51cfe2fb40192e91088c1533c183172e5cba1a70",
         []
@@ -408486,6 +412795,118 @@
        []
       ]
      },
+     "word-space-transform": {
+      "reference": {
+       "word-space-transform-001-ref.html": [
+        "620079f6ad48bba3d65a9bcd92edfd717228b973",
+        []
+       ],
+       "word-space-transform-002-ref.html": [
+        "70a1a6528e704b26ef5afdec938741ff30a962f4",
+        []
+       ],
+       "word-space-transform-004-ref.html": [
+        "fbe74942b14ef5cdffbace68f64beae61de5bf9e",
+        []
+       ],
+       "word-space-transform-007-ref.html": [
+        "b0cb8913084fee3c86ff549fec616f19086630f9",
+        []
+       ],
+       "word-space-transform-008-ref.html": [
+        "ff73104a004eafca18c2b7311edbf6469e329bc9",
+        []
+       ],
+       "word-space-transform-009-ref.html": [
+        "815fe800e3de5cc663fa892284ca1947f3e115d1",
+        []
+       ],
+       "word-space-transform-010-ref.html": [
+        "2ca6b8db7e4d7c6a01de6eca1c2048301bfe5788",
+        []
+       ],
+       "word-space-transform-011-ref.html": [
+        "e1af62ffdf0f3de49d90a058e367b7a0296b6fc9",
+        []
+       ],
+       "word-space-transform-012-ref.html": [
+        "016dc5968c0a85401f15715381daa7d95ab95c15",
+        []
+       ],
+       "word-space-transform-013-ref.html": [
+        "9490e52d1ba6d4ad4a0e62528f9688efebc4a091",
+        []
+       ],
+       "word-space-transform-014-ref.html": [
+        "dbec99b082719a1d9153ca75fa24c3b859dddd00",
+        []
+       ],
+       "word-space-transform-016-a-ref.html": [
+        "3347778df6fa08e1a07235fb54dd322aa3bbfd22",
+        []
+       ],
+       "word-space-transform-016-b-ref.html": [
+        "550c9e88880f6335351bd2f2cae1355697e0c5e5",
+        []
+       ],
+       "word-space-transform-017-ref.html": [
+        "d37b2301d9c366ce44dd321e620df56331b51ab7",
+        []
+       ],
+       "word-space-transform-018-ref.html": [
+        "84cb52c478e224412a0b703f15d23396acd49ec3",
+        []
+       ],
+       "word-space-transform-019-a-ref.html": [
+        "4ff39ee4f3f790ee64ebeda3218916f84c51aa11",
+        []
+       ],
+       "word-space-transform-019-b-ref.html": [
+        "5b58e078dcf40432187a52836a2e589c08ac5acd",
+        []
+       ],
+       "word-space-transform-020-ref.html": [
+        "a7d1dffcd9f18226763a65af359d44dea3c24b1d",
+        []
+       ],
+       "word-space-transform-021-ref.html": [
+        "1569dc9cbce214f96d5780b011881f2c719ea2d6",
+        []
+       ],
+       "word-space-transform-022-ref.html": [
+        "734c08ccab07d0ec02f55b89c3f7fd9b55828b12",
+        []
+       ],
+       "word-space-transform-024-ref.html": [
+        "e198dafafa11666c4038f396ce0a1ba9f8ab5953",
+        []
+       ],
+       "word-space-transform-025-ref.html": [
+        "e9cecd792b0a9aedb440ff0622148d0cd345930e",
+        []
+       ],
+       "word-space-transform-026-ref.html": [
+        "86ecdba91291062da86789bf22ca07956a6bc8fd",
+        []
+       ],
+       "word-space-transform-027-ref.html": [
+        "58cfc552c80d9be523af327a9768147539225db3",
+        []
+       ],
+       "word-space-transform-028-ref.html": [
+        "9904cb96104f7805d0cb104dd0f2519d986a9ff4",
+        []
+       ],
+       "word-space-transform-029-ref.html": [
+        "0844a20126d35ff472c7ad2c5c7897227f67fc9e",
+        []
+       ],
+       "word-space-transform-030-ref.html": [
+        "46df21573f190f555bb2eb2214e467cda6dbf31b",
+        []
+       ]
+      }
+     },
      "word-spacing": {
       "reference": {
        "ref-filled-green-100px-square.xht": [
@@ -408540,6 +412961,14 @@
      ],
      "invalidation": {
       "reference": {
+       "selection-pseudo-with-decoration-invalidation-001-ref.html": [
+        "7bbe11da9267f52c3af5c31643ec49d29e7b5fe3",
+        []
+       ],
+       "selection-pseudo-with-decoration-invalidation-002-ref.html": [
+        "59351f8bed45ea5f29dcfd1d345a0a6ab49f57c9",
+        []
+       ],
        "text-decoration-invalidation-dashed-ref.html": [
         "64356838638ce794bbf408351606bb68398bbf4c",
         []
@@ -408783,6 +413212,10 @@
        "0a6dbd448f4b037b840377c1b19d28c93a3a9efa",
        []
       ],
+      "text-decoration-thickness-non-inherit-ref.html": [
+       "ae383f9e514dc402f60e8d055c2ada37d2057dd4",
+       []
+      ],
       "text-decoration-thickness-percent-001-ref.html": [
        "c37c0facdc1210ed5a5e086adf2267f9f0c1aabf",
        []
@@ -409305,7 +413738,7 @@
       []
      ],
      "backface-visibility-hidden-003-ref.html": [
-      "7dab6b947fb6bf1d927e659fcacce87d8d4fa23e",
+      "b21977caa5e8c89b3db116c0136b536d73dd128c",
       []
      ],
      "backface-visibility-hidden-004-ref.html": [
@@ -410068,6 +414501,14 @@
         "ebcb699c7d108bd5d5b4967adb0f52d2dceb902d",
         []
        ],
+       "svgbox-rect-dasharray-ref.html": [
+        "ae4c8aa6f6106e6613c849597d0bc54d490b8524",
+        []
+       ],
+       "svgbox-rect-ref.html": [
+        "eb1ac1fca2ad1e0b9202e042b1911f4f113a2133",
+        []
+       ],
        "svgbox-ref.html": [
         "c765ebe8665a71d2f79a9512dad4c9bd63756299",
         []
@@ -410183,7 +414624,7 @@
       []
      ],
      "transform-input-009-ref.html": [
-      "90d048b91414bdd1d84cd1448e996f1cf1e6701e",
+      "b363509c9114692173cab87ef5a058cf142295f5",
       []
      ],
      "transform-input-010-ref.html": [
@@ -410567,7 +415008,7 @@
       []
      ],
      "transform3d-preserve3d-001-ref.html": [
-      "383bc7a63eb55053bf17948c1c973d80f8f2d352",
+      "63dce0180ae19554c820b05aa23b09e87908ce29",
       []
      ],
      "transform3d-preserve3d-013-ref.html": [
@@ -411082,6 +415523,10 @@
       "d02c20cb3e7c75ca0a1e3be94405d276a73360f3",
       []
      ],
+     "negative-outline-offset-ref.html": [
+      "acf1a6e0e8850f1b15aa94bc4feb869d22b35bf4",
+      []
+     ],
      "nothing-below-ref.html": [
       "c8d6508ace4e4bd0343f67f2e12e35ea6e098df9",
       []
@@ -412246,6 +416691,10 @@
       "a22882a9996b14afa942d3403fa1a873f526073a",
       []
      ],
+     "attr-notype-fallback-ref.html": [
+      "efb9b969f3a1ea041d48187b7a0477bef406814e",
+      []
+     ],
      "calc-background-image-gradient-1-ref.html": [
       "d4b529b964b030fc47fdb947e6644d5bacaa1485",
       []
@@ -412901,7 +417350,7 @@
       []
      ],
      "content-with-clip-ref.html": [
-      "28d8733e27addde11904cd55485bc0a850a5f602",
+      "a322301686ff441dc203768db8881b813b227413",
       []
      ],
      "content-with-clip-root-ref.html": [
@@ -413024,6 +417473,10 @@
       "44a41f1bf93366e06f2eae0cbfcd4acb126d192f",
       []
      ],
+     "inline-element-size-ref.html": [
+      "177594c870ceb2fabcf309ba5a8ff7e7553ca7a5",
+      []
+     ],
      "intrinsic-aspect-ratio-ref.html": [
       "4455ad6172ef93668ab239317a17e33e9b0cb35e",
       []
@@ -413292,10 +417745,22 @@
       "3d307ce3c7eaf0d7b218a5803ca2ea3603de0355",
       []
      ],
+     "snapshot-containing-block-includes-scrollbar-gutter-ref.html": [
+      "8a74bd216450ef7ddf37f1819da7119e9eb48854",
+      []
+     ],
      "snapshot-containing-block-static-ref.html": [
       "8ed60934cafe3970b4bd8e5ddcbc79818b10679b",
       []
      ],
+     "span-with-overflowing-text-hidden-ref.html": [
+      "1d27e470ac15cc48aef31079ccc6ff445cead05a",
+      []
+     ],
+     "span-with-overflowing-text-ref.html": [
+      "76fc3671da1faafaaf25760d11dd84bd670f6b4a",
+      []
+     ],
      "support": {
       "cat.png": [
        "85dd7324815b8f8ef1a1d0496224c1a0661db9d8",
@@ -416517,7 +420982,7 @@
       []
      ],
      "css-filters-animation-blur-ref.html": [
-      "3bde6f1826f7620fc0754fff46ed5ef382de3d4d",
+      "86929b82e682eb284d4990577b3cd6f9e9dc3c91",
       []
      ],
      "css-filters-animation-brightness-ref.html": [
@@ -417318,6 +421783,14 @@
       "39dd8204de1e4bdc573fa8e8e8d44986cc976427",
       []
      ],
+     "offset-path-ray-019-ref.html": [
+      "1bf242e3fc62a0d88fc7b58c1140a80147b1a2a7",
+      []
+     ],
+     "offset-path-ray-022-ref.html": [
+      "63bbc2cfb3202c9dca3345e2c69f699a623e9edb",
+      []
+     ],
      "offset-path-ray-contain-001-ref.html": [
       "05f54d9dc55dff6159df20d226eaf0753f351385",
       []
@@ -417658,6 +422131,16 @@
        []
       ]
      },
+     "remote-origin-iframe-print-ref.html": [
+      "f632519cd6e172bb4bc2c903db2b89bddb68273a",
+      []
+     ],
+     "resources": {
+      "iframe-with-abspos.html": [
+       "27de3aad5e05caa1898f744c9e6646a467e74e32",
+       []
+      ]
+     },
      "subpixel-page-size-001-print-ref.html": [
       "cf59f2be374bd6f41913a107b70d41a18cc0e225",
       []
@@ -418031,6 +422514,10 @@
        "627ebc074bf4306cd2d40e5462e35ee1fc036dd7",
        []
       ],
+      "part-pseudo-ref.html": [
+       "aeb724778a78e17b7144c4b7618d49d17ee1e54b",
+       []
+      ],
       "sheet-going-away-002-ref.html": [
        "67841617736730e588f5659fd485fb09a159bd33",
        []
@@ -418378,8 +422865,12 @@
       "85dd7324815b8f8ef1a1d0496224c1a0661db9d8",
       []
      ],
+     "color-testcommon.js": [
+      "44ca0bbb33c9e9571415c14180372ca0b96780a6",
+      []
+     ],
      "computed-testcommon.js": [
-      "31bf451ecf371ec1e45f11ea404ab4d0ea607b24",
+      "8e746258061009f29f6ccdde164241729cf065b0",
       []
      ],
      "delete-other-rule-crash.css": [
@@ -418419,7 +422910,7 @@
       []
      ],
      "parsing-testcommon.js": [
-      "cc040be5116cdca8857a2fe14c0fa6aee8fcea42",
+      "e480f26b3f3db5bc95ecd152c9711c3bccfcfcfe",
       []
      ],
      "pattern-grg-rgr-grg.png": [
@@ -418560,6 +423051,18 @@
       "e7775276038f307b7cdb0a75d19ee24f67619c2a",
       []
      ]
+    },
+    "zoom": {
+     "tentative": {
+      "basic-ref.html": [
+       "5de90caf7f0c72041334349b7c4b1044d373bc22",
+       []
+      ],
+      "green-square-100px.html": [
+       "6677176230e33cd39424ee3dc8bc9c0af321774c",
+       []
+      ]
+     }
     }
    },
    "custom-elements": {
@@ -418750,7 +423253,7 @@
      []
     ],
     "Dockerfile": [
-     "757552686661f8a28d99a1befc7ea1b6626396b8",
+     "8732db2f7ecc396e94eb6295798390587da41710",
      []
     ],
     "META.yml": [
@@ -418767,7 +423270,7 @@
     ],
     "admin": {
      "index.md": [
-      "f42d3075b6b7011ec3966ecb2b9cfd8ef54e5609",
+      "e0ec8b2b26caf0bde2ec2b1d5a0420170885fbc2",
       []
      ],
      "pywebsocket3.rst": [
@@ -418889,7 +423392,7 @@
     },
     "running-tests": {
      "android_webview.md": [
-      "4a86814fdf71b69e7b6b89d684a208131852cdbe",
+      "4e3623c664ebbb611f4382ff58ae36020b1a0527",
       []
      ],
      "chrome-chromium-installation-detection.md": [
@@ -419057,11 +423560,11 @@
       []
      ],
      "testdriver.md": [
-      "e482452aef39a56952f1a51ff875c1d04aa66a41",
+      "d5f7f8d3667bed74c37bd6543ad3e3ea2479bed1",
       []
      ],
      "testharness-api.md": [
-      "339815c5ffe673542441be66c96803780fbb966a",
+      "56dc4a4417a21d322c859e543b4d509e45921e96",
       []
      ],
      "testharness-tutorial.md": [
@@ -419332,7 +423835,7 @@
    },
    "dom": {
     "META.yml": [
-     "6fd5b12664da091fd9ee773b821ad72ee704ee8f",
+     "fb6dd26bd3ac5207e207276f5a4213ed0af7cc82",
      []
     ],
     "abort": {
@@ -419400,15 +423903,15 @@
      },
      "scrolling": {
       "scroll_support.js": [
-       "52c2f58723a2a39e9d652036d82d59475497c76e",
+       "f05251ce21a55db622a28fab7e71f29b9de71451",
        []
       ],
       "scrollend-event-fires-to-iframe-inner-frame.html": [
-       "3657a8b87714f5b03f52def89847dd8df986f174",
+       "115e583c067ebd381da8f9665b3a322c29b41268",
        []
       ],
       "scrollend-user-scroll-common.js": [
-       "34af4ce921e72386491149f0f47f754481a3cf3e",
+       "5c278784d83916beda046e9c6b760429c3dc9804",
        []
       ]
      }
@@ -419763,6 +424266,14 @@
       ]
      }
     },
+    "parts": {
+     "resources": {
+      "domparts-utils.js": [
+       "5deeec80a358a56e2c40c2b6e371591210504316",
+       []
+      ]
+     }
+    },
     "ranges": {
      "Range-mutations.js": [
       "23c013ac6a1d7a1563739afe50f151af49b4ffa6",
@@ -419892,7 +424403,7 @@
    },
    "domxpath": {
     "META.yml": [
-     "39abd8e7065477f07caca7211f984dddcb7c5f2a",
+     "eedf09861f92bb483edd05ac84976ed4c1d2c55d",
      []
     ],
     "README.md": [
@@ -419942,6 +424453,12 @@
      []
     ]
    },
+   "ecmascript": {
+    "README.md": [
+     "d005bf654d36f5d739b4d4fe99ab134b038f647c",
+     []
+    ]
+   },
    "editing": {
     "META.yml": [
      "f7f2f109d655b517e5da0b3b6b0a0835c9971642",
@@ -421504,7 +426021,7 @@
    },
    "eventsource": {
     "META.yml": [
-     "92f1036338515da7807fdbde7ab0a26f509cc986",
+     "437da600931424b63054ca0c0c8e87b56b284167",
      []
     ],
     "README.md": [
@@ -422001,7 +426518,7 @@
       []
      ],
      "automatic-beacon-store.py": [
-      "f783c8530c4386321c6da8e7be1ff4732074917d",
+      "0a4af50ae6910cf1c2fc5ccd1f8f6980d1c71963",
       []
      ],
      "automatic-beacon-unfenced-page.html": [
@@ -422301,11 +426818,11 @@
       []
      ],
      "fledge-bidding-logic.py": [
-      "85c78acb8bc89428ef7c82470711adc47de602ee",
+      "d1178c8a7a07b1c246a67d8d1f82598293705c24",
       []
      ],
      "fledge-decision-logic.py": [
-      "bd615af835bfab6f3f07951d50c4db90f2e3a9f6",
+      "63b544552c0d7f4678ef5e4d6504f982f51fa23f",
       []
      ],
      "frame-navigation-inner-create-nested.https.html": [
@@ -422717,7 +427234,7 @@
       []
      ],
      "utils.js": [
-      "a402dfdde4a89765f0792d9925c6b16ae0bbbc1d",
+      "255e55dd24a2499a81cc88556e5182cf205eba8a",
       []
      ],
      "web-bluetooth-inner.html": [
@@ -423124,7 +427641,7 @@
        []
       ],
       "utils.js": [
-       "3b20ecc83469799df17fa3b6f5defdd1e6c0a5fd",
+       "3721d9bf9cc7cf6d01709aa5e22de2eb9bd4bda7",
        []
       ]
      },
@@ -423908,7 +428425,7 @@
        []
       ],
       "utils.js": [
-       "94a2177f0792bb2ecb0230238e0c0dda55215230",
+       "45fbc4cb38eb8a7e97a1e8dd4ee707f0151f3b57",
        []
       ]
      },
@@ -424014,7 +428531,7 @@
        []
       ],
       "support.sub.js": [
-       "27d733d8b7f4c09df054982a42779520fbbd0d7d",
+       "f8621338cc263c0621fdd49eb088cd61223d1348",
        []
       ],
       "worker-blob-fetcher.html": [
@@ -424151,16 +428668,16 @@
    "fledge": {
     "tentative": {
      "TODO": [
-      "fc2c296762cee6208747460babc154edca2593cc",
+      "7ec6d8808017cbef7062a28df30efb4e0513f629",
       []
      ],
      "resources": {
       "bidding-logic.sub.py": [
-       "6b4e179cff9493202335b43ae68cf5862ff75053",
+       "89707470d25a09f7d87f6f5f6349d7155af078f8",
        []
       ],
       "decision-logic.sub.py": [
-       "9a97d45bd1247cd6c566f4f3cfb5b7e6d40876e8",
+       "165d98400283c1af965b7feb270c939a5c691b84",
        []
       ],
       "empty.html": [
@@ -424168,11 +428685,15 @@
        []
       ],
       "fenced-frame.sub.py": [
-       "c29bb6fecccf5dc47ef82e4dc2fda4991b993f85",
+       "a3cc488a0580dbefcff884a03dd5237f19fd14a3",
        []
       ],
       "fledge-util.js": [
-       "f941d2285d2d495632e18fd99f97fce38b95aeff",
+       "7ed5b13f8d987715558a129dfa93bd5a0fed4e1c",
+       []
+      ],
+      "iframe.sub.html": [
+       "0bc0ea357f6385c77a83629f34748a599ff6ad17",
        []
       ],
       "request-tracker.py": [
@@ -424180,11 +428701,11 @@
        []
       ],
       "trusted-bidding-signals.py": [
-       "9602bd22f9667057c46d3900909ec9bcda832341",
+       "86e4db8ad448ade94b4c5885ea6b99b9f80e2871",
        []
       ],
       "trusted-scoring-signals.py": [
-       "6036d2ef4d122cc767967125840d2c34bed413b7",
+       "43ff772a0e32f2928b01db727b0c1e9988a42cec",
        []
       ]
      }
@@ -424724,15 +429245,19 @@
      ]
     },
     "CanvasTest-ascent256.ttf": [
-     "d5924fc2194a3ae0d9a4eca3c293b14909b2a44e",
+     "84ce51dee712d34c83e364ad09bd48c28f303a76",
      []
     ],
     "CanvasTest-descent0.ttf": [
-     "5887c0de8ddc89e4dcfa9027fa44a2d8a631c465",
+     "b0291dcf429bfe2ee99ebd733ded33abff4af2dd",
+     []
+    ],
+    "CanvasTest-nospace.ttf": [
+     "5e586aa6bebda098a596e68ef3c94f9926c07ccd",
      []
     ],
     "CanvasTest.ttf": [
-     "9cdd0faf10818614202d397bb70b97a51a311fd4",
+     "6cdeccd10fe715d03d06a533a9d1397d111b72d8",
      []
     ],
     "CanvasTest.ttf.headers": [
@@ -425202,6 +429727,24 @@
       "780661ba1ca55c7ba73a8dabe0716c066b8cc7ca",
       []
      ],
+     "cjk": {
+      "LICENSE.txt": [
+       "d952d62c065f3f35fb83a173496e90b21525aef3",
+       []
+      ],
+      "NotoSansCJKjp-Regular-subset-chws.otf": [
+       "18859d5e2fe1200da5caef5f88d15864d0477963",
+       []
+      ],
+      "NotoSansCJKjp-Regular-subset-halt.otf": [
+       "773282263e6e0fe11c4b319ee156f403d824bc5e",
+       []
+      ],
+      "README.md": [
+       "8ff42d0f441ab9c9e0af92fc2f8b49d5c54089af",
+       []
+      ]
+     },
      "noto-sans-v8-latin-regular.woff": [
       "4f1dd100c0917b3ea6e0634d6c0fee5a191db63a",
       []
@@ -425469,7 +430012,7 @@
       []
      ],
      "test-helpers.js": [
-      "d2e09504d3f6116564ad2527f0ac476db04b6cf8",
+      "f185e2f48b6e7915e5dd6354c62923beb98e8a25",
       []
      ]
     },
@@ -425567,7 +430110,7 @@
       []
      ],
      "FileSystemWritableFileStream-write.js": [
-      "a91a206b868250d486a6ec67a708dc8f4803ded6",
+      "0b12def74c965d689908b7aa689e209e02ee38fa",
       []
      ],
      "FileSystemWritableFileStream.js": [
@@ -425788,7 +430331,7 @@
    },
    "html": {
     "META.yml": [
-     "94b925cc0760b29dc6d0ee7c6fb37ec424da833b",
+     "7eecf519f1b69eda044e17fdfafda34561b95a18",
      []
     ],
     "README.md": [
@@ -425856,7 +430399,7 @@
          []
         ],
         "rc-helper.js": [
-         "cb73f52e15b0c27e7f7dacb9415d158e14291af0",
+         "9ecdc91ff147ac785154ae2ab5991ea32f9dacb3",
          []
         ],
         "service-worker.js": [
@@ -426291,16 +430834,16 @@
          "bc9ff6faf10e665d8c84a555217f53a711d9051a",
          []
         ],
+        "executor-window.py": [
+         "3ccba723892403e119cab1593bdf3040cf3295a6",
+         []
+        ],
         "executor-worker.js": [
          "49ce6bd52a5a829799078823c8f3b7a450a28233",
          []
         ],
-        "executor.sub.html": [
-         "38f4429d91e4ee9f203fe312043cec23298c205a",
-         []
-        ],
         "remote-context-helper.js": [
-         "047d5cf821e5502f03736b2120541e7ff20dbb1d",
+         "b62c9ac491a7643becdf0f8bc56c18e519eae06a",
          []
         ]
        }
@@ -427795,7 +432338,7 @@
         []
        ],
        "window-name.sub.html": [
-        "5bb8ebda8f85134ac2dd02fc5862e49ec7c76b8d",
+        "9255ba340159ba67d08f90837cb77c0aa514a5f0",
         []
        ],
        "window-opener.html": [
@@ -427819,6 +432362,116 @@
        "707bafd3203610433808979232509d6a506dc3d5",
        []
       ],
+      "canvas-host": {
+       "2d.canvas.host.scaled.png": [
+        "875407769ff19385c8be8b1dfd4eafc8a2e285be",
+        []
+       ],
+       "2d.canvas.host.size.attributes.parse.decimal.png": [
+        "f8426733306293c70134e35f4704268b7a19a407",
+        []
+       ],
+       "2d.canvas.host.size.attributes.parse.em.png": [
+        "f8426733306293c70134e35f4704268b7a19a407",
+        []
+       ],
+       "2d.canvas.host.size.attributes.parse.empty.png": [
+        "a72d047556a72dc83654077f88bd5ba271dc1a36",
+        []
+       ],
+       "2d.canvas.host.size.attributes.parse.exp.png": [
+        "f8426733306293c70134e35f4704268b7a19a407",
+        []
+       ],
+       "2d.canvas.host.size.attributes.parse.junk.png": [
+        "a72d047556a72dc83654077f88bd5ba271dc1a36",
+        []
+       ],
+       "2d.canvas.host.size.attributes.parse.minus.png": [
+        "a72d047556a72dc83654077f88bd5ba271dc1a36",
+        []
+       ],
+       "2d.canvas.host.size.attributes.parse.octal.png": [
+        "f8426733306293c70134e35f4704268b7a19a407",
+        []
+       ],
+       "2d.canvas.host.size.attributes.parse.onlyspace.png": [
+        "a72d047556a72dc83654077f88bd5ba271dc1a36",
+        []
+       ],
+       "2d.canvas.host.size.attributes.parse.percent.png": [
+        "f8426733306293c70134e35f4704268b7a19a407",
+        []
+       ],
+       "2d.canvas.host.size.attributes.parse.plus.png": [
+        "f8426733306293c70134e35f4704268b7a19a407",
+        []
+       ],
+       "2d.canvas.host.size.attributes.parse.space.png": [
+        "f8426733306293c70134e35f4704268b7a19a407",
+        []
+       ],
+       "2d.canvas.host.size.attributes.parse.trailingjunk.png": [
+        "f8426733306293c70134e35f4704268b7a19a407",
+        []
+       ],
+       "2d.canvas.host.size.attributes.parse.whitespace.png": [
+        "f8426733306293c70134e35f4704268b7a19a407",
+        []
+       ],
+       "2d.canvas.host.size.attributes.setAttribute.decimal.png": [
+        "f8426733306293c70134e35f4704268b7a19a407",
+        []
+       ],
+       "2d.canvas.host.size.attributes.setAttribute.em.png": [
+        "f8426733306293c70134e35f4704268b7a19a407",
+        []
+       ],
+       "2d.canvas.host.size.attributes.setAttribute.empty.png": [
+        "a72d047556a72dc83654077f88bd5ba271dc1a36",
+        []
+       ],
+       "2d.canvas.host.size.attributes.setAttribute.exp.png": [
+        "f8426733306293c70134e35f4704268b7a19a407",
+        []
+       ],
+       "2d.canvas.host.size.attributes.setAttribute.junk.png": [
+        "a72d047556a72dc83654077f88bd5ba271dc1a36",
+        []
+       ],
+       "2d.canvas.host.size.attributes.setAttribute.minus.png": [
+        "a72d047556a72dc83654077f88bd5ba271dc1a36",
+        []
+       ],
+       "2d.canvas.host.size.attributes.setAttribute.octal.png": [
+        "f8426733306293c70134e35f4704268b7a19a407",
+        []
+       ],
+       "2d.canvas.host.size.attributes.setAttribute.onlyspace.png": [
+        "a72d047556a72dc83654077f88bd5ba271dc1a36",
+        []
+       ],
+       "2d.canvas.host.size.attributes.setAttribute.percent.png": [
+        "f8426733306293c70134e35f4704268b7a19a407",
+        []
+       ],
+       "2d.canvas.host.size.attributes.setAttribute.plus.png": [
+        "f8426733306293c70134e35f4704268b7a19a407",
+        []
+       ],
+       "2d.canvas.host.size.attributes.setAttribute.space.png": [
+        "f8426733306293c70134e35f4704268b7a19a407",
+        []
+       ],
+       "2d.canvas.host.size.attributes.setAttribute.trailingjunk.png": [
+        "f8426733306293c70134e35f4704268b7a19a407",
+        []
+       ],
+       "2d.canvas.host.size.attributes.setAttribute.whitespace.png": [
+        "f8426733306293c70134e35f4704268b7a19a407",
+        []
+       ]
+      },
       "compositing": {
        "2d.composite.canvas.clear.png": [
         "eeedd0ff05889ffd4468bf19a2e8e9e0a094201c",
@@ -428434,6 +433087,14 @@
        ]
       },
       "layers": {
+       "2d.layer.blur-from-outside-canvas.no-clipping-expected.html": [
+        "6cad180f1487e576ea4062a24b049759c28ba4b0",
+        []
+       ],
+       "2d.layer.blur-from-outside-canvas.with-clipping-expected.html": [
+        "1823f789839a973121269406f387ae8a66b6f8e1",
+        []
+       ],
        "2d.layer.cross-layer-paths-expected.html": [
         "c394ecdfe3904f0afb1e4879241cf38d985155e6",
         []
@@ -428582,6 +433243,22 @@
         "ef46f69e2a577fb407175bb21fdc94ecb5cdfd6d",
         []
        ],
+       "2d.layer.shadow-from-outside-canvas.long-distance-expected.html": [
+        "cc10684a9bc2f5e18a71c34f590161e36c5d33bd",
+        []
+       ],
+       "2d.layer.shadow-from-outside-canvas.long-distance-with-clipping-expected.html": [
+        "377dd55ef6f0d69fd00803dfcd9d40069e502036",
+        []
+       ],
+       "2d.layer.shadow-from-outside-canvas.short-distance-expected.html": [
+        "8980708dd18cb7f8231cc38c7aec14eac5f31a1a",
+        []
+       ],
+       "2d.layer.shadow-from-outside-canvas.short-distance-with-clipping-expected.html": [
+        "024fc8c9a4aafd32d125bb50a6a2a02f1879fa76",
+        []
+       ],
        "2d.layer.unclosed-expected.html": [
         "625630f5e6b1d09adffc4fcbb151da2b1fbe0032",
         []
@@ -429274,6 +433951,30 @@
        ]
       },
       "reset": {
+       "2d.reset.render.drop_shadow-expected.html": [
+        "182f7e40cd088ce569d9ca41bdc351c486548ef8",
+        []
+       ],
+       "2d.reset.render.global_composite_operation-expected.html": [
+        "1f9d247634c6d9fc206f219611bdd859d666a828",
+        []
+       ],
+       "2d.reset.render.line-expected.html": [
+        "dcd648d8c3494e44b851f8f08a9eaaa61ac79686",
+        []
+       ],
+       "2d.reset.render.misc-expected.html": [
+        "c359e6b42e20ddc5d8c2dba059cfbb81f8febc32",
+        []
+       ],
+       "2d.reset.render.miter_limit-expected.html": [
+        "c91f485c531fb232d7ff4caeda696b61eede2db7",
+        []
+       ],
+       "2d.reset.render.text-expected.html": [
+        "7221483b02fe379e2aebcca708be235fd4a74e2c",
+        []
+       ],
        "2d.reset.state.clip-expected.html": [
         "974b37fab4ecf087a518b14306ade81b4f8c924f",
         []
@@ -429339,27 +434040,23 @@
         []
        ],
        "2d.text.fontVariantCaps1-expected.html": [
-        "8ea3c22be13dd3bf1421c3f80b121edcc8b2d3bc",
-        []
-       ],
-       "2d.text.fontVariantCaps2-unexpected.html": [
-        "c64f5d0ec2aea8307ea4ba5257498f2f236186e6",
+        "e2cef0d77a64b17657bdfe99194930c5328cc3e8",
         []
        ],
        "2d.text.fontVariantCaps3-expected.html": [
-        "069fbfba8823e3e0f5fcf7ada4bd600b6dce1bbd",
+        "cf2d5ae119b549803b48521003d394313159944a",
         []
        ],
        "2d.text.fontVariantCaps4-expected.html": [
-        "069fbfba8823e3e0f5fcf7ada4bd600b6dce1bbd",
+        "3813fd3684e8c94887337a551727e068469a66c5",
         []
        ],
        "2d.text.fontVariantCaps5-expected.html": [
-        "8ea3c22be13dd3bf1421c3f80b121edcc8b2d3bc",
+        "4bda4ec4b5dc522b400df462b8a13b2fc7a9be8a",
         []
        ],
        "2d.text.fontVariantCaps6-expected.html": [
-        "c64f5d0ec2aea8307ea4ba5257498f2f236186e6",
+        "af9c736aea7f9b20f4fd09522a8aa2dd25a11ef1",
         []
        ],
        "reference": {
@@ -429412,6 +434109,14 @@
        ]
       },
       "layers": {
+       "2d.layer.blur-from-outside-canvas.no-clipping-expected.html": [
+        "6cad180f1487e576ea4062a24b049759c28ba4b0",
+        []
+       ],
+       "2d.layer.blur-from-outside-canvas.with-clipping-expected.html": [
+        "1823f789839a973121269406f387ae8a66b6f8e1",
+        []
+       ],
        "2d.layer.cross-layer-paths-expected.html": [
         "c394ecdfe3904f0afb1e4879241cf38d985155e6",
         []
@@ -429556,6 +434261,22 @@
         "ef46f69e2a577fb407175bb21fdc94ecb5cdfd6d",
         []
        ],
+       "2d.layer.shadow-from-outside-canvas.long-distance-expected.html": [
+        "cc10684a9bc2f5e18a71c34f590161e36c5d33bd",
+        []
+       ],
+       "2d.layer.shadow-from-outside-canvas.long-distance-with-clipping-expected.html": [
+        "377dd55ef6f0d69fd00803dfcd9d40069e502036",
+        []
+       ],
+       "2d.layer.shadow-from-outside-canvas.short-distance-expected.html": [
+        "8980708dd18cb7f8231cc38c7aec14eac5f31a1a",
+        []
+       ],
+       "2d.layer.shadow-from-outside-canvas.short-distance-with-clipping-expected.html": [
+        "024fc8c9a4aafd32d125bb50a6a2a02f1879fa76",
+        []
+       ],
        "2d.layer.unclosed-expected.html": [
         "625630f5e6b1d09adffc4fcbb151da2b1fbe0032",
         []
@@ -429590,6 +434311,30 @@
        ]
       },
       "reset": {
+       "2d.reset.render.drop_shadow-expected.html": [
+        "182f7e40cd088ce569d9ca41bdc351c486548ef8",
+        []
+       ],
+       "2d.reset.render.global_composite_operation-expected.html": [
+        "1f9d247634c6d9fc206f219611bdd859d666a828",
+        []
+       ],
+       "2d.reset.render.line-expected.html": [
+        "dcd648d8c3494e44b851f8f08a9eaaa61ac79686",
+        []
+       ],
+       "2d.reset.render.misc-expected.html": [
+        "c359e6b42e20ddc5d8c2dba059cfbb81f8febc32",
+        []
+       ],
+       "2d.reset.render.miter_limit-expected.html": [
+        "c91f485c531fb232d7ff4caeda696b61eede2db7",
+        []
+       ],
+       "2d.reset.render.text-expected.html": [
+        "7221483b02fe379e2aebcca708be235fd4a74e2c",
+        []
+       ],
        "2d.reset.state.clip-expected.html": [
         "974b37fab4ecf087a518b14306ade81b4f8c924f",
         []
@@ -429655,7 +434400,7 @@
         []
        ],
        "2d.text.fontVariantCaps1-expected.html": [
-        "942bcdec9cb938536738ef1f71a60cd1c85c9086",
+        "e2cef0d77a64b17657bdfe99194930c5328cc3e8",
         []
        ],
        "2d.text.fontVariantCaps2-unexpected.html": [
@@ -429663,19 +434408,19 @@
         []
        ],
        "2d.text.fontVariantCaps3-expected.html": [
-        "8d96d0ab0320ea8412e0045f59b6a3ca18260242",
+        "cf2d5ae119b549803b48521003d394313159944a",
         []
        ],
        "2d.text.fontVariantCaps4-expected.html": [
-        "8d96d0ab0320ea8412e0045f59b6a3ca18260242",
+        "3813fd3684e8c94887337a551727e068469a66c5",
         []
        ],
        "2d.text.fontVariantCaps5-expected.html": [
-        "942bcdec9cb938536738ef1f71a60cd1c85c9086",
+        "4bda4ec4b5dc522b400df462b8a13b2fc7a9be8a",
         []
        ],
        "2d.text.fontVariantCaps6-expected.html": [
-        "dbcb8abd76a544d8a5ab48b1f477fc54c7ba008f",
+        "af9c736aea7f9b20f4fd09522a8aa2dd25a11ef1",
         []
        ],
        "canvas.2d.fontStretch-ref.html": [
@@ -429736,7 +434481,7 @@
        []
       ],
       "gentest_union.py": [
-       "bde7c1bc061d431cde3cc09122989760f13a9b04",
+       "38a37a81ac761e649f279a231f83e0a3f6999df9",
        []
       ],
       "gentestutils.py": [
@@ -429748,15 +434493,15 @@
        []
       ],
       "name2dir-canvas.yaml": [
-       "2ad5197d34c166a15f7f19db2e74affc9e8d8c77",
+       "1e0caff5b982da5ef914aaae6e376bf749ac412c",
        []
       ],
       "name2dir-offscreen.yaml": [
-       "807b09507b1cb137cef392be63a550f49bdd9725",
+       "c52acb793ba717f02a37fe8692e95941b2f7bf34",
        []
       ],
       "name2dir.yaml": [
-       "a56fc2ff488e80b78c2c40649869e08bf384fd68",
+       "ae69c153780ed2398466bfa12287462bf04c3bfa",
        []
       ],
       "templates": {
@@ -429796,21 +434541,21 @@
       "yaml": {
        "element": {
         "meta.yaml": [
-         "7b6f28f1713f19c601be350e7ffa12a76f08a42e",
+         "5fd8b68498ac3fa8e8bc79d58738c503e3517193",
          []
         ],
         "the-canvas-element.yaml": [
-         "d6d8cd801b410909fdee32b7e0c9f903fda469de",
+         "1ecf8ccdbf17b9d54798d64680fbc04c7c0135ed",
          []
         ]
        },
        "offscreen": {
         "meta.yaml": [
-         "bd761937f40e8796f6192e09741c1c2bccf3df2d",
+         "7b44fd9f2677fc63ce974a426025f6646cf9e3c8",
          []
         ],
         "the-offscreen-canvas.yaml": [
-         "0bef18bf9d56acccb5a747a791bc038c61857f48",
+         "ccabe094b8a7f8a187feac5d93faf9ad8569ea82",
          []
         ]
        }
@@ -429845,7 +434590,7 @@
         []
        ],
        "layers.yaml": [
-        "dd33e05a4d85e3c7bde50f2713d48589d9c19625",
+        "9145108bd3c27f1563fd3ca36e3ef3f1069f85b4",
         []
        ],
        "line-styles.yaml": [
@@ -429861,7 +434606,7 @@
         []
        ],
        "reset.yaml": [
-        "fdb7f815c27ee7f3826276a64c52076b5074d22c",
+        "086fb04e04ae34763294879f302086730afe7f69",
         []
        ],
        "scroll.yaml": [
@@ -429873,7 +434618,7 @@
         []
        ],
        "text.yaml": [
-        "93c86b8b5e59e4c9817698d248e3b670c69c9528",
+        "8bbc874f06f499ab1d9780114edb06d467ac9b4c",
         []
        ],
        "the-canvas-state.yaml": [
@@ -430688,6 +435433,10 @@
         "aae50bc7218ae5452f24741ea60af49346741ae3",
         []
        ],
+       "dir_auto-N-EN-ref.html": [
+        "0d938b2e168beecdacecf479798079ac2a99c899",
+        []
+       ],
        "dir_auto-N-L-ref.html": [
         "4bbaca1e317b259ecfe2b05c9c0d845c6c1cc5be",
         []
@@ -434707,11 +439456,11 @@
           []
          ],
          "resolve-url.js": [
-          "f654a894b9d4df94caf46852ac4dc33d11b3d5dd",
+          "1c4a77705e57fc6feb438e25acc21ee0384cea09",
           []
          ],
          "resource.py": [
-          "60eb4a15a06cd481aefbdd4d6c75b5280cf9fccf",
+          "54b4bc9b5ba97f3666ae1974a59ceac8dfbd6e3c",
           []
          ],
          "stash.py": [
@@ -435601,6 +440350,10 @@
        "43f2216bec7894f5ffd060bd52375697dbb3faec",
        []
       ],
+      "details-pseudo-elements-002-ref.html": [
+       "baf242291b5ef22370d99f5ff8c0dd1b06c5842a",
+       []
+      ],
       "details-revert-ref.html": [
        "dc46b159012fd80c39b66e94935c210a11826487",
        []
@@ -436013,7 +440766,7 @@
           []
          ],
          "media-min-width.html": [
-          "6d429d70fd20206208bfac2749fcd4aea72a1a59",
+          "7c309469024ad95eb294d32e1d97868718ff1722",
           []
          ]
         }
@@ -436420,10 +441173,6 @@
        ]
       },
       "the-canvas-element": {
-       "2d.scaled.png": [
-        "875407769ff19385c8be8b1dfd4eafc8a2e285be",
-        []
-       ],
        "initial.colour.png": [
         "eeedd0ff05889ffd4468bf19a2e8e9e0a094201c",
         []
@@ -436448,58 +441197,6 @@
         "47830c83ea9dfbcfdf6ea7aad64bce33097c06f7",
         []
        ],
-       "size.attributes.parse.decimal.png": [
-        "f8426733306293c70134e35f4704268b7a19a407",
-        []
-       ],
-       "size.attributes.parse.em.png": [
-        "f8426733306293c70134e35f4704268b7a19a407",
-        []
-       ],
-       "size.attributes.parse.empty.png": [
-        "a72d047556a72dc83654077f88bd5ba271dc1a36",
-        []
-       ],
-       "size.attributes.parse.exp.png": [
-        "f8426733306293c70134e35f4704268b7a19a407",
-        []
-       ],
-       "size.attributes.parse.junk.png": [
-        "a72d047556a72dc83654077f88bd5ba271dc1a36",
-        []
-       ],
-       "size.attributes.parse.minus.png": [
-        "a72d047556a72dc83654077f88bd5ba271dc1a36",
-        []
-       ],
-       "size.attributes.parse.octal.png": [
-        "f8426733306293c70134e35f4704268b7a19a407",
-        []
-       ],
-       "size.attributes.parse.onlyspace.png": [
-        "a72d047556a72dc83654077f88bd5ba271dc1a36",
-        []
-       ],
-       "size.attributes.parse.percent.png": [
-        "f8426733306293c70134e35f4704268b7a19a407",
-        []
-       ],
-       "size.attributes.parse.plus.png": [
-        "f8426733306293c70134e35f4704268b7a19a407",
-        []
-       ],
-       "size.attributes.parse.space.png": [
-        "f8426733306293c70134e35f4704268b7a19a407",
-        []
-       ],
-       "size.attributes.parse.trailingjunk.png": [
-        "f8426733306293c70134e35f4704268b7a19a407",
-        []
-       ],
-       "size.attributes.parse.whitespace.png": [
-        "f8426733306293c70134e35f4704268b7a19a407",
-        []
-       ],
        "size.attributes.reflect.setcontent.png": [
         "47830c83ea9dfbcfdf6ea7aad64bce33097c06f7",
         []
@@ -436516,58 +441213,6 @@
         "47830c83ea9dfbcfdf6ea7aad64bce33097c06f7",
         []
        ],
-       "size.attributes.setAttribute.decimal.png": [
-        "f8426733306293c70134e35f4704268b7a19a407",
-        []
-       ],
-       "size.attributes.setAttribute.em.png": [
-        "f8426733306293c70134e35f4704268b7a19a407",
-        []
-       ],
-       "size.attributes.setAttribute.empty.png": [
-        "a72d047556a72dc83654077f88bd5ba271dc1a36",
-        []
-       ],
-       "size.attributes.setAttribute.exp.png": [
-        "f8426733306293c70134e35f4704268b7a19a407",
-        []
-       ],
-       "size.attributes.setAttribute.junk.png": [
-        "a72d047556a72dc83654077f88bd5ba271dc1a36",
-        []
-       ],
-       "size.attributes.setAttribute.minus.png": [
-        "a72d047556a72dc83654077f88bd5ba271dc1a36",
-        []
-       ],
-       "size.attributes.setAttribute.octal.png": [
-        "f8426733306293c70134e35f4704268b7a19a407",
-        []
-       ],
-       "size.attributes.setAttribute.onlyspace.png": [
-        "a72d047556a72dc83654077f88bd5ba271dc1a36",
-        []
-       ],
-       "size.attributes.setAttribute.percent.png": [
-        "f8426733306293c70134e35f4704268b7a19a407",
-        []
-       ],
-       "size.attributes.setAttribute.plus.png": [
-        "f8426733306293c70134e35f4704268b7a19a407",
-        []
-       ],
-       "size.attributes.setAttribute.space.png": [
-        "f8426733306293c70134e35f4704268b7a19a407",
-        []
-       ],
-       "size.attributes.setAttribute.trailingjunk.png": [
-        "f8426733306293c70134e35f4704268b7a19a407",
-        []
-       ],
-       "size.attributes.setAttribute.whitespace.png": [
-        "f8426733306293c70134e35f4704268b7a19a407",
-        []
-       ],
        "size.attributes.style.png": [
         "eeedd0ff05889ffd4468bf19a2e8e9e0a094201c",
         []
@@ -437276,6 +441921,10 @@
        }
       },
       "the-input-element": {
+       "auto-direction-ref.html": [
+        "675ba509144515a44e06f39dd1ac727b4a2d2bc6",
+        []
+       ],
        "hidden-charset-case-sensitive-child.html": [
         "92c9981a1123454af8462cea7840a099721109a0",
         []
@@ -437381,17 +442030,39 @@
        "reset-algorithm-rendering-ref.html": [
         "acf192d1d55b7da110d04651093e3ebe0cd48214",
         []
-       ]
+       ],
+       "resources": {
+        "show-picker-child-iframe.html": [
+         "bba39898249d508b5e01741b3fb631a327d86858",
+         []
+        ]
+       }
       },
       "the-selectlist-element": {
+       "button-type-selectlist-appearance-ref.html": [
+        "fd7f2b7bcaf8adfd469b6fcfbbb5b0e7a2cf970a",
+        []
+       ],
+       "selectlist-button-type-appearance-ref.html": [
+        "37d4b1b47146bcea345fb47a8d242264c509ec88",
+        []
+       ],
+       "selectlist-default-button-slot-ref.html": [
+        "faa96e1f2724a8f484a2211ba90c7c8ef3a1d478",
+        []
+       ],
        "selectlist-explicit-size-ref.tentative.html": [
-        "3e967d03ed0874114de787994019727151f425ac",
+        "46d932c4b270be7ac2c9593d60c35c6503ebc20e",
         []
        ],
        "selectlist-font-size-ref.tentative.html": [
         "46d6dbdb9b2c740dfe1dd3ef5a8e44a766cbd786",
         []
        ],
+       "selectlist-listbox-element-ref.html": [
+        "5533a97f603d8ad333a8763db15e47f1a07ee83b",
+        []
+       ],
        "selectlist-marker-end-aligned-ref.tentative.html": [
         "b1df8a65816380fd9573e8f463542c50e888b781",
         []
@@ -437421,7 +442092,7 @@
         []
        ],
        "selectlist-rtl-ref.tentative.html": [
-        "70d2b98d33081ec9326c1bda67445421161f0f38",
+        "7c71ea079cfc1a8292ed5ae415c86ebefa11a972",
         []
        ],
        "selectlist-selected-value-behavior-ref.html": [
@@ -437436,6 +442107,14 @@
         "ecb8c886a1d1ec39f99a389917e40a56e958dbf6",
         []
        ],
+       "selectlist-selectedoption-element-cloning-ref.html": [
+        "1c0be58d67e3856d91bdb6351ba19e48426da720",
+        []
+       ],
+       "selectlist-text-only-ref.html": [
+        "ab28fbede61dc7d4332722680187ea4ad075a686",
+        []
+       ],
        "selectlist-writingmode-tb-ref.html": [
         "db922f5f9fbb802cfa7baae92fb7a327ce4f3672",
         []
@@ -437446,7 +442125,7 @@
          []
         ],
         "fake-selectlist.js": [
-         "c17fe1afc5fd205c66c8f696c883d422516110f3",
+         "77b3f7492112d98798942bbe9a1db166c9be169e",
          []
         ],
         "selectlist_button_icon.svg": [
@@ -437622,10 +442301,6 @@
         "70d84c21ff4b01ef933172c676679e04b9333f14",
         []
        ],
-       "backdrop-does-not-inherit-ref.html": [
-        "bdc84186f6960f2f934fff0680f4e072dadb81e6",
-        []
-       ],
        "backdrop-dynamic-display-none-ref.html": [
         "c49a11d41634dcd035f926cb97fe1db9e16dfb78",
         []
@@ -437638,6 +442313,10 @@
         "4857557bf88b491e59ae4cb8d0d3c8bedd6df33b",
         []
        ],
+       "backdrop-inherits-ref.html": [
+        "d9f4cb2c84118ee3290c7f6df3e810d9ba0580ee",
+        []
+       ],
        "backdrop-stacking-order-ref.html": [
         "d3f82de181503e85509f92ea9eec1ba4370777e6",
         []
@@ -437927,7 +442606,7 @@
         []
        ],
        "popover-utils.js": [
-        "bc7643c21ab46d30f61bf5ad5bbffb9b434377bf",
+        "f11291e5c2ff97ee03f0093d55fb33d3e18f8c99",
         []
        ]
       }
@@ -438400,7 +443079,7 @@
          []
         ],
         "unsupported-attribute.js": [
-         "e589fea8305ee708f254ced452c15d802349dfa1",
+         "2fc6829cfbf58ff84c4d17d08e4397cfcf44fca6",
          []
         ]
        },
@@ -441624,7 +446303,7 @@
      []
     ],
     "META.yml": [
-     "f4c01cfa0f6964b867ddace2c6b4a1c80b081053",
+     "35d872dd695ac81956369e1e892ed1ae0f9485cc",
      []
     ],
     "README.md": [
@@ -442445,7 +447124,7 @@
         []
        ],
        "virtual_authenticator.html.ini": [
-        "92cbbf37621e507fc30fd40013a9c5f9f6a6a567",
+        "b5683f8fa991a1760b40f37d01f082e4b5a49696",
         []
        ]
       },
@@ -442702,7 +447381,7 @@
      []
     ],
     "FedCM.idl": [
-     "8de87e88b05fff5ff871b0c8c877adb759933870",
+     "5ef1ca8bc115ca9e61132f956c5fbbb120b2f9e8",
      []
     ],
     "FileAPI.idl": [
@@ -442893,6 +447572,10 @@
      "37b2c61dac94c1d571aa2f6afad24ca01696478b",
      []
     ],
+    "captured-mouse-events.idl": [
+     "64c73b906d5a721ceead8ad0150208937a0a8f39",
+     []
+    ],
     "captured-mouse-events.tentative.idl": [
      "7b081cd9fd8a8a161c98b0bce2597c8a8ffd9df6",
      []
@@ -442901,10 +447584,6 @@
      "3f2c9ba6f28253f6febaf689e150d188d4fc3374",
      []
     ],
-    "close-watcher.idl": [
-     "de7940c07e70dec40be9760ad3f5d8cc846f6848",
-     []
-    ],
     "compat.idl": [
      "8106c2d4e0599cb2383a32873968ffa5dd81ebe4",
      []
@@ -442930,7 +447609,7 @@
      []
     ],
     "cookie-store.idl": [
-     "f44b4c63546605590005c7b05edd387445a088f1",
+     "8a000cac0b262de89a1c265755d8a5aeb2985271",
      []
     ],
     "crash-reporting.idl": [
@@ -442938,7 +447617,7 @@
      []
     ],
     "credential-management.idl": [
-     "e9fab13f35fe13aa13076aeb955f2b3b33d16676",
+     "75e18319190a7976379b8b5ec5d153270c1fa8ad",
      []
     ],
     "csp-embedded-enforcement.idl": [
@@ -442950,7 +447629,7 @@
      []
     ],
     "css-anchor-position.idl": [
-     "c5da3f43f72f1a6c56c41f4767102238aba3d7c8",
+     "5d3973eff3d3b23b6641857ba3d7f5305cf6c62c",
      []
     ],
     "css-animation-worklet.idl": [
@@ -442998,7 +447677,7 @@
      []
     ],
     "css-fonts.idl": [
-     "eddfc025215cbf73eed9bdeb8eb26238cb298de1",
+     "070cbc58f5df950f4d856c71e490e8ad2340517d",
      []
     ],
     "css-highlight-api.idl": [
@@ -443021,10 +447700,6 @@
      "03f039e4cb54f5f714bc252e7bfbd609ec769ed2",
      []
     ],
-    "css-nesting.idl": [
-     "01f27ab9d65af2db7d0fe2929ee1ef614fc89b4f",
-     []
-    ],
     "css-paint-api.idl": [
      "0924c535566779e4f20ee89360df3c334943022f",
      []
@@ -443054,7 +447729,7 @@
      []
     ],
     "css-transitions-2.idl": [
-     "9d06f3cf260ae5c23eebfd38c68d8c1f865fec5c",
+     "223810f761e452fb3cf63e8a17b4625cc36090ae",
      []
     ],
     "css-transitions.idl": [
@@ -443062,7 +447737,7 @@
      []
     ],
     "css-typed-om.idl": [
-     "0df6a0327a24658a75379572334ea040c1476e25",
+     "b0f26ea83c777becd82d86d02964c8627b3a6d83",
      []
     ],
     "css-view-transitions.idl": [
@@ -443074,7 +447749,7 @@
      []
     ],
     "cssom.idl": [
-     "0574f1a771cf45d940b24e9bd9e0cb754786af74",
+     "94cd1912b9123f1c30dcc82566005f101b19f840",
      []
     ],
     "custom-state-pseudo-class.idl": [
@@ -443102,7 +447777,7 @@
      []
     ],
     "document-picture-in-picture.idl": [
-     "742f65e6f06b309521bdc8ebbe213bd6605c9eb3",
+     "f54f437a9365a7f8540fb1bb1c42a3c9118cbf57",
      []
     ],
     "dom.idl": [
@@ -443110,7 +447785,11 @@
      []
     ],
     "edit-context.idl": [
-     "91d8af2ea689ef45c925fbcf4a2e0a222a152c49",
+     "937b6579376b5d4d5bb28fbc885278c539b65e98",
+     []
+    ],
+    "element-capture.idl": [
+     "619a0fd2f44dc11a02fef93159f8c6d158a9945a",
      []
     ],
     "element-timing.idl": [
@@ -443118,7 +447797,7 @@
      []
     ],
     "encoding.idl": [
-     "a8cbe4431a2dc72ec0ee7c0ceb89fc9d7a71aee9",
+     "a9499f62378dd92202b62d1963d239c4f69b6f1a",
      []
     ],
     "encrypted-media.idl": [
@@ -443130,7 +447809,7 @@
      []
     ],
     "event-timing.idl": [
-     "741a05dc6bcd23d945577408c759b31affb15e5e",
+     "ad2cb7b831cfc4b10634c90d570df43faed6a859",
      []
     ],
     "eyedropper-api.idl": [
@@ -443138,7 +447817,7 @@
      []
     ],
     "fenced-frame.idl": [
-     "440ec2bbaa10604d6cfa982242ce6fdb40b530c6",
+     "75196932821489cb7c76fa0b29c2a0b3f2a6d90f",
      []
     ],
     "fetch.idl": [
@@ -443150,7 +447829,7 @@
      []
     ],
     "file-system-access.idl": [
-     "572f9342a40afbc71ada383cc64d062ebed55e55",
+     "f1d86065072f093687d13088053357ce24b8f6ce",
      []
     ],
     "filter-effects.idl": [
@@ -443162,7 +447841,7 @@
      []
     ],
     "fs.idl": [
-     "e341ab387d9c4767c52ad661286ddbf75d7770bf",
+     "46a59dd1acd66bf341d44855105ddba051d04308",
      []
     ],
     "fullscreen.idl": [
@@ -443197,10 +447876,6 @@
      "e096044c2bcf966a72324af6157d59b62d862338",
      []
     ],
-    "gpc-spec.idl": [
-     "0e9a063c54cb5525d466c95df06130d63635d76e",
-     []
-    ],
     "gyroscope.idl": [
      "00fb0efcace7c388743e615ff301e8279e0532b4",
      []
@@ -443214,7 +447889,7 @@
      []
     ],
     "html.idl": [
-     "99b33705b3991c1ffd3823e8d8d2e7aacebf56a9",
+     "eec3f781c7436848e705d4f82875b19accdf8ebd",
      []
     ],
     "idle-detection.idl": [
@@ -443322,7 +447997,7 @@
      []
     ],
     "mediacapture-streams.idl": [
-     "3197ff73689b4cfc3ed2facdcd41bca50c680370",
+     "373f0c328d93d5ca2699c68a523860f69debe1f9",
      []
     ],
     "mediacapture-transform.idl": [
@@ -443350,7 +448025,7 @@
      []
     ],
     "navigation-timing.idl": [
-     "5a33964f07eafd01e45bcc6c103d34d8df63af4c",
+     "355950160e336d9c1331816f2b2f72cb5ff6e4c5",
      []
     ],
     "netinfo.idl": [
@@ -443449,6 +448124,10 @@
      "3bed7ccf991f6b8cd4e9a5a237275c4ff5fc6f1f",
      []
     ],
+    "private-network-access.idl": [
+     "19423bad383cdfff24c661b65afdff3b295f4fc2",
+     []
+    ],
     "proximity.idl": [
      "3cbfbd5ad139031a62d730e9a460b797b7537789",
      []
@@ -443462,7 +448141,7 @@
      []
     ],
     "real-world-meshing.idl": [
-     "38fe71f6c66a7f798d75c71ad5fe128cf7c13ed3",
+     "e3c2970fa59a944ab87b1b4b17b2dc2e1b9a6885",
      []
     ],
     "referrer-policy.idl": [
@@ -443510,7 +448189,7 @@
      []
     ],
     "screen-capture.idl": [
-     "830b96d16fa976f739c73b11433ae0f3fac7b052",
+     "45fd0dd72c58e2faaa745409366291eeff51ae24",
      []
     ],
     "screen-orientation.idl": [
@@ -443522,7 +448201,7 @@
      []
     ],
     "scroll-animations.idl": [
-     "31b3746e9d4d629e468646e695726814682e615e",
+     "d18b8f110d211f2623d18bf1dcf15af0235014a5",
      []
     ],
     "scroll-to-text-fragment.idl": [
@@ -443530,7 +448209,7 @@
      []
     ],
     "secure-payment-confirmation.idl": [
-     "08ec8065c53081b50091ac780c9b330abb6dc1b5",
+     "bec599d7a23512f6e608ccb9930bfbf38df83768",
      []
     ],
     "selection-api.idl": [
@@ -443538,7 +448217,7 @@
      []
     ],
     "serial.idl": [
-     "ee46a8562bb79a899160f39f0db9940cf684f64c",
+     "e624c3c1a60f8d76d821c4a8628b6c1cdb9167db",
      []
     ],
     "server-timing.idl": [
@@ -443554,7 +448233,7 @@
      []
     ],
     "shared-storage.idl": [
-     "eb5806f9a6db83daa76d3807af3683cb07b6ba39",
+     "d223736f29f5933c9f59eb220c49912f8439d50d",
      []
     ],
     "speech-api.idl": [
@@ -443578,11 +448257,7 @@
      []
     ],
     "streams.idl": [
-     "fd5420f16a09673c0cb52294682f3728d996d042",
-     []
-    ],
-    "sub-apps.tentative.idl": [
-     "39dcd97a500a7829696e070c1afe46722184516a",
+     "838bf39c6d6df5bf37722abac51347591b3f1e2a",
      []
     ],
     "svg-animations.idl": [
@@ -443602,7 +448277,7 @@
      []
     ],
     "trust-token-api.idl": [
-     "f521acea1f5e5f5d593576f4af9534bf4371bd0b",
+     "fb7f15b4b74a8c10ef510c4f087ee465f64b477c",
      []
     ],
     "trusted-types.idl": [
@@ -443610,7 +448285,7 @@
      []
     ],
     "turtledove.idl": [
-     "f5867e995a8d19efb967e4bccee0eccb011665f8",
+     "393792ffeac7749d3e2575160106b0038701aede",
      []
     ],
     "ua-client-hints.idl": [
@@ -443666,7 +448341,7 @@
      []
     ],
     "web-animations.idl": [
-     "956d700f49b703400559851d05508e861d495fce",
+     "1bc82fab119828a653641289c5a247d59800e1ad",
      []
     ],
     "web-app-launch.idl": [
@@ -443698,7 +448373,7 @@
      []
     ],
     "webauthn.idl": [
-     "9a37207ba2cbc0c1e6c48c9a325156f959919177",
+     "888040f53d7d58ed72721a8702ce7c69a79f4c1d",
      []
     ],
     "webcodecs-aac-codec-registration.idl": [
@@ -443718,7 +448393,7 @@
      []
     ],
     "webcodecs-hevc-codec-registration.idl": [
-     "b767db89e6fa6d6f527209b79c8bbd960fa87d9f",
+     "92043748c4910c49e2003ac0342ccf6ca7220e50",
      []
     ],
     "webcodecs-opus-codec-registration.idl": [
@@ -443730,7 +448405,7 @@
      []
     ],
     "webcodecs.idl": [
-     "0b95dc8b75788e126d395ec9d69371b11f0d3a6c",
+     "08bf0e26e03bca567814aae38a2eb6395b75f0f1",
      []
     ],
     "webcrypto-secure-curves.idl": [
@@ -443742,23 +448417,23 @@
      []
     ],
     "webgl1.idl": [
-     "3912e9a4b040b87e9fa3468d40a76f453815b924",
+     "b61f031ab28248a73891a60640912acad5b7d0ac",
      []
     ],
     "webgl2.idl": [
-     "22e2d6fa32474b38cd5a2cdb66a23d58a7fe7647",
+     "5499e5a68b1be50f1e398de0d82c34b97c83f8bf",
      []
     ],
     "webgpu.idl": [
-     "25943d99c35b57bee2d5cc70d249a190e59207f3",
+     "9ef2b0134c6e45ea2d94632b76868363c9d8b657",
      []
     ],
     "webhid.idl": [
-     "a1a02d3e43879680b3bb7b92e4d29b5ca99eccd8",
+     "03e72511d961678fe82fee2a70afd44316b51835",
      []
     ],
     "webidl.idl": [
-     "7271f19dfa65f689b6e36d4df255f8c70517a5c0",
+     "4d0dfaa106275fe94b5202d19c34c7bbcf9a10b5",
      []
     ],
     "webmidi.idl": [
@@ -443766,7 +448441,7 @@
      []
     ],
     "webnn.idl": [
-     "17e30803b886c88339a755a60e4c1ab001c3f8a4",
+     "fa0908f0e9f948483cfb6f642939984cb4084e2b",
      []
     ],
     "webrtc-encoded-transform.idl": [
@@ -443786,7 +448461,7 @@
      []
     ],
     "webrtc-stats.idl": [
-     "b398c73e3f414bf3b35281fae3910bf4569d60ac",
+     "8e65578b6ee1e3d566e052836be7d76f81d7230e",
      []
     ],
     "webrtc-svc.idl": [
@@ -443794,7 +448469,7 @@
      []
     ],
     "webrtc.idl": [
-     "4c31d3be67aa9db5fa3094b7aa015854b4ac147c",
+     "e571abb527f843a9b0f93e1e093a1989dce6938e",
      []
     ],
     "websockets.idl": [
@@ -443806,7 +448481,7 @@
      []
     ],
     "webusb.idl": [
-     "fb0a71f307d8b96e9a447067bc569595ada0f107",
+     "c9b2c2f55f13109c8eb50b92347b608d33ea3e3d",
      []
     ],
     "webvr.tentative.idl": [
@@ -444083,7 +448758,7 @@
       []
      ],
      "largest-contentful-paint-helpers.js": [
-      "3ac3705e8e7ad2403715a0983445a567029dd044",
+      "52f7036466cca5d0c75d1966fe978db35f6237ad",
       []
      ],
      "lcp-sw-from-cache.js": [
@@ -444165,7 +448840,7 @@
     ]
    },
    "lint.ignore": [
-    "489c717cd6a715ce07dea9421863d3b69ad42cc9",
+    "1b03b0cdeb822dbe3caa7222d705c8b629ea2091",
     []
    ],
    "loading": {
@@ -444419,8 +449094,20 @@
        "9d761b6de5ee65c9067a4c576c90eb9e7dd6ef05",
        []
       ],
+      "event-generates-loaf.js": [
+       "fe7c3eca2b372a71cf6350bd6577bd60f372c38f",
+       []
+      ],
+      "promise-generates-loaf.js": [
+       "53369f722606e3fbc62b6c1f2568b90b67655e97",
+       []
+      ],
+      "raf-generates-loaf.js": [
+       "b7544af4e5664e05f3ae66ed939b836273a25eec",
+       []
+      ],
       "utils.js": [
-       "8781252e9411fcb3bf2423347e185e2633ef0140",
+       "574af6d6b8c716ba066f49014adabe4b6e1a537a",
        []
       ]
      }
@@ -444825,6 +449512,10 @@
        "6b4ccc775c345dc19ade781409a65d85f6ddace9",
        []
       ],
+      "non-spacing-accent-1-ref.xhtml": [
+       "9c5a9145f86dd11b4bcb50f80992a2fedecabc7c",
+       []
+      ],
       "op-dict-1-notref.html": [
        "5650be19363c0e27979c2cc49ce1063ca73655e9",
        []
@@ -444885,6 +449576,10 @@
        "0c7642a20ac6ebc0779a2c9e2222797c92dad579",
        []
       ],
+      "stretchy-underbar-1-ref.xhtml": [
+       "0f36f2da640b29c01b360ac34f3be3cf49bc9d03",
+       []
+      ],
       "support": {
        "operator-dictionary-tests.css": [
         "4f80ad7f8dd0e28a40900b0c11ee9adaa800bd97",
@@ -447295,7 +451990,7 @@
       []
      ],
      "pending_beacon-helper.js": [
-      "3e8bd20f766e8c3a65bc0155d4fc629edd55e4fe",
+      "e7b6ea5cb6ef33f49692db9b0ef1a0ee41a5e21d",
       []
      ],
      "set_beacon.py": [
@@ -447315,7 +452010,7 @@
     ],
     "not-restored-reasons": {
      "test-helper.js": [
-      "0737f719bfbabea673e279f29697aca9181d2daa",
+      "a172546512a0f2f28c986c36cbb06d1ba333af3b",
       []
      ]
     },
@@ -447664,6 +452359,14 @@
       "12fc99b50b2e4c875c0b31d0d81d3a3f33e0eea3",
       []
      ],
+     "report-to-multiple-endpoints.https.sub.html.sub.headers": [
+      "14b742c5587b928b6b3bac3963443ea2c7251e1c",
+      []
+     ],
+     "report-to-single-endpoint.https.sub.html.sub.headers": [
+      "bbfe7e8afa48c37ca179a3b5afec0a1149c2d088",
+      []
+     ],
      "screen-wake-lock-reporting.https.html.headers": [
       "66f07f4c1c3f106517d4e21f2edd613465ab1672",
       []
@@ -448402,7 +453105,7 @@
    },
    "presentation-api": {
     "META.yml": [
-     "beba89062154273b1eabca34f392ccbc1794932c",
+     "64802e5cb440603db0b055679c485377e4435916",
      []
     ],
     "README.md": [
@@ -448505,7 +453208,7 @@
    "private-aggregation": {
     "resources": {
      "protected-audience-helper-module.js": [
-      "abec6408862ad609438c7024a8f9a66e57f46325",
+      "53b79c0a893e8f6f5f0f8cea67e11b0da37e5bf8",
       []
      ],
      "protected_audience_event_level_report_handler.py": [
@@ -450052,7 +454755,15 @@
      []
     ],
     "README.md": [
-     "b9342275937d80155f46b682a767db8fd7fa479a",
+     "da9bbc387f41ab069c27edc055962f72036b96f2",
+     []
+    ],
+    "prepare-device.js": [
+     "a12dbaf28717cf3776d9e34f5a12e4adaa7bae18",
+     []
+    ],
+    "styles.css": [
+     "7c3dc811482bec7eeab06098015ce531c295a852",
      []
     ]
    },
@@ -450234,7 +454945,7 @@
      []
     ],
     "META.yml": [
-     "662c42cb664219dee159fd248e1446c041a4bc93",
+     "153654eae8b1a1b399b1fb5d65ac2c99418b345f",
      []
     ],
     "SyntheticResponse.py": [
@@ -450831,7 +455542,7 @@
       []
      ],
      "webxr-test.js": [
-      "c5eb1bd14b881d9d6149d6fd0e9b627a5d9b4bee",
+      "aba3447982bd8523410494e81a48effab7927576",
       []
      ],
      "webxr-test.js.headers": [
@@ -451083,7 +455794,7 @@
         []
        ],
        "step_wait.html": [
-        "ae3442c7595499e7aaeed62df2ab0256f5e2b5d2",
+        "8235d9d48a1a422771f988fe6737d1acbc33f2ce",
         []
        ],
        "step_wait_func.html": [
@@ -451324,7 +456035,7 @@
      []
     ],
     "testdriver.js": [
-     "a23d6eaf4cf3831601a6f27682b3b86a0fb2336e",
+     "4b8656b276e6a6bec55f8d9aa4550805f9fda72c",
      []
     ],
     "testdriver.js.headers": [
@@ -451332,7 +456043,7 @@
      []
     ],
     "testharness.js": [
-     "413993089be6561cbad621c61ac4d4ab20bc8278",
+     "497ae23f0e83ee2790291588ebe33c47b7bb6726",
      []
     ],
     "testharness.js.headers": [
@@ -451477,7 +456188,7 @@
       []
      ],
      "animation-inactive-outside-range-ref.html": [
-      "b9ed25d012b5c3e936f195bbf8ea1d82ee646be8",
+      "e744055140a099eca5aefa56760f3317c8af953c",
       []
      ],
      "animation-range-visual-test-ref.html": [
@@ -451651,6 +456362,10 @@
      "self-text-directive-iframe.html": [
       "43573692ea8e186278f51dc7a4f8204f549c997e",
       []
+     ],
+     "util.js": [
+      "00e12929880c349ce3d8d52cb52e21b471465639",
+      []
      ]
     },
     "scroll-to-text-fragment-target.html": [
@@ -454389,7 +459104,7 @@
      "tentative": {
       "static-router": {
        "README.md": [
-        "8826b3c78276fbf8c7f2ebee0498f40d817a30e9",
+        "5429b61d40e4c65fcdecd9d24d71fa2876a8d353",
         []
        ],
        "resources": {
@@ -454401,12 +459116,16 @@
          "0c3e3e78707b14dcca98bf1a435a34f402b3dadd",
          []
         ],
+        "simple.csv": [
+         "ecbef786e73889df94e3ced833c18a15d3f73fa2",
+         []
+        ],
         "simple.html": [
          "0c3e3e78707b14dcca98bf1a435a34f402b3dadd",
          []
         ],
         "static-router-sw.js": [
-         "4655ab5321c45cd98e62a2599df5e42825a317bd",
+         "e95bdadaddbf634b7ba7f6e6c40a0135423a1040",
          []
         ],
         "test-helpers.sub.js": [
@@ -454454,7 +459173,7 @@
     "focus-navigation": {
      "resources": {
       "focus-utils.js": [
-       "0cd4fd26f494eac4e518ec94b91bbd713721ca32",
+       "f593267cc31f8d9060b48f95fd91c5629d5b29ee",
        []
       ],
       "shadow-dom.js": [
@@ -454750,6 +459469,10 @@
       "41595f3ee3868a1e7fa1f866bcc8936de16f5cbd",
       []
      ],
+     "delete-key.https.html.headers": [
+      "1b63235b7cdffe9ebb43bfac3a01d5220e1519fb",
+      []
+     ],
      "embedder-context-inner.https.html": [
       "e4b59f7f7a028f55a9511654234200959e18a5e1",
       []
@@ -454814,6 +459537,14 @@
       "d87092aad1d2efedf5d4245884e28e159880b2df",
       []
      ],
+     "shared-storage-writable-iframe-in-fenced-inner.https.sub.html": [
+      "87dbe81a2b5294d8b7bc62dcc0e438d3f5ef830a",
+      []
+     ],
+     "shared-storage-writable-iframe-in-fenced-inner.https.sub.html.headers": [
+      "1b63235b7cdffe9ebb43bfac3a01d5220e1519fb",
+      []
+     ],
      "shared-storage-writable-pixel.png": [
       "818c71d03f435db011069584cda25c1f66af1a85",
       []
@@ -454822,6 +459553,10 @@
       "8b541e7b13b458932c02f5c1f2bb708a903ef020",
       []
      ],
+     "shared-storage-write-notify-parent.py": [
+      "0f72fb728c4c714988febc2c2a04307d068f8bb8",
+      []
+     ],
      "shared-storage-write.py": [
       "8770b11f09d75eeeaa00b8f2cd4f315cb8eba01c",
       []
@@ -454831,11 +459566,11 @@
       []
      ],
      "util.js": [
-      "b829864c625c0449c5772e87873f43eb55450cf1",
+      "f82765846c22a452f29cc6cd097080955499d1f8",
       []
      ],
      "util.sub.js": [
-      "d92dbf539c3872d3b729edc6980400b17e2bdc09",
+      "970c33b7f2551e76c57d5cc2431b3131084fd025",
       []
      ],
      "verify-get-undefined-module.js": [
@@ -454850,6 +459585,10 @@
       "20c469410492c8a3d600366a285eae9fdbde5ea0",
       []
      ],
+     "verify-key-value.https.html.headers": [
+      "1b63235b7cdffe9ebb43bfac3a01d5220e1519fb",
+      []
+     ],
      "verify-shared-storage.https.html": [
       "52c79e7e85afc66782d7d6c144c1a6b55bfccada",
       []
@@ -455184,8 +459923,12 @@
       "5fa1cdf5e66008396ab71673dbb9386066d7cc5f",
       []
      ],
+     "history_push.js": [
+      "6647dd740a275cb8a62be5cc0356e90dc0991d2e",
+      []
+     ],
      "soft-navigation-helper.js": [
-      "edc9331c26375e81c3b89b6ad891bdcd10d90e86",
+      "7f83df75f8fe5db63bd0e2714b424a319f852a74",
       []
      ]
     }
@@ -455571,10 +460314,6 @@
        "4e0d6076a60aa9a4c5ba94d7d03d098a23b17060",
        []
       ],
-      "web-database-access.html": [
-       "fb00852caa9d6eaa0134662b7fe01f085641509e",
-       []
-      ],
       "web-hid.https.html": [
        "e9531293eadde0a863e292eb2f2df5e0a2946514",
        []
@@ -455712,7 +460451,7 @@
      []
     ],
     "helpers.js": [
-     "0a89c6d7f99374d66a827033e29476e379b624af",
+     "7d259b21676329fcb3770cd7982a3342bf3bf7d3",
      []
     ],
     "resources": {
@@ -455763,6 +460502,10 @@
      "script-with-cookie-header.py": [
       "83129a55595e54225afd7e9161931d8e5f60f0c0",
       []
+     ],
+     "set-cookie-header.py": [
+      "e937ba2ca4eca2421ea0025c5a527d3bb6b574f4",
+      []
      ]
     }
    },
@@ -457045,11 +461788,11 @@
       []
      ],
      "cacert.key": [
-      "2bfd999b64ae229d8b06ef374226d5dd0350c5cf",
+      "28424d9211cd2876c8a8ad5a15b72efe14eb32ad",
       []
      ],
      "cacert.pem": [
-      "f698a351d655dccb814f31128311e00ec9a6a9cb",
+      "4905177a33f77e57d58a9de022c6eb64f4483311",
       []
      ],
      "config.json": [
@@ -457057,11 +461800,11 @@
       []
      ],
      "web-platform.test.key": [
-      "ae07ef896c10b9830568e3ae433b0ee5b16da337",
+      "16c60a9d5b1243a5def069d0414fa558cbf29b56",
       []
      ],
      "web-platform.test.pem": [
-      "6f843553160de8cb2933bab2d1a7b3bcfd341423",
+      "5140687f3c010eacea807b75e45f94219b4739f2",
       []
      ]
     },
@@ -457076,7 +461819,7 @@
        []
       ],
       "affected_tests.yml": [
-       "6d3d32acc82640e80ebd92618d539ae596cdb348",
+       "566021d249687d87f7fc5c9f23110173709e29d2",
        []
       ],
       "checkout.yml": [
@@ -457128,7 +461871,7 @@
        []
       ],
       "sysdiagnose.yml": [
-       "97646f69149fd03db6b085be59f147e2e72f8b16",
+       "76bee7dbb82695d43d565be371645f9f650eca49",
        []
       ],
       "system_info.yml": [
@@ -457209,7 +461952,7 @@
       []
      ],
      "requirements_tc.txt": [
-      "0506dbb0086e29e7e6d55e2d177cd36624c5f7a5",
+      "2ee8c065dba592e4e6c2dcc9b1ca446b49839be8",
       []
      ],
      "run_tc.py": [
@@ -457230,7 +461973,7 @@
        []
       ],
       "decision.py": [
-       "0a6d03ab6cdc4bf554a3046f062b791352985a0b",
+       "6e3bd8619d7780d0949f89a84ec859b0e3156e1c",
        []
       ],
       "download.py": [
@@ -457251,7 +461994,7 @@
       ],
       "tasks": {
        "test.yml": [
-        "4e1abf950b5511bc17c1e3e457d7de649c51c64a",
+        "d774272eca5b8fe1d8a587db3cd14d1087c8c199",
         []
        ]
       },
@@ -457287,7 +462030,7 @@
         []
        ],
        "test_valid.py": [
-        "f7e3d019128fb8951fcc109e6503a471b0107049",
+        "8c4715ad6ecf2d0d8150af75ccadbf1e6178be03",
         []
        ]
       }
@@ -457395,11 +462138,11 @@
       []
      ],
      "lint.py": [
-      "00d76144ea8afc1240b9d5afcc7e0c91a51ae872",
+      "c50282ed3a929feb6eee20c3639aef193d0e4b93",
       []
      ],
      "rules.py": [
-      "580ef8009cdb828aab572101c61deed9439553a9",
+      "06c4f579e6767d5ed619634ae929909f1f6705f3",
       []
      ],
      "tests": {
@@ -457596,7 +462339,7 @@
        }
       },
       "test_file_lints.py": [
-       "62a380e1a407430516b61eac7d12cefafdfea7a4",
+       "96eaf9b84cd4575a1ac406c49f3d0f0979c9a64f",
        []
       ],
       "test_lint.py": [
@@ -457649,7 +462392,11 @@
       []
      ],
      "manifest.py": [
-      "0b00c71ac518967bdcd9c18d5a7faa657a343fd0",
+      "959978f5283072300a31f9f2d04567ad8024a7b6",
+      []
+     ],
+     "mputil.py": [
+      "fc9d5ac94cd5cb72f292d878165236a74a15d1fc",
       []
      ],
      "requirements.txt": [
@@ -457728,11 +462475,11 @@
      []
     ],
     "requirements_pytest.txt": [
-     "2ca04f876e4c0457a21c75461be95c7e10aadbbb",
+     "93ec70d7e6115f59c11d0d956bdb822346895c54",
      []
     ],
     "requirements_tests.txt": [
-     "a0885683ef8558f702287f1e1995fddc5df4ba48",
+     "0a4007dd8f3ed52bb85639103ee176cf6475483a",
      []
     ],
     "runner": {
@@ -457799,7 +462546,7 @@
       []
      ],
      "serve.py": [
-      "1725399facab11c621633c606ff50f8e2ce4e6a4",
+      "6ef5bd89180e35c0bb5ece09d803241acfc578e8",
       []
      ],
      "test_functional.py": [
@@ -464257,456 +469004,188 @@
       }
      },
      "websockets": {
-      ".appveyor.yml": [
-       "7954ee4be78fbaf155ba7bf4503c77a49ac89071",
-       []
-      ],
-      ".circleci": {
-       "config.yml": [
-        "0877c161ad490f820fba72ceae1457e8d3cde756",
-        []
-       ]
-      },
-      ".github": {
-       "FUNDING.yml": [
-        "7ae223b3d8920836f48e2783fe6b3a1648bff39f",
-        []
-       ]
-      },
-      ".gitignore": [
-       "ef0d16520c026513f6348bc835be9238e70e88a1",
-       []
-      ],
-      ".readthedocs.yml": [
-       "109affab457a9e0fd01e5a3af5f95387a9e15a68",
-       []
-      ],
-      ".travis.yml": [
-       "0306937597a3fd0d1f4432b371bce8d69f288580",
-       []
-      ],
-      "CODE_OF_CONDUCT.md": [
-       "80f80d51b115134c79329b69f02c47e3906e0f59",
-       []
-      ],
       "LICENSE": [
-       "b2962adba2b44eeb303d3e70fa354e2ae8cd7c66",
+       "119b29ef35b9f8149cc383bc751ba4d10483010c",
        []
       ],
       "MANIFEST.in": [
        "1c660b95b1464a9401ecd506323158ea2cb6bbfd",
        []
       ],
-      "Makefile": [
-       "d9e16fefe37ae8d1e337cf8450a3008372aa4d43",
+      "PKG-INFO": [
+       "3b042a3f9f822cace1abce4264b479420920fb48",
        []
       ],
       "README.rst": [
-       "1e15ba1981f353ebd82978e8442957a3fdbc18ef",
+       "2b9a445ea5c9ff93c27ae2f3ee44a58b437b85e1",
        []
       ],
-      "compliance": {
-       "README.rst": [
-        "8570f9176d56b47b38852222e490bdc74bea8ead",
-        []
-       ],
-       "fuzzingclient.json": [
-        "202ff49a03a59ab707090ce56bba1ffcea1281cf",
-        []
-       ],
-       "fuzzingserver.json": [
-        "1bdb42723ef92c37a08871c5a9dc0ae943d15a0f",
-        []
-       ],
-       "test_client.py": [
-        "5fd0f4b4fb3feb0a34bf51f7831850b4b55a155b",
-        []
-       ],
-       "test_server.py": [
-        "8020f68d35f1c99a9da3748418c6b0faf070aa9a",
-        []
-       ]
-      },
-      "docs": {
-       "Makefile": [
-        "bb25aa49d08ed6ddbdf46c4abdc5a8eeb6a54cc0",
-        []
-       ],
-       "_static": {
-        "tidelift.png": [
-         "317dc4d9852df72ba34e10a6f61d1838cbbd969e",
-         []
-        ],
-        "websockets.svg": [
-         "b07fb22387385d41d6e1050e603641ea1fe54e12",
-         []
-        ]
-       },
-       "api.rst": [
-        "d265a91c2cda9267bf426a1148b6e71ad035dd95",
-        []
-       ],
-       "changelog.rst": [
-        "04f18a7657dcced73161bb5a76ad91e66f7f7805",
-        []
-       ],
-       "cheatsheet.rst": [
-        "f897326a6ba467ef1834e982b7396892cd2ff51e",
-        []
-       ],
-       "conf.py": [
-        "064c657bf1606fbc3abd48411431e111632bff96",
-        []
-       ],
-       "contributing.rst": [
-        "40f1dbb54aed012470c49f6a60a3a83181691958",
-        []
-       ],
-       "deployment.rst": [
-        "5b05afff143f6c83da4b9b935048f7564add4d03",
-        []
-       ],
-       "design.rst": [
-        "74279b87f6eda36e8caee4ddd28c2f186d6d3448",
-        []
-       ],
-       "extensions.rst": [
-        "4000340906aff27ff1c73d7905ffca4a48969c1d",
-        []
-       ],
-       "faq.rst": [
-        "cea3f53583998bd44fabc36aa0426d3f3208d76d",
-        []
-       ],
-       "index.rst": [
-        "1b2f85f0a4f24f28c28427249530707ecbe0e3d9",
-        []
-       ],
-       "intro.rst": [
-        "8be700239f39d902efdfdfa7ad9895883bb9291e",
-        []
-       ],
-       "license.rst": [
-        "842d3b07fc93f647f3fd08e65b4b4faddcf33afa",
-        []
-       ],
-       "lifecycle.graffle": [
-        "a8ab7ff09f52a41e3e8a8abc2e8a5503e481c44a",
-        []
-       ],
-       "lifecycle.svg": [
-        "0a9818d2930c50f638ade86a2f16fafd254a13dd",
-        []
-       ],
-       "limitations.rst": [
-        "bd6d32b2f63e494b78bf973d93d527e5f0183661",
-        []
-       ],
-       "protocol.graffle": [
-        "df76f49607e5743b809e6f41787262932b6b0743",
-        []
-       ],
-       "protocol.svg": [
-        "51bfd982be7bac755c318376e79b6f7d3dfd91ee",
-        []
-       ],
-       "requirements.txt": [
-        "0eaf94fbe8f91d19a2554d5a9e3413e748efbcfc",
-        []
-       ],
-       "security.rst": [
-        "e9acf0629c83aa3f91819b8774e1ae4c33067d62",
-        []
-       ],
-       "spelling_wordlist.txt": [
-        "1eacc491df7d0eed97c6a831a37c9e648e8fd783",
-        []
-       ],
-       "tidelift.rst": [
-        "43b457aafa8ded867fd474f07dc7ba733ca2f52f",
-        []
-       ]
-      },
-      "example": {
-       "basic_auth_client.py": [
-        "cc94dbe4b49bf24dbefb913705ad93192971c5be",
-        []
-       ],
-       "basic_auth_server.py": [
-        "6740d57989c92ae2ec8cfeb1bcd395c9ea8d7fc2",
-        []
-       ],
-       "client.py": [
-        "4f969c478ada3b55676ad7379e28b3d5b2487f9b",
-        []
-       ],
-       "counter.html": [
-        "6310c4a16d9c6a324362e95669f83b99c9f575eb",
-        []
-       ],
-       "counter.py": [
-        "dbbbe593580dfa3a438eaac681ad5561a76e1415",
-        []
-       ],
-       "echo.py": [
-        "b7ca38d321ffa6bd07865a0595fbabec0e74a4ec",
-        []
-       ],
-       "health_check_server.py": [
-        "417063fce7ee77a115f8b9e01520cee932c6fbae",
-        []
-       ],
-       "hello.py": [
-        "6c9c839d827aa26abad52d5fef16f323fb814a68",
-        []
-       ],
-       "localhost.pem": [
-        "f9a30ba8f63933635bf71f75ad8a6ac31745fdae",
-        []
-       ],
-       "secure_client.py": [
-        "54971b9847e8cb0f50019a80b92f4b0fcf7818a8",
-        []
-       ],
-       "secure_server.py": [
-        "2a00bdb5042cf5866c5188d0f30d20f5716472b3",
-        []
-       ],
-       "server.py": [
-        "c8ab69971b24416af69db8b1833d5fbfb993cae0",
-        []
-       ],
-       "show_time.html": [
-        "721f44264efea3a9198eb62f988576933b1947ed",
-        []
-       ],
-       "show_time.py": [
-        "e5d6ac9aa3b04f5fc7f41c4d058030db8882b1a3",
-        []
-       ],
-       "shutdown.py": [
-        "86846abe73e7a6ab073347ce1c19313f7cbe6317",
-        []
-       ],
-       "unix_client.py": [
-        "577135b3dbf6c72da4bb74bbba7aa6ea0f39a287",
-        []
-       ],
-       "unix_server.py": [
-        "a6ec0168a2b16f50974b1323d6122630e6febd3a",
-        []
-       ]
-      },
-      "logo": {
-       "horizontal.svg": [
-        "ee872dc47869fd63c9f22c1e8dad3a74f64797d2",
-        []
-       ],
-       "icon.svg": [
-        "cb760940aa1928e6df4112abebe7a1d16f1a2778",
-        []
-       ],
-       "old.svg": [
-        "a073139e3311d3bc4e2997e15542cf1f3ddfccdf",
-        []
-       ],
-       "tidelift.png": [
-        "317dc4d9852df72ba34e10a6f61d1838cbbd969e",
-        []
-       ],
-       "vertical.svg": [
-        "b07fb22387385d41d6e1050e603641ea1fe54e12",
-        []
-       ]
-      },
-      "performance": {
-       "mem_client.py": [
-        "890216edf807510bfa98166ee78084c0407fdd1b",
-        []
-       ],
-       "mem_server.py": [
-        "0a4a29f76c6c84850094ec0d706459eb1e444a75",
-        []
-       ]
-      },
       "setup.cfg": [
-       "c306b2d4fb7fb6251e92bcf44e2ec128a87910a5",
+       "dc424fe1955179df2b9b9a382ab840869f7dc5e4",
        []
       ],
       "setup.py": [
-       "f3581924770fe3be23628845f075bc27f1411c40",
+       "b2d07737d227a0e45dbe87f9696116f1a10ed342",
        []
       ],
       "src": {
        "websockets": {
         "__init__.py": [
-         "ea1d829a335f8e20ab31b814ed25c82f5f07dff9",
+         "ec34841247b1b310461f588dc42a3a8cd0020c54",
          []
         ],
         "__main__.py": [
-         "394f7ac799c32fdab5770604c055c253c87f2bce",
+         "c562d21b54473acb2c41767d745f5ee0740b82dc",
          []
         ],
         "auth.py": [
-         "ae204b8d9c77cce686cfbfe517e74bea59ae5026",
+         "afcb38cffe2f48657a71bb4df47a3c9480055411",
          []
         ],
         "client.py": [
-         "eb58f9f484233fd8f4fdbbb672b40316ce4752da",
+         "df8e53429abaf6f4e5fb71772de860fc8896d7d7",
+         []
+        ],
+        "connection.py": [
+         "db8b5369935e171d9f619d3e6336ac2e671630d9",
+         []
+        ],
+        "datastructures.py": [
+         "36a2cbaf99cee07fb08fd484681f902498c6e0ad",
          []
         ],
         "exceptions.py": [
-         "9873a171703bf1fc5601432284055df477acc687",
+         "0c4fc51851a596d7d974a17ad3a2b220ade6bbb2",
          []
         ],
         "extensions": {
          "__init__.py": [
-          "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
+          "02838b98a5335322daad566de9c0d9d0843fc49a",
           []
          ],
          "base.py": [
-          "aa52a7adbf46cb5e5b65e9e03a22cf00564bd534",
+          "0609676185785d8ab3546824e430b8b4d47d7d66",
           []
          ],
          "permessage_deflate.py": [
-          "e38d9edaba69eb08221b543fd49d821eab744116",
+          "e0de5e8f855051a834399614089bbe6abb6c12a2",
           []
          ]
         },
-        "framing.py": [
-         "26e58cdbfbb4414b5df4c6fd9776a9517dcb03d9",
-         []
-        ],
-        "handshake.py": [
-         "9bfe27754fa7637a7c15e6386ef12e435b6145e4",
+        "frames.py": [
+         "043b688b5227b9e6dbd90115b528edb2bb62376a",
          []
         ],
         "headers.py": [
-         "f33c94c046415ad8cec262c4be1125a0f18ff8ce",
+         "9ae3035a5b8fc2254f1c45f97c7d7f02779315f3",
          []
         ],
         "http.py": [
-         "ba6d274bf1469120e7917682040f1bbd4fbc5c78",
+         "b14fa94bdce765dd6d46def2f3d24d98e39d329c",
          []
         ],
-        "protocol.py": [
-         "ede636d0db6217c7a6196e0978bac23dbaa74990",
+        "http11.py": [
+         "84048fa47b3dccf93bb30e49ad88c384cbc6d9d1",
          []
         ],
+        "imports.py": [
+         "a6a59d4c2ee61ec7801af317b88bbda4c26b7ef7",
+         []
+        ],
+        "legacy": {
+         "__init__.py": [
+          "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
+          []
+         ],
+         "auth.py": [
+          "8825c14ecf7bf9e23b42d2c64955ae7768478902",
+          []
+         ],
+         "client.py": [
+          "fadc3efe87667759f024d162dd1340aa27011e6b",
+          []
+         ],
+         "compatibility.py": [
+          "df81de9dbcead50479ec645c4625cadca01f3efc",
+          []
+         ],
+         "framing.py": [
+          "c4de7eb28bc1964a5177ba67f00b0ec2ec64f054",
+          []
+         ],
+         "handshake.py": [
+          "569937bb9a94da186a9b0ef75b0a163540954518",
+          []
+         ],
+         "http.py": [
+          "cc2ef1f067d39cddfe3a701f4e2e604641bdb3d6",
+          []
+         ],
+         "protocol.py": [
+          "3f734fe7602a12d499e87b14c7620fbe0652c9fa",
+          []
+         ],
+         "server.py": [
+          "3e51db1b71e14506aac6adf1d8f129145ecfeaf1",
+          []
+         ]
+        },
         "py.typed": [
          "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
          []
         ],
         "server.py": [
-         "0592083ef76615fd6b987cfe1ce27f5ab0dff6a0",
+         "5dad50b6a12a61c9219a7678d38e733225deeb49",
          []
         ],
         "speedups.c": [
-         "d1c2b37e60cd6f350a1c9f51f50dcbb542f0c044",
+         "a195904198f40078b7e772baafce610838b31db1",
          []
         ],
-        "speedups.pyi": [
-         "821438a064e6ad32154eb6536c975f70d4c35d05",
+        "streams.py": [
+         "f861d4bd25ecc5b5a4ac5ebc22a251712fb4e68e",
          []
         ],
         "typing.py": [
-         "4a60f93f64be10d493288f800fc8fb3801b3afa7",
+         "e672ba0069e5b2c45c47994b4435313b6aea170f",
          []
         ],
         "uri.py": [
-         "6669e5668611d0df9a204659cc1588e61c988c63",
+         "fff0c380645ba6e25696ac45ef6dd59cc4d72f7f",
          []
         ],
         "utils.py": [
-         "40ac8559ff6f83de42842566b4da44c0d5c76ab9",
+         "c40404906edb429d2d888c7f5552110d1c994c19",
          []
         ],
         "version.py": [
-         "7377332e12e1d2fb47b17ab62b93617555f9a5ce",
-         []
-        ]
-       }
-      },
-      "tests": {
-       "__init__.py": [
-        "dd78609f5ba12743a4f945799a22013e1d132e8a",
-        []
-       ],
-       "extensions": {
-        "__init__.py": [
-         "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
-         []
-        ],
-        "test_base.py": [
-         "ba8657b65410f7a02d40f439319463078f6383a5",
-         []
-        ],
-        "test_permessage_deflate.py": [
-         "0ec49c6c02d4470129e006fb8422e8e3e6499222",
+         "c30bfd68f31ab1be4ac213478cdd9cd6c0119b5b",
          []
         ]
        },
-       "test_auth.py": [
-        "97a4485a0ff32fa057c52955d03ecd87ec8b0901",
-        []
-       ],
-       "test_client_server.py": [
-        "35913666c577b944688f733a593a0d8ec2b2f134",
-        []
-       ],
-       "test_exceptions.py": [
-        "7ad5ad833595527a7f2c46e9382e3a1a8bfb7017",
-        []
-       ],
-       "test_exports.py": [
-        "7fcbc80e389533d8a284b9144936b452a7929a60",
-        []
-       ],
-       "test_framing.py": [
-        "5def415d289bfb730772e2d4609a5237d980942d",
-        []
-       ],
-       "test_handshake.py": [
-        "7d04777152bff79047c5a852b22ef390dc710fb1",
-        []
-       ],
-       "test_headers.py": [
-        "26d85fa5eaa204381ab6c647bb67a78e3836a55b",
-        []
-       ],
-       "test_http.py": [
-        "41b522c3d5794a9208c935807143a5ae2e048fa9",
-        []
-       ],
-       "test_localhost.cnf": [
-        "6dc331ac69a290c1959957cfff6be168bada4632",
-        []
-       ],
-       "test_localhost.pem": [
-        "b8a9ea9ab3aadb514a4d09b8d011106750e3e146",
-        []
-       ],
-       "test_protocol.py": [
-        "d32c1f72e7cb94d4bec0ba945835cd9a59d71243",
-        []
-       ],
-       "test_uri.py": [
-        "e41860b8e4c2fe815efdb76491ab387caa1e3f32",
-        []
-       ],
-       "test_utils.py": [
-        "e5570f098baa8842a6a0bfde246e31cf10678fa2",
-        []
-       ],
-       "utils.py": [
-        "983a91edf0681ae934f7a0ab4562269eb2003b28",
-        []
-       ]
-      },
-      "tox.ini": [
-       "825e34061ff6458db805c4ccda6a3212467540d0",
-       []
-      ]
+       "websockets.egg-info": {
+        "PKG-INFO": [
+         "3b042a3f9f822cace1abce4264b479420920fb48",
+         []
+        ],
+        "SOURCES.txt": [
+         "2a51106feebeea3637bfbbe4d830aadfb3ed2c20",
+         []
+        ],
+        "dependency_links.txt": [
+         "8b137891791fe96927ad78e64b0aad7bded08bdc",
+         []
+        ],
+        "not-zip-safe": [
+         "8b137891791fe96927ad78e64b0aad7bded08bdc",
+         []
+        ],
+        "top_level.txt": [
+         "5474af7431bb2a6c326a2627fb198ca3bfb9b439",
+         []
+        ]
+       }
+      }
      },
      "zipp": {
       ".flake8": [
@@ -465887,7 +470366,7 @@
       []
      ],
      "browser.py": [
-      "a8c0d169587ea50a23494a564d9500e1c216b4e9",
+      "3c5f060c4ed5d096144f63876e5879af2307fa4b",
       []
      ],
      "commands.json": [
@@ -465923,7 +470402,7 @@
       []
      ],
      "run.py": [
-      "c737c057966d5561bd8fcef3f57b7a968c29aa62",
+      "efc90d1debd36072b829364e4556b6b3b8c20bd2",
       []
      ],
      "testfiles.py": [
@@ -465990,7 +470469,7 @@
        ]
       },
       "test_browser.py": [
-       "bbaaaae996e06aef763a1325965ce4e7d3e75549",
+       "979531fb4638b4617d01996b190d6b2fa3b870f7",
        []
       ],
       "test_install.py": [
@@ -466018,7 +470497,7 @@
        []
       ],
       "test_wpt.py": [
-       "d123faec2e7e14b51b00a63185af61bbf3a1953d",
+       "c977b9a873f90c95cf1aef8cfdcc3bf91c936476",
        []
       ]
      },
@@ -466079,7 +470558,7 @@
       ]
      },
      "requirements.txt": [
-      "0b7ccba4fb80fec39be58e6ca587c06b6764906f",
+      "ffb46dea79a1a55a33ba2ec7d409f79d7ffb0bb3",
       []
      ],
      "requirements_chromium.txt": [
@@ -466087,19 +470566,19 @@
       []
      ],
      "requirements_edge.txt": [
-      "0ce4d76f8af5118f78294e286353dd6fad1f455e",
+      "f5c4e20a2ce85301888393e02be67e4301df8203",
       []
      ],
      "requirements_firefox.txt": [
-      "0bb6812e6e4e6d2370af0bc0e664fb07af724cca",
+      "3ba4731494acfef5fc9bd75ff3e76111575b2851",
       []
      ],
      "requirements_ie.txt": [
-      "90a5512c79fb3fe8f4295fe1ea2d5c6fa88c4982",
+      "1630585dae5db59966256c9f04ff33e9a321361a",
       []
      ],
      "requirements_opera.txt": [
-      "90a5512c79fb3fe8f4295fe1ea2d5c6fa88c4982",
+      "1630585dae5db59966256c9f04ff33e9a321361a",
       []
      ],
      "requirements_safari.txt": [
@@ -466107,7 +470586,7 @@
       []
      ],
      "requirements_sauce.txt": [
-      "8cf3f1d32c8a27716b88035921f1a6ea46d5d4f7",
+      "2be155d9f5773cdc00eadbf4bc740c586e243a86",
       []
      ],
      "setup.py": [
@@ -466125,7 +470604,7 @@
       ],
       "browsers": {
        "__init__.py": [
-        "9724bb957b5e3c7d1a9e1506c7e710742038c916",
+        "4d10457699d5abd9e1cb5e02a2b58e825be1b417",
         []
        ],
        "android_weblayer.py": [
@@ -466137,11 +470616,11 @@
         []
        ],
        "base.py": [
-        "adf665c19926f04ed6e864a4a3a9c082f4315d48",
+        "bebdf29b642577a7a208b08c2bc993ce45bc8501",
         []
        ],
        "chrome.py": [
-        "047bfa02451f72c0e7fc8a10ece2df1def5fffbe",
+        "5e9549125441979f9b79f30ab448ad31883c0587",
         []
        ],
        "chrome_android.py": [
@@ -466153,7 +470632,7 @@
         []
        ],
        "chrome_spki_certs.py": [
-        "380f0848a73e352d2758263091dd176d7bb51e3f",
+        "0f7825c80ff731a8fd9ddb898392e4985abd0c4f",
         []
        ],
        "chromium.py": [
@@ -466161,7 +470640,7 @@
         []
        ],
        "content_shell.py": [
-        "45fb48a6272d5ffa9eeeb7b9628880c835c93139",
+        "14956eeb786b09f411dfb7a8a37379891e574c46",
         []
        ],
        "edge.py": [
@@ -466173,7 +470652,7 @@
         []
        ],
        "edgechromium.py": [
-        "df7c41a9dd055b2f4c73288b55c436781a73537f",
+        "4f5bffa06c498e2b046789da21755915f6df9d8d",
         []
        ],
        "epiphany.py": [
@@ -466181,23 +470660,27 @@
         []
        ],
        "firefox.py": [
-        "096f851f9d068c883fc63251673653f403ad2313",
+        "d91703f42dd2a2faeab45b2e5941ad626603ceb5",
         []
        ],
        "firefox_android.py": [
-        "298b5f27407abdc1008d1a3de77730a6c60efa98",
+        "8437dd2005929834db22626cbbb3dcd3f4a5b926",
         []
        ],
        "ie.py": [
         "87b989c028b0edaabbb75e5f6361f7f7538e80a1",
         []
        ],
+       "ladybird.py": [
+        "4738a71f1946d46bcf2b70e7502016153865ce96",
+        []
+       ],
        "opera.py": [
         "a2448f4a90067f6eba11854030164f908aa8bbe3",
         []
        ],
        "safari.py": [
-        "f7dcd55d62853c9768b8e0c83b8993f03adad674",
+        "40f5f54859f33f6e6ce8ed39dfc17e975bcb8d42",
         []
        ],
        "sauce.py": [
@@ -466227,7 +470710,7 @@
         []
        ],
        "webkitgtk_minibrowser.py": [
-        "4b247dd36e397c796d0623c57e6038f18663b474",
+        "355ffe3597958ab6116f42ebaaecdb9223e903cc",
         []
        ],
        "wktr.py": [
@@ -466240,7 +470723,7 @@
        []
       ],
       "environment.py": [
-       "9e217eda4825d670a2a53240f1d9da5acb8a0901",
+       "de96f799ba305a47e9894f79148d734115f420bb",
        []
       ],
       "executors": {
@@ -466249,23 +470732,27 @@
         []
        ],
        "actions.py": [
-        "f3fe970484e57d596a04cb11eb7ff6e20a5ad382",
+        "e622c6c67d936c84ecce2683f0a2c0dd12faed3b",
         []
        ],
        "base.py": [
-        "b148365780b20f4bdaa4f9ffca22da78e1bdf6a1",
+        "a4d658eaeb2ed277e9299b3116a9c4d7d8706335",
         []
        ],
        "executorchrome.py": [
-        "5df9de5f7e3c9b119af2a592c3214af9f30ef65e",
+        "7a54eb097f9afbe719ba551894a461a3535bc77b",
         []
        ],
        "executorcontentshell.py": [
-        "8a183bafcbd0ba1afd919c1f5738613bb5034788",
+        "5c4068c7acf5d8c06e3f10a034822dfd94c00803",
+        []
+       ],
+       "executoredge.py": [
+        "cbe5eadf9a608da0b8d767f26a4fca6b15eb4681",
         []
        ],
        "executormarionette.py": [
-        "95f186082042e322ccf53faa308f429f972523a1",
+        "eaeaddf412303ed53eae7dff6b46cbf1b275cf1f",
         []
        ],
        "executorselenium.py": [
@@ -466281,11 +470768,11 @@
         []
        ],
        "executorwebdriver.py": [
-        "b31c84d8e88f3e14a726fcd1725ac2911844e4b3",
+        "ff174a4e0ca44e7ee9bd41ef72652b8fb6dd97ff",
         []
        ],
        "executorwktr.py": [
-        "ab94000fa209c2e864271ec4d9f091c88d83c851",
+        "b240bca556a454ba785bf2452bb91589396010b1",
         []
        ],
        "process.py": [
@@ -466293,7 +470780,7 @@
         []
        ],
        "protocol.py": [
-        "170c27cd687d62cfb15014794e37768cc694a16b",
+        "abf3191cd2f57c446117f4e27e69bb7a8d337555",
         []
        ],
        "pytestrunner": {
@@ -466302,7 +470789,7 @@
          []
         ],
         "runner.py": [
-         "f520e095e8197a658bf270c63386971e95af2f70",
+         "df7b7c40132267f5a9cf569b390ade94efa433ff",
          []
         ]
        },
@@ -466363,7 +470850,7 @@
         ]
        },
        "wptreport.py": [
-        "21c121158015b9e940e728b85f2a824ce9bd5920",
+        "5919631ab718dad76c65a54d0b6bc5fa12396978",
         []
        ],
        "wptscreenshot.py": [
@@ -466384,11 +470871,11 @@
        []
       ],
       "manifestupdate.py": [
-       "a919d6df7e00ae222b36530e07ae6f4608469168",
+       "ebab2493a711636e9ab45c5cf2dade8667348d33",
        []
       ],
       "metadata.py": [
-       "d026fdf574efe9e37cf460d0abd00baf57f358c5",
+       "b9cb61eb07f3069df007c33cdcf24f48ae457da9",
        []
       ],
       "mpcontext.py": [
@@ -466408,7 +470895,7 @@
        []
       ],
       "testdriver-extra.js": [
-       "b5cc9cdbbbf176f6fc97e29a479d70f45b500004",
+       "8e44800d6cb7ec9ec9abe30f10820978a5df1fa6",
        []
       ],
       "testdriver-vendor.js": [
@@ -466440,11 +470927,11 @@
        []
       ],
       "testloader.py": [
-       "86004b83387a97437be4f013680bf2155fa29627",
+       "6cb2110301fde0d85eb2bc8f13388280854138e5",
        []
       ],
       "testrunner.py": [
-       "f29aebac4b9a2e23080f8b9ee48d5d93fd24641d",
+       "05e0436899c248364a011d12fed597c4ec5a5e49",
        []
       ],
       "tests": {
@@ -466470,7 +470957,7 @@
          []
         ],
         "test_webkitgtk.py": [
-         "5b751e945622f85e18286553f9791e579aecd6ca",
+         "324142c0add2acf7461e907880be78a4c66ab443",
          []
         ]
        },
@@ -466490,6 +470977,10 @@
         "e47a3470d8da752eded9f43534e48792eb180a7a",
         []
        ],
+       "test_manifestupdate.py": [
+        "12e379615d5683d23127ca1f254efc59d0902da4",
+        []
+       ],
        "test_metadata.py": [
         "ee3d90915de6492c9dd1ddd76639391f409ba8ad",
         []
@@ -466503,7 +470994,7 @@
         []
        ],
        "test_testloader.py": [
-        "6e93a20e02ec9b7a3bfea0da30c14cd724f41f51",
+        "0915f42381e6fda36d7342d01fa38872243b13af",
         []
        ],
        "test_update.py": [
@@ -466525,11 +471016,11 @@
         []
        ],
        "metadata.py": [
-        "388b569bcc3c79f0243fba542de5586f93694d6b",
+        "48519900e7db5ad5f395ef03409b5c95fc9250af",
         []
        ],
        "state.py": [
-        "2c23ad66c2111c5e468da2c4bb6cb4ef3b9837be",
+        "e187d411a2c0b400a332781a8faa757a731a9ad4",
         []
        ],
        "sync.py": [
@@ -466550,7 +471041,7 @@
        []
       ],
       "wptcommandline.py": [
-       "bc664b08ca020a51452fadd52690e8d6fbaf24a8",
+       "58c726fe379e0cadbef9f89dcf21200189d3999e",
        []
       ],
       "wptlogging.py": [
@@ -466620,11 +471111,11 @@
        }
       },
       "wptrunner.py": [
-       "4bfb4158d1305c2814b67ab76f491ae61f7b8779",
+       "8badb13163905f3de2c05c28933cf8dbc9036695",
        []
       ],
       "wpttest.py": [
-       "492549d4e7f35df92a20736953a69d68ed527f3d",
+       "ba038a25ae3bbd1f39f0140921aff8c60d287f3a",
        []
       ]
      },
@@ -466938,7 +471429,7 @@
        []
       ],
       "handlers.py": [
-       "00ba06789c8ee21e261339a161201e993b8a1bef",
+       "6d79230a32410a486342ce1168dcb7ae6df188eb",
        []
       ],
       "logger.py": [
@@ -467034,7 +471525,7 @@
    },
    "touch-events": {
     "META.yml": [
-     "3dcab9a534bc43753827b2d4f7cc6d3cd9974404",
+     "e9b7a8915e04f136c072ae7379e15892faaaced8",
      []
     ],
     "multi-touch-interactions.js": [
@@ -467180,7 +471671,7 @@
    },
    "uievents": {
     "META.yml": [
-     "2f1ec58efec10e0dd6374aac05cb926c8cffa3f1",
+     "3c490cdc55f1deac7a6aabf0fab6d108c1febf6f",
      []
     ],
     "README.md": [
@@ -467775,11 +472266,11 @@
       []
      ],
      "a-element-origin.js": [
-      "de72988ea93c12b067d01f99bb39e451e312d837",
+      "c1c24c8986b4aa6c1c214c3e5f480ace2abf885f",
       []
      ],
      "a-element.js": [
-      "d87937d002b24ad70a53a535e32d40fbf4ab2523",
+      "cff4160d32894231c5ea3d8316930564915a2c0e",
       []
      ],
      "percent-encoding.json": [
@@ -467955,11 +472446,11 @@
       []
      ],
      "assertions.js": [
-      "162f5a9a6b8dcc3639444440b0c46be8212d317d",
+      "3b370190682a3aab7426b3c31712f9b46968d9aa",
       []
      ],
      "bad-imports.js": [
-      "786fc650e326b61f548ea09b0d5d389bf7a0f489",
+      "c7c9c6b6cdd1355f274b8289aed21bb70b91305c",
       []
      ],
      "error-interfaces-no-symbol-tostringtag.js": [
@@ -468033,7 +472524,7 @@
       }
      },
      "instanceTestFactory.js": [
-      "ac468947ec22e29310d0714cb7dfa0972893477d",
+      "6e6ec875bda4100a22b18f4059d22f35514843fd",
       []
      ],
      "memory": {
@@ -468049,7 +472540,7 @@
       ]
      },
      "wasm-module-builder.js": [
-      "86d836a5a37245100c628fe6f03691373b6a27d4",
+      "3545c3a8da7bc9cec9798c261df953dfb5ad86c8",
       []
      ]
     },
@@ -468346,7 +472837,7 @@
     "animation-model": {
      "animation-types": {
       "property-list.js": [
-       "c4ef7937ba3d71906db089855b81e1a4f9239625",
+       "14a175d7549ccbb22a0604ac51d5e220ac6858c8",
        []
       ],
       "property-types.js": [
@@ -469396,7 +473887,7 @@
    },
    "webcodecs": {
     "META.yml": [
-     "b5b838a4cf9767d555df2b08f057636e1e7b86ee",
+     "8570ee05e5a29b7835b28f9113db32b9677ca535",
      []
     ],
     "README.md": [
@@ -469596,7 +474087,7 @@
      ],
      "bidi": {
       "__init__.py": [
-       "9d049f0a5482907600bbf2f592082bce10b99aac",
+       "98a95a37fc3573595414a3232a4013e44cfa7e1a",
        []
       ],
       "browsing_context": {
@@ -469676,6 +474167,12 @@
          []
         ]
        },
+       "navigation_started": {
+        "__init__.py": [
+         "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
+         []
+        ]
+       },
        "print": {
         "__init__.py": [
          "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
@@ -469684,7 +474181,7 @@
        },
        "reload": {
         "__init__.py": [
-         "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
+         "3cec19363dc628c8a7ab53ff0feb5f3883db1aef",
          []
         ]
        },
@@ -469723,6 +474220,18 @@
          "c5916f289705642eec4975cf51458b9afeefe46c",
          []
         ]
+       },
+       "user_prompt_closed": {
+        "__init__.py": [
+         "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
+         []
+        ]
+       },
+       "user_prompt_opened": {
+        "__init__.py": [
+         "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
+         []
+        ]
        }
       },
       "errors": {
@@ -469733,7 +474242,7 @@
       },
       "input": {
        "__init__.py": [
-        "17f1ae6eb3ef02f2fbd98ed46007443af2109120",
+        "809379d56dc3c28a3283c92561476d36e499c721",
         []
        ],
        "conftest.py": [
@@ -469742,7 +474251,7 @@
        ],
        "perform_actions": {
         "__init__.py": [
-         "fb5bffaebc2115759922c57ce17f13ae1d180c6e",
+         "626dbad1476143e71fac622976bfe37235f81054",
          []
         ]
        },
@@ -469767,7 +474276,7 @@
       },
       "network": {
        "__init__.py": [
-        "19a4a69b4c50c8cc613d118ca83edf790612b344",
+        "cab997d14d9e20d954ad814055b6e546da0807f6",
         []
        ],
        "add_intercept": {
@@ -469789,7 +474298,7 @@
         ]
        },
        "conftest.py": [
-        "924d5a34c6d4899bea2d0c14efb013918f9ebbf1",
+        "9f74cc67cc64c8951cb38fcd38a44ba017221976",
         []
        ],
        "remove_intercept": {
@@ -469831,6 +474340,10 @@
          "c6cac69265af1e1684d2e3038f8fc90b84c87e9c",
          []
         ],
+        "other.txt": [
+         "e45c9c2666d44e0327c1f9c239a74c508336053e",
+         []
+        ],
         "redirect_http_equiv.html": [
          "9b588c67ef8d610fcf8228b17c01044193d195bb",
          []
@@ -469843,7 +474356,7 @@
       },
       "script": {
        "__init__.py": [
-        "5635a4bbfb0f02450205d6abb997a692259d43ab",
+        "603abc84375072128c3b31db3c9c553342d8265e",
         []
        ],
        "add_preload_script": {
@@ -469892,6 +474405,18 @@
          []
         ]
        },
+       "realm_created": {
+        "__init__.py": [
+         "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
+         []
+        ]
+       },
+       "realm_destroyed": {
+        "__init__.py": [
+         "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
+         []
+        ]
+       },
        "remove_preload_script": {
         "__init__.py": [
          "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
@@ -470388,7 +474913,7 @@
        []
       ],
       "fixtures.py": [
-       "850c654d2a6db38b1e1bdbe6299d6dd1085c9d04",
+       "d7ca4d0fab7f593e773a5014dd00edf8eab85dc4",
        []
       ],
       "fixtures_bidi.py": [
@@ -470400,7 +474925,7 @@
        []
       ],
       "helpers.py": [
-       "c0d0cb11dc4d5156b7fcb16f418acd6da8b4682a",
+       "dbc5abc2475cf53c4d24add726a12a2ff47175c5",
        []
       ],
       "html": {
@@ -470437,7 +474962,7 @@
         []
        ],
        "test_actions_scroll.html": [
-        "cc9278954a0e0bb278f940b2f6e091e0c90a086b",
+        "db5952ed74d2bc771933296f313797126c18291e",
         []
        ]
       },
@@ -470476,7 +475001,7 @@
        []
       ],
       "image.py": [
-       "9597b05a22fe29c9bd107d5ff7e1e9a41de802a0",
+       "533b8b2068218bdfb4f88785319b880d8ed82800",
        []
       ],
       "inline.py": [
@@ -470484,7 +475009,7 @@
        []
       ],
       "keys.py": [
-       "c353644dddfde4178829b0253c2c5064d7bd3fd5",
+       "3794a4296f6072d7fbd49d4069ad40af5fd438e7",
        []
       ],
       "screenshot.py": [
@@ -470572,7 +475097,7 @@
    },
    "webmessaging": {
     "META.yml": [
-     "95d5071171b5a20cc14a414c97c9eae2f525f43f",
+     "cce20869bc0b6e6384d03a4655816ccb4a90bbd1",
      []
     ],
     "README.md": [
@@ -470936,7 +475461,7 @@
      []
     ],
     "RTCPeerConnection-helper.js": [
-     "eefe10579b4e17964375a81068debb0310938586",
+     "5d188328e80331748677d77832eb44c3018cc5ef",
      []
     ],
     "RTCPeerConnection-perfect-negotiation-helper.js": [
@@ -471174,7 +475699,7 @@
    },
    "websockets": {
     "META.yml": [
-     "da999b994f36be57d331d264c5cf10d614760d4e",
+     "77a6bff0bff75f68db1a5592b3e27b13a4ea4b45",
      []
     ],
     "README.md": [
@@ -471404,7 +475929,7 @@
    },
    "webstorage": {
     "META.yml": [
-     "020075c3f2401ca4b8da73116a84582d46e265c0",
+     "a3853105f8fb0dfe348235f7c23d713ee643aac0",
      []
     ],
     "README.md": [
@@ -471544,6 +476069,10 @@
       "75d458255ad7af10508dce9905bf2ddb259f3699",
       []
      ],
+     "sendorder.py": [
+      "3677d4033c4a5d9c2b8d25ca0290e52773ba8b03",
+      []
+     ],
      "server-close.py": [
       "e9d08f483cff2859d3c1ec1426089d99bd5b253e",
       []
@@ -473707,14 +478236,14 @@
     ],
     "resources": {
      "helpers.js": [
-      "71ebab15c6a71ea01d2d9558c8ffa3231d1c8ab7",
+      "ee77fd8d30d713eb5e764db51c0edd1429e0f1e8",
       []
      ]
     }
    },
    "workers": {
     "META.yml": [
-     "a7297d3844728b8bb2f7c82a2c4f32d65040a919",
+     "b5b28235ce1510a934b1be39cb8892f0fba67003",
      []
     ],
     "README.md": [
@@ -474214,7 +478743,7 @@
        []
       ],
       "dynamic-import-remote-origin-referrer-checker-worker.sub.js": [
-       "3f281faa7c38c9f830f115606ab0879838bc2bc9",
+       "014a3467e86c8a61ae013965a12f7f379b2b4f12",
        []
       ],
       "dynamic-import-remote-origin-script-worker.sub.js": [
@@ -474354,7 +478883,7 @@
        []
       ],
       "static-import-remote-origin-referrer-checker-worker.sub.js": [
-       "45fc5493c92a4fdf1dceb1f985253c60630c253c",
+       "c1f8340f36d71873c96c912e5e2531d5fdc3f2c2",
        []
       ],
       "static-import-remote-origin-script-worker.sub.js": [
@@ -476577,7 +481106,7 @@
      ]
     ],
     "back-forward-cache-open-connection.window.js": [
-     "0021857d8b52509c309385f81aa3d7ea42476431",
+     "cee7287a0bbc1ca229ab7b6127f17b738bd0e6ab",
      [
       "IndexedDB/back-forward-cache-open-connection.window.html",
       {
@@ -488357,7 +492886,7 @@
     ],
     "import_export": {
      "ec_importKey.https.any.js": [
-      "25defa369c1d31430fd44a0afdd4455773d606a1",
+      "31f062e313f6fe9dc735fc9a5588df0c098fde98",
       [
        "WebCryptoAPI/import_export/ec_importKey.https.any.html",
        {
@@ -488400,7 +492929,7 @@
       ]
      ],
      "okp_importKey.https.any.js": [
-      "2257a5fa418ad5f2a71cda4c83b919c7d28850b2",
+      "a0ec3e81c877e12539528ca5ba60502bc4f91979",
       [
        "WebCryptoAPI/import_export/okp_importKey.https.any.html",
        {
@@ -488647,7 +493176,7 @@
       ]
      ],
      "rsa_importKey.https.any.js": [
-      "5582b2f506b067d38dda13af286a87dcb507d7b4",
+      "c0917cab683caaa5d2ed9a3b5d03bf49518d651f",
       [
        "WebCryptoAPI/import_export/rsa_importKey.https.any.html",
        {
@@ -488690,7 +493219,7 @@
       ]
      ],
      "symmetric_importKey.https.any.js": [
-      "a9ce9be0a1becf95a3d199a6a1ac18da67a4f173",
+      "01b3180189db83ba72402dd6f956e737e091ecc1",
       [
        "WebCryptoAPI/import_export/symmetric_importKey.https.any.html",
        {
@@ -497114,7 +501643,7 @@
       ]
      },
      "feature-policy.sub.https.html": [
-      "e1aa3ad68f85764bbf7267c5690a4496641208b4",
+      "8f9be9fde43eedd74120441f3f7e11bf5e8c315d",
       [
        null,
        {}
@@ -497966,7 +502495,7 @@
      ]
     ],
     "http-equiv-accept-ch-merge.https.html": [
-     "832c0578874fcb6da58fb4c1424d339735567280",
+     "bc578afb1e10d4164a97928987dbb4b3fcd477bb",
      [
       null,
       {}
@@ -498024,7 +502553,7 @@
      ]
     ],
     "meta-equiv-delegate-ch-injection.https.html": [
-     "b9e4a334fcaf77bad0ef5e51773471d6437176e3",
+     "79221efe95490b2ad03a498dee59d08ad10f2d00",
      [
       null,
       {}
@@ -498038,7 +502567,7 @@
      ]
     ],
     "meta-equiv-delegate-ch-merge.https.html": [
-     "d8dbc9f96c4304c68ea247b34fecf083de3b4bba",
+     "1039be4dbe45c9455eae573e30207f7b3eb61d99",
      [
       null,
       {}
@@ -498103,7 +502632,7 @@
      ]
     },
     "sec-ch-quotes.https.html": [
-     "31dc945510d970064e65fcf18450969a9633c795",
+     "08f7c51af0f4ed15eb1a07cac50ccaae102ed139",
      [
       null,
       {}
@@ -498375,7 +502904,7 @@
      ]
     ],
     "async-unsanitized-standard-html-formats-write-read.tentative.https.html": [
-     "f6313c1b901c7ec454d58c8f8d3580a649bd55ae",
+     "0eb97926bc091fff89913e830498d50c43049fe3",
      [
       null,
       {
@@ -498934,14 +503463,14 @@
    },
    "compression": {
     "compression-bad-chunks.tentative.any.js": [
-     "cbd4805a4daf3d3a99df0615f6ddc861e03310d1",
+     "2d0b5684733930e4fe02ca290590cdb24edf1f39",
      [
       "compression/compression-bad-chunks.tentative.any.html",
       {
        "script_metadata": [
         [
          "global",
-         "window,worker"
+         "window,worker,shadowrealm"
         ]
        ]
       }
@@ -498952,7 +503481,18 @@
        "script_metadata": [
         [
          "global",
-         "window,worker"
+         "window,worker,shadowrealm"
+        ]
+       ]
+      }
+     ],
+     [
+      "compression/compression-bad-chunks.tentative.any.shadowrealm.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker,shadowrealm"
         ]
        ]
       }
@@ -498963,7 +503503,7 @@
        "script_metadata": [
         [
          "global",
-         "window,worker"
+         "window,worker,shadowrealm"
         ]
        ]
       }
@@ -498974,21 +503514,21 @@
        "script_metadata": [
         [
          "global",
-         "window,worker"
+         "window,worker,shadowrealm"
         ]
        ]
       }
      ]
     ],
     "compression-constructor-error.tentative.any.js": [
-     "2d5271c11d31f46ec79a382a2fd44aad2a4b79d9",
+     "b39ab93bd02aba56e852014d0a2cb1c9dbc6e474",
      [
       "compression/compression-constructor-error.tentative.any.html",
       {
        "script_metadata": [
         [
          "global",
-         "window,worker"
+         "window,worker,shadowrealm"
         ]
        ]
       }
@@ -498999,7 +503539,18 @@
        "script_metadata": [
         [
          "global",
-         "window,worker"
+         "window,worker,shadowrealm"
+        ]
+       ]
+      }
+     ],
+     [
+      "compression/compression-constructor-error.tentative.any.shadowrealm.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker,shadowrealm"
         ]
        ]
       }
@@ -499010,7 +503561,7 @@
        "script_metadata": [
         [
          "global",
-         "window,worker"
+         "window,worker,shadowrealm"
         ]
        ]
       }
@@ -499021,21 +503572,21 @@
        "script_metadata": [
         [
          "global",
-         "window,worker"
+         "window,worker,shadowrealm"
         ]
        ]
       }
      ]
     ],
     "compression-including-empty-chunk.tentative.any.js": [
-     "0948029c4bd5819535fb029e130ad6edd38b58d6",
+     "a7fd1ceb24f086e7b7579c9826a352774dc97f96",
      [
       "compression/compression-including-empty-chunk.tentative.any.html",
       {
        "script_metadata": [
         [
          "global",
-         "window,worker"
+         "window,worker,shadowrealm"
         ],
         [
          "script",
@@ -499055,7 +503606,27 @@
        "script_metadata": [
         [
          "global",
-         "window,worker"
+         "window,worker,shadowrealm"
+        ],
+        [
+         "script",
+         "third_party/pako/pako_inflate.min.js"
+        ],
+        [
+         "timeout",
+         "long"
+        ]
+       ],
+       "timeout": "long"
+      }
+     ],
+     [
+      "compression/compression-including-empty-chunk.tentative.any.shadowrealm.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker,shadowrealm"
         ],
         [
          "script",
@@ -499075,7 +503646,7 @@
        "script_metadata": [
         [
          "global",
-         "window,worker"
+         "window,worker,shadowrealm"
         ],
         [
          "script",
@@ -499095,7 +503666,7 @@
        "script_metadata": [
         [
          "global",
-         "window,worker"
+         "window,worker,shadowrealm"
         ],
         [
          "script",
@@ -499111,14 +503682,14 @@
      ]
     ],
     "compression-large-flush-output.any.js": [
-     "c7455807fb2b2acc6d74d2ebf9540a81cf09647c",
+     "6afcb4d52875b91b599e76945403ccfa3b39692e",
      [
       "compression/compression-large-flush-output.any.html",
       {
        "script_metadata": [
         [
          "global",
-         "window,worker"
+         "window,worker,shadowrealm"
         ],
         [
          "script",
@@ -499142,7 +503713,31 @@
        "script_metadata": [
         [
          "global",
-         "window,worker"
+         "window,worker,shadowrealm"
+        ],
+        [
+         "script",
+         "third_party/pako/pako_inflate.min.js"
+        ],
+        [
+         "script",
+         "resources/concatenate-stream.js"
+        ],
+        [
+         "timeout",
+         "long"
+        ]
+       ],
+       "timeout": "long"
+      }
+     ],
+     [
+      "compression/compression-large-flush-output.any.shadowrealm.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker,shadowrealm"
         ],
         [
          "script",
@@ -499166,7 +503761,7 @@
        "script_metadata": [
         [
          "global",
-         "window,worker"
+         "window,worker,shadowrealm"
         ],
         [
          "script",
@@ -499190,7 +503785,7 @@
        "script_metadata": [
         [
          "global",
-         "window,worker"
+         "window,worker,shadowrealm"
         ],
         [
          "script",
@@ -499210,14 +503805,14 @@
      ]
     ],
     "compression-multiple-chunks.tentative.any.js": [
-     "f43f13b5411033e53884017d7de70608017be854",
+     "28a90e5ca539028031695727f9b91d5985e7190f",
      [
       "compression/compression-multiple-chunks.tentative.any.html",
       {
        "script_metadata": [
         [
          "global",
-         "window,worker"
+         "window,worker,shadowrealm"
         ],
         [
          "script",
@@ -499237,7 +503832,27 @@
        "script_metadata": [
         [
          "global",
-         "window,worker"
+         "window,worker,shadowrealm"
+        ],
+        [
+         "script",
+         "third_party/pako/pako_inflate.min.js"
+        ],
+        [
+         "timeout",
+         "long"
+        ]
+       ],
+       "timeout": "long"
+      }
+     ],
+     [
+      "compression/compression-multiple-chunks.tentative.any.shadowrealm.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker,shadowrealm"
         ],
         [
          "script",
@@ -499257,7 +503872,7 @@
        "script_metadata": [
         [
          "global",
-         "window,worker"
+         "window,worker,shadowrealm"
         ],
         [
          "script",
@@ -499277,7 +503892,7 @@
        "script_metadata": [
         [
          "global",
-         "window,worker"
+         "window,worker,shadowrealm"
         ],
         [
          "script",
@@ -499293,14 +503908,14 @@
      ]
     ],
     "compression-output-length.tentative.any.js": [
-     "07efe92a826e787fb00dba2929f94b930c8f8316",
+     "7aa13734500d269755ba924e1605aeb8026db085",
      [
       "compression/compression-output-length.tentative.any.html",
       {
        "script_metadata": [
         [
          "global",
-         "window,worker"
+         "window,worker,shadowrealm"
         ]
        ]
       }
@@ -499311,7 +503926,18 @@
        "script_metadata": [
         [
          "global",
-         "window,worker"
+         "window,worker,shadowrealm"
+        ]
+       ]
+      }
+     ],
+     [
+      "compression/compression-output-length.tentative.any.shadowrealm.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker,shadowrealm"
         ]
        ]
       }
@@ -499322,7 +503948,7 @@
        "script_metadata": [
         [
          "global",
-         "window,worker"
+         "window,worker,shadowrealm"
         ]
        ]
       }
@@ -499333,21 +503959,21 @@
        "script_metadata": [
         [
          "global",
-         "window,worker"
+         "window,worker,shadowrealm"
         ]
        ]
       }
      ]
     ],
     "compression-stream.tentative.any.js": [
-     "8c02a6d699a6d2225131d75b87ea2c68e9d50c7d",
+     "a7ea0cb908402faa8cbe77e8b86ad84e50c556ec",
      [
       "compression/compression-stream.tentative.any.html",
       {
        "script_metadata": [
         [
          "global",
-         "window,worker"
+         "window,worker,shadowrealm"
         ],
         [
          "script",
@@ -499367,7 +503993,27 @@
        "script_metadata": [
         [
          "global",
-         "window,worker"
+         "window,worker,shadowrealm"
+        ],
+        [
+         "script",
+         "third_party/pako/pako_inflate.min.js"
+        ],
+        [
+         "timeout",
+         "long"
+        ]
+       ],
+       "timeout": "long"
+      }
+     ],
+     [
+      "compression/compression-stream.tentative.any.shadowrealm.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker,shadowrealm"
         ],
         [
          "script",
@@ -499387,7 +504033,7 @@
        "script_metadata": [
         [
          "global",
-         "window,worker"
+         "window,worker,shadowrealm"
         ],
         [
          "script",
@@ -499407,7 +504053,7 @@
        "script_metadata": [
         [
          "global",
-         "window,worker"
+         "window,worker,shadowrealm"
         ],
         [
          "script",
@@ -499423,14 +504069,14 @@
      ]
     ],
     "compression-with-detach.tentative.window.js": [
-     "786bba21c800ca9f067a6d033f0345a52bfbb218",
+     "465feaa47d4e9af02fb86b9a36b698aa9c465fbe",
      [
       "compression/compression-with-detach.tentative.window.html",
       {
        "script_metadata": [
         [
          "global",
-         "window,worker"
+         "window,worker,shadowrealm"
         ],
         [
          "script",
@@ -499441,14 +504087,14 @@
      ]
     ],
     "decompression-bad-chunks.tentative.any.js": [
-     "0a1312a5a111b8cc2690e9541ba4b7b778f86cf7",
+     "f450b0c4cb255393a11007493b538d8fc87e59ad",
      [
       "compression/decompression-bad-chunks.tentative.any.html",
       {
        "script_metadata": [
         [
          "global",
-         "window,worker"
+         "window,worker,shadowrealm"
         ]
        ]
       }
@@ -499459,7 +504105,18 @@
        "script_metadata": [
         [
          "global",
-         "window,worker"
+         "window,worker,shadowrealm"
+        ]
+       ]
+      }
+     ],
+     [
+      "compression/decompression-bad-chunks.tentative.any.shadowrealm.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker,shadowrealm"
         ]
        ]
       }
@@ -499470,7 +504127,7 @@
        "script_metadata": [
         [
          "global",
-         "window,worker"
+         "window,worker,shadowrealm"
         ]
        ]
       }
@@ -499481,21 +504138,21 @@
        "script_metadata": [
         [
          "global",
-         "window,worker"
+         "window,worker,shadowrealm"
         ]
        ]
       }
      ]
     ],
     "decompression-buffersource.tentative.any.js": [
-     "5f8638b1351efda13d9b688e7dba61e8fea5fdc7",
+     "e81fc566779800f324034eb338957cf1b2f24106",
      [
       "compression/decompression-buffersource.tentative.any.html",
       {
        "script_metadata": [
         [
          "global",
-         "window,worker"
+         "window,worker,shadowrealm"
         ]
        ]
       }
@@ -499506,7 +504163,18 @@
        "script_metadata": [
         [
          "global",
-         "window,worker"
+         "window,worker,shadowrealm"
+        ]
+       ]
+      }
+     ],
+     [
+      "compression/decompression-buffersource.tentative.any.shadowrealm.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker,shadowrealm"
         ]
        ]
       }
@@ -499517,7 +504185,7 @@
        "script_metadata": [
         [
          "global",
-         "window,worker"
+         "window,worker,shadowrealm"
         ]
        ]
       }
@@ -499528,21 +504196,21 @@
        "script_metadata": [
         [
          "global",
-         "window,worker"
+         "window,worker,shadowrealm"
         ]
        ]
       }
      ]
     ],
     "decompression-constructor-error.tentative.any.js": [
-     "1bd86ff5b5999ee435612e0a59e26464b419d71a",
+     "0270ba7353128c66f5c86f300cc7ec8aa3dc31bb",
      [
       "compression/decompression-constructor-error.tentative.any.html",
       {
        "script_metadata": [
         [
          "global",
-         "window,worker"
+         "window,worker,shadowrealm"
         ]
        ]
       }
@@ -499553,7 +504221,18 @@
        "script_metadata": [
         [
          "global",
-         "window,worker"
+         "window,worker,shadowrealm"
+        ]
+       ]
+      }
+     ],
+     [
+      "compression/decompression-constructor-error.tentative.any.shadowrealm.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker,shadowrealm"
         ]
        ]
       }
@@ -499564,7 +504243,7 @@
        "script_metadata": [
         [
          "global",
-         "window,worker"
+         "window,worker,shadowrealm"
         ]
        ]
       }
@@ -499575,21 +504254,21 @@
        "script_metadata": [
         [
          "global",
-         "window,worker"
+         "window,worker,shadowrealm"
         ]
        ]
       }
      ]
     ],
     "decompression-correct-input.tentative.any.js": [
-     "e5f56c0f0a5e70dda2d6d2c2b882eb7682675d59",
+     "90519445e3667b7c0335c17b025cb0e3ac3bb361",
      [
       "compression/decompression-correct-input.tentative.any.html",
       {
        "script_metadata": [
         [
          "global",
-         "window,worker"
+         "window,worker,shadowrealm"
         ]
        ]
       }
@@ -499600,7 +504279,18 @@
        "script_metadata": [
         [
          "global",
-         "window,worker"
+         "window,worker,shadowrealm"
+        ]
+       ]
+      }
+     ],
+     [
+      "compression/decompression-correct-input.tentative.any.shadowrealm.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker,shadowrealm"
         ]
        ]
       }
@@ -499611,7 +504301,7 @@
        "script_metadata": [
         [
          "global",
-         "window,worker"
+         "window,worker,shadowrealm"
         ]
        ]
       }
@@ -499622,14 +504312,14 @@
        "script_metadata": [
         [
          "global",
-         "window,worker"
+         "window,worker,shadowrealm"
         ]
        ]
       }
      ]
     ],
     "decompression-corrupt-input.tentative.any.js": [
-     "edf6dedaee08c35b58a803707ed5bd4771a7432f",
+     "fc18197dfbd3db497ada00f96c36bdc219692170",
      [
       "compression/decompression-corrupt-input.tentative.any.html",
       {}
@@ -499640,14 +504330,14 @@
      ]
     ],
     "decompression-empty-input.tentative.any.js": [
-     "62759757720de61f96e4bcc547a217b0eea0b56c",
+     "201db8ec0b0d7cdb170ae1d04d05162194502d4a",
      [
       "compression/decompression-empty-input.tentative.any.html",
       {
        "script_metadata": [
         [
          "global",
-         "window,worker"
+         "window,worker,shadowrealm"
         ]
        ]
       }
@@ -499658,7 +504348,18 @@
        "script_metadata": [
         [
          "global",
-         "window,worker"
+         "window,worker,shadowrealm"
+        ]
+       ]
+      }
+     ],
+     [
+      "compression/decompression-empty-input.tentative.any.shadowrealm.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker,shadowrealm"
         ]
        ]
       }
@@ -499669,7 +504370,7 @@
        "script_metadata": [
         [
          "global",
-         "window,worker"
+         "window,worker,shadowrealm"
         ]
        ]
       }
@@ -499680,21 +504381,21 @@
        "script_metadata": [
         [
          "global",
-         "window,worker"
+         "window,worker,shadowrealm"
         ]
        ]
       }
      ]
     ],
     "decompression-split-chunk.tentative.any.js": [
-     "96c26f004c8e5aba21eef68459b49a169da30d32",
+     "eb12c2a2360cd923076ec7aebadea3f855ce609c",
      [
       "compression/decompression-split-chunk.tentative.any.html",
       {
        "script_metadata": [
         [
          "global",
-         "window,worker"
+         "window,worker,shadowrealm"
         ]
        ]
       }
@@ -499705,7 +504406,18 @@
        "script_metadata": [
         [
          "global",
-         "window,worker"
+         "window,worker,shadowrealm"
+        ]
+       ]
+      }
+     ],
+     [
+      "compression/decompression-split-chunk.tentative.any.shadowrealm.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker,shadowrealm"
         ]
        ]
       }
@@ -499716,7 +504428,7 @@
        "script_metadata": [
         [
          "global",
-         "window,worker"
+         "window,worker,shadowrealm"
         ]
        ]
       }
@@ -499727,21 +504439,21 @@
        "script_metadata": [
         [
          "global",
-         "window,worker"
+         "window,worker,shadowrealm"
         ]
        ]
       }
      ]
     ],
     "decompression-uint8array-output.tentative.any.js": [
-     "ff0f8d62254d733ff09f8b30fa1c09ffbae01912",
+     "0c45a0aaa727f12263a338a0009524102e5a67a6",
      [
       "compression/decompression-uint8array-output.tentative.any.html",
       {
        "script_metadata": [
         [
          "global",
-         "window,worker"
+         "window,worker,shadowrealm"
         ],
         [
          "timeout",
@@ -499757,7 +504469,23 @@
        "script_metadata": [
         [
          "global",
-         "window,worker"
+         "window,worker,shadowrealm"
+        ],
+        [
+         "timeout",
+         "long"
+        ]
+       ],
+       "timeout": "long"
+      }
+     ],
+     [
+      "compression/decompression-uint8array-output.tentative.any.shadowrealm.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker,shadowrealm"
         ],
         [
          "timeout",
@@ -499773,7 +504501,7 @@
        "script_metadata": [
         [
          "global",
-         "window,worker"
+         "window,worker,shadowrealm"
         ],
         [
          "timeout",
@@ -499789,7 +504517,7 @@
        "script_metadata": [
         [
          "global",
-         "window,worker"
+         "window,worker,shadowrealm"
         ],
         [
          "timeout",
@@ -499801,14 +504529,14 @@
      ]
     ],
     "decompression-with-detach.tentative.window.js": [
-     "a2f8bda09148f0d323022b1f93be78d83c4aa654",
+     "1ff9c2698370225ea0a6a458edafd9357a810b88",
      [
       "compression/decompression-with-detach.tentative.window.html",
       {
        "script_metadata": [
         [
          "global",
-         "window,worker"
+         "window,worker,shadowrealm"
         ],
         [
          "script",
@@ -501348,6 +506076,27 @@
        {}
       ]
      ],
+     "connect-src-syncxmlhttprequest-allowed.sub.html": [
+      "5da8890de956b2e09924bcf694dfe07d7694dfa6",
+      [
+       null,
+       {}
+      ]
+     ],
+     "connect-src-syncxmlhttprequest-blocked.sub.html": [
+      "0dfa642e0915853d6e38debf7571db0d21a0267b",
+      [
+       null,
+       {}
+      ]
+     ],
+     "connect-src-syncxmlhttprequest-redirect-to-blocked.sub.html": [
+      "000250842664959be472af8b73bb7b3d515e783b",
+      [
+       null,
+       {}
+      ]
+     ],
      "connect-src-websocket-allowed.sub.html": [
       "4263d97fe2dfbb9e2a0f0851c07798d40a5671a9",
       [
@@ -501384,7 +506133,7 @@
       ]
      ],
      "connect-src-xmlhttprequest-redirect-to-blocked.sub.html": [
-      "429e463c5314f19a982163099aa02d97b14b7fc2",
+      "61f58f00c19214c19a4e32072c2ee760553b2d81",
       [
        null,
        {}
@@ -504937,7 +509686,7 @@
       ]
      ],
      "media-src-7_2_2.sub.html": [
-      "e1626eec5aa0d3e6875422a6ab92df74c90f351a",
+      "ce6b8add3c8324512ff74c07c0bc76e963c427db",
       [
        null,
        {}
@@ -507767,6 +512516,29 @@
      ]
     ]
    },
+   "cookie-deprecation-label": {
+    "cookie-deprecation-label-detached-iframe.https.html": [
+     "9573dd2a4a14e9324c152292462390e2f6662fd0",
+     [
+      null,
+      {}
+     ]
+    ],
+    "cookie-deprecation-label-insecure-context.http.html": [
+     "bf415e97fa860020c440e14f41bbaac29941ad8c",
+     [
+      null,
+      {}
+     ]
+    ],
+    "cookie-deprecation-label.https.html": [
+     "c1ad72c30bf2d6468cec51165435d246d7624bb8",
+     [
+      null,
+      {}
+     ]
+    ]
+   },
    "cookie-store": {
     "change_eventhandler_for_document_cookie.https.window.js": [
      "0a8b1bd21efc9b0ac69468ad81c306757e5b18ff",
@@ -509343,6 +514115,17 @@
       ]
      ]
     },
+    "third-party-cookies": {
+     "third-party-cookies.tentative.https.html": [
+      "184649ff5bcf365b70b5d2e95af4926e5ac3dd78",
+      [
+       null,
+       {
+        "timeout": "long"
+       }
+      ]
+     ]
+    },
     "value": {
      "value-ctl.html": [
       "5a24064f43c9a4a79ac37cfa2d1d787f1ab5e3f1",
@@ -509624,6 +514407,15 @@
       }
      ]
     ],
+    "fedcm-account-auto-selected-flag.https.html": [
+     "ac3515596ae6699285ab9abe028585cd5d70b631",
+     [
+      null,
+      {
+       "testdriver": true
+      }
+     ]
+    ],
     "fedcm-after-abort.https.html": [
      "3c2f981e82fab32d20303367289180c20e8eb71f",
      [
@@ -509634,7 +514426,7 @@
      ]
     ],
     "fedcm-basic.https.html": [
-     "d5804f796e90d5a3ef5163863cf6212df7cb0894",
+     "d07c0de9577956bfd39cbd0701a1adc7daa57010",
      [
       null,
       {
@@ -509695,7 +514487,7 @@
      ]
     ],
     "fedcm-iframe.https.html": [
-     "964ebf4c44df4e8c33474c0cde464be7a7eeee6f",
+     "dc0c17dea695e632988c773df32a7c0e20d24d91",
      [
       null,
       {}
@@ -509869,7 +514661,7 @@
      ]
     ],
     "fedcm-returning-account-auto-reauthn.https.html": [
-     "bec836f25f02c4f324c95d92ffa34376b88b3a44",
+     "38c07f0a60a55cc264237727b4ebfa36a737eb57",
      [
       null,
       {
@@ -510372,6 +515164,13 @@
      }
     },
     "compositing": {
+     "canvas-composite-modes.html": [
+      "c1aae52ce6f65fcaf1ba2a184ac1470c5f67cbfb",
+      [
+       null,
+       {}
+      ]
+     ],
      "inheritance.html": [
       "8bd08672edf54d3e6478841af7714235afb7bfab",
       [
@@ -511413,8 +516212,15 @@
        {}
       ]
      ],
+     "anchor-name-004.html": [
+      "ebe96df74016c95df5335e195b71b6b7c2827947",
+      [
+       null,
+       {}
+      ]
+     ],
      "anchor-name-basics.html": [
-      "1d88b9413770b8a55de7f890bc1e85212f2eb0c9",
+      "9523ee87725ae40922727f5d9933c66a16d27be5",
       [
        null,
        {}
@@ -511546,6 +516352,13 @@
        {}
       ]
      ],
+     "anchor-position-auto-004.html": [
+      "befd5fcff068d7af8d9b9a1a658eddfb3008b55d",
+      [
+       null,
+       {}
+      ]
+     ],
      "anchor-position-borders-001.html": [
       "1e2ecbc909cee0f9f301481c12ab6a8fc9b4ff0c",
       [
@@ -511904,7 +516717,7 @@
       ]
      ],
      "at-fallback-position-allowed-declarations.html": [
-      "873fa13140047c0943dde64faa8ab7dc54b28203",
+      "25f6a14577f06bca4d321cceb826f1dbac04b692",
       [
        null,
        {}
@@ -511966,6 +516779,13 @@
        {}
       ]
      ],
+     "position-fallback-004.html": [
+      "e4dbd718664fca1d5aa1276b32a8c6e94f907c3a",
+      [
+       null,
+       {}
+      ]
+     ],
      "position-fallback-basics.html": [
       "bfeb921de1bab4b194f0bb07b46bc7208c5e2166",
       [
@@ -512999,7 +517819,7 @@
        ]
       ],
       "box-shadow-interpolation.html": [
-       "4ed55abc9e6c914493d3caca42dd126e4dd7e659",
+       "f0b7ec083ed8ab49659789854ca51bfdbea5c33e",
        [
         null,
         {}
@@ -514228,6 +519048,13 @@
        {}
       ]
      ],
+     "inline-with-float-003.html": [
+      "377548768a1dae539871f202915283ea3706d153",
+      [
+       null,
+       {}
+      ]
+     ],
      "offset-top-block-in-inline.html": [
       "72b35087e424cbf13289686dcc9436309320b27e",
       [
@@ -514524,7 +519351,7 @@
       ]
      ],
      "all-prop-revert-layer.html": [
-      "fa29b5106a7bab8bb8f7f5ce5ccc864fbeda312d",
+      "420a3a61cacdcf3743e612302dfa82fdbb775145",
       [
        null,
        {}
@@ -515009,6 +519836,13 @@
        {}
       ]
      ],
+     "color-mix-currentcolor-visited-getcomputedstyle.html": [
+      "754fe56a96f5e0eaa6aef075468786c1b5640487",
+      [
+       null,
+       {}
+      ]
+     ],
      "inheritance.html": [
       "2928bfa3bbf7686f17d28f4ef31ecb3674d0439c",
       [
@@ -515039,7 +519873,7 @@
        ]
       ],
       "color-computed-color-mix-function.html": [
-       "c1ca47491ffe165c76b8cf3187effd8ee10da126",
+       "a48d6b20bcd0f2976e7c90069c7d994adc285304",
        [
         null,
         {}
@@ -515081,14 +519915,14 @@
        ]
       ],
       "color-computed-relative-color.html": [
-       "f1e0a734970ac60ddc1c6082d768459c6f71dba2",
+       "fd51bc2d2d4b4179fc77347c32b2a89cdeb715c8",
        [
         null,
         {}
        ]
       ],
       "color-computed-rgb.html": [
-       "3b6fa2005681a1c4edf3cf8ffea6515bae35dc7b",
+       "1f62567f5c78345a4468d152e2e0efcd4832bf3e",
        [
         null,
         {}
@@ -515130,14 +519964,14 @@
        ]
       ],
       "color-invalid-hsl.html": [
-       "1ea5cf3518d3c46624b6c0cde25f9b9d3bf34100",
+       "9ac84c82ea73477f8899c3cfddbf9622f2cea45f",
        [
         null,
         {}
        ]
       ],
       "color-invalid-hwb.html": [
-       "058ec03b681b6e6ea31561a3f4f0ad3435e12f93",
+       "2b5e49e4edfd9b639f59dfa8e4b7e686230bf44a",
        [
         null,
         {}
@@ -515158,7 +519992,7 @@
        ]
       ],
       "color-invalid-relative-color.html": [
-       "1e95ef3997d6fa03abeb9ef7ef5580d2649fff59",
+       "db0aa0b2fe8bb32dd4cc0a138e08d564854d8258",
        [
         null,
         {}
@@ -515179,7 +520013,7 @@
        ]
       ],
       "color-mix-out-of-gamut.html": [
-       "1803397f8a71dcfea8be93621fd47b33591f464e",
+       "d3e8a3560d02fae71bb0ce62074a0de2a533625c",
        [
         null,
         {}
@@ -515207,14 +520041,14 @@
        ]
       ],
       "color-valid-hsl.html": [
-       "135a0a39db4eebe2e45f07d286ae671479252e83",
+       "cc40c3b27f687efe416a0c588f9f391a663373a2",
        [
         null,
         {}
        ]
       ],
       "color-valid-hwb.html": [
-       "dc2cec5276ec72547ccf642cda038460697af165",
+       "a827c1f761bb4360b79696e3934402939c927a53",
        [
         null,
         {}
@@ -515228,14 +520062,14 @@
        ]
       ],
       "color-valid-relative-color.html": [
-       "68a78a8d44cedd25af38e8acdd6c67ce7a255848",
+       "26f766ed4cea0c0c55aa5ab89dc4acd1708c459f",
        [
         null,
         {}
        ]
       ],
       "color-valid-rgb.html": [
-       "22054a18f90b2e0df6e60568bf48845809ca71e4",
+       "a979dbc484f6ef0e9c629eda582e4aee957fff24",
        [
         null,
         {}
@@ -515270,7 +520104,14 @@
        ]
       ],
       "opacity-valid.html": [
-       "990ca1ca1435edb21c1d81df9c38c34c89eac9c7",
+       "ad65ad6df2bbbc6f4f2119441200f6bc1396d91b",
+       [
+        null,
+        {}
+       ]
+      ],
+      "relative-color-out-of-gamut.html": [
+       "745b21a0404fd462da1b32fc2688dd26e0150a3d",
        [
         null,
         {}
@@ -515568,7 +520409,7 @@
        ]
       ],
       "auto-scrollbars.html": [
-       "9cf797186c5a2de984afce85ca623cb0e267e607",
+       "44074ed2133eda9e5296b375ef5f688cb4d9122f",
        [
         null,
         {}
@@ -516484,6 +521325,55 @@
         {}
        ]
       ],
+      "content-visibility-086.html": [
+       "51c1586098e4a1c54aa7095a9d7d70c2107c5f47",
+       [
+        null,
+        {}
+       ]
+      ],
+      "content-visibility-087.html": [
+       "f2faa45774cde805a295f3376b87444091500f47",
+       [
+        null,
+        {}
+       ]
+      ],
+      "content-visibility-088.html": [
+       "1d1b549594c74ce1f74764dc26dbe07a7d81a220",
+       [
+        null,
+        {}
+       ]
+      ],
+      "content-visibility-089.html": [
+       "b7e4d90299b123cb4ef8d34ae4683759f2862223",
+       [
+        null,
+        {}
+       ]
+      ],
+      "content-visibility-090.html": [
+       "4d90d0611c4af1c0ea49c046be673515e23bb2cb",
+       [
+        null,
+        {}
+       ]
+      ],
+      "content-visibility-091.html": [
+       "f6799693eba47bf1d65926e514f4304719ca0e7a",
+       [
+        null,
+        {}
+       ]
+      ],
+      "content-visibility-animation-in-auto-subtree.html": [
+       "50f04f94f3f74bfd3215260bdd4262a80847d25e",
+       [
+        null,
+        {}
+       ]
+      ],
       "content-visibility-auto-first-observation-immediate.html": [
        "5a177d6ea98f15315db595d6bc7b0e8f2da5ac4e",
        [
@@ -516543,6 +521433,27 @@
         {}
        ]
       ],
+      "content-visibility-svg-path.html": [
+       "a91f5817fdd9e2eb1993d727183921126e61e605",
+       [
+        null,
+        {}
+       ]
+      ],
+      "content-visibility-svg-rect.html": [
+       "be0abe57674d2527fdecde90821b46ff98500a5f",
+       [
+        null,
+        {}
+       ]
+      ],
+      "content-visibility-svg-text.html": [
+       "7f12a9448890362ea821e7fba1017dab912ba337",
+       [
+        null,
+        {}
+       ]
+      ],
       "content-visibility-svg.html": [
        "568149ba7fb637082dd45523e9d20d322813b0e3",
        [
@@ -517087,6 +521998,17 @@
       ]
      ]
     },
+    "css-fill-stroke": {
+     "animation": {
+      "fill-interpolation.html": [
+       "aef91eb79c1c1ab71d2eb4758fc964b77a9c57de",
+       [
+        null,
+        {}
+       ]
+      ]
+     }
+    },
     "css-flexbox": {
      "abspos": {
       "abspos-descendent-001.html": [
@@ -519229,7 +524151,7 @@
       ]
      ],
      "percentage-heights-013.html": [
-      "2410e0a5fdff5861f8dbd21e65137c50943cc9c8",
+      "f39e83c19f9597963c4cec95ae0c2adc5260767d",
       [
        null,
        {}
@@ -519487,6 +524409,13 @@
     },
     "css-fonts": {
      "animations": {
+      "font-palette-interpolation.html": [
+       "66b0f00ebf01dac4cb4ad12aea9eece0d67b06f0",
+       [
+        null,
+        {}
+       ]
+      ],
       "font-size-adjust-composition.html": [
        "d98b0ffd10e5550ab7ccc7a96d02ebb93385ddcb",
        [
@@ -519587,7 +524516,7 @@
       ]
      ],
      "discrete-no-interpolation.html": [
-      "28760f6a52867065ec706ad4588710e7407b7135",
+      "327e463accb22898e622c750521d698e8bfbdc26",
       [
        null,
        {
@@ -519774,6 +524703,13 @@
        ]
       ]
      },
+     "palette-mix-computed.html": [
+      "bade68111bdc5635ce36750b8e08ae0311b32773",
+      [
+       null,
+       {}
+      ]
+     ],
      "parsing": {
       "font-computed.html": [
        "ab2694d211468b62b7d82d8ec353005d058b4f24",
@@ -523813,6 +528749,27 @@
         {}
        ]
       ],
+      "grid-column-invalid.html": [
+       "d1f4dce1723e598ce5012deb8064e607c4857b0b",
+       [
+        null,
+        {}
+       ]
+      ],
+      "grid-column-shortest-serialization.html": [
+       "868de54c35ce0cf520799e07bc014ce9382984c8",
+       [
+        null,
+        {}
+       ]
+      ],
+      "grid-column-shorthand.html": [
+       "b60db55dc3ec6a7c9383d7492537107cb597b009",
+       [
+        null,
+        {}
+       ]
+      ],
       "grid-columns-rows-get-set-multiple.html": [
        "99af0110be7d14ae6a61f612cebf02c4a86be76b",
        [
@@ -523827,6 +528784,27 @@
         {}
        ]
       ],
+      "grid-row-invalid.html": [
+       "ca7b1d681a9ecb712895dd6c5bef9dc2467a3f38",
+       [
+        null,
+        {}
+       ]
+      ],
+      "grid-row-shortest-serialization.html": [
+       "59558c0ac351b085f5e706837b5efa774277d207",
+       [
+        null,
+        {}
+       ]
+      ],
+      "grid-row-shorthand.html": [
+       "505fdb97759c3ca3b10f4562a7a9ac66f6d93eda",
+       [
+        null,
+        {}
+       ]
+      ],
       "grid-shorthand-invalid.html": [
        "e5dbe7821c11f45d5663c6ebdf1d5261dbd493c6",
        [
@@ -523835,7 +528813,7 @@
        ]
       ],
       "grid-shorthand-serialization.html": [
-       "20ba330c03e988b8060cbdaa4d72fd5c599b8964",
+       "7751fd883b2938dcbaf85e7a66e2c24a1b620579",
        [
         null,
         {}
@@ -523925,6 +528903,13 @@
         {}
        ]
       ],
+      "grid-template-node-not-connected.html": [
+       "89bee03a11bcae62448a088889398ba32e6f25bb",
+       [
+        null,
+        {}
+       ]
+      ],
       "grid-template-repeat-auto-computed-withcontent-001.html": [
        "c18f296abc9cd32a77abef8e12f41282a52cfafb",
        [
@@ -523996,7 +528981,7 @@
        ]
       ],
       "grid-template-shorthand-valid.html": [
-       "d5ae75e74e504c47ac7fe2dca707a1a1ab269644",
+       "f26ef330671ce3e4932f9179638f708e41a30236",
        [
         null,
         {}
@@ -524191,6 +529176,13 @@
        {}
       ]
      ],
+     "highlight-pseudo-from-font-computed.html": [
+      "7c436d95d126e0b063e064255db8c5167e13dbef",
+      [
+       null,
+       {}
+      ]
+     ],
      "highlight-pseudo-parsing.html": [
       "c6d999efdf74d6998fe36f6d365d2c33577dabf5",
       [
@@ -525734,6 +530726,13 @@
         null,
         {}
        ]
+      ],
+      "clip-path-svg-geometry-box.html": [
+       "13ad624be2b74de2b2abc26d4bcd23158be7e4f4",
+       [
+        null,
+        {}
+       ]
       ]
      },
      "idlharness.html": [
@@ -525750,6 +530749,13 @@
        {}
       ]
      ],
+     "mask-shorthand-subproperties-reset.html": [
+      "9ea20cbb8b16fa7d2a05e4e3bdd0f1ba758ae556",
+      [
+       null,
+       {}
+      ]
+     ],
      "parsing": {
       "clip-computed.html": [
        "a1a8ce1cb245703356e104bea69eb3d69acb0254",
@@ -525787,7 +530793,7 @@
        ]
       ],
       "clip-path-valid.html": [
-       "2fb0c6248a227de445d3b55292dc28fd8dbf8539",
+       "84555fd2d1656563da477db2a33c0e210120e44d",
        [
         null,
         {}
@@ -525836,7 +530842,7 @@
        ]
       ],
       "mask-position-valid.html": [
-       "c70e18c47a3d369b79acb0e51410a87c2fae8112",
+       "858bb4b68ac695a17c49e9e6d60416d432c77e67",
        [
         null,
         {}
@@ -525864,7 +530870,7 @@
        ]
       ],
       "mask-valid.sub.html": [
-       "6b6d712d175b00692786dcd67213acdb53c5736b",
+       "a377060ded8e6ee3b8ac4ede1b13378a0a24f2cb",
        [
         null,
         {}
@@ -525910,6 +530916,13 @@
        ]
       ]
      },
+     "balance-grid-001.html": [
+      "5c81b56b4a5e2173e0605e349a4904cd5950c5a5",
+      [
+       null,
+       {}
+      ]
+     ],
      "filter-with-abspos.html": [
       "763bf1fc5a13ba86f440155aa0373357bf7782cb",
       [
@@ -526078,6 +531091,20 @@
        {}
       ]
      ],
+     "multicol-fill-balance-027.html": [
+      "9a18959504701600ef6052c0333aa55c0d1a5795",
+      [
+       null,
+       {}
+      ]
+     ],
+     "multicol-fill-balance-028.html": [
+      "f66c99869b332c2ede7e3f0921f5ab2ccd325ffd",
+      [
+       null,
+       {}
+      ]
+     ],
      "multicol-gap-animation-001.html": [
       "6a3a8d33780fe048528e1e3cd6a26707f2df4b70",
       [
@@ -527152,6 +532179,13 @@
        ]
       ]
      },
+     "backdrop-inherit-computed.html": [
+      "77c6f362640df8133d95d83e1fc9dc5853a3e84e",
+      [
+       null,
+       {}
+      ]
+     ],
      "backdrop-tree-abiding-slotted.html": [
       "55db27a80e02f8305aea31ec5a45d7c45c3ceb38",
       [
@@ -528336,7 +533370,7 @@
       ]
      ],
      "var-reference-registered-properties.html": [
-      "a6f26429e84761bdccd61b450559a93327f65be5",
+      "4fb1a866ea43e210cd90a3aad0ca84df537acea2",
       [
        null,
        {}
@@ -528386,6 +533420,13 @@
        {}
       ]
      ],
+     "highlight-cascade-009.html": [
+      "acc48c7c3642cd267bf6e33c475d5b59c6d58fed",
+      [
+       null,
+       {}
+      ]
+     ],
      "highlight-currentcolor-computed-inheritance.html": [
       "d67ae828818aab04a61d7e55cbdfb23222277f93",
       [
@@ -528924,6 +533965,20 @@
        {}
       ]
      ],
+     "after-scrollable-range-shrinkage-001.html": [
+      "e155c6625c3aea989e192106bd3adaaedb4c3a39",
+      [
+       null,
+       {}
+      ]
+     ],
+     "after-scrollable-range-shrinkage-002.html": [
+      "d6399c5a6c5165e5a0a8839b17849dd5aeb75e8e",
+      [
+       null,
+       {}
+      ]
+     ],
      "ancestor-change-heuristic.html": [
       "21adfbb6b7a56c0a098eda1843897926afb363f5",
       [
@@ -529294,7 +534349,7 @@
      ],
      "input": {
       "keyboard.html": [
-       "6f2255446149458d348ef38226b1eb89f90ca0fb",
+       "79d0fc9f36dbb5a8eb0c29488c29e83c28e9589c",
        [
         null,
         {
@@ -529312,7 +534367,7 @@
        ]
       ],
       "snap-area-overflow-boundary.html": [
-       "c497845263f5443fe9b9a1ea420af11f5eb9eb92",
+       "0978f127fa461fa811050081b5aceb7481b1b081",
        [
         null,
         {
@@ -529336,7 +534391,7 @@
       ]
      ],
      "overflowing-snap-areas.html": [
-      "a35799517fe54841d288a91f8ce79d8f298f48c4",
+      "38002c3edda71f53b95dcf27049198affdf6f896",
       [
        null,
        {}
@@ -529550,7 +534605,7 @@
       ]
      ],
      "scroll-on-large-element-not-covering-snapport.tentative.html": [
-      "2db00d414acea1b9eb46d55523260a24ae00ce2d",
+      "df4fc20ec8cf9cd38d8727f7a5aeb63ebe79c670",
       [
        null,
        {}
@@ -529570,6 +534625,15 @@
        {}
       ]
      ],
+     "scroll-snap-nested-snap-area-layout-changed.html": [
+      "be0bd5c4a57827547a0e95f4a496cc212ff7d9d2",
+      [
+       null,
+       {
+        "testdriver": true
+       }
+      ]
+     ],
      "scroll-snap-stop-001.html": [
       "7d2a228688fc2011662b659803cc615dac14f350",
       [
@@ -529578,7 +534642,7 @@
       ]
      ],
      "scroll-snap-stop-002.html": [
-      "cadafe2a82de126b7d809f0241c1d61ebd60afef",
+      "0951604a74bb0c3726e00641b076948dd4a67849",
       [
        null,
        {}
@@ -529599,7 +534663,7 @@
       ]
      ],
      "scroll-snap-type-on-root-element.html": [
-      "2556ed99def6098220e4091d50e82b411c62a0cc",
+      "a45ac92e5ac347817a3a52d89842dbb46081733a",
       [
        null,
        {}
@@ -529658,7 +534722,7 @@
        ]
       ],
       "changing-scroll-snap-align.html": [
-       "3be68fe841a0d6183b83d5b7287b70883c3cfce7",
+       "c4bb2e9ff4262ef2ab9b1ba7a57405cf6896f166",
        [
         null,
         {}
@@ -529758,6 +534822,15 @@
        {}
       ]
      ],
+     "snap-into-covering-area.html": [
+      "2cc8741f5ef2e02afa1e313fc918fef00c12adb5",
+      [
+       null,
+       {
+        "testdriver": true
+       }
+      ]
+     ],
      "snap-on-focus.html": [
       "13709d2747a223929f17d7cb0e15d1b4f2152e57",
       [
@@ -529765,6 +534838,20 @@
        {}
       ]
      ],
+     "snap-to-combination-of-two-elements-1.html": [
+      "985227bb53c8014990ec9885563c5ad1eca9a9bb",
+      [
+       null,
+       {}
+      ]
+     ],
+     "snap-to-combination-of-two-elements-2.tentative.html": [
+      "8d06eb91d0da3484cee4183b5cfc576c03702c59",
+      [
+       null,
+       {}
+      ]
+     ],
      "snap-to-transformed-target.html": [
       "b8604269b4b9a1d6dbf337cfe867714cbf40fabb",
       [
@@ -529780,7 +534867,7 @@
       ]
      ],
      "snap-to-visible-areas-margin-both.html": [
-      "f148036a1d5d7165ffc085b2c4f6d49ae64fe9af",
+      "4c3c3c11a642b7f0bda5aee7adbc72f2eea7b25c",
       [
        null,
        {}
@@ -529946,7 +535033,7 @@
        ]
       ],
       "scroll-start-with-scroll-snap.tentative.html": [
-       "b813fcc750ef5b7c9adff7ef46af5079c8b2c3a7",
+       "8bdac300ba332c6ba4da361358ab4a84716f9804",
        [
         null,
         {}
@@ -530538,7 +535625,7 @@
       ]
      },
      "basic-shape-circle-ellipse-serialization.html": [
-      "715593d47b1330a325c6ba526f350f1bd7f2c3da",
+      "0b7a7bb3ccdbbccdacf2cab55d9a8d1dc3c1b6ed",
       [
        null,
        {}
@@ -530623,7 +535710,7 @@
        ]
       ],
       "shape-outside-valid-position.html": [
-       "cd13c25ba38a18489c8d02ae553cc36a38214127",
+       "07b82ddda6472d04d8fc53a9803e83f8214723dd",
        [
         null,
         {}
@@ -531716,7 +536803,7 @@
       ],
       "parsing": {
        "contain-intrinsic-size-computed.html": [
-        "305fe621cd595c6b3cf91432520ea3d44a1f017a",
+        "489b9e1be2e048b41fe2afd8f4775fd54c6e791f",
         [
          null,
          {}
@@ -534702,7 +539789,7 @@
        ]
       ],
       "hyphenate-character-invalid.html": [
-       "52801e6eb153e692d2dee0353cc6676a025f64fe",
+       "29351085bb5069cfa077c77317dcc74222b496c4",
        [
         null,
         {}
@@ -534723,7 +539810,7 @@
        ]
       ],
       "hyphenate-limit-chars-invalid.html": [
-       "db68f403c111211c387cb4a98e0d56357d1f4f7d",
+       "5a25f747df8a628fdaae31fa09c7602eb4b09a7d",
        [
         null,
         {}
@@ -534912,7 +539999,7 @@
        ]
       ],
       "text-autospace-valid.html": [
-       "c40c0e0a4ce7c2cf2a339db926ba5d368fac4919",
+       "903da68307462b32536bbbfba136cd504b3f75d3",
        [
         null,
         {}
@@ -534981,6 +540068,27 @@
         {}
        ]
       ],
+      "text-spacing-trim-computed.html": [
+       "33a845fb9e7ccc15ffe29660b23573628a69a716",
+       [
+        null,
+        {}
+       ]
+      ],
+      "text-spacing-trim-invalid.html": [
+       "f63ae0df427d3b3e4665e4e5dd969de2d825e602",
+       [
+        null,
+        {}
+       ]
+      ],
+      "text-spacing-trim-valid.html": [
+       "2fc258adb6d3eb6960f8207bbe246b01858849f9",
+       [
+        null,
+        {}
+       ]
+      ],
       "text-transform-computed.html": [
        "1808e6fdca2e37d9d85362450dc3a7259774f2c7",
        [
@@ -535003,14 +540111,14 @@
        ]
       ],
       "text-wrap-invalid.html": [
-       "6e8a5808503b969b15fb6743e6819b621dd05e5b",
+       "b67cecc183069358448e9ef9e5bbb9ddb064ba75",
        [
         null,
         {}
        ]
       ],
       "text-wrap-valid.html": [
-       "6be9e74ea34fb711370a2f3b46b840b73fb6b59b",
+       "d9ff34eee2018c36edde8ccb4efc81d04d371f80",
        [
         null,
         {}
@@ -535059,7 +540167,7 @@
        ]
       ],
       "white-space-shorthand.html": [
-       "a7788f74ae30f930de4865aaa07d0806973394c4",
+       "01c409a79cd71b057159ce056dc3f1d652ac6ef7",
        [
         null,
         {}
@@ -535072,48 +540180,6 @@
         {}
        ]
       ],
-      "word-boundary-detection-computed.html": [
-       "b12922924ad632ffecef3eca0a05ec603f7b537d",
-       [
-        null,
-        {}
-       ]
-      ],
-      "word-boundary-detection-invalid.html": [
-       "a844566b8caa7b296865a2b8d89f17e079bd45f7",
-       [
-        null,
-        {}
-       ]
-      ],
-      "word-boundary-detection-valid.html": [
-       "81a8ea32b997c20e3e4c74c97b508be5daea3395",
-       [
-        null,
-        {}
-       ]
-      ],
-      "word-boundary-expansion-computed.html": [
-       "054a298ae7899512f6cad61aafec38b063c7c1fc",
-       [
-        null,
-        {}
-       ]
-      ],
-      "word-boundary-expansion-invalid.html": [
-       "6b68e578d4d7ac4c94d15d76997a4ed0c96e130f",
-       [
-        null,
-        {}
-       ]
-      ],
-      "word-boundary-expansion-valid.html": [
-       "cf1128a5f726cf5acb6f259309509ba4b7909ec4",
-       [
-        null,
-        {}
-       ]
-      ],
       "word-break-computed.html": [
        "5a3b7f66852923a3cc24f1c7f461287cc6eaa9c1",
        [
@@ -535122,14 +540188,35 @@
        ]
       ],
       "word-break-invalid.html": [
-       "46456b677d8d658cf285a005c7b72d10174d450d",
+       "91b4a8ec479b52c7cf76146d4d010f0e29f4a1f0",
        [
         null,
         {}
        ]
       ],
       "word-break-valid.html": [
-       "40015d9dd36e7c97abc788e39f624e567a02ddba",
+       "93c58e8557d660554da1a892af8774a80cf557ba",
+       [
+        null,
+        {}
+       ]
+      ],
+      "word-space-transform-computed.html": [
+       "2137305cec8d42f55e9ae589b8608c23f405fc2b",
+       [
+        null,
+        {}
+       ]
+      ],
+      "word-space-transform-invalid.html": [
+       "049bf1d0da8f94e9fd6153e66b29914408b9c10f",
+       [
+        null,
+        {}
+       ]
+      ],
+      "word-space-transform-valid.html": [
+       "2323931f53193d54b37356b19bee6c0af9fd69ce",
        [
         null,
         {}
@@ -535224,6 +540311,29 @@
        ]
       ]
      },
+     "text-autospace": {
+      "text-autospace-001.html": [
+       "40a98861ad9c3b4a0d3028512bcf52c0fa36b51f",
+       [
+        null,
+        {}
+       ]
+      ],
+      "text-autospace-first-line-001.html": [
+       "7294856b8f68e299185cf8471ba7d5dd92380591",
+       [
+        null,
+        {}
+       ]
+      ],
+      "text-autospace-ligature-001.html": [
+       "0d431f65d6d0464f8aa474adafb7f7634a602a10",
+       [
+        null,
+        {}
+       ]
+      ]
+     },
      "text-indent": {
       "percentage-value-intrinsic-size.html": [
        "d63a9f1ba25f31dec6c719b35c19eae7b380e695",
@@ -535249,6 +540359,15 @@
        ]
       ]
      },
+     "text-spacing-trim": {
+      "text-spacing-trim-combinations-001.html": [
+       "4b49e64323a9c1a116fc1b2a1ba8138ad3170aa6",
+       [
+        null,
+        {}
+       ]
+      ]
+     },
      "white-space": {
       "append-whitespace-only-node-crash-001.html": [
        "b32555b18876898beb1b3b7b4559268d64ae9c1c",
@@ -536386,7 +541505,7 @@
       ]
      ],
      "transform-2d-getComputedStyle-001.html": [
-      "b6a2a7cef211392c0e379809cbdac2fbfd286ddb",
+      "c70cfa9cdc52d133fd57d13d64a0455d9d5ae8bf",
       [
        null,
        {}
@@ -536605,7 +541724,7 @@
       ]
      ],
      "all-with-discrete.tentative.html": [
-      "c8734f28029e70465b5000d61548d652afca1bc3",
+      "c3642eeed8919e867ec66677f814969c7671e4b8",
       [
        null,
        {}
@@ -537273,6 +542392,13 @@
        {}
       ]
      ],
+     "factory-font-relative-length.html": [
+      "f7e41ee29768cde6a4ead585ebfdcd42d35ee525",
+      [
+       null,
+       {}
+      ]
+     ],
      "factory-frequency.html": [
       "56a544b32f4969d00a7299403d6c02393758ab39",
       [
@@ -538736,7 +543862,7 @@
         ]
        ],
        "font-variant-emoji.html": [
-        "38cd6d237bea9c3a7b8000920cedd0a31f4a80ed",
+        "9433263fd9064f435b2edf0bde887950f3f40c3a",
         [
          null,
          {}
@@ -539959,7 +545085,7 @@
       ]
      },
      "inheritance.html": [
-      "c2aab07a23b9502353c7c3bbe798963442c651fe",
+      "9a2efdd049ee9316da318b69079f11a8071d8b84",
       [
        null,
        {}
@@ -540057,36 +545183,50 @@
         {}
        ]
       ],
+      "form-sizing-computed.html": [
+       "557b1d5eb960d4afe4b073b376d476108dc2fb95",
+       [
+        null,
+        {}
+       ]
+      ],
+      "form-sizing-invalid.html": [
+       "80ab546f90e1ea1f54a1661ea68623ffa942e9c9",
+       [
+        null,
+        {}
+       ]
+      ],
+      "form-sizing-valid.html": [
+       "f7cc8f44c3cc06d482b0956a7e0635408d9abb9d",
+       [
+        null,
+        {}
+       ]
+      ],
       "outline-color-computed.html": [
-       "b9aab1d230a226e64cd5be736091d6ffaf1d003c",
+       "c6631881b01de8299fa45c1db9048f62077fa0a9",
        [
         null,
         {}
        ]
       ],
       "outline-color-invalid.html": [
-       "2b910e803038e3c9892a7e3ee09473a410d84465",
+       "91823ffca342300060c34ae71f83fd81bdfa1214",
        [
         null,
         {}
        ]
       ],
-      "outline-color-valid-mandatory.html": [
-       "2af06658241a407ff0472b80ee052f072fd844f1",
-       [
-        null,
-        {}
-       ]
-      ],
-      "outline-color-valid-optional.html": [
-       "79932990988d18dd76129989a8bddb8cb8e5e1ad",
+      "outline-color-valid.html": [
+       "ce28fbb4b6081a90cf0a12b4a1119738e437f01c",
        [
         null,
         {}
        ]
       ],
       "outline-invalid.html": [
-       "c43cc3c6434ca4097acb040d7d1f1e9ae652ec4a",
+       "1d14e7854f0d811cbbba6200ccb918bd46461578",
        [
         null,
         {}
@@ -540141,15 +545281,8 @@
         {}
        ]
       ],
-      "outline-valid-mandatory.html": [
-       "94d87cb1125a09591afd5b6c3542837b523dfb6e",
-       [
-        null,
-        {}
-       ]
-      ],
-      "outline-valid-optional.html": [
-       "8150ffa208eb8f4ee55508f3524e814cc6806dd6",
+      "outline-valid.html": [
+       "7259a838077f5de40f29d0912b033e6cf865a867",
        [
         null,
         {}
@@ -540347,7 +545480,7 @@
       ]
      ],
      "acos-asin-atan-atan2-computed.html": [
-      "82e9dde6223381541dc0759ef72c72b90b17dd63",
+      "5f4b7b9aa324cd3d295a87cf24fa5ad767cf9c5c",
       [
        null,
        {}
@@ -540573,7 +545706,7 @@
       ]
      ],
      "calc-z-index-fractions-001.html": [
-      "eef8032169b9ecd9c49a189bf2a28ef7d7528339",
+      "caa75ea7842a81a8363d3958d81a5a8c64b98ecf",
       [
        null,
        {}
@@ -540608,7 +545741,7 @@
       ]
      ],
      "clamp-length-computed.html": [
-      "8ace5b9550207480f53c95eebb48e0c56bb746f8",
+      "9ca089d25521c6cecb2fd6f6ae53b0c1f4a7f140",
       [
        null,
        {}
@@ -540622,7 +545755,7 @@
       ]
      ],
      "clamp-length-serialize.html": [
-      "36738447ed2a954daa1fff652dfe8fd9d63e24f2",
+      "987d028ee87126d98328cbaef12b1c0b504a1a71",
       [
        null,
        {}
@@ -540678,7 +545811,7 @@
       ]
      ],
      "getComputedStyle-calc-mixed-units-001.html": [
-      "c6fea70aae9b01c141e230a876f269c94900038e",
+      "4b8ec04188d13f6129222dfd0cf09453df16165e",
       [
        null,
        {}
@@ -540747,6 +545880,13 @@
        {}
       ]
      ],
+     "lh-unit-005.html": [
+      "477c153c0d0e0603417681d09b1047e87d665c67",
+      [
+       null,
+       {}
+      ]
+     ],
      "line-break-ch-unit.html": [
       "295b418f304a76cde4dba21a1d24022557882b18",
       [
@@ -540951,7 +546091,7 @@
       ]
      ],
      "round-mod-rem-invalid.html": [
-      "c0857cc52623bba775ba222eead3795ec20f8c92",
+      "01268091908f8366472ae5a6bfea040859e663c8",
       [
        null,
        {}
@@ -541000,7 +546140,7 @@
       ]
      ],
      "sin-cos-tan-serialize.html": [
-      "c6a25e960252632646c521d4b9624f01594c7da8",
+      "59d682421da132840e3eb5519a756282b09be8bd",
       [
        null,
        {}
@@ -541305,7 +546445,7 @@
       ]
      ],
      "variable-presentation-attribute.html": [
-      "1674f3ffdbcca5428dd20f5f5cb3f799a9974fe2",
+      "6e35c444b53aa8fbabe06df3190cc831703e78cb",
       [
        null,
        {}
@@ -541595,7 +546735,7 @@
       ]
      ],
      "pseudo-get-computed-style.html": [
-      "268df4718e6dadcb53cc00bd5a53e826d87ca4b7",
+      "2481a713133b7e1bf47cedf0b4966a51dd777d78",
       [
        null,
        {}
@@ -541715,20 +546855,36 @@
       ]
      ],
      "forms": {
+      "button-appearance-native-computed-style.html": [
+       "dd82b54d6d088a6718daf5933c7a99561e172b21",
+       [
+        null,
+        {}
+       ]
+      ],
       "meter-appearance-native-computed-style.optional.html": [
-       "58e1daee47177b86b63c460d2311b04da3da4d7c",
+       "446036b73c92734f8d4099b3d9018879bdce1239",
        [
         null,
         {}
        ]
       ],
       "progress-appearance-native-computed-style.optional.html": [
-       "47cd65ecf755d21117e5c201a24220dd39e0dfe2",
+       "0f2e4f1792bf551e1b851da691cbab6a76af20bb",
        [
         null,
         {}
        ]
       ],
+      "select-multiple-options-visual-order.html": [
+       "359c09279ed856087e4967ed44521dce7fd63c5c",
+       [
+        null,
+        {
+         "testdriver": true
+        }
+       ]
+      ],
       "select-multiple-scrolling.optional.html": [
        "ffaba9fe552dc999576342e368fed5e54941a546",
        [
@@ -541758,7 +546914,7 @@
        ]
       ],
       "text-input-vertical-overflow-no-scroll.html": [
-       "50d2cb44ea6669cd314ff712c37d6870d86bcb8e",
+       "601acb17e0c1b6cdbf5a75b638d8afed7aa70317",
        [
         null,
         {
@@ -542856,6 +548012,13 @@
        {}
       ]
      ],
+     "getComputedStyle-insets-absolute-roundtrip.html": [
+      "d89a22d86650371d31d90b3b6be728f3502c8db5",
+      [
+       null,
+       {}
+      ]
+     ],
      "getComputedStyle-insets-absolute.html": [
       "fae0a84a7b4a554b6cc182f48aee98bc7c196ad4",
       [
@@ -542947,6 +548110,13 @@
        {}
       ]
      ],
+     "getComputedStyle-margins-roundtrip.html": [
+      "8913be012d705ba7b7e7832ac57b275d0e726555",
+      [
+       null,
+       {}
+      ]
+     ],
      "getComputedStyle-property-order.html": [
       "f52700eb9434111f7d4460493dd7c586fc321780",
       [
@@ -542955,7 +548125,7 @@
       ]
      ],
      "getComputedStyle-pseudo.html": [
-      "40af5b0818c3a92adf8386d622b64f7c7dc292c2",
+      "59c7db9e734c1e9d7e6365d0c1660379f8c815be",
       [
        null,
        {}
@@ -543174,7 +548344,7 @@
       ]
      ],
      "serialize-values.html": [
-      "e92808af70d63a3c3df33fe1afdd18cd7b10c0f4",
+      "2d20f263f4fd6db4134f6280af50c0037c06d41f",
       [
        null,
        {}
@@ -543986,7 +549156,7 @@
       ]
      ],
      "scroll-behavior-main-frame-root.html": [
-      "7b4a8e38632a00fa94c4de36e626c49b5b0fbd8c",
+      "d60275f1ccf892230250199f5af07207bc27ab1d",
       [
        null,
        {
@@ -543995,7 +549165,7 @@
       ]
      ],
      "scroll-behavior-main-frame-window.html": [
-      "8024d5319b452ea8277192a0f64e72da2aa66c44",
+      "7593baf1b86c0e8da22d9b8ae190e47fae70bd4e",
       [
        null,
        {
@@ -544601,7 +549771,7 @@
     },
     "geometry": {
      "DOMMatrix-001.html": [
-      "1752c2c5caedc1bbb7e5594448c7e12c5dae8665",
+      "f578da076cbe6d7d7eb69b2cf438aa6f11a5c060",
       [
        null,
        {}
@@ -544831,6 +550001,20 @@
        {}
       ]
      ],
+     "display-mode.html": [
+      "e6633de856c5f438e47ebe1d05b1593753948fbf",
+      [
+       null,
+       {}
+      ]
+     ],
+     "display-mode.tentative.html": [
+      "0762d065c339e0c962692ca07e4575e631f7fa3c",
+      [
+       null,
+       {}
+      ]
+     ],
      "dynamic-range.html": [
       "75b3015b8e76298767c19dfbaf775a53c8d9b706",
       [
@@ -545292,7 +550476,7 @@
       ]
      ],
      "dir-pseudo-on-input-element.html": [
-      "b61a829b30a8cac765953be2ffe190648fd3c802",
+      "db528d4079b83d352c9470d160aef130930190e8",
       [
        null,
        {}
@@ -545834,6 +551018,13 @@
        {}
       ]
      ],
+     "hash-collision.html": [
+      "04f15e75887383457b51f5e165e15778afddc574",
+      [
+       null,
+       {}
+      ]
+     ],
      "hover-002.html": [
       "02cee99bf6cd161eb95806854cb12e39504a359e",
       [
@@ -546197,7 +551388,7 @@
        ]
       ],
       "empty-pseudo-in-has.html": [
-       "83cf051565694c8b940582c8a6ec163cc443121e",
+       "4e9f6f27378fb9579728cad3f9208b97d48f1b96",
        [
         null,
         {}
@@ -546275,6 +551466,13 @@
         {}
        ]
       ],
+      "has-sibling-insertion-removal.html": [
+       "1331a22ad5528b753727535ac3df4ba9e17c1445",
+       [
+        null,
+        {}
+       ]
+      ],
       "has-sibling.html": [
        "7c56b2e7b3340f9cba724475751051fe284b44b6",
        [
@@ -546282,6 +551480,20 @@
         {}
        ]
       ],
+      "has-side-effect.html": [
+       "0ea0dee993f71d98471d66adb42b0aa91b1e8dd6",
+       [
+        null,
+        {}
+       ]
+      ],
+      "has-unstyled.html": [
+       "6a64e493587ac53708f9233edf4155bab686a465",
+       [
+        null,
+        {}
+       ]
+      ],
       "has-with-not.html": [
        "b67ec5e3b7d05cee54666c079d197d2232609dad",
        [
@@ -546303,15 +551515,22 @@
         {}
        ]
       ],
+      "host-context-pseudo-class-in-has.html": [
+       "ca140af6b342c23a2dac58c8c36395247582b002",
+       [
+        null,
+        {}
+       ]
+      ],
       "host-pseudo-class-in-has.html": [
-       "a2c63d546355c33144d787d603c3c27a8f6e4e07",
+       "4d300befa763efb2f7c4bed847dbba3cbdb91fb8",
        [
         null,
         {}
        ]
       ],
       "input-pseudo-classes-in-has.html": [
-       "67aeedf315e686133c444455255ed7bbdf3b20e0",
+       "a9a1d9f5ee7e0b10ee6ccd01242de8e000918dbb",
        [
         null,
         {}
@@ -546346,7 +551565,7 @@
        ]
       ],
       "is-pseudo-containing-complex-in-has.html": [
-       "4e6d4c8832e31cad61d5ada85ce12b1024311887",
+       "c189b0f4bebdb6d79fefd4d472a9fc8d1ccf479c",
        [
         null,
         {}
@@ -546433,6 +551652,13 @@
         {}
        ]
       ],
+      "placeholder-shown.html": [
+       "71233ed2a28c46930c6e56755676404fa6aaa9f3",
+       [
+        null,
+        {}
+       ]
+      ],
       "quirks-mode-stylesheet-dynamic-add-001.html": [
        "3d7be982378fe2414f818d1682eca8f38f3575ac",
        [
@@ -546689,14 +551915,14 @@
        ]
       ],
       "parse-has-disallow-nesting-has-inside-has.html": [
-       "c5fcb589a3ccf1af1b46f8c004c37e34e8946263",
+       "a633c913d160164023a33ff1a6ffe74dc617eb29",
        [
         null,
         {}
        ]
       ],
       "parse-has.html": [
-       "902fc98ff68350e3a6c8c64e3cc62bf17f2e6e47",
+       "3492373a3362f8e220f02c84bfc8b8eb5a6e29c8",
        [
         null,
         {}
@@ -546745,6 +551971,13 @@
        ]
       ]
      },
+     "placeholder-shown.html": [
+      "62f6f96a10398804dc5d48efbb4ca0631322db4c",
+      [
+       null,
+       {}
+      ]
+     ],
      "pseudo-enabled-disabled.html": [
       "521767de3763130f22e066c01d38fb7e83cb3de9",
       [
@@ -546790,7 +552023,16 @@
       ]
      ],
      "user-invalid.html": [
-      "e7e008e677bc781502b0cb8367a7ba19d7fd57c4",
+      "f20d9970715c308945cd670fc5e4eefd6f3fde05",
+      [
+       null,
+       {
+        "testdriver": true
+       }
+      ]
+     ],
+     "user-valid-user-invalid-invalidation.html": [
+      "bca20fc99c3053491fe6e54d28c88cf1b294633a",
       [
        null,
        {
@@ -546799,7 +552041,16 @@
       ]
      ],
      "user-valid.html": [
-      "86e756df2ee29694b9b0c9e08d2ce62c8acc7faa",
+      "9960fc846a0504f7c5818cfbfaad6219fe985048",
+      [
+       null,
+       {
+        "testdriver": true
+       }
+      ]
+     ],
+     "valid-invalid-form-fieldset.html": [
+      "95bfd9c844ce9ae8df5ea7ae6e37d27c7e1a2c16",
       [
        null,
        {
@@ -546821,6 +552072,26 @@
        {}
       ]
      ]
+    },
+    "zoom": {
+     "tentative": {
+      "parsing": {
+       "zoom-computed.html": [
+        "3737901490926148d157c69a4627bf890f7f5974",
+        [
+         null,
+         {}
+        ]
+       ],
+       "zoom-valid.html": [
+        "3db16e0748b679e29611784296f2ce1d9ec3aab3",
+        [
+         null,
+         {}
+        ]
+       ]
+      }
+     }
     }
    },
    "custom-elements": {
@@ -547086,6 +552357,13 @@
        {}
       ]
      ],
+     "focusability.html": [
+      "cc12b7d51b990620c078d361f07e7562e18bd91e",
+      [
+       null,
+       {}
+      ]
+     ],
      "form-associated-callback.html": [
       "7feec50fef89103326e404efc2287767ee0981fb",
       [
@@ -547340,7 +552618,7 @@
       ]
      ],
      "Document.html": [
-      "1f05982a90cf94e8a0ba79bd107f663ed90eead0",
+      "4c5d2eb6e2ee0c580f2490c8a5d7d14f27ca79e0",
       [
        null,
        {}
@@ -547693,6 +552971,13 @@
        {}
       ]
      ],
+     "ShadowRoot-createElement.tentative.html": [
+      "335773f9c6d011578f9c6093ee051c8a12085ada",
+      [
+       null,
+       {}
+      ]
+     ],
      "ShadowRoot-init-registry.tentative.html": [
       "f9bc5b5b5686a0f5cb43ea653f623ba164c5cabb",
       [
@@ -548747,6 +554032,13 @@
        {}
       ]
      ],
+     "Event-dispatch-single-activation-behavior.html": [
+      "2b6568a60af51f569eefa217fb848b41ac849d94",
+      [
+       null,
+       {}
+      ]
+     ],
      "Event-dispatch-target-moved.html": [
       "facb2c7b9568f632f93ab904d094eabb04b3529d",
       [
@@ -549538,7 +554830,7 @@
        ]
       ],
       "overscroll-deltas.html": [
-       "6574a56a1e615e5e37d91d684537a2f28e091126",
+       "e13e9f1cce5949da74227a1f069f64baad1f517c",
        [
         null,
         {
@@ -549657,7 +554949,7 @@
        ]
       ],
       "scrollend-event-fires-to-iframe-window.html": [
-       "1a20751bd53b1d4e838fd13d8eed09bf9b3f6dfb",
+       "4e53158087018884a82e5086ca6bdaf2d12661be",
        [
         null,
         {
@@ -549702,7 +554994,7 @@
        ]
       ],
       "scrollend-with-snap-on-fractional-offset.html": [
-       "74dcb0f0bd068f3f6334fa323acb3162fb5f30b9",
+       "d1f50304add2ac1f1c3fb69a197150951b2e6a0a",
        [
         null,
         {}
@@ -551652,8 +556944,43 @@
      ]
     },
     "parts": {
+     "basic-dom-part-declarative-brace-syntax.tentative.html": [
+      "dd5f1ba7b1052d7b39597ae43fdbe455c6225c89",
+      [
+       null,
+       {}
+      ]
+     ],
+     "basic-dom-part-declarative-pi-syntax.tentative.html": [
+      "f6460353949a9c4984dccacc36e54c05bad17f53",
+      [
+       null,
+       {}
+      ]
+     ],
      "basic-dom-part-objects.tentative.html": [
-      "3dda4e492c21987e3287b705759312ace27de120",
+      "af77b28b02f91b1e553901ad2f2ea4e96d8ea97b",
+      [
+       null,
+       {}
+      ]
+     ],
+     "dom-parts-parseparts-on-body.tentative.html": [
+      "542c7b2881aa0456e578325630a8cc302406c266",
+      [
+       null,
+       {}
+      ]
+     ],
+     "dom-parts-parseparts-on-head.tentative.html": [
+      "e65c0d728febd3589a468947d648d83b3722e2dd",
+      [
+       null,
+       {}
+      ]
+     ],
+     "dom-parts-parseparts-on-root.tentative.html": [
+      "f3ba3eaf6bf9f118c9eb64c3c930c9977165b76e",
       [
        null,
        {}
@@ -552482,6 +557809,13 @@
     ]
    },
    "ecmascript": {
+    "locale-compat.html": [
+     "d1d2f78c67fdb76dd39ca500186935b0fa5e13f2",
+     [
+      null,
+      {}
+     ]
+    ],
     "regexp-lookbehind.html": [
      "07156f570e7b3d5d967110c700642d85bae4a922",
      [
@@ -552701,6 +558035,13 @@
        }
       ]
      ],
+     "editable-state-and-focus-in-assigned-slot-dom.tentative.html": [
+      "ae8b14528320f9379855183b23fb56d39730cdc2",
+      [
+       null,
+       {}
+      ]
+     ],
      "editable-state-and-focus-in-shadow-dom-in-designMode.tentative.html": [
       "88e6d291299c2fec70b91d5459c88ac855381f75",
       [
@@ -553551,7 +558892,7 @@
       ]
      ],
      "insertparagraph-in-non-splittable-element.html": [
-      "21aa495bd675a5b579fa3205db4409eb4adfb8df",
+      "c77862fecb297e86cbe3605057646cc1238fa1d7",
       [
        null,
        {
@@ -553561,7 +558902,7 @@
       ]
      ],
      "insertparagraph-with-white-space-style.tentative.html": [
-      "496c073b5f81721ed5b40d3fbfe23d9a2fc5a9b2",
+      "3c9f1848f5070bd2a79b928a5aa0ff7df204c10b",
       [
        "editing/other/insertparagraph-with-white-space-style.tentative.html?white-space=nowrap&command=insertParagraph",
        {
@@ -556524,11 +561865,30 @@
    },
    "encoding": {
     "api-basics.any.js": [
-     "941b878738ce71e34202c4614793d5c3816db76c",
+     "768f8159313ece26042dbe20f8894d5c37c3aa48",
      [
       "encoding/api-basics.any.html",
       {
        "script_metadata": [
+        [
+         "global",
+         "window,dedicatedworker,shadowrealm"
+        ],
+        [
+         "title",
+         "Encoding API: Basics"
+        ]
+       ]
+      }
+     ],
+     [
+      "encoding/api-basics.any.shadowrealm.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,dedicatedworker,shadowrealm"
+        ],
         [
          "title",
          "Encoding API: Basics"
@@ -556540,6 +561900,10 @@
       "encoding/api-basics.any.worker.html",
       {
        "script_metadata": [
+        [
+         "global",
+         "window,dedicatedworker,shadowrealm"
+        ],
         [
          "title",
          "Encoding API: Basics"
@@ -556905,11 +562269,30 @@
      ]
     ],
     "api-surrogates-utf8.any.js": [
-     "a4ced03d428e948ffa07621b926ed4daaad87bc7",
+     "52d297314940413151667dd60d03bcd154a0b23c",
      [
       "encoding/api-surrogates-utf8.any.html",
       {
        "script_metadata": [
+        [
+         "global",
+         "window,dedicatedworker,shadowrealm"
+        ],
+        [
+         "title",
+         "Encoding API: Invalid UTF-16 surrogates with UTF-8 encoding"
+        ]
+       ]
+      }
+     ],
+     [
+      "encoding/api-surrogates-utf8.any.shadowrealm.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,dedicatedworker,shadowrealm"
+        ],
         [
          "title",
          "Encoding API: Invalid UTF-16 surrogates with UTF-8 encoding"
@@ -556921,6 +562304,10 @@
       "encoding/api-surrogates-utf8.any.worker.html",
       {
        "script_metadata": [
+        [
+         "global",
+         "window,dedicatedworker,shadowrealm"
+        ],
         [
          "title",
          "Encoding API: Invalid UTF-16 surrogates with UTF-8 encoding"
@@ -557100,14 +562487,39 @@
      ]
     ],
     "iso-2022-jp-decoder.any.js": [
-     "b02259b9600e47908b19f6c64a3a26ad25e6c7f4",
+     "f9915a2fcf6254a1eddd9c86e643f042051571cb",
      [
       "encoding/iso-2022-jp-decoder.any.html",
-      {}
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,dedicatedworker,shadowrealm"
+        ]
+       ]
+      }
+     ],
+     [
+      "encoding/iso-2022-jp-decoder.any.shadowrealm.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,dedicatedworker,shadowrealm"
+        ]
+       ]
+      }
      ],
      [
       "encoding/iso-2022-jp-decoder.any.worker.html",
-      {}
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,dedicatedworker,shadowrealm"
+        ]
+       ]
+      }
      ]
     ],
     "iso-2022-jp-encoder.html": [
@@ -564838,14 +570250,14 @@
     ],
     "streams": {
      "backpressure.any.js": [
-      "22f7f0aa2bc64382c232dde7a2ce988dc39c07fd",
+      "0f67e3358414d344132fdf7f8efe072511a7a80e",
       [
        "encoding/streams/backpressure.any.html",
        {
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -564856,7 +570268,18 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
+         ]
+        ]
+       }
+      ],
+      [
+       "encoding/streams/backpressure.any.shadowrealm.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -564867,7 +570290,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -564878,21 +570301,21 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
       ]
      ],
      "decode-attributes.any.js": [
-      "0843cc665fd39f114c057710661594f0767cc775",
+      "f64f45b56acba90f27689e1c4e2934648bf9fec3",
       [
        "encoding/streams/decode-attributes.any.html",
        {
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -564903,7 +570326,18 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
+         ]
+        ]
+       }
+      ],
+      [
+       "encoding/streams/decode-attributes.any.shadowrealm.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -564914,7 +570348,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -564925,21 +570359,21 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
       ]
      ],
      "decode-bad-chunks.any.js": [
-      "b7b2dd58459d0ea659d90d98015ef78ee25d1a2c",
+      "21d61427a2bca357af37df1767bac9a538f233b6",
       [
        "encoding/streams/decode-bad-chunks.any.html",
        {
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -564950,7 +570384,18 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
+         ]
+        ]
+       }
+      ],
+      [
+       "encoding/streams/decode-bad-chunks.any.shadowrealm.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -564961,7 +570406,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -564972,7 +570417,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -565137,14 +570582,14 @@
       ]
      ],
      "decode-non-utf8.any.js": [
-      "2950a9e58edcbd41a150b74d864c1400a07d69e4",
+      "effdee3b430de5dac64962054ed9b5763181e3e1",
       [
        "encoding/streams/decode-non-utf8.any.html",
        {
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -565155,7 +570600,18 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
+         ]
+        ]
+       }
+      ],
+      [
+       "encoding/streams/decode-non-utf8.any.shadowrealm.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -565166,7 +570622,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -565177,7 +570633,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -565523,14 +570979,14 @@
       ]
      ],
      "readable-writable-properties.any.js": [
-      "234649209cfa40adb97f8750340a80b8c3f6caa7",
+      "8084cb9942145064387e18e685fc7a87c6422e07",
       [
        "encoding/streams/readable-writable-properties.any.html",
        {
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -565541,7 +570997,18 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
+         ]
+        ]
+       }
+      ],
+      [
+       "encoding/streams/readable-writable-properties.any.shadowrealm.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -565552,7 +571019,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -565563,7 +571030,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -565578,11 +571045,30 @@
      ]
     },
     "textdecoder-arguments.any.js": [
-     "f469dcd30eaf877ffb2d6772a1862800c241f681",
+     "2d137b7aa37e15dbb4a93315f616891fee01a6b2",
      [
       "encoding/textdecoder-arguments.any.html",
       {
        "script_metadata": [
+        [
+         "global",
+         "window,dedicatedworker,shadowrealm"
+        ],
+        [
+         "title",
+         "Encoding API: TextDecoder decode() optional arguments"
+        ]
+       ]
+      }
+     ],
+     [
+      "encoding/textdecoder-arguments.any.shadowrealm.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,dedicatedworker,shadowrealm"
+        ],
         [
          "title",
          "Encoding API: TextDecoder decode() optional arguments"
@@ -565594,6 +571080,10 @@
       "encoding/textdecoder-arguments.any.worker.html",
       {
        "script_metadata": [
+        [
+         "global",
+         "window,dedicatedworker,shadowrealm"
+        ],
         [
          "title",
          "Encoding API: TextDecoder decode() optional arguments"
@@ -565603,11 +571093,30 @@
      ]
     ],
     "textdecoder-byte-order-marks.any.js": [
-     "9ef0d73141a0e0ceaafba61cc101986afa32477d",
+     "31350fdf689ed6e8ab277eb0bfdaa7a068d02acb",
      [
       "encoding/textdecoder-byte-order-marks.any.html",
       {
        "script_metadata": [
+        [
+         "global",
+         "window,dedicatedworker,shadowrealm"
+        ],
+        [
+         "title",
+         "Encoding API: Byte-order marks"
+        ]
+       ]
+      }
+     ],
+     [
+      "encoding/textdecoder-byte-order-marks.any.shadowrealm.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,dedicatedworker,shadowrealm"
+        ],
         [
          "title",
          "Encoding API: Byte-order marks"
@@ -565619,6 +571128,10 @@
       "encoding/textdecoder-byte-order-marks.any.worker.html",
       {
        "script_metadata": [
+        [
+         "global",
+         "window,dedicatedworker,shadowrealm"
+        ],
         [
          "title",
          "Encoding API: Byte-order marks"
@@ -566601,11 +572114,30 @@
      ]
     ],
     "textdecoder-fatal-streaming.any.js": [
-     "0d58b2e1d7d8a1e90353b3e42e1da58bf7345c8f",
+     "9043b43eae29aa6fe6a593d0f89e7b176b32481e",
      [
       "encoding/textdecoder-fatal-streaming.any.html",
       {
        "script_metadata": [
+        [
+         "global",
+         "window,dedicatedworker,shadowrealm"
+        ],
+        [
+         "title",
+         "Encoding API: End-of-file"
+        ]
+       ]
+      }
+     ],
+     [
+      "encoding/textdecoder-fatal-streaming.any.shadowrealm.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,dedicatedworker,shadowrealm"
+        ],
         [
          "title",
          "Encoding API: End-of-file"
@@ -566617,6 +572149,10 @@
       "encoding/textdecoder-fatal-streaming.any.worker.html",
       {
        "script_metadata": [
+        [
+         "global",
+         "window,dedicatedworker,shadowrealm"
+        ],
         [
          "title",
          "Encoding API: End-of-file"
@@ -566626,11 +572162,30 @@
      ]
     ],
     "textdecoder-fatal.any.js": [
-     "f9ccb2dfa7608baf283ce8b163d18b98e68f92e9",
+     "054b35f21f488795a5d0559bd8ea1fdb243099ae",
      [
       "encoding/textdecoder-fatal.any.html",
       {
        "script_metadata": [
+        [
+         "global",
+         "window,dedicatedworker,shadowrealm"
+        ],
+        [
+         "title",
+         "Encoding API: Fatal flag"
+        ]
+       ]
+      }
+     ],
+     [
+      "encoding/textdecoder-fatal.any.shadowrealm.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,dedicatedworker,shadowrealm"
+        ],
         [
          "title",
          "Encoding API: Fatal flag"
@@ -566642,6 +572197,10 @@
       "encoding/textdecoder-fatal.any.worker.html",
       {
        "script_metadata": [
+        [
+         "global",
+         "window,dedicatedworker,shadowrealm"
+        ],
         [
          "title",
          "Encoding API: Fatal flag"
@@ -566651,11 +572210,30 @@
      ]
     ],
     "textdecoder-ignorebom.any.js": [
-     "81f210eec89b4ec074040e081b82ca29439a212d",
+     "e825698ba405230d90da085e6fae70c364cbec16",
      [
       "encoding/textdecoder-ignorebom.any.html",
       {
        "script_metadata": [
+        [
+         "global",
+         "window,dedicatedworker,shadowrealm"
+        ],
+        [
+         "title",
+         "Encoding API: TextDecoder ignoreBOM option"
+        ]
+       ]
+      }
+     ],
+     [
+      "encoding/textdecoder-ignorebom.any.shadowrealm.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,dedicatedworker,shadowrealm"
+        ],
         [
          "title",
          "Encoding API: TextDecoder ignoreBOM option"
@@ -566667,6 +572245,10 @@
       "encoding/textdecoder-ignorebom.any.worker.html",
       {
        "script_metadata": [
+        [
+         "global",
+         "window,dedicatedworker,shadowrealm"
+        ],
         [
          "title",
          "Encoding API: TextDecoder ignoreBOM option"
@@ -566814,11 +572396,30 @@
      ]
     ],
     "textdecoder-utf16-surrogates.any.js": [
-     "b08ea56cee38a29ba62cecb19fb04561fbc80175",
+     "7e8322cd19c2133ea4bf557e0502be343b5d524f",
      [
       "encoding/textdecoder-utf16-surrogates.any.html",
       {
        "script_metadata": [
+        [
+         "global",
+         "window,dedicatedworker,shadowrealm"
+        ],
+        [
+         "title",
+         "Encoding API: UTF-16 surrogate handling"
+        ]
+       ]
+      }
+     ],
+     [
+      "encoding/textdecoder-utf16-surrogates.any.shadowrealm.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,dedicatedworker,shadowrealm"
+        ],
         [
          "title",
          "Encoding API: UTF-16 surrogate handling"
@@ -566830,6 +572431,10 @@
       "encoding/textdecoder-utf16-surrogates.any.worker.html",
       {
        "script_metadata": [
+        [
+         "global",
+         "window,dedicatedworker,shadowrealm"
+        ],
         [
          "title",
          "Encoding API: UTF-16 surrogate handling"
@@ -566872,11 +572477,30 @@
      ]
     ],
     "textencoder-utf16-surrogates.any.js": [
-     "014a0ebb12d0f6e3bee476bcf6acb2c25b9bc040",
+     "31657516455bd60b803600db9f36f641504d1c15",
      [
       "encoding/textencoder-utf16-surrogates.any.html",
       {
        "script_metadata": [
+        [
+         "global",
+         "window,dedicatedworker,shadowrealm"
+        ],
+        [
+         "title",
+         "Encoding API: USVString surrogate handling when encoding"
+        ]
+       ]
+      }
+     ],
+     [
+      "encoding/textencoder-utf16-surrogates.any.shadowrealm.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,dedicatedworker,shadowrealm"
+        ],
         [
          "title",
          "Encoding API: USVString surrogate handling when encoding"
@@ -566888,6 +572512,10 @@
       "encoding/textencoder-utf16-surrogates.any.worker.html",
       {
        "script_metadata": [
+        [
+         "global",
+         "window,dedicatedworker,shadowrealm"
+        ],
         [
          "title",
          "Encoding API: USVString surrogate handling when encoding"
@@ -570484,6 +576112,15 @@
       }
      ]
     ],
+    "automatic-beacon-no-destination.https.html": [
+     "bf1c56ad9ee30ce078b18d54cf4dc5cc416b6b5e",
+     [
+      null,
+      {
+       "testdriver": true
+      }
+     ]
+    ],
     "automatic-beacon-shared-storage.https.html": [
      "a21e42a488190e332a5fb75d744f711cbe8fadd2",
      [
@@ -570494,7 +576131,7 @@
      ]
     ],
     "automatic-beacon-two-events-clear.https.html": [
-     "61543ffa4856060f2cf48d46e4ccb6158146e4ad",
+     "28a34bf8fbf29888bc400de26bd7402b97cae67d",
      [
       null,
       {
@@ -570833,7 +576470,7 @@
      ]
     ],
     "disallowed-navigations-dangling-markup-urn.https.html": [
-     "eceb2a4a901ebe82c6e0a38c4f237cae7cb43c88",
+     "a36f98f9755a4773407f10c4ad163571dd5dc267",
      [
       null,
       {
@@ -571178,7 +576815,7 @@
      ]
     ],
     "navigator-subapp.https.html": [
-     "c5b980537b3d334eef9d76c4d9e5af745e245e73",
+     "843d25655436276e2bf0f38d7363ce421140b4d0",
      [
       null,
       {}
@@ -572581,7 +578218,7 @@
        ]
       ],
       "request-forbidden-headers.any.js": [
-       "511ce601e7c45cf39223ef0bd29bb6437ae078a1",
+       "d7560f03a23e6c637bda33a2c59141b98a2132da",
        [
         "fetch/api/basic/request-forbidden-headers.any.html",
         {
@@ -572847,6 +578484,69 @@
         }
        ]
       ],
+      "request-private-network-headers.tentative.any.js": [
+       "9662a91c1770ad67285bbd3ac144bc1da06f4267",
+       [
+        "fetch/api/basic/request-private-network-headers.tentative.any.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,worker"
+          ],
+          [
+           "script",
+           "../resources/utils.js"
+          ]
+         ]
+        }
+       ],
+       [
+        "fetch/api/basic/request-private-network-headers.tentative.any.serviceworker.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,worker"
+          ],
+          [
+           "script",
+           "../resources/utils.js"
+          ]
+         ]
+        }
+       ],
+       [
+        "fetch/api/basic/request-private-network-headers.tentative.any.sharedworker.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,worker"
+          ],
+          [
+           "script",
+           "../resources/utils.js"
+          ]
+         ]
+        }
+       ],
+       [
+        "fetch/api/basic/request-private-network-headers.tentative.any.worker.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,worker"
+          ],
+          [
+           "script",
+           "../resources/utils.js"
+          ]
+         ]
+        }
+       ]
+      ],
       "request-referrer-redirected-worker.html": [
        "bdea1e185314aa56690782b1b84e89b3d99d5be5",
        [
@@ -573245,7 +578945,7 @@
        ]
       ],
       "scheme-blob.sub.any.js": [
-       "a6059ea93d9a5a18235ffdc3a131b4098b9982c3",
+       "8afdc033c9d7dd4b0861e6ed4ed7098a9c507558",
        [
         "fetch/api/basic/scheme-blob.sub.any.html",
         {
@@ -573594,6 +579294,21 @@
          ]
         }
        ]
+      ],
+      "url-parsing.sub.html": [
+       "fa47b29473af21f3c8326d8732f33dca4022e90a",
+       [
+        "fetch/api/basic/url-parsing.sub.html?encoding=utf8",
+        {}
+       ],
+       [
+        "fetch/api/basic/url-parsing.sub.html?encoding=windows-1252",
+        {}
+       ],
+       [
+        "fetch/api/basic/url-parsing.sub.html?encoding=x-cp1251",
+        {}
+       ]
       ]
      },
      "body": {
@@ -577693,7 +583408,7 @@
        ]
       ],
       "request-headers.any.js": [
-       "22925e01b6923c3dae8a9624c8b16b1fad83d2f9",
+       "a766bcb5fff6b3387fd840a41e6101f2849bdc39",
        [
         "fetch/api/request/request-headers.any.html",
         {
@@ -578616,6 +584331,69 @@
         }
        ]
       ],
+      "response-headers-guard.any.js": [
+       "4a67d067a718506139dcc96808a255f6a7a69961",
+       [
+        "fetch/api/response/response-headers-guard.any.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,worker"
+          ],
+          [
+           "title",
+           "Response: error static method"
+          ]
+         ]
+        }
+       ],
+       [
+        "fetch/api/response/response-headers-guard.any.serviceworker.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,worker"
+          ],
+          [
+           "title",
+           "Response: error static method"
+          ]
+         ]
+        }
+       ],
+       [
+        "fetch/api/response/response-headers-guard.any.sharedworker.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,worker"
+          ],
+          [
+           "title",
+           "Response: error static method"
+          ]
+         ]
+        }
+       ],
+       [
+        "fetch/api/response/response-headers-guard.any.worker.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,worker"
+          ],
+          [
+           "title",
+           "Response: error static method"
+          ]
+         ]
+        }
+       ]
+      ],
       "response-init-001.any.js": [
        "559e49ad11ffe13a7a291935f6540b6a177e4c9f",
        [
@@ -578770,7 +584548,7 @@
        ]
       ],
       "response-static-error.any.js": [
-       "1f8c49ab006a489029edcb5597d06379b19c5c9a",
+       "4097eab37b4c90e8c453027b99fbf4ed31a08b42",
        [
         "fetch/api/response/response-static-error.any.html",
         {
@@ -580226,7 +586004,7 @@
     },
     "fetch-later": {
      "basic.tentative.https.window.js": [
-      "a8ca011a7c992878ddd51df65742939b8fbf6337",
+      "0870f1c273a1eaa2e55a2b019f226cfcc97092e9",
       [
        "fetch/fetch-later/basic.tentative.https.window.html",
        {
@@ -580261,10 +586039,82 @@
        }
       ]
      ],
-     "sendondiscard.tentative.https.window.js": [
-      "0613d18dffbfc98104b0ab7d605330d09ad997c0",
+     "quota.tentative.https.window.js": [
+      "4fc5979374c0e214f44d28982c7f22b86454d22f",
       [
-       "fetch/fetch-later/sendondiscard.tentative.https.window.html",
+       "fetch/fetch-later/quota.tentative.https.window.html",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "/resources/testharness.js"
+         ],
+         [
+          "script",
+          "/resources/testharnessreport.js"
+         ],
+         [
+          "script",
+          "/common/get-host-info.sub.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "/pending-beacon/resources/pending_beacon-helper.js"
+         ]
+        ]
+       }
+      ]
+     ],
+     "send-on-deactivate.tentative.https.window.js": [
+      "4fbea12bfec4d4d88d02753e8e9edd38f0b03404",
+      [
+       "fetch/fetch-later/send-on-deactivate.tentative.https.window.html",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "/resources/testharness.js"
+         ],
+         [
+          "script",
+          "/resources/testharnessreport.js"
+         ],
+         [
+          "script",
+          "/common/dispatcher/dispatcher.js"
+         ],
+         [
+          "script",
+          "/common/get-host-info.sub.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "/html/browsers/browsing-the-web/remote-context-helper/resources/remote-context-helper.js"
+         ],
+         [
+          "script",
+          "/html/browsers/browsing-the-web/back-forward-cache/resources/rc-helper.js"
+         ],
+         [
+          "script",
+          "/pending-beacon/resources/pending_beacon-helper.js"
+         ]
+        ]
+       }
+      ]
+     ],
+     "send-on-discard.tentative.https.window.js": [
+      "8a39458f9b2a14932fb9d0d7374c5107a4ab7fb2",
+      [
+       "fetch/fetch-later/send-on-discard.tentative.https.window.html",
        {
         "script_metadata": [
          [
@@ -580286,6 +586136,48 @@
         ]
        }
       ]
+     ],
+     "timeout.tentative.https.window.js": [
+      "ec47e756abeb7b5e33078b086d9c3c618795d739",
+      [
+       "fetch/fetch-later/timeout.tentative.https.window.html",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "/resources/testharness.js"
+         ],
+         [
+          "script",
+          "/resources/testharnessreport.js"
+         ],
+         [
+          "script",
+          "/common/dispatcher/dispatcher.js"
+         ],
+         [
+          "script",
+          "/common/get-host-info.sub.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "/html/browsers/browsing-the-web/remote-context-helper/resources/remote-context-helper.js"
+         ],
+         [
+          "script",
+          "/html/browsers/browsing-the-web/back-forward-cache/resources/rc-helper.js"
+         ],
+         [
+          "script",
+          "/pending-beacon/resources/pending_beacon-helper.js"
+         ]
+        ]
+       }
+      ]
      ]
     },
     "h1-parsing": {
@@ -582635,7 +588527,7 @@
        ]
       ],
       "content-range.sub.any.js": [
-       "ee97521a55cd9906d693499a79d72f6b46effa23",
+       "c965aea4f8dc3f0069b92eaa93a958485763770e",
        [
         "fetch/orb/tentative/content-range.sub.any.html",
         {
@@ -582667,7 +588559,7 @@
        ]
       ],
       "known-mime-type.sub.any.js": [
-       "b0521e8b363dcb1129618414311b0eb6fbb66c84",
+       "cc6d208fd3fbac3164d82e3d467b7ca347f158ca",
        [
         "fetch/orb/tentative/known-mime-type.sub.any.html",
         {
@@ -582692,7 +588584,7 @@
        ]
       ],
       "nosniff.sub.any.js": [
-       "3df9d22e0b7beb0b6f25dde7d9e3d8f9cd1ebfd6",
+       "d1e01fd87b5596c40d88b4ecd2ec54276b590967",
        [
         "fetch/orb/tentative/nosniff.sub.any.html",
         {
@@ -582738,7 +588630,7 @@
        ]
       ],
       "status.sub.any.js": [
-       "b94d8b7f6359a7d58bc1f19d3c55e40082925935",
+       "e281ca6f5331cf2d7e6cc1968a6f7679db93d411",
        [
         "fetch/orb/tentative/status.sub.any.html",
         {
@@ -582770,7 +588662,7 @@
        ]
       ],
       "unknown-mime-type.sub.any.js": [
-       "f72ff928adb61029a752510317e244ea4442e337",
+       "268ebb0258da37092af6f92aced115f47300f3a0",
        [
         "fetch/orb/tentative/unknown-mime-type.sub.any.html",
         {
@@ -584568,9 +590460,9 @@
    "fledge": {
     "tentative": {
      "auction-config.https.sub.window.js": [
-      "537f3267838148fff4353762d263e1ceeaffcf4d",
+      "347f9eb5613ee4370f60a0dc71c1679fa6b87d8e",
       [
-       "fledge/tentative/auction-config.https.sub.window.html",
+       "fledge/tentative/auction-config.https.sub.window.html?1-5",
        {
         "script_metadata": [
          [
@@ -584584,8 +590476,587 @@
          [
           "script",
           "resources/fledge-util.js"
+         ],
+         [
+          "script",
+          "/common/subset-tests.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "variant",
+          "?1-5"
+         ],
+         [
+          "variant",
+          "?6-10"
+         ],
+         [
+          "variant",
+          "?11-15"
+         ],
+         [
+          "variant",
+          "?16-20"
+         ],
+         [
+          "variant",
+          "?21-last"
          ]
-        ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "fledge/tentative/auction-config.https.sub.window.html?11-15",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "/resources/testdriver.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "resources/fledge-util.js"
+         ],
+         [
+          "script",
+          "/common/subset-tests.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "variant",
+          "?1-5"
+         ],
+         [
+          "variant",
+          "?6-10"
+         ],
+         [
+          "variant",
+          "?11-15"
+         ],
+         [
+          "variant",
+          "?16-20"
+         ],
+         [
+          "variant",
+          "?21-last"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "fledge/tentative/auction-config.https.sub.window.html?16-20",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "/resources/testdriver.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "resources/fledge-util.js"
+         ],
+         [
+          "script",
+          "/common/subset-tests.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "variant",
+          "?1-5"
+         ],
+         [
+          "variant",
+          "?6-10"
+         ],
+         [
+          "variant",
+          "?11-15"
+         ],
+         [
+          "variant",
+          "?16-20"
+         ],
+         [
+          "variant",
+          "?21-last"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "fledge/tentative/auction-config.https.sub.window.html?21-last",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "/resources/testdriver.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "resources/fledge-util.js"
+         ],
+         [
+          "script",
+          "/common/subset-tests.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "variant",
+          "?1-5"
+         ],
+         [
+          "variant",
+          "?6-10"
+         ],
+         [
+          "variant",
+          "?11-15"
+         ],
+         [
+          "variant",
+          "?16-20"
+         ],
+         [
+          "variant",
+          "?21-last"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "fledge/tentative/auction-config.https.sub.window.html?6-10",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "/resources/testdriver.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "resources/fledge-util.js"
+         ],
+         [
+          "script",
+          "/common/subset-tests.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "variant",
+          "?1-5"
+         ],
+         [
+          "variant",
+          "?6-10"
+         ],
+         [
+          "variant",
+          "?11-15"
+         ],
+         [
+          "variant",
+          "?16-20"
+         ],
+         [
+          "variant",
+          "?21-last"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ]
+     ],
+     "component-ads.https.sub.window.js": [
+      "ae639d7b20e060bf868a56f6203d726b74d4324f",
+      [
+       "fledge/tentative/component-ads.https.sub.window.html?1-5",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "/resources/testdriver.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "/common/subset-tests.js"
+         ],
+         [
+          "script",
+          "resources/fledge-util.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "variant",
+          "?1-5"
+         ],
+         [
+          "variant",
+          "?6-10"
+         ],
+         [
+          "variant",
+          "?11-15"
+         ],
+         [
+          "variant",
+          "?16-last"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "fledge/tentative/component-ads.https.sub.window.html?11-15",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "/resources/testdriver.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "/common/subset-tests.js"
+         ],
+         [
+          "script",
+          "resources/fledge-util.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "variant",
+          "?1-5"
+         ],
+         [
+          "variant",
+          "?6-10"
+         ],
+         [
+          "variant",
+          "?11-15"
+         ],
+         [
+          "variant",
+          "?16-last"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "fledge/tentative/component-ads.https.sub.window.html?16-last",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "/resources/testdriver.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "/common/subset-tests.js"
+         ],
+         [
+          "script",
+          "resources/fledge-util.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "variant",
+          "?1-5"
+         ],
+         [
+          "variant",
+          "?6-10"
+         ],
+         [
+          "variant",
+          "?11-15"
+         ],
+         [
+          "variant",
+          "?16-last"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "fledge/tentative/component-ads.https.sub.window.html?6-10",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "/resources/testdriver.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "/common/subset-tests.js"
+         ],
+         [
+          "script",
+          "resources/fledge-util.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "variant",
+          "?1-5"
+         ],
+         [
+          "variant",
+          "?6-10"
+         ],
+         [
+          "variant",
+          "?11-15"
+         ],
+         [
+          "variant",
+          "?16-last"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ]
+     ],
+     "cross-origin.https.sub.window.js": [
+      "1c1d5f2f6b77ac777b4d1c5167abba439b0bc577",
+      [
+       "fledge/tentative/cross-origin.https.sub.window.html?1-4",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "/resources/testdriver.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "/common/subset-tests.js"
+         ],
+         [
+          "script",
+          "resources/fledge-util.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "variant",
+          "?1-4"
+         ],
+         [
+          "variant",
+          "?5-8"
+         ],
+         [
+          "variant",
+          "?9-12"
+         ],
+         [
+          "variant",
+          "?13-last"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "fledge/tentative/cross-origin.https.sub.window.html?13-last",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "/resources/testdriver.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "/common/subset-tests.js"
+         ],
+         [
+          "script",
+          "resources/fledge-util.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "variant",
+          "?1-4"
+         ],
+         [
+          "variant",
+          "?5-8"
+         ],
+         [
+          "variant",
+          "?9-12"
+         ],
+         [
+          "variant",
+          "?13-last"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "fledge/tentative/cross-origin.https.sub.window.html?5-8",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "/resources/testdriver.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "/common/subset-tests.js"
+         ],
+         [
+          "script",
+          "resources/fledge-util.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "variant",
+          "?1-4"
+         ],
+         [
+          "variant",
+          "?5-8"
+         ],
+         [
+          "variant",
+          "?9-12"
+         ],
+         [
+          "variant",
+          "?13-last"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "fledge/tentative/cross-origin.https.sub.window.html?9-12",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "/resources/testdriver.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "/common/subset-tests.js"
+         ],
+         [
+          "script",
+          "resources/fledge-util.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "variant",
+          "?1-4"
+         ],
+         [
+          "variant",
+          "?5-8"
+         ],
+         [
+          "variant",
+          "?9-12"
+         ],
+         [
+          "variant",
+          "?13-last"
+         ]
+        ],
+        "timeout": "long"
        }
       ]
      ],
@@ -584604,7 +591075,7 @@
       ]
      ],
      "generate-bid-recency.https.sub.window.js": [
-      "ed431820d3058769f3c7dd56c2fbc55dd6d95df9",
+      "b4c059820ed056db67361daa7a224eac52d3d343",
       [
        "fledge/tentative/generate-bid-recency.https.sub.window.html",
        {
@@ -584638,9 +591109,9 @@
       ]
      ],
      "join-leave-ad-interest-group.https.sub.window.js": [
-      "9b2b501fc720e02ef133663ccce56462c53010e4",
+      "85e172ed6f824efe872afafa74228ce13fbcd7cf",
       [
-       "fledge/tentative/join-leave-ad-interest-group.https.sub.window.html",
+       "fledge/tentative/join-leave-ad-interest-group.https.sub.window.html?1-10",
        {
         "script_metadata": [
          [
@@ -584655,9 +591126,561 @@
           "script",
           "resources/fledge-util.js"
          ],
+         [
+          "script",
+          "/common/subset-tests.js"
+         ],
          [
           "timeout",
           "long"
+         ],
+         [
+          "variant",
+          "?1-10"
+         ],
+         [
+          "variant",
+          "?11-20"
+         ],
+         [
+          "variant",
+          "?21-30"
+         ],
+         [
+          "variant",
+          "?31-40"
+         ],
+         [
+          "variant",
+          "?41-50"
+         ],
+         [
+          "variant",
+          "?51-60"
+         ],
+         [
+          "variant",
+          "?61-70"
+         ],
+         [
+          "variant",
+          "?71-80"
+         ],
+         [
+          "variant",
+          "?81-last"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "fledge/tentative/join-leave-ad-interest-group.https.sub.window.html?11-20",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "/resources/testdriver.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "resources/fledge-util.js"
+         ],
+         [
+          "script",
+          "/common/subset-tests.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "variant",
+          "?1-10"
+         ],
+         [
+          "variant",
+          "?11-20"
+         ],
+         [
+          "variant",
+          "?21-30"
+         ],
+         [
+          "variant",
+          "?31-40"
+         ],
+         [
+          "variant",
+          "?41-50"
+         ],
+         [
+          "variant",
+          "?51-60"
+         ],
+         [
+          "variant",
+          "?61-70"
+         ],
+         [
+          "variant",
+          "?71-80"
+         ],
+         [
+          "variant",
+          "?81-last"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "fledge/tentative/join-leave-ad-interest-group.https.sub.window.html?21-30",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "/resources/testdriver.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "resources/fledge-util.js"
+         ],
+         [
+          "script",
+          "/common/subset-tests.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "variant",
+          "?1-10"
+         ],
+         [
+          "variant",
+          "?11-20"
+         ],
+         [
+          "variant",
+          "?21-30"
+         ],
+         [
+          "variant",
+          "?31-40"
+         ],
+         [
+          "variant",
+          "?41-50"
+         ],
+         [
+          "variant",
+          "?51-60"
+         ],
+         [
+          "variant",
+          "?61-70"
+         ],
+         [
+          "variant",
+          "?71-80"
+         ],
+         [
+          "variant",
+          "?81-last"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "fledge/tentative/join-leave-ad-interest-group.https.sub.window.html?31-40",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "/resources/testdriver.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "resources/fledge-util.js"
+         ],
+         [
+          "script",
+          "/common/subset-tests.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "variant",
+          "?1-10"
+         ],
+         [
+          "variant",
+          "?11-20"
+         ],
+         [
+          "variant",
+          "?21-30"
+         ],
+         [
+          "variant",
+          "?31-40"
+         ],
+         [
+          "variant",
+          "?41-50"
+         ],
+         [
+          "variant",
+          "?51-60"
+         ],
+         [
+          "variant",
+          "?61-70"
+         ],
+         [
+          "variant",
+          "?71-80"
+         ],
+         [
+          "variant",
+          "?81-last"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "fledge/tentative/join-leave-ad-interest-group.https.sub.window.html?41-50",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "/resources/testdriver.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "resources/fledge-util.js"
+         ],
+         [
+          "script",
+          "/common/subset-tests.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "variant",
+          "?1-10"
+         ],
+         [
+          "variant",
+          "?11-20"
+         ],
+         [
+          "variant",
+          "?21-30"
+         ],
+         [
+          "variant",
+          "?31-40"
+         ],
+         [
+          "variant",
+          "?41-50"
+         ],
+         [
+          "variant",
+          "?51-60"
+         ],
+         [
+          "variant",
+          "?61-70"
+         ],
+         [
+          "variant",
+          "?71-80"
+         ],
+         [
+          "variant",
+          "?81-last"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "fledge/tentative/join-leave-ad-interest-group.https.sub.window.html?51-60",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "/resources/testdriver.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "resources/fledge-util.js"
+         ],
+         [
+          "script",
+          "/common/subset-tests.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "variant",
+          "?1-10"
+         ],
+         [
+          "variant",
+          "?11-20"
+         ],
+         [
+          "variant",
+          "?21-30"
+         ],
+         [
+          "variant",
+          "?31-40"
+         ],
+         [
+          "variant",
+          "?41-50"
+         ],
+         [
+          "variant",
+          "?51-60"
+         ],
+         [
+          "variant",
+          "?61-70"
+         ],
+         [
+          "variant",
+          "?71-80"
+         ],
+         [
+          "variant",
+          "?81-last"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "fledge/tentative/join-leave-ad-interest-group.https.sub.window.html?61-70",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "/resources/testdriver.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "resources/fledge-util.js"
+         ],
+         [
+          "script",
+          "/common/subset-tests.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "variant",
+          "?1-10"
+         ],
+         [
+          "variant",
+          "?11-20"
+         ],
+         [
+          "variant",
+          "?21-30"
+         ],
+         [
+          "variant",
+          "?31-40"
+         ],
+         [
+          "variant",
+          "?41-50"
+         ],
+         [
+          "variant",
+          "?51-60"
+         ],
+         [
+          "variant",
+          "?61-70"
+         ],
+         [
+          "variant",
+          "?71-80"
+         ],
+         [
+          "variant",
+          "?81-last"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "fledge/tentative/join-leave-ad-interest-group.https.sub.window.html?71-80",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "/resources/testdriver.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "resources/fledge-util.js"
+         ],
+         [
+          "script",
+          "/common/subset-tests.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "variant",
+          "?1-10"
+         ],
+         [
+          "variant",
+          "?11-20"
+         ],
+         [
+          "variant",
+          "?21-30"
+         ],
+         [
+          "variant",
+          "?31-40"
+         ],
+         [
+          "variant",
+          "?41-50"
+         ],
+         [
+          "variant",
+          "?51-60"
+         ],
+         [
+          "variant",
+          "?61-70"
+         ],
+         [
+          "variant",
+          "?71-80"
+         ],
+         [
+          "variant",
+          "?81-last"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "fledge/tentative/join-leave-ad-interest-group.https.sub.window.html?81-last",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "/resources/testdriver.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "resources/fledge-util.js"
+         ],
+         [
+          "script",
+          "/common/subset-tests.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "variant",
+          "?1-10"
+         ],
+         [
+          "variant",
+          "?11-20"
+         ],
+         [
+          "variant",
+          "?21-30"
+         ],
+         [
+          "variant",
+          "?31-40"
+         ],
+         [
+          "variant",
+          "?41-50"
+         ],
+         [
+          "variant",
+          "?51-60"
+         ],
+         [
+          "variant",
+          "?61-70"
+         ],
+         [
+          "variant",
+          "?71-80"
+         ],
+         [
+          "variant",
+          "?81-last"
          ]
         ],
         "timeout": "long"
@@ -584665,9 +591688,9 @@
       ]
      ],
      "no-winner.https.sub.window.js": [
-      "8fd7df50cde0fb237deca7d3b9f1f3eedaff94e6",
+      "229a707b0997bb5f0a55c7dc5504c8b1dc4307ad",
       [
-       "fledge/tentative/no-winner.https.sub.window.html",
+       "fledge/tentative/no-winner.https.sub.window.html?1-5",
        {
         "script_metadata": [
          [
@@ -584682,9 +591705,465 @@
           "script",
           "resources/fledge-util.js"
          ],
+         [
+          "script",
+          "/common/subset-tests.js"
+         ],
          [
           "timeout",
           "long"
+         ],
+         [
+          "variant",
+          "?1-5"
+         ],
+         [
+          "variant",
+          "?6-10"
+         ],
+         [
+          "variant",
+          "?11-15"
+         ],
+         [
+          "variant",
+          "?16-20"
+         ],
+         [
+          "variant",
+          "?21-25"
+         ],
+         [
+          "variant",
+          "?26-30"
+         ],
+         [
+          "variant",
+          "?31-35"
+         ],
+         [
+          "variant",
+          "?36-last"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "fledge/tentative/no-winner.https.sub.window.html?11-15",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "/resources/testdriver.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "resources/fledge-util.js"
+         ],
+         [
+          "script",
+          "/common/subset-tests.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "variant",
+          "?1-5"
+         ],
+         [
+          "variant",
+          "?6-10"
+         ],
+         [
+          "variant",
+          "?11-15"
+         ],
+         [
+          "variant",
+          "?16-20"
+         ],
+         [
+          "variant",
+          "?21-25"
+         ],
+         [
+          "variant",
+          "?26-30"
+         ],
+         [
+          "variant",
+          "?31-35"
+         ],
+         [
+          "variant",
+          "?36-last"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "fledge/tentative/no-winner.https.sub.window.html?16-20",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "/resources/testdriver.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "resources/fledge-util.js"
+         ],
+         [
+          "script",
+          "/common/subset-tests.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "variant",
+          "?1-5"
+         ],
+         [
+          "variant",
+          "?6-10"
+         ],
+         [
+          "variant",
+          "?11-15"
+         ],
+         [
+          "variant",
+          "?16-20"
+         ],
+         [
+          "variant",
+          "?21-25"
+         ],
+         [
+          "variant",
+          "?26-30"
+         ],
+         [
+          "variant",
+          "?31-35"
+         ],
+         [
+          "variant",
+          "?36-last"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "fledge/tentative/no-winner.https.sub.window.html?21-25",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "/resources/testdriver.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "resources/fledge-util.js"
+         ],
+         [
+          "script",
+          "/common/subset-tests.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "variant",
+          "?1-5"
+         ],
+         [
+          "variant",
+          "?6-10"
+         ],
+         [
+          "variant",
+          "?11-15"
+         ],
+         [
+          "variant",
+          "?16-20"
+         ],
+         [
+          "variant",
+          "?21-25"
+         ],
+         [
+          "variant",
+          "?26-30"
+         ],
+         [
+          "variant",
+          "?31-35"
+         ],
+         [
+          "variant",
+          "?36-last"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "fledge/tentative/no-winner.https.sub.window.html?26-30",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "/resources/testdriver.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "resources/fledge-util.js"
+         ],
+         [
+          "script",
+          "/common/subset-tests.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "variant",
+          "?1-5"
+         ],
+         [
+          "variant",
+          "?6-10"
+         ],
+         [
+          "variant",
+          "?11-15"
+         ],
+         [
+          "variant",
+          "?16-20"
+         ],
+         [
+          "variant",
+          "?21-25"
+         ],
+         [
+          "variant",
+          "?26-30"
+         ],
+         [
+          "variant",
+          "?31-35"
+         ],
+         [
+          "variant",
+          "?36-last"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "fledge/tentative/no-winner.https.sub.window.html?31-35",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "/resources/testdriver.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "resources/fledge-util.js"
+         ],
+         [
+          "script",
+          "/common/subset-tests.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "variant",
+          "?1-5"
+         ],
+         [
+          "variant",
+          "?6-10"
+         ],
+         [
+          "variant",
+          "?11-15"
+         ],
+         [
+          "variant",
+          "?16-20"
+         ],
+         [
+          "variant",
+          "?21-25"
+         ],
+         [
+          "variant",
+          "?26-30"
+         ],
+         [
+          "variant",
+          "?31-35"
+         ],
+         [
+          "variant",
+          "?36-last"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "fledge/tentative/no-winner.https.sub.window.html?36-last",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "/resources/testdriver.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "resources/fledge-util.js"
+         ],
+         [
+          "script",
+          "/common/subset-tests.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "variant",
+          "?1-5"
+         ],
+         [
+          "variant",
+          "?6-10"
+         ],
+         [
+          "variant",
+          "?11-15"
+         ],
+         [
+          "variant",
+          "?16-20"
+         ],
+         [
+          "variant",
+          "?21-25"
+         ],
+         [
+          "variant",
+          "?26-30"
+         ],
+         [
+          "variant",
+          "?31-35"
+         ],
+         [
+          "variant",
+          "?36-last"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "fledge/tentative/no-winner.https.sub.window.html?6-10",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "/resources/testdriver.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "resources/fledge-util.js"
+         ],
+         [
+          "script",
+          "/common/subset-tests.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "variant",
+          "?1-5"
+         ],
+         [
+          "variant",
+          "?6-10"
+         ],
+         [
+          "variant",
+          "?11-15"
+         ],
+         [
+          "variant",
+          "?16-20"
+         ],
+         [
+          "variant",
+          "?21-25"
+         ],
+         [
+          "variant",
+          "?26-30"
+         ],
+         [
+          "variant",
+          "?31-35"
+         ],
+         [
+          "variant",
+          "?36-last"
          ]
         ],
         "timeout": "long"
@@ -584692,9 +592171,9 @@
       ]
      ],
      "register-ad-beacon.https.sub.window.js": [
-      "48ce1fa26364ba5157237e34285fc6ba38137a96",
+      "7f9053d52446545d14342815182e6a289e5e4b3a",
       [
-       "fledge/tentative/register-ad-beacon.https.sub.window.html",
+       "fledge/tentative/register-ad-beacon.https.sub.window.html?1-5",
        {
         "script_metadata": [
          [
@@ -584709,9 +592188,105 @@
           "script",
           "resources/fledge-util.js"
          ],
+         [
+          "script",
+          "/common/subset-tests.js"
+         ],
          [
           "timeout",
           "long"
+         ],
+         [
+          "variant",
+          "?1-5"
+         ],
+         [
+          "variant",
+          "?6-10"
+         ],
+         [
+          "variant",
+          "?11-last"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "fledge/tentative/register-ad-beacon.https.sub.window.html?11-last",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "/resources/testdriver.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "resources/fledge-util.js"
+         ],
+         [
+          "script",
+          "/common/subset-tests.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "variant",
+          "?1-5"
+         ],
+         [
+          "variant",
+          "?6-10"
+         ],
+         [
+          "variant",
+          "?11-last"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "fledge/tentative/register-ad-beacon.https.sub.window.html?6-10",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "/resources/testdriver.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "resources/fledge-util.js"
+         ],
+         [
+          "script",
+          "/common/subset-tests.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "variant",
+          "?1-5"
+         ],
+         [
+          "variant",
+          "?6-10"
+         ],
+         [
+          "variant",
+          "?11-last"
          ]
         ],
         "timeout": "long"
@@ -584719,9 +592294,9 @@
       ]
      ],
      "reporting-arguments.https.sub.window.js": [
-      "3b03d29bcf50e4a5fe47b621f280d57d1f9d6eaf",
+      "b68341c62a16e8540c543bbc48a13a7ccf836057",
       [
-       "fledge/tentative/reporting-arguments.https.sub.window.html",
+       "fledge/tentative/reporting-arguments.https.sub.window.html?1-5",
        {
         "script_metadata": [
          [
@@ -584736,9 +592311,161 @@
           "script",
           "resources/fledge-util.js"
          ],
+         [
+          "script",
+          "/common/subset-tests.js"
+         ],
          [
           "timeout",
           "long"
+         ],
+         [
+          "variant",
+          "?1-5"
+         ],
+         [
+          "variant",
+          "?6-10"
+         ],
+         [
+          "variant",
+          "?11-15"
+         ],
+         [
+          "variant",
+          "?16-last"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "fledge/tentative/reporting-arguments.https.sub.window.html?11-15",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "/resources/testdriver.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "resources/fledge-util.js"
+         ],
+         [
+          "script",
+          "/common/subset-tests.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "variant",
+          "?1-5"
+         ],
+         [
+          "variant",
+          "?6-10"
+         ],
+         [
+          "variant",
+          "?11-15"
+         ],
+         [
+          "variant",
+          "?16-last"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "fledge/tentative/reporting-arguments.https.sub.window.html?16-last",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "/resources/testdriver.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "resources/fledge-util.js"
+         ],
+         [
+          "script",
+          "/common/subset-tests.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "variant",
+          "?1-5"
+         ],
+         [
+          "variant",
+          "?6-10"
+         ],
+         [
+          "variant",
+          "?11-15"
+         ],
+         [
+          "variant",
+          "?16-last"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "fledge/tentative/reporting-arguments.https.sub.window.html?6-10",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "/resources/testdriver.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "resources/fledge-util.js"
+         ],
+         [
+          "script",
+          "/common/subset-tests.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "variant",
+          "?1-5"
+         ],
+         [
+          "variant",
+          "?6-10"
+         ],
+         [
+          "variant",
+          "?11-15"
+         ],
+         [
+          "variant",
+          "?16-last"
          ]
         ],
         "timeout": "long"
@@ -584746,7 +592473,7 @@
       ]
      ],
      "round-a-value.https.sub.window.js": [
-      "252e4db00fbb6151a45cf7042c96d19ac5ae818e",
+      "3eb0f5f359dd4137cc05889612da73b96d6d7f51",
       [
        "fledge/tentative/round-a-value.https.sub.window.html",
        {
@@ -584773,9 +592500,9 @@
       ]
      ],
      "send-report-to.https.sub.window.js": [
-      "087140af3ef51ac69ddcfa3efdf4b5f97bfa44ad",
+      "e97545985c45d8ca0eaeaff40e25432c29796519",
       [
-       "fledge/tentative/send-report-to.https.sub.window.html",
+       "fledge/tentative/send-report-to.https.sub.window.html?1-5",
        {
         "script_metadata": [
          [
@@ -584790,9 +592517,57 @@
           "script",
           "resources/fledge-util.js"
          ],
+         [
+          "script",
+          "/common/subset-tests.js"
+         ],
          [
           "timeout",
           "long"
+         ],
+         [
+          "variant",
+          "?1-5"
+         ],
+         [
+          "variant",
+          "?6-last"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "fledge/tentative/send-report-to.https.sub.window.html?6-last",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "/resources/testdriver.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "resources/fledge-util.js"
+         ],
+         [
+          "script",
+          "/common/subset-tests.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "variant",
+          "?1-5"
+         ],
+         [
+          "variant",
+          "?6-last"
          ]
         ],
         "timeout": "long"
@@ -584800,9 +592575,9 @@
       ]
      ],
      "trusted-bidding-signals.https.sub.window.js": [
-      "90c1c39fd6eb094d7b3470d0a481ae6bf870ea08",
+      "f2201456a1254d736bde737b78f88e790aeaa73e",
       [
-       "fledge/tentative/trusted-bidding-signals.https.sub.window.html",
+       "fledge/tentative/trusted-bidding-signals.https.sub.window.html?1-5",
        {
         "script_metadata": [
          [
@@ -584813,6 +592588,10 @@
           "script",
           "/common/utils.js"
          ],
+         [
+          "script",
+          "/common/subset-tests.js"
+         ],
          [
           "script",
           "resources/fledge-util.js"
@@ -584820,6 +592599,554 @@
          [
           "timeout",
           "long"
+         ],
+         [
+          "variant",
+          "?1-5"
+         ],
+         [
+          "variant",
+          "?6-10"
+         ],
+         [
+          "variant",
+          "?11-15"
+         ],
+         [
+          "variant",
+          "?16-20"
+         ],
+         [
+          "variant",
+          "?21-25"
+         ],
+         [
+          "variant",
+          "?26-30"
+         ],
+         [
+          "variant",
+          "?31-35"
+         ],
+         [
+          "variant",
+          "?36-40"
+         ],
+         [
+          "variant",
+          "?41-last"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "fledge/tentative/trusted-bidding-signals.https.sub.window.html?11-15",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "/resources/testdriver.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "/common/subset-tests.js"
+         ],
+         [
+          "script",
+          "resources/fledge-util.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "variant",
+          "?1-5"
+         ],
+         [
+          "variant",
+          "?6-10"
+         ],
+         [
+          "variant",
+          "?11-15"
+         ],
+         [
+          "variant",
+          "?16-20"
+         ],
+         [
+          "variant",
+          "?21-25"
+         ],
+         [
+          "variant",
+          "?26-30"
+         ],
+         [
+          "variant",
+          "?31-35"
+         ],
+         [
+          "variant",
+          "?36-40"
+         ],
+         [
+          "variant",
+          "?41-last"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "fledge/tentative/trusted-bidding-signals.https.sub.window.html?16-20",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "/resources/testdriver.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "/common/subset-tests.js"
+         ],
+         [
+          "script",
+          "resources/fledge-util.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "variant",
+          "?1-5"
+         ],
+         [
+          "variant",
+          "?6-10"
+         ],
+         [
+          "variant",
+          "?11-15"
+         ],
+         [
+          "variant",
+          "?16-20"
+         ],
+         [
+          "variant",
+          "?21-25"
+         ],
+         [
+          "variant",
+          "?26-30"
+         ],
+         [
+          "variant",
+          "?31-35"
+         ],
+         [
+          "variant",
+          "?36-40"
+         ],
+         [
+          "variant",
+          "?41-last"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "fledge/tentative/trusted-bidding-signals.https.sub.window.html?21-25",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "/resources/testdriver.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "/common/subset-tests.js"
+         ],
+         [
+          "script",
+          "resources/fledge-util.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "variant",
+          "?1-5"
+         ],
+         [
+          "variant",
+          "?6-10"
+         ],
+         [
+          "variant",
+          "?11-15"
+         ],
+         [
+          "variant",
+          "?16-20"
+         ],
+         [
+          "variant",
+          "?21-25"
+         ],
+         [
+          "variant",
+          "?26-30"
+         ],
+         [
+          "variant",
+          "?31-35"
+         ],
+         [
+          "variant",
+          "?36-40"
+         ],
+         [
+          "variant",
+          "?41-last"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "fledge/tentative/trusted-bidding-signals.https.sub.window.html?26-30",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "/resources/testdriver.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "/common/subset-tests.js"
+         ],
+         [
+          "script",
+          "resources/fledge-util.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "variant",
+          "?1-5"
+         ],
+         [
+          "variant",
+          "?6-10"
+         ],
+         [
+          "variant",
+          "?11-15"
+         ],
+         [
+          "variant",
+          "?16-20"
+         ],
+         [
+          "variant",
+          "?21-25"
+         ],
+         [
+          "variant",
+          "?26-30"
+         ],
+         [
+          "variant",
+          "?31-35"
+         ],
+         [
+          "variant",
+          "?36-40"
+         ],
+         [
+          "variant",
+          "?41-last"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "fledge/tentative/trusted-bidding-signals.https.sub.window.html?31-35",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "/resources/testdriver.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "/common/subset-tests.js"
+         ],
+         [
+          "script",
+          "resources/fledge-util.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "variant",
+          "?1-5"
+         ],
+         [
+          "variant",
+          "?6-10"
+         ],
+         [
+          "variant",
+          "?11-15"
+         ],
+         [
+          "variant",
+          "?16-20"
+         ],
+         [
+          "variant",
+          "?21-25"
+         ],
+         [
+          "variant",
+          "?26-30"
+         ],
+         [
+          "variant",
+          "?31-35"
+         ],
+         [
+          "variant",
+          "?36-40"
+         ],
+         [
+          "variant",
+          "?41-last"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "fledge/tentative/trusted-bidding-signals.https.sub.window.html?36-40",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "/resources/testdriver.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "/common/subset-tests.js"
+         ],
+         [
+          "script",
+          "resources/fledge-util.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "variant",
+          "?1-5"
+         ],
+         [
+          "variant",
+          "?6-10"
+         ],
+         [
+          "variant",
+          "?11-15"
+         ],
+         [
+          "variant",
+          "?16-20"
+         ],
+         [
+          "variant",
+          "?21-25"
+         ],
+         [
+          "variant",
+          "?26-30"
+         ],
+         [
+          "variant",
+          "?31-35"
+         ],
+         [
+          "variant",
+          "?36-40"
+         ],
+         [
+          "variant",
+          "?41-last"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "fledge/tentative/trusted-bidding-signals.https.sub.window.html?41-last",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "/resources/testdriver.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "/common/subset-tests.js"
+         ],
+         [
+          "script",
+          "resources/fledge-util.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "variant",
+          "?1-5"
+         ],
+         [
+          "variant",
+          "?6-10"
+         ],
+         [
+          "variant",
+          "?11-15"
+         ],
+         [
+          "variant",
+          "?16-20"
+         ],
+         [
+          "variant",
+          "?21-25"
+         ],
+         [
+          "variant",
+          "?26-30"
+         ],
+         [
+          "variant",
+          "?31-35"
+         ],
+         [
+          "variant",
+          "?36-40"
+         ],
+         [
+          "variant",
+          "?41-last"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "fledge/tentative/trusted-bidding-signals.https.sub.window.html?6-10",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "/resources/testdriver.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "/common/subset-tests.js"
+         ],
+         [
+          "script",
+          "resources/fledge-util.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "variant",
+          "?1-5"
+         ],
+         [
+          "variant",
+          "?6-10"
+         ],
+         [
+          "variant",
+          "?11-15"
+         ],
+         [
+          "variant",
+          "?16-20"
+         ],
+         [
+          "variant",
+          "?21-25"
+         ],
+         [
+          "variant",
+          "?26-30"
+         ],
+         [
+          "variant",
+          "?31-35"
+         ],
+         [
+          "variant",
+          "?36-40"
+         ],
+         [
+          "variant",
+          "?41-last"
          ]
         ],
         "timeout": "long"
@@ -584827,9 +593154,9 @@
       ]
      ],
      "trusted-scoring-signals.https.sub.window.js": [
-      "94385fd731ad3400b39449a71445c7154a0b96e6",
+      "422994b8202295da758bbfd6e9ab598f5d7aaac0",
       [
-       "fledge/tentative/trusted-scoring-signals.https.sub.window.html",
+       "fledge/tentative/trusted-scoring-signals.https.sub.window.html?1-5",
        {
         "script_metadata": [
          [
@@ -584844,9 +593171,561 @@
           "script",
           "resources/fledge-util.js"
          ],
+         [
+          "script",
+          "/common/subset-tests.js"
+         ],
          [
           "timeout",
           "long"
+         ],
+         [
+          "variant",
+          "?1-5"
+         ],
+         [
+          "variant",
+          "?6-10"
+         ],
+         [
+          "variant",
+          "?11-15"
+         ],
+         [
+          "variant",
+          "?16-20"
+         ],
+         [
+          "variant",
+          "?21-25"
+         ],
+         [
+          "variant",
+          "?26-30"
+         ],
+         [
+          "variant",
+          "?31-35"
+         ],
+         [
+          "variant",
+          "?36-40"
+         ],
+         [
+          "variant",
+          "?41-last"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "fledge/tentative/trusted-scoring-signals.https.sub.window.html?11-15",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "/resources/testdriver.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "resources/fledge-util.js"
+         ],
+         [
+          "script",
+          "/common/subset-tests.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "variant",
+          "?1-5"
+         ],
+         [
+          "variant",
+          "?6-10"
+         ],
+         [
+          "variant",
+          "?11-15"
+         ],
+         [
+          "variant",
+          "?16-20"
+         ],
+         [
+          "variant",
+          "?21-25"
+         ],
+         [
+          "variant",
+          "?26-30"
+         ],
+         [
+          "variant",
+          "?31-35"
+         ],
+         [
+          "variant",
+          "?36-40"
+         ],
+         [
+          "variant",
+          "?41-last"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "fledge/tentative/trusted-scoring-signals.https.sub.window.html?16-20",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "/resources/testdriver.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "resources/fledge-util.js"
+         ],
+         [
+          "script",
+          "/common/subset-tests.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "variant",
+          "?1-5"
+         ],
+         [
+          "variant",
+          "?6-10"
+         ],
+         [
+          "variant",
+          "?11-15"
+         ],
+         [
+          "variant",
+          "?16-20"
+         ],
+         [
+          "variant",
+          "?21-25"
+         ],
+         [
+          "variant",
+          "?26-30"
+         ],
+         [
+          "variant",
+          "?31-35"
+         ],
+         [
+          "variant",
+          "?36-40"
+         ],
+         [
+          "variant",
+          "?41-last"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "fledge/tentative/trusted-scoring-signals.https.sub.window.html?21-25",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "/resources/testdriver.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "resources/fledge-util.js"
+         ],
+         [
+          "script",
+          "/common/subset-tests.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "variant",
+          "?1-5"
+         ],
+         [
+          "variant",
+          "?6-10"
+         ],
+         [
+          "variant",
+          "?11-15"
+         ],
+         [
+          "variant",
+          "?16-20"
+         ],
+         [
+          "variant",
+          "?21-25"
+         ],
+         [
+          "variant",
+          "?26-30"
+         ],
+         [
+          "variant",
+          "?31-35"
+         ],
+         [
+          "variant",
+          "?36-40"
+         ],
+         [
+          "variant",
+          "?41-last"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "fledge/tentative/trusted-scoring-signals.https.sub.window.html?26-30",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "/resources/testdriver.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "resources/fledge-util.js"
+         ],
+         [
+          "script",
+          "/common/subset-tests.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "variant",
+          "?1-5"
+         ],
+         [
+          "variant",
+          "?6-10"
+         ],
+         [
+          "variant",
+          "?11-15"
+         ],
+         [
+          "variant",
+          "?16-20"
+         ],
+         [
+          "variant",
+          "?21-25"
+         ],
+         [
+          "variant",
+          "?26-30"
+         ],
+         [
+          "variant",
+          "?31-35"
+         ],
+         [
+          "variant",
+          "?36-40"
+         ],
+         [
+          "variant",
+          "?41-last"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "fledge/tentative/trusted-scoring-signals.https.sub.window.html?31-35",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "/resources/testdriver.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "resources/fledge-util.js"
+         ],
+         [
+          "script",
+          "/common/subset-tests.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "variant",
+          "?1-5"
+         ],
+         [
+          "variant",
+          "?6-10"
+         ],
+         [
+          "variant",
+          "?11-15"
+         ],
+         [
+          "variant",
+          "?16-20"
+         ],
+         [
+          "variant",
+          "?21-25"
+         ],
+         [
+          "variant",
+          "?26-30"
+         ],
+         [
+          "variant",
+          "?31-35"
+         ],
+         [
+          "variant",
+          "?36-40"
+         ],
+         [
+          "variant",
+          "?41-last"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "fledge/tentative/trusted-scoring-signals.https.sub.window.html?36-40",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "/resources/testdriver.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "resources/fledge-util.js"
+         ],
+         [
+          "script",
+          "/common/subset-tests.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "variant",
+          "?1-5"
+         ],
+         [
+          "variant",
+          "?6-10"
+         ],
+         [
+          "variant",
+          "?11-15"
+         ],
+         [
+          "variant",
+          "?16-20"
+         ],
+         [
+          "variant",
+          "?21-25"
+         ],
+         [
+          "variant",
+          "?26-30"
+         ],
+         [
+          "variant",
+          "?31-35"
+         ],
+         [
+          "variant",
+          "?36-40"
+         ],
+         [
+          "variant",
+          "?41-last"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "fledge/tentative/trusted-scoring-signals.https.sub.window.html?41-last",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "/resources/testdriver.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "resources/fledge-util.js"
+         ],
+         [
+          "script",
+          "/common/subset-tests.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "variant",
+          "?1-5"
+         ],
+         [
+          "variant",
+          "?6-10"
+         ],
+         [
+          "variant",
+          "?11-15"
+         ],
+         [
+          "variant",
+          "?16-20"
+         ],
+         [
+          "variant",
+          "?21-25"
+         ],
+         [
+          "variant",
+          "?26-30"
+         ],
+         [
+          "variant",
+          "?31-35"
+         ],
+         [
+          "variant",
+          "?36-40"
+         ],
+         [
+          "variant",
+          "?41-last"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "fledge/tentative/trusted-scoring-signals.https.sub.window.html?6-10",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "/resources/testdriver.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "resources/fledge-util.js"
+         ],
+         [
+          "script",
+          "/common/subset-tests.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ],
+         [
+          "variant",
+          "?1-5"
+         ],
+         [
+          "variant",
+          "?6-10"
+         ],
+         [
+          "variant",
+          "?11-15"
+         ],
+         [
+          "variant",
+          "?16-20"
+         ],
+         [
+          "variant",
+          "?21-25"
+         ],
+         [
+          "variant",
+          "?26-30"
+         ],
+         [
+          "variant",
+          "?31-35"
+         ],
+         [
+          "variant",
+          "?36-40"
+         ],
+         [
+          "variant",
+          "?41-last"
          ]
         ],
         "timeout": "long"
@@ -586146,10 +595025,10 @@
       }
      ]
     ],
-    "FileSystemFileHandle-create-sync-access-handle.https.tentative.window.js": [
+    "FileSystemFileHandle-create-sync-access-handle.https.window.js": [
      "6e20b57cb7b4bfb7556284d983752a2cc55eaf52",
      [
-      "fs/FileSystemFileHandle-create-sync-access-handle.https.tentative.window.html",
+      "fs/FileSystemFileHandle-create-sync-access-handle.https.window.html",
       {
        "script_metadata": [
         [
@@ -586172,6 +595051,13 @@
       }
      ]
     ],
+    "FileSystemFileHandle-cross-primitive-locking.https.tentative.worker.js": [
+     "df71082b11f5857be2af33f5bd4578bc19b0c3ae",
+     [
+      "fs/FileSystemFileHandle-cross-primitive-locking.https.tentative.worker.html",
+      {}
+     ]
+    ],
     "FileSystemFileHandle-getFile.https.any.js": [
      "fb93858fe7934b27244fa0ff828eac75c34b6629",
      [
@@ -586254,52 +595140,52 @@
       }
      ]
     ],
-    "FileSystemFileHandle-sync-access-handle-cross-primitive-locking.https.tentative.worker.js": [
-     "edb30186364c8bf08dd5dd08354fc577538838b3",
-     [
-      "fs/FileSystemFileHandle-sync-access-handle-cross-primitive-locking.https.tentative.worker.html",
-      {}
-     ]
-    ],
     "FileSystemFileHandle-sync-access-handle-lock-modes.https.tentative.worker.js": [
-     "c5636e7e329e2801e1b2628f302b666240dbe95d",
+     "bb82632e185c3f4e9c7c2dd503faabaa054719a9",
      [
       "fs/FileSystemFileHandle-sync-access-handle-lock-modes.https.tentative.worker.html",
       {}
      ]
     ],
-    "FileSystemSyncAccessHandle-close.https.tentative.worker.js": [
+    "FileSystemFileHandle-writable-file-stream-lock-modes.https.tentative.worker.js": [
+     "3e9b4334b9a4d512c42f8056b1bc95aa22ac0920",
+     [
+      "fs/FileSystemFileHandle-writable-file-stream-lock-modes.https.tentative.worker.html",
+      {}
+     ]
+    ],
+    "FileSystemSyncAccessHandle-close.https.worker.js": [
      "1c6aaf38a32a8341085ff83580dc874c3624c29a",
      [
-      "fs/FileSystemSyncAccessHandle-close.https.tentative.worker.html",
+      "fs/FileSystemSyncAccessHandle-close.https.worker.html",
       {}
      ]
     ],
-    "FileSystemSyncAccessHandle-flush.https.tentative.worker.js": [
+    "FileSystemSyncAccessHandle-flush.https.worker.js": [
      "96953a88f2eaa7383bf80a1fe49bd7204cb46863",
      [
-      "fs/FileSystemSyncAccessHandle-flush.https.tentative.worker.html",
+      "fs/FileSystemSyncAccessHandle-flush.https.worker.html",
       {}
      ]
     ],
-    "FileSystemSyncAccessHandle-getSize.https.tentative.worker.js": [
+    "FileSystemSyncAccessHandle-getSize.https.worker.js": [
      "4b62b280b96044ea85d2e31fbd79829ce39b9c13",
      [
-      "fs/FileSystemSyncAccessHandle-getSize.https.tentative.worker.html",
+      "fs/FileSystemSyncAccessHandle-getSize.https.worker.html",
       {}
      ]
     ],
-    "FileSystemSyncAccessHandle-read-write.https.tentative.worker.js": [
-     "a22608a2c7da86e80d747a119759c95321d86f73",
+    "FileSystemSyncAccessHandle-read-write.https.worker.js": [
+     "1c8fda94bbeb09bec8f395364bcea3a6343c3a3d",
      [
-      "fs/FileSystemSyncAccessHandle-read-write.https.tentative.worker.html",
+      "fs/FileSystemSyncAccessHandle-read-write.https.worker.html",
       {}
      ]
     ],
-    "FileSystemSyncAccessHandle-truncate.https.tentative.worker.js": [
+    "FileSystemSyncAccessHandle-truncate.https.worker.js": [
      "e5f557e070caba40b861fd83bac7f2bae3bea492",
      [
-      "fs/FileSystemSyncAccessHandle-truncate.https.tentative.worker.html",
+      "fs/FileSystemSyncAccessHandle-truncate.https.worker.html",
       {}
      ]
     ],
@@ -589815,7 +598701,7 @@
         ]
        ],
        "PopStateEvent.html": [
-        "5774c150f4275c6527c0457a2562db71a0c109cf",
+        "9ee75762493b04360af01cd3966ecf3500d03041",
         [
          null,
          {}
@@ -589857,7 +598743,7 @@
         ]
        ],
        "document-state.https.html": [
-        "609ce9b850369fae857c3e407cfbbaccaf381067",
+        "f03efc3b6583d93803f96a7459a2aad869bb3727",
         [
          null,
          {}
@@ -591710,6 +600596,40 @@
          }
         ]
        ],
+       "getRequestHeaders.window.js": [
+        "90610e27fb83d643fa6c2a376ecf7609195c626c",
+        [
+         "html/browsers/browsing-the-web/remote-context-helper-tests/getRequestHeaders.window.html",
+         {
+          "script_metadata": [
+           [
+            "title",
+            "RemoteContextHelper with defaults"
+           ],
+           [
+            "script",
+            "/common/dispatcher/dispatcher.js"
+           ],
+           [
+            "script",
+            "/common/get-host-info.sub.js"
+           ],
+           [
+            "script",
+            "/common/utils.js"
+           ],
+           [
+            "script",
+            "/html/browsers/browsing-the-web/remote-context-helper/resources/remote-context-helper.js"
+           ],
+           [
+            "script",
+            "./resources/test-helper.js"
+           ]
+          ]
+         }
+        ]
+       ],
        "navigateToNew.window.js": [
         "f7dd3f8325a5fcbd9feffc191b4d97ffcef625b1",
         [
@@ -595572,7 +604492,7 @@
         }
        ]
       ],
-      "dangling-markup-window-name.tentative.html": [
+      "dangling-markup-window-name.html": [
        "1bc8bb9f7ff558f60bda1dbacda617e34dfe2d19",
        [
         null,
@@ -595822,6 +604742,318 @@
         {}
        ]
       ],
+      "canvas-context": {
+       "2d.canvas.context.exists.html": [
+        "1c44acbd549c71b80c386344339b6fb5d0b7004c",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.context.extraargs.cache.html": [
+        "f4db40815dcc518a75f1568ab1cfc21ba0cf9db5",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.context.extraargs.create.html": [
+        "6ae7f787c6adeceabc3dfe37a981cf07eb46de2e",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.context.invalid.args.html": [
+        "cfa58266eacf75b9a68c1bdd958426e5427f0e87",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.context.prototype.html": [
+        "5d5edc6864bc994a0b60a1fb80535598857fad40",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.context.shared.html": [
+        "fd8deddec02204fca5aeed3f57427c1a6cc28001",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.context.type.exists.html": [
+        "d25f009abbd049bfedf7b952e03fa15b0a93eced",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.context.type.extend.html": [
+        "8d34d5310197bcc4727592aac35da349437385c8",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.context.type.prototype.html": [
+        "a537fe5106cd7c3ddd5a0b91f1089493ae01ab3d",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.context.type.replace.html": [
+        "ac3c40587d1ba73410b2de408fdcbb4b629b0ef2",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.context.unique.html": [
+        "c7b1803856c9ad0b1bd55b8f34c5044b34af0b1d",
+        [
+         null,
+         {}
+        ]
+       ]
+      },
+      "canvas-host": {
+       "2d.canvas.host.initial.reset.2dstate.html": [
+        "e1940011989c98b352a690f5218d349b56697747",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.host.readonly.html": [
+        "cbbf32f2e2bd77ab112d6f80b6d2d578a9da0fc0",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.host.reference.html": [
+        "6a4bdb65b082180b4af66d1cbe38f85446f0a894",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.host.size.attributes.parse.decimal.html": [
+        "0de11e235dc2d49c1ee37ed1f44a7bb78b87d046",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.host.size.attributes.parse.em.html": [
+        "315c8323fa23b36fe5f0ba06e15e3d74b187e824",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.host.size.attributes.parse.empty.html": [
+        "b9568712e7151aed44548f3161a29888812e4566",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.host.size.attributes.parse.exp.html": [
+        "208ddeceeb080d3dc8ca0a9592d20e86ccb139c6",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.host.size.attributes.parse.hex.html": [
+        "05f7030d47f89a7664945328c3d4395136debbf7",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.host.size.attributes.parse.junk.html": [
+        "3a55fd13dd04fea2b4a3eb26e79841771936050c",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.host.size.attributes.parse.minus.html": [
+        "da5f21ad0456de30a8f66f07e23dd46c2d9f81c8",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.host.size.attributes.parse.octal.html": [
+        "ccc7efaafa902ee2a3dd5aa492a6b4fd4452b0dc",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.host.size.attributes.parse.onlyspace.html": [
+        "da14fa25c0f07b8043a885863d656b9e461ac33a",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.host.size.attributes.parse.percent.html": [
+        "d699288f73fcd75824fe3c6889fe5fc23479853a",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.host.size.attributes.parse.plus.html": [
+        "58fb07f17942ed68b078da4c42f35d83574e57dc",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.host.size.attributes.parse.space.html": [
+        "52fadaad431536f5389b1e174176c7e572f7d12b",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.host.size.attributes.parse.trailingjunk.html": [
+        "b18167c5991da6247516b111cb1ae484452fab62",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.host.size.attributes.parse.whitespace.html": [
+        "79e81c1020a85279ee119ebd2757c32bf89c10cb",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.host.size.attributes.parse.zero.html": [
+        "b7fd499d1fb4eecd34b55fd98cf5aa518504b2d8",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.host.size.attributes.setAttribute.decimal.html": [
+        "b6c2130bf0afec9b139d6b670c9ea2403d1e89ab",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.host.size.attributes.setAttribute.em.html": [
+        "f70713fd8f686bdd986bd779279a2fa113be4d46",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.host.size.attributes.setAttribute.empty.html": [
+        "fab2394fec29136e617f3a468d743c937cece6dc",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.host.size.attributes.setAttribute.exp.html": [
+        "cfa11eb302ff7f4dfaa5ab158f53e0fcede30306",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.host.size.attributes.setAttribute.hex.html": [
+        "80a1fbda602495340650c0793fc2877d83842a2d",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.host.size.attributes.setAttribute.junk.html": [
+        "b583871f38a65b42c3bc0738b9cbd0baca37bdba",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.host.size.attributes.setAttribute.minus.html": [
+        "90a31403e104ff9719b3079b27e98c294466b6f6",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.host.size.attributes.setAttribute.octal.html": [
+        "c5b263bd5faa2556f2e245f23f72dbc7aae13e8a",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.host.size.attributes.setAttribute.onlyspace.html": [
+        "ac4cdb001b96647e156e432ded75a4d65ce9699d",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.host.size.attributes.setAttribute.percent.html": [
+        "5aebf5a0b1144c20d4e92858a0d67b35aa59987a",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.host.size.attributes.setAttribute.plus.html": [
+        "60da44daf3256d7a01552ec63bac16fec521d506",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.host.size.attributes.setAttribute.space.html": [
+        "fbfd4c33c0474a98c42b4794c53b42c1abb3afa1",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.host.size.attributes.setAttribute.trailingjunk.html": [
+        "1d230bd654b2bca4019c4378d8fe893a05347fd8",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.host.size.attributes.setAttribute.whitespace.html": [
+        "1aa86d6a9eb387fb5a95b1a5c0fa795fb8d8039c",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.host.size.attributes.setAttribute.zero.html": [
+        "64b4811d79a0edb73dc426927da10b3b5be2abac",
+        [
+         null,
+         {}
+        ]
+       ]
+      },
       "compositing": {
        "2d.composite.canvas.clear.html": [
         "cb805b692e2d61232f81bc603f17459c5091969c",
@@ -602390,7 +611622,7 @@
         ]
        ],
        "2d.text.drawing.style.letterSpacing.measure.html": [
-        "611ea0b2f0af6618786b6d78191d5d0a359fef6a",
+        "0e4848b6fe64c360513effc54afb846687f6bb25",
         [
          null,
          {}
@@ -602439,7 +611671,7 @@
         ]
        ],
        "2d.text.drawing.style.wordSpacing.measure.html": [
-        "802646d03017cb718800b929bd0bdd8da73b2c9b",
+        "2562477d944745ada0adc408bc953a729b8ac723",
         [
          null,
          {}
@@ -602529,6 +611761,13 @@
          {}
         ]
        ],
+       "2d.text.fontVariantCaps2.html": [
+        "56efbb6fd3a990b04163889dcd0010538c714a5f",
+        [
+         null,
+         {}
+        ]
+       ],
        "2d.text.measure.actualBoundingBox.html": [
         "d0672b23dcd3f4902f1ca6375a3be62560f96902",
         [
@@ -602620,6 +611859,13 @@
          {}
         ]
        ],
+       "2d.text.setFont.mathFont.html": [
+        "370104f1b845238a7d2e098e97f2a14449151136",
+        [
+         null,
+         {}
+        ]
+       ],
        "parent-style-relative-units.html": [
         "b9a6b314c6ff2b8cff34740ef13d708ecdc976eb",
         [
@@ -603051,6 +612297,637 @@
         {}
        ]
       ],
+      "canvas-context": {
+       "2d.canvas.context.arguments.missing.html": [
+        "0c9fdc96393c7d192d5553bdf453753c7e3e14ac",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.context.arguments.missing.worker.js": [
+        "1b5c857a793fd30acc983071a6f2baa593c86abc",
+        [
+         "html/canvas/offscreen/canvas-context/2d.canvas.context.arguments.missing.worker.html",
+         {}
+        ]
+       ],
+       "2d.canvas.context.casesensitive.html": [
+        "aed71a37e95efb8f6ccb37a107bc15fca6425bbf",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.context.casesensitive.worker.js": [
+        "c1df3a9f8086a8baf9cd741930a3509bb4e944cd",
+        [
+         "html/canvas/offscreen/canvas-context/2d.canvas.context.casesensitive.worker.html",
+         {}
+        ]
+       ],
+       "2d.canvas.context.emptystring.html": [
+        "10548a6b7c660f14db48ec49136efc0ac8d6976a",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.context.emptystring.worker.js": [
+        "53a58c1f5dea79e4c58bfbd62b38940e1e5c1c77",
+        [
+         "html/canvas/offscreen/canvas-context/2d.canvas.context.emptystring.worker.html",
+         {}
+        ]
+       ],
+       "2d.canvas.context.exists.html": [
+        "41b5cfee311334cdb35e5721b88f4bc93a11e427",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.context.exists.worker.js": [
+        "77a43530a04636635cca71221f577df7a56e5337",
+        [
+         "html/canvas/offscreen/canvas-context/2d.canvas.context.exists.worker.html",
+         {}
+        ]
+       ],
+       "2d.canvas.context.extraargs.cache.html": [
+        "2bcf34490ea9ca75d49191ccdf7188eb8797d5f5",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.context.extraargs.cache.worker.js": [
+        "14284a0a7d7c1c5931f0ff82ad6e02ca1274d7b9",
+        [
+         "html/canvas/offscreen/canvas-context/2d.canvas.context.extraargs.cache.worker.html",
+         {}
+        ]
+       ],
+       "2d.canvas.context.extraargs.create.html": [
+        "029122355c9c8ccaff5e48fc50da707ff5baf236",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.context.extraargs.create.worker.js": [
+        "b4208edba8cffa2ffdb249b80189aae88573582c",
+        [
+         "html/canvas/offscreen/canvas-context/2d.canvas.context.extraargs.create.worker.html",
+         {}
+        ]
+       ],
+       "2d.canvas.context.shared.html": [
+        "cb9501747eec2c5fde1a63eae5546a64154b1179",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.context.shared.worker.js": [
+        "8e53475756329718e26e95d5c7d5127cce8a4ff7",
+        [
+         "html/canvas/offscreen/canvas-context/2d.canvas.context.shared.worker.html",
+         {}
+        ]
+       ],
+       "2d.canvas.context.unique.html": [
+        "66e4a049baad4b090ca18664782f5197d842ebce",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.context.unique.worker.js": [
+        "275e45fde64266a3b8d7474f93e8af615eec1ed9",
+        [
+         "html/canvas/offscreen/canvas-context/2d.canvas.context.unique.worker.html",
+         {}
+        ]
+       ],
+       "2d.canvas.context.unrecognised.badname.html": [
+        "4313f408437e360a08c5d5264b87a46036b2a9ca",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.context.unrecognised.badname.worker.js": [
+        "dd16f2fbe1108751f07d1d7a0d05064ffc849995",
+        [
+         "html/canvas/offscreen/canvas-context/2d.canvas.context.unrecognised.badname.worker.html",
+         {}
+        ]
+       ],
+       "2d.canvas.context.unrecognised.badsuffix.html": [
+        "c00afa686edd563972620ec5717f252cc57dd347",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.context.unrecognised.badsuffix.worker.js": [
+        "5e684c92c72acd87b4c84d48ec6778dbd3553a62",
+        [
+         "html/canvas/offscreen/canvas-context/2d.canvas.context.unrecognised.badsuffix.worker.html",
+         {}
+        ]
+       ],
+       "2d.canvas.context.unrecognised.nullsuffix.html": [
+        "0ce3d4195e0d19cd882e2019ec1455e83d01613f",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.context.unrecognised.nullsuffix.worker.js": [
+        "2886010fb644a69ea5e3c96050560a450cb500f2",
+        [
+         "html/canvas/offscreen/canvas-context/2d.canvas.context.unrecognised.nullsuffix.worker.html",
+         {}
+        ]
+       ],
+       "2d.canvas.context.unrecognised.unicode.html": [
+        "316123675ad75e31a85c0286760d374c7f316e90",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.context.unrecognised.unicode.worker.js": [
+        "46e562dd486835e28b41c6215273ebc8f8d4c21e",
+        [
+         "html/canvas/offscreen/canvas-context/2d.canvas.context.unrecognised.unicode.worker.html",
+         {}
+        ]
+       ],
+       "2d.getContext.options.any.js": [
+        "930f7722ee0eae02674c6773751d04c69f4bb384",
+        [
+         "html/canvas/offscreen/canvas-context/2d.getContext.options.any.html",
+         {}
+        ],
+        [
+         "html/canvas/offscreen/canvas-context/2d.getContext.options.any.worker.html",
+         {}
+        ]
+       ]
+      },
+      "canvas-host": {
+       "2d.canvas.host.initial.color.html": [
+        "0793c74f398cff50cb234a4aff6ca2e058a04a10",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.host.initial.color.worker.js": [
+        "11d6b9f098e7bed4c47c2aa9dbd9ace9f4b29764",
+        [
+         "html/canvas/offscreen/canvas-host/2d.canvas.host.initial.color.worker.html",
+         {}
+        ]
+       ],
+       "2d.canvas.host.initial.reset.2dstate.html": [
+        "36230dab7735685ef0c4714aff07f42a3edd995e",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.host.initial.reset.2dstate.worker.js": [
+        "df0bd9f63cb6e2df735b7d321f16e86c4adbe7b0",
+        [
+         "html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.2dstate.worker.html",
+         {}
+        ]
+       ],
+       "2d.canvas.host.initial.reset.clip.html": [
+        "fc5324079570839bc544a558e22a55265289dda0",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.host.initial.reset.clip.worker.js": [
+        "80554b0a3fdf11bfda72bc92b4d2ce640f5f2395",
+        [
+         "html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.clip.worker.html",
+         {}
+        ]
+       ],
+       "2d.canvas.host.initial.reset.different.html": [
+        "3771a5e37a94b329f6c880ef33a0077b2e25d8f1",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.host.initial.reset.different.worker.js": [
+        "6074d4f2a2c88eda4d8f91fd0b931fda6bbb7f01",
+        [
+         "html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.different.worker.html",
+         {}
+        ]
+       ],
+       "2d.canvas.host.initial.reset.gradient.html": [
+        "387b4d1f1ed6037dc2cefd9fee3819edba30841c",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.host.initial.reset.gradient.worker.js": [
+        "9029b48056fa03e60236505b159f067bb689d9d8",
+        [
+         "html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.gradient.worker.html",
+         {}
+        ]
+       ],
+       "2d.canvas.host.initial.reset.path.html": [
+        "3a887a8f1ffe5148f2b4ef6e711787363d0d2fa6",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.host.initial.reset.path.worker.js": [
+        "0ab12872aee4a3ce6b0e9122e7222661e543d38e",
+        [
+         "html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.path.worker.html",
+         {}
+        ]
+       ],
+       "2d.canvas.host.initial.reset.pattern.html": [
+        "d822f90917fb7b58cd0ccbdee3307a7384643b0c",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.host.initial.reset.pattern.worker.js": [
+        "c4870a6f998b9b63d90c37613dd2cbce5d0e3e02",
+        [
+         "html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.pattern.worker.html",
+         {}
+        ]
+       ],
+       "2d.canvas.host.initial.reset.same.html": [
+        "19394def373c881d3ad9c35b51fa5a67a640db13",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.host.initial.reset.same.worker.js": [
+        "48d24750ac4e85e638c8b6ad6e9386b3f68b61d3",
+        [
+         "html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.same.worker.html",
+         {}
+        ]
+       ],
+       "2d.canvas.host.initial.reset.transform.html": [
+        "ee3b5abf107738b1d433ff3d9f59f9ffc93dc2a6",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.host.initial.reset.transform.worker.js": [
+        "218e64fa5dc34070ec5b84b2f3b86edceadc256f",
+        [
+         "html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.transform.worker.html",
+         {}
+        ]
+       ],
+       "2d.canvas.host.readonly.html": [
+        "0e7e10cd242adf6d09ea41e0ca6df4f39d3182a9",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.host.readonly.worker.js": [
+        "bbe50dcf61f461ceb3d7e1887d0c4049bf3292ae",
+        [
+         "html/canvas/offscreen/canvas-host/2d.canvas.host.readonly.worker.html",
+         {}
+        ]
+       ],
+       "2d.canvas.host.reference.html": [
+        "b5de73f403d88c2e4b3cad691c56c56c37464715",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.host.reference.worker.js": [
+        "7a1f0c5ab498a3c7acb9cd17c71561fce0b73088",
+        [
+         "html/canvas/offscreen/canvas-host/2d.canvas.host.reference.worker.html",
+         {}
+        ]
+       ],
+       "2d.canvas.host.size.attributes.default.html": [
+        "dc7b894b207356fd422333ec1a91f89d9aa68462",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.host.size.attributes.default.worker.js": [
+        "78fce5aef8d510a1366cec79a6ace66c1e53cfbf",
+        [
+         "html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.default.worker.html",
+         {}
+        ]
+       ],
+       "2d.canvas.host.size.attributes.idl.html": [
+        "7030103524caeb33d53d717624de77515924bfa1",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.host.size.attributes.idl.set.zero.html": [
+        "347c460cd7ef44f8ea78658f0d8d923b9244cea0",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.host.size.attributes.idl.set.zero.worker.js": [
+        "21535da0eb335eec3f73548d8350fc946d8e1726",
+        [
+         "html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.idl.set.zero.worker.html",
+         {}
+        ]
+       ],
+       "2d.canvas.host.size.attributes.idl.worker.js": [
+        "a00201f18cc59687e75881b3763e1869b14c8ee8",
+        [
+         "html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.idl.worker.html",
+         {}
+        ]
+       ],
+       "2d.canvas.host.size.attributes.parse.decimal.html": [
+        "c3fa3b4ba6674396ff12f9adfe55dd4400bc87bc",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.host.size.attributes.parse.decimal.worker.js": [
+        "1267bb205a94034bb790e7aa0910f0fcdfce763b",
+        [
+         "html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.decimal.worker.html",
+         {}
+        ]
+       ],
+       "2d.canvas.host.size.attributes.parse.em.html": [
+        "ea6f811b8ff5faa5f000887b57dfd6f3f861525d",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.host.size.attributes.parse.em.worker.js": [
+        "2f0642d99790ab1009709051bc6f5c9d61c8830a",
+        [
+         "html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.em.worker.html",
+         {}
+        ]
+       ],
+       "2d.canvas.host.size.attributes.parse.empty.html": [
+        "d38c159a6e3486c0d96a0b0abae938af1c2d771f",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.host.size.attributes.parse.empty.worker.js": [
+        "b1eee3a5b226f1627e243537e4f70f6c3ec72eb3",
+        [
+         "html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.empty.worker.html",
+         {}
+        ]
+       ],
+       "2d.canvas.host.size.attributes.parse.exp.html": [
+        "2aa8245a49c7c1e111662a7ad67eb7751ab10610",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.host.size.attributes.parse.exp.worker.js": [
+        "8c8b4cc715efae513b7d5071b55084d5013d2361",
+        [
+         "html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.exp.worker.html",
+         {}
+        ]
+       ],
+       "2d.canvas.host.size.attributes.parse.hex.html": [
+        "4b0e47b53f5112413e352c2c90a0d6d6ad503de5",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.host.size.attributes.parse.hex.worker.js": [
+        "b685aaffa2d9c5d99c8c03e6ee1b77a7ef832aa4",
+        [
+         "html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.hex.worker.html",
+         {}
+        ]
+       ],
+       "2d.canvas.host.size.attributes.parse.junk.html": [
+        "a619651f781251fb3ae8945cd34795b78978f1a9",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.host.size.attributes.parse.junk.worker.js": [
+        "f4822f4bd954618d238c15fa2db7724d3649a8dc",
+        [
+         "html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.junk.worker.html",
+         {}
+        ]
+       ],
+       "2d.canvas.host.size.attributes.parse.minus.html": [
+        "c7f12fdb021465e89e0c7fae8788429336cebf27",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.host.size.attributes.parse.minus.worker.js": [
+        "322b992eda24947c04e3eff3c5dec6e3133f37f7",
+        [
+         "html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.minus.worker.html",
+         {}
+        ]
+       ],
+       "2d.canvas.host.size.attributes.parse.octal.html": [
+        "7bfb7658d4d479437ab724a8004ea5e6aecbe263",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.host.size.attributes.parse.octal.worker.js": [
+        "ce518e35c7ad6b4305c6c0dacec11630feb74835",
+        [
+         "html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.octal.worker.html",
+         {}
+        ]
+       ],
+       "2d.canvas.host.size.attributes.parse.onlyspace.html": [
+        "16dace16ea96f83e09cd5eb10dc3a0d8548b591c",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.host.size.attributes.parse.onlyspace.worker.js": [
+        "c186a4c08bab5f604b843c9ebd936fe62202cc3d",
+        [
+         "html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.onlyspace.worker.html",
+         {}
+        ]
+       ],
+       "2d.canvas.host.size.attributes.parse.percent.html": [
+        "040a775ec7a2820347558f6bb9f0c1d34042e0f9",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.host.size.attributes.parse.percent.worker.js": [
+        "f38a1862d41aecfd3052f73d2df76eff0b0c8a15",
+        [
+         "html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.percent.worker.html",
+         {}
+        ]
+       ],
+       "2d.canvas.host.size.attributes.parse.plus.html": [
+        "50c8467e2cdc5ff20e462b3271ac5e7d11cef846",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.host.size.attributes.parse.plus.worker.js": [
+        "bb45a1e4fa07954b54aa0b742e77571a99253ec0",
+        [
+         "html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.plus.worker.html",
+         {}
+        ]
+       ],
+       "2d.canvas.host.size.attributes.parse.space.html": [
+        "cb1f3ae840ad554fd2932886e1561dca479d60a7",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.host.size.attributes.parse.space.worker.js": [
+        "967a0939d806700df42c67481dbdb71a79a2a8de",
+        [
+         "html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.space.worker.html",
+         {}
+        ]
+       ],
+       "2d.canvas.host.size.attributes.parse.trailingjunk.html": [
+        "8d8d481aefaadedb376a872a68b2bb11691350d9",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.host.size.attributes.parse.trailingjunk.worker.js": [
+        "ffebcd97f1ec2aab95c5caf3951ed0c45ba9a4b3",
+        [
+         "html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.trailingjunk.worker.html",
+         {}
+        ]
+       ],
+       "2d.canvas.host.size.attributes.parse.whitespace.html": [
+        "f6e29d6cb61902db985c61dbfa72998a819b803d",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.host.size.attributes.parse.whitespace.worker.js": [
+        "fb7ba47975ae150e22e63908d9260ecb5a9660aa",
+        [
+         "html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.whitespace.worker.html",
+         {}
+        ]
+       ],
+       "2d.canvas.host.size.attributes.parse.zero.html": [
+        "07e924a6030a0b110047bbcd223931e5548dfde0",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.host.size.attributes.parse.zero.worker.js": [
+        "1363bff7728a1e6a091818f3588b8026eb8efcac",
+        [
+         "html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.zero.worker.html",
+         {}
+        ]
+       ],
+       "2d.canvas.host.size.attributes.reflect.setidl.html": [
+        "d24b2cc49ff9bbac98f3fc3f7b51a0847b19f36f",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.host.size.attributes.reflect.setidl.worker.js": [
+        "3b3ced124ab2bda792db0c00ce6dfc3e4fe18320",
+        [
+         "html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.reflect.setidl.worker.html",
+         {}
+        ]
+       ],
+       "2d.canvas.host.size.attributes.reflect.setidlzero.html": [
+        "c4839afb0e4c9bbf7e12a6960b629e5665c09994",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.host.size.attributes.reflect.setidlzero.worker.js": [
+        "d440a9d807a7877ce7af903f7de99112187fcc93",
+        [
+         "html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.reflect.setidlzero.worker.html",
+         {}
+        ]
+       ],
+       "2d.canvas.host.size.large.html": [
+        "b220f8f2edea11803098283367b624f97ec56869",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.canvas.host.size.large.worker.js": [
+        "a763704131a55f958c0971407c626d5437ec74ae",
+        [
+         "html/canvas/offscreen/canvas-host/2d.canvas.host.size.large.worker.html",
+         {}
+        ]
+       ]
+      },
       "compositing": {
        "2d.composite.canvas.clear.html": [
         "eac9dbdef9acf93a7be8f7322eba552edff52b16",
@@ -614800,14 +624677,14 @@
         ]
        ],
        "2d.text.drawing.style.letterSpacing.measure.html": [
-        "63169486badaa1bb44253141073fabf5343c52d7",
+        "a565770a1636cf77c616ee7722a5177cf5d4153c",
         [
          null,
          {}
         ]
        ],
        "2d.text.drawing.style.letterSpacing.measure.worker.js": [
-        "585166fca01f0b9398d000499bcbcd1d6d7a35d8",
+        "630bf1d486ecad509e81459d70dbee1eaa3c4403",
         [
          "html/canvas/offscreen/text/2d.text.drawing.style.letterSpacing.measure.worker.html",
          {}
@@ -614898,14 +624775,14 @@
         ]
        ],
        "2d.text.drawing.style.wordSpacing.measure.html": [
-        "69bf6e979c60473f05aa9697016748b80c453f8c",
+        "7a1d867d0fe0b8da10aa1c2e8e83db7d546dda23",
         [
          null,
          {}
         ]
        ],
        "2d.text.drawing.style.wordSpacing.measure.worker.js": [
-        "d899b8c32824718aae9010c458cd8c03d72a6a9a",
+        "b7acecb0ebb4bfd24d19c7823d46c5be140ea7e0",
         [
          "html/canvas/offscreen/text/2d.text.drawing.style.wordSpacing.measure.worker.html",
          {}
@@ -615051,6 +624928,20 @@
          {}
         ]
        ],
+       "2d.text.fontVariantCaps2.html": [
+        "e5bcff1831689321a0bd23983780769cce4e0669",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.text.fontVariantCaps2.worker.js": [
+        "89f4f48c7371f119098789c44d46e7a611664519",
+        [
+         "html/canvas/offscreen/text/2d.text.fontVariantCaps2.worker.html",
+         {}
+        ]
+       ],
        "2d.text.measure.actualBoundingBox.html": [
         "105efc07948a4de537689bb8bbc7ee1548f187bf",
         [
@@ -615516,635 +625407,6 @@
         ]
        ]
       },
-      "the-offscreen-canvas": {
-       "2d-getcontext-options.any.js": [
-        "930f7722ee0eae02674c6773751d04c69f4bb384",
-        [
-         "html/canvas/offscreen/the-offscreen-canvas/2d-getcontext-options.any.html",
-         {}
-        ],
-        [
-         "html/canvas/offscreen/the-offscreen-canvas/2d-getcontext-options.any.worker.html",
-         {}
-        ]
-       ],
-       "2d.canvas.readonly.html": [
-        "6bc6eef2efaabb9e7984e2ea701914cec584ca58",
-        [
-         null,
-         {}
-        ]
-       ],
-       "2d.canvas.readonly.worker.js": [
-        "068c2c2019d32dbe70f64ab6a8c0f8b2672f5425",
-        [
-         "html/canvas/offscreen/the-offscreen-canvas/2d.canvas.readonly.worker.html",
-         {}
-        ]
-       ],
-       "2d.canvas.reference.html": [
-        "c43afd816ae194940b4e1ffa8b9fb57a1b880c49",
-        [
-         null,
-         {}
-        ]
-       ],
-       "2d.canvas.reference.worker.js": [
-        "a1578af07c0bd5c710a0ae8c7cdc3eacf4f5dc40",
-        [
-         "html/canvas/offscreen/the-offscreen-canvas/2d.canvas.reference.worker.html",
-         {}
-        ]
-       ],
-       "2d.getcontext.exists.html": [
-        "73fc45c30969b3fb929fbb7267940e03a73e9612",
-        [
-         null,
-         {}
-        ]
-       ],
-       "2d.getcontext.exists.worker.js": [
-        "0ed6f242484b855ac6653d95532e44ae5bedd5ea",
-        [
-         "html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.exists.worker.html",
-         {}
-        ]
-       ],
-       "2d.getcontext.extraargs.cache.html": [
-        "2f57050a4d54293c5c4eefe402daa9dd3007dcb4",
-        [
-         null,
-         {}
-        ]
-       ],
-       "2d.getcontext.extraargs.cache.worker.js": [
-        "88540513ab36116bce0031b396199f5a5f82fdbd",
-        [
-         "html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.extraargs.cache.worker.html",
-         {}
-        ]
-       ],
-       "2d.getcontext.extraargs.create.html": [
-        "a2869c45f6a76ff503ed119c2d2f0dbdf75c3e6c",
-        [
-         null,
-         {}
-        ]
-       ],
-       "2d.getcontext.extraargs.create.worker.js": [
-        "21d4f8ce6ddcb0779ff938b4e0c6a45d660cae34",
-        [
-         "html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.extraargs.create.worker.html",
-         {}
-        ]
-       ],
-       "2d.getcontext.shared.html": [
-        "c37664f9d370d788218e28a2f1e593e106d2cb1a",
-        [
-         null,
-         {}
-        ]
-       ],
-       "2d.getcontext.shared.worker.js": [
-        "936ca03c27b3de0d92426d2ae1326846ef127e26",
-        [
-         "html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.shared.worker.html",
-         {}
-        ]
-       ],
-       "2d.getcontext.unique.html": [
-        "945526c5d183593f254da38eb022a715df5efbea",
-        [
-         null,
-         {}
-        ]
-       ],
-       "2d.getcontext.unique.worker.js": [
-        "fbf8e3c68d28881b2f0e58ad100d940e18f9bdcf",
-        [
-         "html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.unique.worker.html",
-         {}
-        ]
-       ],
-       "context.arguments.missing.html": [
-        "4d5478e893a98bc1d0b4b50fb41ba377b164a220",
-        [
-         null,
-         {}
-        ]
-       ],
-       "context.arguments.missing.worker.js": [
-        "f20db3ad753516da2480c847d5530e657507c501",
-        [
-         "html/canvas/offscreen/the-offscreen-canvas/context.arguments.missing.worker.html",
-         {}
-        ]
-       ],
-       "context.casesensitive.html": [
-        "6183607aac5daab865f3e4556b40c17faedbf12d",
-        [
-         null,
-         {}
-        ]
-       ],
-       "context.casesensitive.worker.js": [
-        "a834a3e13f99a4daacd8035bcb14ba94dec910ce",
-        [
-         "html/canvas/offscreen/the-offscreen-canvas/context.casesensitive.worker.html",
-         {}
-        ]
-       ],
-       "context.emptystring.html": [
-        "b898698bb7e39ed1ec7d562207a4cae75f0e325e",
-        [
-         null,
-         {}
-        ]
-       ],
-       "context.emptystring.worker.js": [
-        "df7d06df0c793e020ca73254bba2b8d7e5d37724",
-        [
-         "html/canvas/offscreen/the-offscreen-canvas/context.emptystring.worker.html",
-         {}
-        ]
-       ],
-       "context.unrecognised.badname.html": [
-        "5460fe10796a34b8f944d994b2d798545b1ba492",
-        [
-         null,
-         {}
-        ]
-       ],
-       "context.unrecognised.badname.worker.js": [
-        "8dfee5498204b6694907e9dd3b7edc8d30db90c0",
-        [
-         "html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.badname.worker.html",
-         {}
-        ]
-       ],
-       "context.unrecognised.badsuffix.html": [
-        "72624be12cb452e8cb904aa909bef22f746b2a9f",
-        [
-         null,
-         {}
-        ]
-       ],
-       "context.unrecognised.badsuffix.worker.js": [
-        "6cfcbc3c81b94080ab515f0370fe3e27ac0cf45f",
-        [
-         "html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.badsuffix.worker.html",
-         {}
-        ]
-       ],
-       "context.unrecognised.nullsuffix.html": [
-        "f36f7583fb950b72c3fb967d9e58534fcf4e85d1",
-        [
-         null,
-         {}
-        ]
-       ],
-       "context.unrecognised.nullsuffix.worker.js": [
-        "d9b563db61d5ed743b655eeabe9c28616e0b2e94",
-        [
-         "html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.nullsuffix.worker.html",
-         {}
-        ]
-       ],
-       "context.unrecognised.unicode.html": [
-        "f8176f58dfb84f6e13842898305f9723c7128cb0",
-        [
-         null,
-         {}
-        ]
-       ],
-       "context.unrecognised.unicode.worker.js": [
-        "2d02a794563939fa012e670d58970e35638f49d0",
-        [
-         "html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.unicode.worker.html",
-         {}
-        ]
-       ],
-       "initial.color.html": [
-        "d89b01df6689292836b35a00e626511b404d3693",
-        [
-         null,
-         {}
-        ]
-       ],
-       "initial.color.worker.js": [
-        "c9705727d99b462edde414be0ca491917b5e5bb9",
-        [
-         "html/canvas/offscreen/the-offscreen-canvas/initial.color.worker.html",
-         {}
-        ]
-       ],
-       "initial.reset.2dstate.html": [
-        "55954fc421af4f8ad9750b18b13c648bd2a02fbc",
-        [
-         null,
-         {}
-        ]
-       ],
-       "initial.reset.2dstate.worker.js": [
-        "dc0d6ea00b71b2be4fe4354cbe2d6f94709eb3d5",
-        [
-         "html/canvas/offscreen/the-offscreen-canvas/initial.reset.2dstate.worker.html",
-         {}
-        ]
-       ],
-       "initial.reset.clip.html": [
-        "9b1354bdabff3963abe1c5ee4a9dacbd125946c1",
-        [
-         null,
-         {}
-        ]
-       ],
-       "initial.reset.clip.worker.js": [
-        "d774aad6c81009dff420aa8f07e114b9c86ed4c5",
-        [
-         "html/canvas/offscreen/the-offscreen-canvas/initial.reset.clip.worker.html",
-         {}
-        ]
-       ],
-       "initial.reset.different.html": [
-        "a5c891ff1443873a82ab7cb452cc746abd4a2464",
-        [
-         null,
-         {}
-        ]
-       ],
-       "initial.reset.different.worker.js": [
-        "dc8f4bd146d16da642c90ff951b15ef49a09641c",
-        [
-         "html/canvas/offscreen/the-offscreen-canvas/initial.reset.different.worker.html",
-         {}
-        ]
-       ],
-       "initial.reset.gradient.html": [
-        "8b734d19b4b00cecce8d443ca7e22b0e5b7bfa0c",
-        [
-         null,
-         {}
-        ]
-       ],
-       "initial.reset.gradient.worker.js": [
-        "dabc013fed6e0cc7a63e2d6cb3b2076c2d1beea4",
-        [
-         "html/canvas/offscreen/the-offscreen-canvas/initial.reset.gradient.worker.html",
-         {}
-        ]
-       ],
-       "initial.reset.path.html": [
-        "24b7ff22fb9dbc4b637552baed2fc1c7b7dbd25e",
-        [
-         null,
-         {}
-        ]
-       ],
-       "initial.reset.path.worker.js": [
-        "6535232414946a14d98eb475bca621c9a2357cf8",
-        [
-         "html/canvas/offscreen/the-offscreen-canvas/initial.reset.path.worker.html",
-         {}
-        ]
-       ],
-       "initial.reset.pattern.html": [
-        "2742d8fb5ff827433347ce67c97bedc81ba7c62c",
-        [
-         null,
-         {}
-        ]
-       ],
-       "initial.reset.pattern.worker.js": [
-        "a69f36e8736974b45286f6e00d37fa2e8e181b33",
-        [
-         "html/canvas/offscreen/the-offscreen-canvas/initial.reset.pattern.worker.html",
-         {}
-        ]
-       ],
-       "initial.reset.same.html": [
-        "137dcbd556eaf2131a7d633ba7324d060f3d4747",
-        [
-         null,
-         {}
-        ]
-       ],
-       "initial.reset.same.worker.js": [
-        "fd3c46482baddbadf5cb16c09689a16ac9aa84ba",
-        [
-         "html/canvas/offscreen/the-offscreen-canvas/initial.reset.same.worker.html",
-         {}
-        ]
-       ],
-       "initial.reset.transform.html": [
-        "d09f8f928f47b699e22185ce844719f4ab8181df",
-        [
-         null,
-         {}
-        ]
-       ],
-       "initial.reset.transform.worker.js": [
-        "564a3bd82f4252eb4d18b146030cb5341c29740f",
-        [
-         "html/canvas/offscreen/the-offscreen-canvas/initial.reset.transform.worker.html",
-         {}
-        ]
-       ],
-       "size.attributes.default.html": [
-        "52ddf116e61f78dd0e7768827b974f5da6cb35e7",
-        [
-         null,
-         {}
-        ]
-       ],
-       "size.attributes.default.worker.js": [
-        "83e0271f1ab085fa7bec8e16a5deb0c0e4608ed6",
-        [
-         "html/canvas/offscreen/the-offscreen-canvas/size.attributes.default.worker.html",
-         {}
-        ]
-       ],
-       "size.attributes.idl.html": [
-        "a815a7beb49e7e873dc6466693cb8a25b8443373",
-        [
-         null,
-         {}
-        ]
-       ],
-       "size.attributes.idl.set.zero.html": [
-        "5a069f3c014358c925557f80e9f9661ac3924468",
-        [
-         null,
-         {}
-        ]
-       ],
-       "size.attributes.idl.set.zero.worker.js": [
-        "d51258ac2a4639ea15be2c0f5aa12d08e10c298c",
-        [
-         "html/canvas/offscreen/the-offscreen-canvas/size.attributes.idl.set.zero.worker.html",
-         {}
-        ]
-       ],
-       "size.attributes.idl.worker.js": [
-        "931b95cb65c1a640886075e860aba273ffeed7a5",
-        [
-         "html/canvas/offscreen/the-offscreen-canvas/size.attributes.idl.worker.html",
-         {}
-        ]
-       ],
-       "size.attributes.parse.decimal.html": [
-        "688d80b2fa650127e0564b4dba0eafa085b7219f",
-        [
-         null,
-         {}
-        ]
-       ],
-       "size.attributes.parse.decimal.worker.js": [
-        "157bd613bbc0bc31ea2e29ab59823487ac9e5913",
-        [
-         "html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.decimal.worker.html",
-         {}
-        ]
-       ],
-       "size.attributes.parse.em.html": [
-        "2e5056aad0d4ba426afbed2ce3e6b62c99cd54d8",
-        [
-         null,
-         {}
-        ]
-       ],
-       "size.attributes.parse.em.worker.js": [
-        "b939765ee4e26834d0e872737357652b61b21adb",
-        [
-         "html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.em.worker.html",
-         {}
-        ]
-       ],
-       "size.attributes.parse.empty.html": [
-        "7755f9d0db2bc68fc01473390a540977abaf490b",
-        [
-         null,
-         {}
-        ]
-       ],
-       "size.attributes.parse.empty.worker.js": [
-        "72fcd9f6e5a2d7917952a9c6a5323c763db0f22f",
-        [
-         "html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.empty.worker.html",
-         {}
-        ]
-       ],
-       "size.attributes.parse.exp.html": [
-        "0a2f0125834f33bc1cc38be58522a78210001019",
-        [
-         null,
-         {}
-        ]
-       ],
-       "size.attributes.parse.exp.worker.js": [
-        "0b7d5f2b9759bf719ddf12f889adac2d5ce3813a",
-        [
-         "html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.exp.worker.html",
-         {}
-        ]
-       ],
-       "size.attributes.parse.hex.html": [
-        "5a8990183a4b002bbf8f014cbdc98711385e708c",
-        [
-         null,
-         {}
-        ]
-       ],
-       "size.attributes.parse.hex.worker.js": [
-        "1edd0edee65ac0815a04f11b7a9cb191dfb0b4f4",
-        [
-         "html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.hex.worker.html",
-         {}
-        ]
-       ],
-       "size.attributes.parse.junk.html": [
-        "10d2e20388fd013756f9422cd8183ddca32791d4",
-        [
-         null,
-         {}
-        ]
-       ],
-       "size.attributes.parse.junk.worker.js": [
-        "c7e18d12cb5d424865cafd6b205b9ff6138b1fcf",
-        [
-         "html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.junk.worker.html",
-         {}
-        ]
-       ],
-       "size.attributes.parse.minus.html": [
-        "2a7d5d1296839693ecd7eab5cf8120e819d945f1",
-        [
-         null,
-         {}
-        ]
-       ],
-       "size.attributes.parse.minus.worker.js": [
-        "9680f90776604b746c798eb6ec07171932421653",
-        [
-         "html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.minus.worker.html",
-         {}
-        ]
-       ],
-       "size.attributes.parse.octal.html": [
-        "3d9c2fb0443767ab81087f89c0ff9b38a4b98185",
-        [
-         null,
-         {}
-        ]
-       ],
-       "size.attributes.parse.octal.worker.js": [
-        "2925361e3b33b0c0659181af0293f0f749177568",
-        [
-         "html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.octal.worker.html",
-         {}
-        ]
-       ],
-       "size.attributes.parse.onlyspace.html": [
-        "821de438aa41cbe2a680f193784b90f9b635f7a4",
-        [
-         null,
-         {}
-        ]
-       ],
-       "size.attributes.parse.onlyspace.worker.js": [
-        "e5fadf13c8eef7c55a788a78dde0ffa5872848d3",
-        [
-         "html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.onlyspace.worker.html",
-         {}
-        ]
-       ],
-       "size.attributes.parse.percent.html": [
-        "58748103a4f876352315d6fb7fcc871478acf2cc",
-        [
-         null,
-         {}
-        ]
-       ],
-       "size.attributes.parse.percent.worker.js": [
-        "acbd2a1354814255d12cf59a61e8b1e8aae773b4",
-        [
-         "html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.percent.worker.html",
-         {}
-        ]
-       ],
-       "size.attributes.parse.plus.html": [
-        "45558293b6228b7ac06c4470ddd128665a2a2671",
-        [
-         null,
-         {}
-        ]
-       ],
-       "size.attributes.parse.plus.worker.js": [
-        "ecf67976769f06186527a4567b10c7688bc00c7f",
-        [
-         "html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.plus.worker.html",
-         {}
-        ]
-       ],
-       "size.attributes.parse.space.html": [
-        "b0d63a4694f3f0b047929a60620f059d3550412f",
-        [
-         null,
-         {}
-        ]
-       ],
-       "size.attributes.parse.space.worker.js": [
-        "11ac398b0d42e9e20f0f2165382ece487c7843f0",
-        [
-         "html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.space.worker.html",
-         {}
-        ]
-       ],
-       "size.attributes.parse.trailingjunk.html": [
-        "536ea901d0e8e7fc79249c774d5bc36b3ca870f8",
-        [
-         null,
-         {}
-        ]
-       ],
-       "size.attributes.parse.trailingjunk.worker.js": [
-        "1d1c5e7f28dcc58aff8e15696584e3aa206aeb39",
-        [
-         "html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.trailingjunk.worker.html",
-         {}
-        ]
-       ],
-       "size.attributes.parse.whitespace.html": [
-        "53a3a2e6055b3cf33190dc84e84ce09dfb69186f",
-        [
-         null,
-         {}
-        ]
-       ],
-       "size.attributes.parse.whitespace.worker.js": [
-        "26296e10234ff4701837726d5e33346832261fe8",
-        [
-         "html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.whitespace.worker.html",
-         {}
-        ]
-       ],
-       "size.attributes.parse.zero.html": [
-        "1af0d2a61e246fa9678c8dd86ad4a486fca16090",
-        [
-         null,
-         {}
-        ]
-       ],
-       "size.attributes.parse.zero.worker.js": [
-        "5348bf6a83c94f147bc9fbcf253067000712e096",
-        [
-         "html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.zero.worker.html",
-         {}
-        ]
-       ],
-       "size.attributes.reflect.setidl.html": [
-        "997bf974ad839bf0fb7a5305f3cc89a773969234",
-        [
-         null,
-         {}
-        ]
-       ],
-       "size.attributes.reflect.setidl.worker.js": [
-        "9555f665ab391f044366429a147bca78adee399b",
-        [
-         "html/canvas/offscreen/the-offscreen-canvas/size.attributes.reflect.setidl.worker.html",
-         {}
-        ]
-       ],
-       "size.attributes.reflect.setidlzero.html": [
-        "50e9096fdd43063d52eb1dbac029dc28afe4a67e",
-        [
-         null,
-         {}
-        ]
-       ],
-       "size.attributes.reflect.setidlzero.worker.js": [
-        "e412b7a5142b780577679a0513a8f481a056dbbe",
-        [
-         "html/canvas/offscreen/the-offscreen-canvas/size.attributes.reflect.setidlzero.worker.html",
-         {}
-        ]
-       ],
-       "size.large.html": [
-        "46b8a055bb3bde2f553fefdc19ad6fbd20e35e73",
-        [
-         null,
-         {}
-        ]
-       ],
-       "size.large.worker.js": [
-        "6a5bb5ee7e06719096b3a33f9acbff2768285e03",
-        [
-         "html/canvas/offscreen/the-offscreen-canvas/size.large.worker.html",
-         {}
-        ]
-       ]
-      },
       "transformations": {
        "2d.transformation.order.html": [
         "d438c274338886941fd28d302316eca646a29349",
@@ -620769,6 +630031,13 @@
          {}
         ]
        ],
+       "dir-assorted.window.js": [
+        "d65cba7421cba3f9966310a9f3aabd09fa27d075",
+        [
+         "html/dom/elements/global-attributes/dir-assorted.window.html",
+         {}
+        ]
+       ],
        "dir-auto-div-append-child.html": [
         "e69f64b3a9abdf3dd4e8184897f1c2ad01b9f314",
         [
@@ -620776,6 +630045,13 @@
          {}
         ]
        ],
+       "dir-auto-dynamic-changes.window.js": [
+        "a0cf4aae7bad32420b0eb72dbf5c8310d2cce9d4",
+        [
+         "html/dom/elements/global-attributes/dir-auto-dynamic-changes.window.html",
+         {}
+        ]
+       ],
        "dir-bdi-script.html": [
         "30080430936213b034e09a2cb3fee14608350373",
         [
@@ -620784,7 +630060,7 @@
         ]
        ],
        "dir-slots-directionality.tentative.html": [
-        "1f0dc07f8ef5c1ef5a2bf2ee955285ec33f2d639",
+        "5e8cedb9c156f7c3f83d6e22af46e31cc1ed5874",
         [
          null,
          {}
@@ -621049,7 +630325,7 @@
       ]
      ],
      "idlharness-shadowrealm.window.js": [
-      "cb9449acb1bd02544467b575f0194afc14c91383",
+      "ef71b74e50984fbfb9a397296150227cecb7c15a",
       [
        "html/dom/idlharness-shadowrealm.window.html",
        {
@@ -623907,6 +633183,15 @@
         ]
        ]
       },
+      "setSequentialFocusStartingPoint.tentative.html": [
+       "a7c7506b13b636297cf5a026358457a062d86b3f",
+       [
+        null,
+        {
+         "testdriver": true
+        }
+       ]
+      ],
       "tabindex-focus-flag.html": [
        "93fdb19a592ff632405c338256082043ae608002",
        [
@@ -624117,6 +633402,22 @@
         ]
        ]
       }
+     },
+     "stylesheet": {
+      "quirk-origin-check-recursive-import.html": [
+       "c0053f1f29ad8f23dbebdd41b38dbdd8537e9e27",
+       [
+        null,
+        {}
+       ]
+      ],
+      "quirk-origin-check.html": [
+       "89adcb428fa2bb59f8241fcc271e27d4460e06a8",
+       [
+        null,
+        {}
+       ]
+      ]
      }
     },
     "obsolete": {
@@ -624283,7 +633584,7 @@
        ]
       },
       "hidden-elements.html": [
-       "4286681addd09cbd9df8491ec618ccadd55a8c0b",
+       "e1bcf508e5d91348f3963792df2ca03a71e8ebaf",
        [
         null,
         {}
@@ -624988,6 +634289,34 @@
         ]
        ]
       },
+      "form-sizing-input-number.tentative.html": [
+       "59835805a07148061b3e37b12d98d345a7f6b4cb",
+       [
+        null,
+        {}
+       ]
+      ],
+      "form-sizing-input-text.tentative.html": [
+       "32cabc557f6fc2d7cc22dcfa5eac7bd9059d5615",
+       [
+        null,
+        {}
+       ]
+      ],
+      "form-sizing-select.tentative.html": [
+       "f9efdc74f9145b73d02e15105a9d19996d47d277",
+       [
+        null,
+        {}
+       ]
+      ],
+      "form-sizing-textarea.tentative.html": [
+       "ae20e59290c7d4d8bef9d36af583356f08819014",
+       [
+        null,
+        {}
+       ]
+      ],
       "input-date-no-resize-on-hover.html": [
        "74952ca239524b08890dc670c4972fa794bcfce4",
        [
@@ -625154,6 +634483,20 @@
        ]
       },
       "the-base-element": {
+       "base-data.html": [
+        "4905dd84ca10965ec9896403cc0d305c193a2c9b",
+        [
+         null,
+         {}
+        ]
+       ],
+       "base-javascript.html": [
+        "65d9c84fcf70f4f51c71179fd85dd4a298a88da1",
+        [
+         null,
+         {}
+        ]
+       ],
        "base_about_blank.html": [
         "54c4794549a35ee34011483aa5f24f1d0e585faa",
         [
@@ -626637,7 +635980,7 @@
        },
        "location-of-the-media-resource": {
         "currentSrc.html": [
-         "cd1ebb9e492673feb095a227e7ca04ceae7643b9",
+         "be4d09f739549825c56761adf2eb01c653c4bc45",
          [
           null,
           {}
@@ -627938,97 +637281,6 @@
          {}
         ]
        ],
-       "2d.canvas.context.html": [
-        "51cf0a2ec6d7d17731fc8407214cf3383adaac93",
-        [
-         null,
-         {}
-        ]
-       ],
-       "2d.canvas.readonly.html": [
-        "4b9e68108fe8f5faea7e6f9b343db9c973790a73",
-        [
-         null,
-         {}
-        ]
-       ],
-       "2d.canvas.reference.html": [
-        "182a0170a67b9a46f99829e2bf8a65b3330ccb30",
-        [
-         null,
-         {}
-        ]
-       ],
-       "2d.getcontext.exists.html": [
-        "a26bc4040c7d3940d5bb07ea358096fa9c630e7d",
-        [
-         null,
-         {}
-        ]
-       ],
-       "2d.getcontext.extraargs.cache.html": [
-        "eb47929a09f75d73743ccfd42041e575b36586ad",
-        [
-         null,
-         {}
-        ]
-       ],
-       "2d.getcontext.extraargs.create.html": [
-        "0683e459c4b37fea779de8314503710faf0b38ab",
-        [
-         null,
-         {}
-        ]
-       ],
-       "2d.getcontext.invalid.args.html": [
-        "c3407d0500352e4ec0edccf6527a4c6b062f67d4",
-        [
-         null,
-         {}
-        ]
-       ],
-       "2d.getcontext.shared.html": [
-        "54c1fd13fdedf29022153c4c7147289dbdfc25be",
-        [
-         null,
-         {}
-        ]
-       ],
-       "2d.getcontext.unique.html": [
-        "c6e8980a20c5ce596a95afaa5f5cd9f11a49df9e",
-        [
-         null,
-         {}
-        ]
-       ],
-       "2d.type.exists.html": [
-        "e2c09e60d742779e76b3da528d60e51382973b61",
-        [
-         null,
-         {}
-        ]
-       ],
-       "2d.type.extend.html": [
-        "151b40d36f493328f42ce7dc484221695963ed1a",
-        [
-         null,
-         {}
-        ]
-       ],
-       "2d.type.prototype.html": [
-        "24ee5068bd5823a85af101af9ee0ce15c3aab53d",
-        [
-         null,
-         {}
-        ]
-       ],
-       "2d.type.replace.html": [
-        "aa0ec1cff4d93b36d1a2bd1fb629147610d9c063",
-        [
-         null,
-         {}
-        ]
-       ],
        "canvas-descendants-focusability-001.html": [
         "327c9f49d6aeffc2b3eef49cc38c8a00ebf15f95",
         [
@@ -628155,13 +637407,6 @@
          {}
         ]
        ],
-       "initial.reset.2dstate.html": [
-        "a99cb5d3898e3ec9dd33e01aa9120e126931fcdf",
-        [
-         null,
-         {}
-        ]
-       ],
        "initial.reset.clip.html": [
         "ebf52bfa764a3431f11edea22ca485c6398aafb0",
         [
@@ -628386,111 +637631,6 @@
          {}
         ]
        ],
-       "size.attributes.parse.decimal.html": [
-        "613cf0e11a5821c7354f022bab7d028cf1b53252",
-        [
-         null,
-         {}
-        ]
-       ],
-       "size.attributes.parse.em.html": [
-        "21d9e6ab1e84504705c3c103ec466f7193eaf098",
-        [
-         null,
-         {}
-        ]
-       ],
-       "size.attributes.parse.empty.html": [
-        "7198ccd3abf8c32426a4a6cd7fe05d4cdec70e00",
-        [
-         null,
-         {}
-        ]
-       ],
-       "size.attributes.parse.exp.html": [
-        "c609939640b3820941b6cffedb1e71bf25874b46",
-        [
-         null,
-         {}
-        ]
-       ],
-       "size.attributes.parse.hex.html": [
-        "a00bb3c4ea2f1900a6fed23f38d5364d434a28e1",
-        [
-         null,
-         {}
-        ]
-       ],
-       "size.attributes.parse.junk.html": [
-        "7b4f837600dbd6ad9c3354a1e32e6bda10aa376b",
-        [
-         null,
-         {}
-        ]
-       ],
-       "size.attributes.parse.minus.html": [
-        "6d6560b8db92779896450033115abb4d489d0eb2",
-        [
-         null,
-         {}
-        ]
-       ],
-       "size.attributes.parse.octal.html": [
-        "e1f42ea18865f6a2fc8203761aff69e79949e7ec",
-        [
-         null,
-         {}
-        ]
-       ],
-       "size.attributes.parse.onlyspace.html": [
-        "20721dcc6fa2eefb187b8546accdef30b1e12b60",
-        [
-         null,
-         {}
-        ]
-       ],
-       "size.attributes.parse.percent.html": [
-        "860703c6c2e4172321c2ef5c975dfd12b4d21b39",
-        [
-         null,
-         {}
-        ]
-       ],
-       "size.attributes.parse.plus.html": [
-        "2b600941a8db2580d8cb19169e20a2d0486f6840",
-        [
-         null,
-         {}
-        ]
-       ],
-       "size.attributes.parse.space.html": [
-        "34cae4d4c90957740f8785b00bd1a2379d582505",
-        [
-         null,
-         {}
-        ]
-       ],
-       "size.attributes.parse.trailingjunk.html": [
-        "e2b92ee0aaed53d6bc7e941a55a7a250779f4635",
-        [
-         null,
-         {}
-        ]
-       ],
-       "size.attributes.parse.whitespace.html": [
-        "c7a76f967e249112941a7e8507c456eaf9026d0d",
-        [
-         null,
-         {}
-        ]
-       ],
-       "size.attributes.parse.zero.html": [
-        "0f7a0415a173a48db72bf7c8925e711ec6327dfd",
-        [
-         null,
-         {}
-        ]
-       ],
        "size.attributes.reflect.setcontent.html": [
         "a25c4b784a29b16708d6a8959151b1982dc8c7d3",
         [
@@ -628519,113 +637659,8 @@
          {}
         ]
        ],
-       "size.attributes.setAttribute.decimal.html": [
-        "9f0b4b1deb052aeda2966e605278b92bf0c8a1ce",
-        [
-         null,
-         {}
-        ]
-       ],
-       "size.attributes.setAttribute.em.html": [
-        "df0eee7462e3253968994d97e55f18e1cdec3f43",
-        [
-         null,
-         {}
-        ]
-       ],
-       "size.attributes.setAttribute.empty.html": [
-        "37e021424a086fb7be7d45d285333dde65b866ba",
-        [
-         null,
-         {}
-        ]
-       ],
-       "size.attributes.setAttribute.exp.html": [
-        "943b98b9c3b7a627ad1d9ec475707d41742e9890",
-        [
-         null,
-         {}
-        ]
-       ],
-       "size.attributes.setAttribute.hex.html": [
-        "a73ff5ec042dbabb9bcff7799caaaf34a3e58ae7",
-        [
-         null,
-         {}
-        ]
-       ],
-       "size.attributes.setAttribute.junk.html": [
-        "607892d3f08e979e85a53a29846bb17225cf1122",
-        [
-         null,
-         {}
-        ]
-       ],
-       "size.attributes.setAttribute.minus.html": [
-        "4fd49e5eccf200782a0440a6e9358188b70674b2",
-        [
-         null,
-         {}
-        ]
-       ],
-       "size.attributes.setAttribute.octal.html": [
-        "d841413d3fe1f5ac85c9ffb74eeca779d96fa21e",
-        [
-         null,
-         {}
-        ]
-       ],
-       "size.attributes.setAttribute.onlyspace.html": [
-        "7959c303d489fbf1602438d72bead3bf90e6999c",
-        [
-         null,
-         {}
-        ]
-       ],
-       "size.attributes.setAttribute.percent.html": [
-        "6fed0cdae5a4c90907b026cd351c6f886e9276f3",
-        [
-         null,
-         {}
-        ]
-       ],
-       "size.attributes.setAttribute.plus.html": [
-        "4be39bf19bdc817fbc209f893298d3ce244bc6f7",
-        [
-         null,
-         {}
-        ]
-       ],
-       "size.attributes.setAttribute.space.html": [
-        "3cc00788ef7acde2c6c425f08db8bde7f733143e",
-        [
-         null,
-         {}
-        ]
-       ],
-       "size.attributes.setAttribute.trailingjunk.html": [
-        "4c9b7ce54a2c43e1ab1616365f16c1ec0f40feac",
-        [
-         null,
-         {}
-        ]
-       ],
-       "size.attributes.setAttribute.whitespace.html": [
-        "8f6ecc95b4a8f2b06a6f077fd2bc50a4798856fa",
-        [
-         null,
-         {}
-        ]
-       ],
-       "size.attributes.setAttribute.zero.html": [
-        "2bbad823537779286a4f52bf39252e45f09c8d51",
-        [
-         null,
-         {}
-        ]
-       ],
        "size.attributes.style.html": [
-        "31640c82f425a4ebaedbd3bde75d4125d0ddde79",
+        "aeb5c7ecb2ec1a71f83a8b68c2dd3298992d1ff8",
         [
          null,
          {}
@@ -630763,7 +639798,7 @@
          {}
         ]
        ],
-       "infinite_backtracking.html": [
+       "infinite_backtracking.tentative.html": [
         "52f6e316b1faa3abec3d0680a6be68ab0d2e6b07",
         [
          null,
@@ -632143,6 +641178,13 @@
          {}
         ]
        ],
+       "radio-disconnected-group-owner.html": [
+        "60feb2b0ba9b14554c39a1f633d7652a2d19bd28",
+        [
+         null,
+         {}
+        ]
+       ],
        "radio-double-activate-pseudo.html": [
         "287dc7d58edddacb3bd282eae8450f89f5128345",
         [
@@ -632458,6 +641500,15 @@
         ]
        ]
       },
+      "the-optgroup-element": {
+       "optgroup-removal.window.js": [
+        "4e4c2df77e317c68f9858d7f8692f27380688d10",
+        [
+         "html/semantics/forms/the-optgroup-element/optgroup-removal.window.html",
+         {}
+        ]
+       ]
+      },
       "the-option-element": {
        "option-element-constructor.html": [
         "05bcb3024a28e0050bad95fbbf72a424f62c6ebb",
@@ -632619,6 +641670,13 @@
          {}
         ]
        ],
+       "select-add-optgroup.html": [
+        "fab5332f26bf74ac23faa2affdca8c25d09de490",
+        [
+         null,
+         {}
+        ]
+       ],
        "select-add.html": [
         "910be348ae765df079970f4fc7f38cbbf955454d",
         [
@@ -632695,6 +641753,52 @@
          null,
          {}
         ]
+       ],
+       "show-picker-cross-origin-iframe.tentative.html": [
+        "3f710b39c60beb205ac131929849442fac2cf430",
+        [
+         null,
+         {}
+        ]
+       ],
+       "show-picker-disabled.tentative.html": [
+        "f20bc2cf61b2544892740bf7c37fe617e1ca25ef",
+        [
+         null,
+         {
+          "testdriver": true
+         }
+        ]
+       ],
+       "show-picker-multiple.tentative.html": [
+        "c38e98ee4e95aa4ae0cc9603ca55c9970faf3b1b",
+        [
+         null,
+         {
+          "testdriver": true,
+          "timeout": "long"
+         }
+        ]
+       ],
+       "show-picker-size.tentative.html": [
+        "b9b10c42a9126d21fbf31c704b83d001edc5b7a4",
+        [
+         null,
+         {
+          "testdriver": true,
+          "timeout": "long"
+         }
+        ]
+       ],
+       "show-picker-user-gesture.tentative.html": [
+        "24ccd72c8ae83d4fbad2bebd271869b83b494c71",
+        [
+         null,
+         {
+          "testdriver": true,
+          "timeout": "long"
+         }
+        ]
        ]
       },
       "the-selectlist-element": {
@@ -632705,6 +641809,15 @@
          {}
         ]
        ],
+       "selectlist-button-type-behavior.tentative.html": [
+        "cc7eb62a6327e90a2d038e777612685e00edb746",
+        [
+         null,
+         {
+          "testdriver": true
+         }
+        ]
+       ],
        "selectlist-disabled.tentative.html": [
         "f557804d9bf3d81daa2132d604d1085e65e6fca7",
         [
@@ -632824,7 +641937,7 @@
         ]
        ],
        "selectlist-popover.tentative.html": [
-        "b7663875ce0643e2176676268ca056fe4b1ce9a9",
+        "2187226adbf61108334c94aa1962a62de03a59b0",
         [
          null,
          {
@@ -632855,6 +641968,13 @@
          {}
         ]
        ],
+       "selectlist-selectedoption-element.tentative.html": [
+        "593c4a6f21132b73cb6b28aaebd9a3dc6a9444b6",
+        [
+         null,
+         {}
+        ]
+       ],
        "selectlist-tab-navigation.tentative.html": [
         "3b7d9d3d9ada9aee6f4227572450774b347a5b34",
         [
@@ -633160,14 +642280,14 @@
         ]
        ],
        "name-attribute.tentative.html": [
-        "271577efe5ec074b424837089ad64e3fd01c6258",
+        "6f45b3da089e3f14ae8a0d4c712b0dde1dd2607a",
         [
          null,
          {}
         ]
        ],
        "toggleEvent.html": [
-        "8ad60de5d9b52ec5f22e6232d4ec8650fff5ec0c",
+        "a54ad1f8a8e7465453312af49165d5ce51b2cd0a",
         [
          null,
          {}
@@ -633183,7 +642303,7 @@
         ]
        ],
        "backdrop-receives-element-events.html": [
-        "31c3c6ce3c088ab779da6bca466496d7943caeda",
+        "5d515000cef95465d406809978c5bb9428a9a413",
         [
          null,
          {
@@ -633850,6 +642970,27 @@
          {}
         ]
        ],
+       "non-parsable-url-getter-setter.window.js": [
+        "587f9b9c46359b46740f1a9c22c40b8530d1b5b7",
+        [
+         "html/semantics/links/links-created-by-a-and-area-elements/non-parsable-url-getter-setter.window.html",
+         {}
+        ]
+       ],
+       "non-special-opaque-path-url-getter-setter.window.js": [
+        "9549c6e2a6f639b54108dad2b5f3f6c414c5ca06",
+        [
+         "html/semantics/links/links-created-by-a-and-area-elements/non-special-opaque-path-url-getter-setter.window.html",
+         {}
+        ]
+       ],
+       "non-special-url-getter-setter.window.js": [
+        "de528a2f973d137b8dba715e669cd49e31b529da",
+        [
+         "html/semantics/links/links-created-by-a-and-area-elements/non-special-url-getter-setter.window.html",
+         {}
+        ]
+       ],
        "target_blank_implicit_noopener.html": [
         "73eebaff70f09bb98a3b7dd6b59f9357a3ab0668",
         [
@@ -634069,7 +643210,7 @@
        ]
       ],
       "popover-light-dismiss-flat-tree.html": [
-       "d2792a895cce9acb17d1c0a22ccbd880dcf81588",
+       "26c8d7af4c1c18fc1cd0e1a5663dcd815537bc11",
        [
         null,
         {
@@ -634095,7 +643236,7 @@
        ]
       ],
       "popover-light-dismiss.html": [
-       "4c31bed1635f68774f4368e834b3793d3f857495",
+       "4a57276bce3cbb1c6bcb287d268af38e4ee19752",
        [
         null,
         {
@@ -634149,7 +643290,7 @@
        ]
       ],
       "popover-shadowhost-focus.html": [
-       "4dcf6692420d249ccc42d64464cd32ecf3ba3418",
+       "d5899d21bb00f9202d19f216a2623570b88be3a0",
        [
         null,
         {}
@@ -635819,6 +644960,13 @@
           {}
          ]
         ],
+        "invalid-import-errors-order.html": [
+         "17c95faea0f80ae089e2fb84d075e174ae954450",
+         [
+          null,
+          {}
+         ]
+        ],
         "invalid-type-assertion-error.html": [
          "0adcc475693e27cebceef5e0f28212ffe2fb73a1",
          [
@@ -635878,6 +645026,13 @@
           {}
          ]
         ],
+        "invalid-import-errors-order.html": [
+         "8c438f626b79b4e2f2fd5b0729b422af043f5cfb",
+         [
+          null,
+          {}
+         ]
+        ],
         "invalid-type-attribute-error.html": [
          "ac6d61a642640657c0f864177b1e305660465633",
          [
@@ -637456,6 +646611,33 @@
           }
          ]
         ],
+        "inline-async-onload.html": [
+         "314abc98dc71cc42b81e6ba19086e65186665133",
+         [
+          null,
+          {
+           "timeout": "long"
+          }
+         ]
+        ],
+        "inline-defer-onload.html": [
+         "0a0bc36f8b816d3466fcee46a48beead8b3c8e08",
+         [
+          null,
+          {
+           "timeout": "long"
+          }
+         ]
+        ],
+        "inline-no-async-onload.html": [
+         "50f42c6a38653602d77aaee787da3f7ce0bbda77",
+         [
+          null,
+          {
+           "timeout": "long"
+          }
+         ]
+        ],
         "instantiation-error-1.html": [
          "57b40f5baafbaf42bcb3b863971d61320618a343",
          [
@@ -637611,7 +646793,7 @@
          ]
         ],
         "referrer-policy-for-descendants.sub.html": [
-         "cf8a3dce014efb4349d2f3bfcf49ae48b9ac78e8",
+         "4a7005da840b42fe4ffb57a6a173d6dbb49304ca",
          [
           null,
           {}
@@ -638775,7 +647957,7 @@
         ]
        ],
        "readwrite-readonly.html": [
-        "fc112f3ceb39cff15a1eb3d60c5551d6f9f8c587",
+        "fb8a5b9ad70e0e0ffcc402c8ff662fbcda9da00b",
         [
          null,
          {}
@@ -641782,7 +650964,7 @@
       ]
      ],
      "activation-trigger-pointerevent.html": [
-      "5d3eedb925e55d1c6f443b2f2265fef2f6093b16",
+      "e3042b718de545dc1470fa74dd7cd3834bec856f",
       [
        "html/user-activation/activation-trigger-pointerevent.html?mouse",
        {
@@ -644013,7 +653195,7 @@
      "system-state-and-capabilities": {
       "the-navigator-object": {
        "clientinformation.window.js": [
-        "3d3b6b5947daca44f42a4b8f22f752f0f54c748a",
+        "197a3b13e93faf59f30becc455c45c2d574bd8f8",
         [
          "html/webappapis/system-state-and-capabilities/the-navigator-object/clientinformation.window.html",
          {}
@@ -644453,6 +653635,15 @@
       }
      ]
     ],
+    "idle-detection-detached-frame.https.html": [
+     "062499b54d6ce4fffba9f612ddbf4ed9a81e93c6",
+     [
+      null,
+      {
+       "testdriver": true
+      }
+     ]
+    ],
     "idle-detection-disabled-by-permissions-policy.https.sub.html": [
      "90317dece7aff71c84a2d288790104d61cf4e1da",
      [
@@ -646555,6 +655746,97 @@
       {}
      ]
     ],
+    "scroll-and-root-margin.html": [
+     "c79233d08759acb23af570ff0dd4eaab7d6e38b7",
+     [
+      null,
+      {}
+     ]
+    ],
+    "scroll-margin-4-val.html": [
+     "04b1e4bace8b0604db9f82068ff825241e21646f",
+     [
+      null,
+      {}
+     ]
+    ],
+    "scroll-margin-clip-path.html": [
+     "05a9cc202395a4d6ba615adf7df03246434eb9b3",
+     [
+      null,
+      {}
+     ]
+    ],
+    "scroll-margin-dynamic.html": [
+     "e2f697b79e654c764eb2170108db80962f516bd0",
+     [
+      null,
+      {}
+     ]
+    ],
+    "scroll-margin-horizontal.html": [
+     "0c79167f346d33c12ee35b945922b73985e6743b",
+     [
+      null,
+      {}
+     ]
+    ],
+    "scroll-margin-nested-2.html": [
+     "32cfd1ba93639704fdb4f614e64da1b5ff93f371",
+     [
+      null,
+      {}
+     ]
+    ],
+    "scroll-margin-nested-3.html": [
+     "06aaeb825bd16b584a7415fe543ff235d8d688a9",
+     [
+      null,
+      {}
+     ]
+    ],
+    "scroll-margin-nested.html": [
+     "247f5454706b2edadd0b9b275543a0d0de31effc",
+     [
+      null,
+      {}
+     ]
+    ],
+    "scroll-margin-no-intersect.html": [
+     "3259d472b5e9dc53bcab16ed24d3fa81a8a1f328",
+     [
+      null,
+      {}
+     ]
+    ],
+    "scroll-margin-non-scrolling-root.html": [
+     "9f567c2896c2723d0aa9f15e0b2f17af76de4722",
+     [
+      null,
+      {}
+     ]
+    ],
+    "scroll-margin-percent.html": [
+     "c33cfeae28ad633892f507ba56ceb0f9d51deb43",
+     [
+      null,
+      {}
+     ]
+    ],
+    "scroll-margin-zero.html": [
+     "9f2727f6959e561a8b26e8f29083c5f91a0457c3",
+     [
+      null,
+      {}
+     ]
+    ],
+    "scroll-margin.html": [
+     "1b8cdd6b39ab37af4fc8ef81db5f70778ed782c1",
+     [
+      null,
+      {}
+     ]
+    ],
     "shadow-content.html": [
      "ce9473cb79258fca90321ee26240612c387ac9b9",
      [
@@ -647678,6 +656960,13 @@
       ]
      ]
     },
+    "broken-image-icon.html": [
+     "be27e34e6ac9274276b26f239e7f69a168d2e849",
+     [
+      null,
+      {}
+     ]
+    ],
     "contracted-image.html": [
      "8816bf4ba99cb71e9f79ba44859a80a4c103ebad",
      [
@@ -647784,7 +657073,7 @@
      ]
     ],
     "image-upscaling.html": [
-     "b3ce16f03f9f0131139bd0faef219a86a7c855a3",
+     "5de0790281b9fb2379ed9b3dc5ea004da686b633",
      [
       null,
       {}
@@ -649487,8 +658776,17 @@
        }
       ]
      ],
+     "loaf-callback-after-promise.html": [
+      "f7048072fa84dd52a10858141ba400c12f0917c0",
+      [
+       null,
+       {
+        "timeout": "long"
+       }
+      ]
+     ],
      "loaf-desired-exec-time.html": [
-      "dd350078b6024d41e25e663acbfa6a2b03aea789",
+      "656c58d0c24c7738e9dc3c7fcdfb5c05d2a69506",
       [
        null,
        {
@@ -649507,7 +658805,7 @@
       ]
      ],
      "loaf-first-ui-event.html": [
-      "47a3a51de215e47add78b96047d431b13eb89257",
+      "857ccd0a182ef0f061f9acff3ee42a12e47d89d2",
       [
        null,
        {
@@ -649570,8 +658868,17 @@
        }
       ]
      ],
+     "loaf-source-location-redirect.html": [
+      "f8d5d3d2498342759168733732a664b455f1a3e0",
+      [
+       null,
+       {
+        "timeout": "long"
+       }
+      ]
+     ],
      "loaf-source-location.html": [
-      "1065564206fc151e9690aca9bf512f7d48016099",
+      "41979105e5801eb18dc64eb22332d35ac1ef96c0",
       [
        null,
        {
@@ -649604,6 +658911,15 @@
        {}
       ]
      ],
+     "loaf-trusted-types.html": [
+      "4297842759f435902289de8e67ecf792d254ea72",
+      [
+       null,
+       {
+        "timeout": "long"
+       }
+      ]
+     ],
      "loaf-user-callback.html": [
       "3d868af87f3b7bb597b44fe78b1787deda003d3c",
       [
@@ -650048,6 +659364,13 @@
         {}
        ]
       ],
+      "mphantom-001.html": [
+       "771688cf19416d78342e019450221102728942ae",
+       [
+        null,
+        {}
+       ]
+      ],
       "mrow-fallback.html": [
        "3f9d466148c66877e9fe4104f00d2963cbec0380",
        [
@@ -652186,11 +661509,13 @@
       {}
      ]
     ],
-    "MediaStreamTrack-getFrameStats.https.html": [
-     "bc378d71b253ec36402f8a1cf0e9c3f86e6b9a9c",
+    "MediaStreamTrack-video-stats.https.html": [
+     "0f85f75b665b53fece76902410a7227e28caeab5",
      [
       null,
-      {}
+      {
+       "timeout": "long"
+      }
      ]
     ]
    },
@@ -653012,7 +662337,7 @@
      ]
     ],
     "MediaStreamTrack-MediaElement-disabled-video-is-black.https.html": [
-     "f920eccdf2bcdfd330b86ce92565afe8c611d557",
+     "9215f931f0ce7d3c22ad006901595b1f8a58ebc7",
      [
       null,
       {
@@ -654873,6 +664198,15 @@
       {}
      ]
     ],
+    "RTCRtpSendParameters-degradationEffect.html": [
+     "e6a03c593f3a2e9e37cd2520181b266fc827d8a2",
+     [
+      null,
+      {
+       "timeout": "long"
+      }
+     ]
+    ],
     "RTCRtpSendParameters-degradationPreference.html": [
      "3573bb58760210611cd13f0d7d0fbd2aa6682bd7",
      [
@@ -655394,7 +664728,7 @@
       ]
      ],
      "event-constructor.html": [
-      "065884240e092c59b3ce2178aa7a8162fdabe0c4",
+      "863681ced730d1c3f441a6f8b21db7b890301d25",
       [
        null,
        {}
@@ -655408,7 +664742,7 @@
       ]
      ],
      "intercept-and-navigate.html": [
-      "dfbb67b6b6b1c021fa7cbae33ddd7968de64f0ba",
+      "e689dd6974e4721bc37c1cf2a1bad9b613c5ba8f",
       [
        null,
        {}
@@ -655499,7 +664833,7 @@
       ]
      ],
      "intercept-navigation-back.html": [
-      "8babf2bcdcc5bd7b27beff6807898d2a7e5fda7c",
+      "7c7b80d5100906188e857c3985791d1b8d6525da",
       [
        null,
        {}
@@ -655534,21 +664868,21 @@
       ]
      ],
      "intercept-same-document-history-back.html": [
-      "6faabe1964651a6aa5e2d0ff2cb736e00d081edc",
+      "6f57d95b1afd9d2e9a257274f2305c3059ff2aa2",
       [
        null,
        {}
       ]
      ],
      "navigate-anchor-cross-origin.html": [
-      "ee0992485078fd85d1c2099e7c74440407c111b4",
+      "62e5adb20ae88c33c3f76b527d98502d38db3a52",
       [
        null,
        {}
       ]
      ],
      "navigate-anchor-download-userInitiated.html": [
-      "b9506984dad8d8cd65b6d80c084922c59ed319ac",
+      "69181425292e758ac5bdccaec51b95f3670ecb71",
       [
        null,
        {
@@ -655557,28 +664891,28 @@
       ]
      ],
      "navigate-anchor-download.html": [
-      "05fb0ecf2fe6f60577fed75e2ca6fc57677cac0f",
+      "d04245ec253ce0b9f56afa9fbc598730924ba40e",
       [
        null,
        {}
       ]
      ],
      "navigate-anchor-fragment.html": [
-      "51221ebcad381b04600835bbc765e82dafa9d4b2",
+      "6443ccecd1d702cc1210857bd9c7013721d88fa6",
       [
        null,
        {}
       ]
      ],
      "navigate-anchor-same-origin-cross-document.html": [
-      "68f5bf0627c123f1fe954d109924c2c1a5ab7170",
+      "5a6dce7ec8bcc9b349494ff151428d219ee7bfc0",
       [
        null,
        {}
       ]
      ],
      "navigate-anchor-userInitiated.html": [
-      "39192c915132485a512a353d7f6e2c5693cf4cdf",
+      "bb76e7a3fbe65121452fb39218f89c567bafac48",
       [
        null,
        {
@@ -655587,7 +664921,7 @@
       ]
      ],
      "navigate-anchor-with-target.html": [
-      "6407b963beb7cd8a321574faab8b942e887959ae",
+      "e4b897d82f3ddc62e64f9a7489969425338b29f9",
       [
        null,
        {}
@@ -655601,56 +664935,63 @@
       ]
      ],
      "navigate-destination-dynamic-index.html": [
-      "2e0f1ea49730fcdcf07f483188b01d5350540069",
+      "535e5cfee788c4aaba7005518568079fb6eda54e",
       [
        null,
        {}
       ]
      ],
      "navigate-destination-getState-back-forward.html": [
-      "c8b1043aba6f5ee4605ee461b4f0ab1bc4136077",
+      "869fc1648157b25f296c69f8163a441a0101277b",
       [
        null,
        {}
       ]
      ],
      "navigate-destination-getState-navigate.html": [
-      "5dac40de566e9e42a5e2f08ec0a7a2882f318b51",
+      "d19a16851453a0ea5f9b7ac72ea2bb9e70e98199",
       [
        null,
        {}
       ]
      ],
      "navigate-destination-getState-reload.html": [
-      "a180e086a94b084bb8df4a6a315444551ea57158",
+      "ac6528ce7ef261ac087105f54d52d0ef381cb231",
       [
        null,
        {}
       ]
      ],
      "navigate-form-get.html": [
-      "87a102ddc0598f9903c630c5c1add3075dbbdcdb",
+      "7a71a1c3050a0cceca5ca0e9415a830ae8210356",
       [
        null,
        {}
       ]
      ],
      "navigate-form-reload.html": [
-      "f18a11ebdaca671566db4722e537054dd7d315df",
+      "217169053722c2b4c4ecdbaed4b9a8e263fbb97a",
+      [
+       null,
+       {}
+      ]
+     ],
+     "navigate-form-requestSubmit.html": [
+      "38dd9c7eee649f3f7d8e54e446ceb83fc48d3a36",
       [
        null,
        {}
       ]
      ],
      "navigate-form-traverse.html": [
-      "d673537503e02f2440aabe55f303560c570c9e3b",
+      "b9665c805665956fe57bf6640cb292be71f447f3",
       [
        null,
        {}
       ]
      ],
      "navigate-form-userInitiated.html": [
-      "40c5905447c59fc0ed1d873d3248c39a49163db0",
+      "246e028a0dbf241f1667c380a0255396d13b1553",
       [
        null,
        {
@@ -655659,112 +665000,119 @@
       ]
      ],
      "navigate-form-with-target.html": [
-      "f6fe05c938f2fb88289c3a95bfab2f809d11177b",
+      "4b1a8ce9d3a975f839f0af2a91e0a600a8ea827e",
       [
        null,
        {}
       ]
      ],
      "navigate-form.html": [
-      "c57d72c3deb0f7714bf78630afe6a39d87569f01",
+      "653ef3b8eba65a79f631ac392c9cdf8b0ec77d9b",
       [
        null,
        {}
       ]
      ],
      "navigate-history-back-after-fragment.html": [
-      "57a30c85b8700b1e86f577bed1008b16271acbb2",
+      "9da4ddcd50779229c550452987ce153671a4e093",
       [
        null,
        {}
       ]
      ],
      "navigate-history-back-after-pushState.html": [
-      "bf2e6e4e300e96c684d467c40a7b3ad796b5018c",
+      "fdee41a312191455e0f7babdad75d281b6fc6755",
       [
        null,
        {}
       ]
      ],
      "navigate-history-back-cross-document.html": [
-      "cd7be6e9ad37eb1975a6a183c290cf972de10c4a",
+      "29c626a522145f5a26b050e9e97aeff4d213cad8",
       [
        null,
        {}
       ]
      ],
      "navigate-history-back-noop.html": [
-      "10763c93fd20ec841acb1f1dab45d2343c5de074",
+      "109106b77fcd34de072fb090081b88d6d2630775",
       [
        null,
        {}
       ]
      ],
      "navigate-history-go-0.html": [
-      "b1f41425b62f833474b85dd3049d1c33ea3095d9",
+      "5508928e198dd9a4d88fe6ac3b50a99286c2e825",
       [
        null,
        {}
       ]
      ],
      "navigate-history-pushState.html": [
-      "266309a79e13a4e5239853316089c19a729a5ba2",
+      "5079b21078178175df99bdb1875889b9328fed34",
       [
        null,
        {}
       ]
      ],
      "navigate-history-replaceState.html": [
-      "ea6d3df455dc74fb27e964a4f41eabdf611ab5f5",
+      "444116a6324c361b6876f3370bbcf4f579c7f0f4",
       [
        null,
        {}
       ]
      ],
      "navigate-iframe-location.html": [
-      "25d51476f3ffeea34583254a9e8162c507915408",
+      "1bd79188231b6ff973fe9e741f9d554be252bd72",
       [
        null,
        {}
       ]
      ],
      "navigate-location.html": [
-      "a4d0c60776dc0eb21996ffa8abb92e884995b9dd",
+      "a0ed4dc0aac5886cee3496a4aac007eaddaee46e",
       [
        null,
        {}
       ]
      ],
      "navigate-meta-refresh.html": [
-      "9fa59b29f240014e86e7a379cfd3b56a490dc853",
+      "d4d5b1c8e13927eaa3bbda1d973cc1413421c753",
       [
        null,
        {}
       ]
      ],
      "navigate-navigation-back-cross-document.html": [
-      "2e1adbeee93ee082a7d9f7e008a5f863e0fc0c50",
+      "084051539b8db3f50edb4e3037c9dd8882a6bbe6",
       [
        null,
        {}
       ]
      ],
      "navigate-navigation-back-same-document-in-iframe.html": [
-      "cebd2f3693c9d8f0845b78ac0a26e53e164f2628",
+      "42c694e2905d73eb7ba92dc7a96c3c3152febf8e",
       [
        null,
        {}
       ]
      ],
      "navigate-navigation-back-same-document.html": [
-      "e587569a3c61065989d4cf48834f47b87af57584",
+      "b08bbfcbf11430e3e5f6131e91fb8b90ea82a891",
       [
        null,
        {}
       ]
      ],
      "navigate-navigation-navigate.html": [
-      "ffc8ea867f71f3c23290813a1e90065341f68c81",
+      "c56af1b40df8fd0720f0114f687ef78fed88a074",
+      [
+       null,
+       {}
+      ]
+     ],
+     "navigate-svg-anchor-fragment.html": [
+      "c6d210cccb1335983ba3df95788e1f7e7caa3dc8",
       [
        null,
        {}
@@ -655778,21 +665126,21 @@
       ]
      ],
      "navigate-to-srcdoc.html": [
-      "8bbb66a31fdfee846444dc2c2e338fb7669bfff7",
+      "ea5c3f92168500ed6966dd1211447eb0bbcc7280",
       [
        null,
        {}
       ]
      ],
      "navigate-window-open-self.html": [
-      "a6e443fd5a115edd7dea6f5cd40abfb3386c937c",
+      "4e569b6d548f165cd7939b5e51d7da19957b0f69",
       [
        null,
        {}
       ]
      ],
      "navigate-window-open.html": [
-      "1fe2402bc91e524371cb0f998e6477000ad96357",
+      "42828308d7709e717402e126f7aebbf1d6e0896c",
       [
        null,
        {}
@@ -655820,35 +665168,35 @@
       ]
      ],
      "navigation-back-same-document-preventDefault.html": [
-      "7edb188823352694caf70101f126135142e7dd28",
+      "f8e31252a42e8b5519bb1fcae456bedc7e5050bc",
       [
        null,
        {}
       ]
      ],
      "navigation-traverseTo-in-iframe-same-document-preventDefault.html": [
-      "463746e8f7977017066e4f9525b7c7a55a04a600",
+      "b3b57f2a1abf8e285660d8e6e902b25ae38bcf0d",
       [
        null,
        {}
       ]
      ],
      "navigation-traverseTo-navigates-top-and-same-doc-child-and-cross-doc-child.html": [
-      "31cb54fca2a4d5e06f3bab4330b77d7a87f78fb6",
+      "479f54213a95ccd64c8b215cd1c4fa60d94dc21f",
       [
        null,
        {}
       ]
      ],
      "navigation-traverseTo-same-document-preventDefault-multiple-windows.html": [
-      "9bb64fb7cc7a7dd5e007021039616b44da56cdd3",
+      "61859adb5ee7204b07bbf2c084ace722eb4b34e1",
       [
        null,
        {}
       ]
      ],
      "navigation-traverseTo-top-cancels-cross-document-child.html": [
-      "11f07afefc5236efc12efc341f9b85da3c0b6c9f",
+      "4ece3ca8cbc013ee92adf36910ffa293a64f1b8d",
       [
        null,
        {}
@@ -655869,14 +665217,14 @@
       ]
      ],
      "same-url-replace-cross-document.html": [
-      "0a976cd51fdcb3205d2a71cc9dc1a9853e417eee",
+      "b6bd0cdd88358ba439cada84c9160c1e70f89e65",
       [
        null,
        {}
       ]
      ],
      "same-url-replace-same-document.html": [
-      "839c687934238d594013ec6ca009532df440d269",
+      "cc4faffe77ab732520fdf1653dd831abf0655385",
       [
        null,
        {}
@@ -656160,42 +665508,42 @@
     },
     "navigation-methods": {
      "back-forward-multiple-frames.html": [
-      "738bfd37dcc720aa3c6b1b11208c5d8426860ece",
+      "6c30987f7598de076e5e8820d686577a8fa6b03e",
       [
        null,
        {}
       ]
      ],
      "disambigaute-back.html": [
-      "d44d435896dd8723677db8724478d862468e1cec",
+      "a42000ca5fc9c10b325de4113da8adaf3bf41fe1",
       [
        null,
        {}
       ]
      ],
      "disambigaute-forward.html": [
-      "e252e309941037d42e3f3310c6ce9e140433db77",
+      "3062cb0bebfc60c598c88fdaed5fc6d57313d6c0",
       [
        null,
        {}
       ]
      ],
      "disambigaute-traverseTo-back-multiple.html": [
-      "03a8eb10edeb854bc3444136817256180b40709a",
+      "7ecfc01b3fce1bcf8dc8c7b59d89aac86f27458a",
       [
        null,
        {}
       ]
      ],
      "disambigaute-traverseTo-forward-multiple.html": [
-      "f8e78c4b1d951d7c29f326bcdacbf1c688d3635c",
+      "92f23f0acff9e2ecc06fcba1ee54662bac12bcac",
       [
        null,
        {}
       ]
      ],
      "forward-to-pruned-entry.html": [
-      "05f70c5c2dccb659e36e77068a457d06881e4b74",
+      "18b30c620d59c8ad48c8fd8524aa1a880ae98429",
       [
        null,
        {}
@@ -656230,7 +665578,7 @@
       ]
      ],
      "navigate-history-push-not-loaded.html": [
-      "c1ecdaeeafdfbee3b3a1f25e826e5aa435bbe7b3",
+      "f919417332559cd3e8de9cc270c4f2948f77fdad",
       [
        null,
        {}
@@ -656244,7 +665592,7 @@
       ]
      ],
      "navigate-history-push-same-url.html": [
-      "339e8c3056bb2e6694750c5a190649d4086b20eb",
+      "a81215f7d46a32348486cb98acc6d1ec02afc9a3",
       [
        null,
        {}
@@ -656286,14 +665634,14 @@
       ]
      ],
      "navigate-replace-cross-document.html": [
-      "7f016babe6bc767fc95d1d29054b7d7562cadaeb",
+      "0a36e25970fd134b3d08f111b5de6b97a970418e",
       [
        null,
        {}
       ]
      ],
      "navigate-replace-same-document.html": [
-      "0d8493b7882407edc1c8734e37ee1bd2b55b3c64",
+      "943ab377654b1e1a42f882b00c06868d547cae66",
       [
        null,
        {}
@@ -656406,28 +665754,28 @@
        ]
       ],
       "back-forward-out-of-bounds.html": [
-       "015c090bf97e567ab3b4acd4f9858cd79fc9c725",
+       "ac6d901ba52a972a546b39d073e075c5508007d1",
        [
         null,
         {}
        ]
       ],
       "back-intercept-rejected.html": [
-       "9d4238087ff501bd1b01c8d24fe566bbf96b9ccd",
+       "013ebf1e1e3df145b4e9037452e89b043c283fa7",
        [
         null,
         {}
        ]
       ],
       "back-intercept.html": [
-       "2654045c2b0080985d10b9ca802174aeac8de46a",
+       "1db2f870d8dce440720640507cd17986ff1bf4f7",
        [
         null,
         {}
        ]
       ],
       "back.html": [
-       "a2b13db901bfa11e438edbe89b15058b3be582e1",
+       "5521de25b7950e09fe17683e9e9d335efe27a1bd",
        [
         null,
         {}
@@ -656448,21 +665796,21 @@
        ]
       ],
       "forward-intercept-rejected.html": [
-       "9e86dcca19760ef1ecf8d4a89ef875bddbb444eb",
+       "9d5318a260d77244972795bb6a94d94edba680a1",
        [
         null,
         {}
        ]
       ],
       "forward-intercept.html": [
-       "ce4ab3217070a8c194e608c416ec831e31977d6f",
+       "3c5211974541191792fb2b4d72ef7871dba70c36",
        [
         null,
         {}
        ]
       ],
       "forward.html": [
-       "36bdba8daafd877b6ad274dfab8167110e524c03",
+       "5ba58f2c8ea19ac5f42a295b386eff2533bc79f6",
        [
         null,
         {}
@@ -656532,7 +665880,7 @@
        ]
       ],
       "navigate-intercept-interrupted.html": [
-       "36403c892c6c94a76e65762cb4ed9d26396aadda",
+       "7f661b80b6d494c0088d3cc02da251853e6c65fa",
        [
         null,
         {}
@@ -656553,14 +665901,14 @@
        ]
       ],
       "navigate-interrupted-within-onnavigate.html": [
-       "3db02c6931e41da69f8a7581ee65a5851d102cec",
+       "249a7df69c2fff137c08fd5819382bec2a42fe1e",
        [
         null,
         {}
        ]
       ],
       "navigate-interrupted.html": [
-       "2c928254e0b64e8b5f3750cd366cf73e7edb2998",
+       "d1ade5b423da7ca19d6b8d9a11a25e92dcae7321",
        [
         null,
         {}
@@ -656791,7 +666139,7 @@
        ]
       ],
       "traverseTo-current.html": [
-       "212fe992cf774cdcf5565f64ce0f4edf77b33c9f",
+       "3942faf77fb3b0fb500eeae73cf39c84cb5351f2",
        [
         null,
         {}
@@ -656826,14 +666174,14 @@
        ]
       ],
       "traverseTo-intercept-rejected.html": [
-       "f934eae5d4c1a39bd38a656a17a414fa8ff39f11",
+       "f39913e05b239156bbc55a22f644899cf0f133e5",
        [
         null,
         {}
        ]
       ],
       "traverseTo-intercept.html": [
-       "a4cb4e711d8c9b940714561c0e94908dbf30fa0a",
+       "e5baf8b1417fceb29e08d42dcf8da3975d4ceccb",
        [
         null,
         {}
@@ -656854,7 +666202,7 @@
        ]
       ],
       "traverseTo.html": [
-       "8e00f5ba918cddc9d5a7df9336c3eefc05062e32",
+       "5270bbb411df80d4d09402398068274f98a8d6fa",
        [
         null,
         {}
@@ -656890,7 +666238,7 @@
       ]
      ],
      "traverseTo-after-adding-iframe.html": [
-      "5ab28205510800eccc6fffed97b972929e1c0068",
+      "0289c455f1b749fcd1b20a93d93163f00503ad2b",
       [
        null,
        {}
@@ -656918,21 +666266,21 @@
       ]
      ],
      "traverseTo-multiple-steps.html": [
-      "059eb214a8b8529779b6e0455220faca391a12d8",
+      "24cf0281845f6a8d11d782ee9c2784c285e295ef",
       [
        null,
        {}
       ]
      ],
      "traverseTo-navigates-multiple-iframes.html": [
-      "3d6adb53413e3e8a32e1287cf9f67ec9068ba378",
+      "1892ae065e2e372ff14e9049a2094812688ec3a0",
       [
        null,
        {}
       ]
      ],
      "traverseTo-same-document.html": [
-      "1a32bce99c98e22ea426f612c26d6368adae4972",
+      "3bd7f4d3d2bf80ac7f3252e7ed40673e41981bb8",
       [
        null,
        {}
@@ -657996,6 +667344,13 @@
       {}
      ]
     ],
+    "test-timing-attributes-dependent-on-document-load.html": [
+     "9eac7bd0333ddb95a6a3cd4de3f020d54a286997",
+     [
+      null,
+      {}
+     ]
+    ],
     "test-timing-attributes-exist.html": [
      "5db07459b4e63ef8c8ae5d2cb9c21cc45b31a9ae",
      [
@@ -658597,6 +667952,15 @@
        {}
       ]
      ],
+     "page-visibility.https.html": [
+      "ea67131151f1ed27b621558d413ce6656c022821",
+      [
+       null,
+       {
+        "testdriver": true
+       }
+      ]
+     ],
      "requestPermission.https.window.js": [
       "2c96d26d10f42c1aba6156a49beb595e270b8618",
       [
@@ -658694,6 +668058,15 @@
        {}
       ]
      ],
+     "page-visibility.https.html": [
+      "37ca3681c9198a04b6d238d96bf2d15657961e21",
+      [
+       null,
+       {
+        "testdriver": true
+       }
+      ]
+     ],
      "requestPermission.https.window.js": [
       "4a39a238d018d20e5c3f968d6cd5fc68cd0ce8ca",
       [
@@ -659360,7 +668733,7 @@
      ]
     ],
     "finalizeAd.tentative.https.sub.window.js": [
-     "e8bf6753f04135cab77fd2f4f02459ff9a1fca21",
+     "cbb852151fc6832e7aab179f4b6b7b680dfed27b",
      [
       "parakeet/finalizeAd.tentative.https.sub.window.html",
       {
@@ -660306,7 +669679,7 @@
     ],
     "not-restored-reasons": {
      "performance-navigation-timing-attributes.tentative.window.js": [
-      "95ca3dd6b4daaf177e716d74b95b27064637bc6f",
+      "811fa515dc2ce648d6334f219e309e9c40686bac",
       [
        "performance-timeline/not-restored-reasons/performance-navigation-timing-attributes.tentative.window.html",
        {
@@ -660353,7 +669726,7 @@
       ]
      ],
      "performance-navigation-timing-bfcache-reasons-stay.tentative.window.js": [
-      "36c1b92dca43b1d6ebff2ea0804ea57f7f61d009",
+      "897a9900268076826b9c07d2b0051bb2c7404b0e",
       [
        "performance-timeline/not-restored-reasons/performance-navigation-timing-bfcache-reasons-stay.tentative.window.html",
        {
@@ -660443,7 +669816,7 @@
       ]
      ],
      "performance-navigation-timing-cross-origin-bfcache.tentative.window.js": [
-      "80adec007a2e4a80daf33e2752fb2e04ea902668",
+      "851dd8c650833a49f58610d875edfb1cf556f925",
       [
        "performance-timeline/not-restored-reasons/performance-navigation-timing-cross-origin-bfcache.tentative.window.html",
        {
@@ -660489,8 +669862,141 @@
        }
       ]
      ],
+     "performance-navigation-timing-fetch.tentative.window.js": [
+      "5cd35c7ba362e1a1b844fab38fe72e4991005192",
+      [
+       "performance-timeline/not-restored-reasons/performance-navigation-timing-fetch.tentative.window.html",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "Ensure that ongoing fetch upon entering bfcache blocks bfcache and recorded."
+         ],
+         [
+          "script",
+          "./test-helper.js"
+         ],
+         [
+          "script",
+          "/common/dispatcher/dispatcher.js"
+         ],
+         [
+          "script",
+          "/common/get-host-info.sub.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "/html/browsers/browsing-the-web/back-forward-cache/resources/rc-helper.js"
+         ],
+         [
+          "script",
+          "/html/browsers/browsing-the-web/remote-context-helper/resources/remote-context-helper.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ]
+     ],
+     "performance-navigation-timing-lock.https.tentative.window.js": [
+      "46d8752f20d9674f64999c2693ae60855f07dc9b",
+      [
+       "performance-timeline/not-restored-reasons/performance-navigation-timing-lock.https.tentative.window.html",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "Ensure that if WebLock is held upon entering bfcache, it cannot enter bfcache and gets reported."
+         ],
+         [
+          "script",
+          "./test-helper.js"
+         ],
+         [
+          "script",
+          "/common/dispatcher/dispatcher.js"
+         ],
+         [
+          "script",
+          "/common/get-host-info.sub.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "/html/browsers/browsing-the-web/back-forward-cache/resources/rc-helper.js"
+         ],
+         [
+          "script",
+          "/html/browsers/browsing-the-web/remote-context-helper/resources/remote-context-helper.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ]
+     ],
+     "performance-navigation-timing-navigation-failure.tentative.window.js": [
+      "4022e6e59f1c010207051697d0bf098143bfc309",
+      [
+       "performance-timeline/not-restored-reasons/performance-navigation-timing-navigation-failure.tentative.window.html",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "Ensure that navigation failure blocks bfcache and gets recorded."
+         ],
+         [
+          "script",
+          "./test-helper.js"
+         ],
+         [
+          "script",
+          "/common/dispatcher/dispatcher.js"
+         ],
+         [
+          "script",
+          "/common/get-host-info.sub.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "/html/browsers/browsing-the-web/back-forward-cache/resources/rc-helper.js"
+         ],
+         [
+          "script",
+          "/html/browsers/browsing-the-web/back-forward-cache/resources/404.py"
+         ],
+         [
+          "script",
+          "/html/browsers/browsing-the-web/remote-context-helper/resources/remote-context-helper.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ]
+     ],
      "performance-navigation-timing-not-bfcached.tentative.window.js": [
-      "3afce4b97557bc9ba0c2309306403556f38fed28",
+      "0dc1519d1bb1c05026029f5ff644738f74fcd744",
       [
        "performance-timeline/not-restored-reasons/performance-navigation-timing-not-bfcached.tentative.window.html",
        {
@@ -660584,7 +670090,7 @@
       ]
      ],
      "performance-navigation-timing-reload.tentative.window.js": [
-      "3e94c3a4487bd7bbbf02925f35e2520b816e0503",
+      "58584390cd3dc5a2400e62c65df1cf5ce99fa6c6",
       [
        "performance-timeline/not-restored-reasons/performance-navigation-timing-reload.tentative.window.html",
        {
@@ -660631,7 +670137,7 @@
       ]
      ],
      "performance-navigation-timing-same-origin-bfcache.tentative.window.js": [
-      "26fea56bbbc00bc92c8e11f0b82000f5911240e9",
+      "44b44a865c0e5aa7dfd5320f5407b1e74748ab97",
       [
        "performance-timeline/not-restored-reasons/performance-navigation-timing-same-origin-bfcache.tentative.window.html",
        {
@@ -660678,7 +670184,7 @@
       ]
      ],
      "performance-navigation-timing-same-origin-replace.tentative.window.js": [
-      "e1bfafd77988245bdd50effbb1ddf712034efb49",
+      "c833db751390fbf43a73f49870c74377691c4b54",
       [
        "performance-timeline/not-restored-reasons/performance-navigation-timing-same-origin-replace.tentative.window.html",
        {
@@ -661969,6 +671475,24 @@
        }
       ]
      ],
+     "report-to-multiple-endpoints.https.sub.html": [
+      "ce392ed94124d35726bc8fdbdbb6c855d69d0cb8",
+      [
+       null,
+       {
+        "testdriver": true
+       }
+      ]
+     ],
+     "report-to-single-endpoint.https.sub.html": [
+      "bcedd242d25d15c644061dd7cd804b1cf92d3df9",
+      [
+       null,
+       {
+        "testdriver": true
+       }
+      ]
+     ],
      "screen-wake-lock-reporting.https.html": [
       "4ddfc69f86506d7ad3538213ce3d770a13a4f9bc",
       [
@@ -662342,7 +671866,7 @@
      ]
     ],
     "coalesced_events_attributes_under_load.html": [
-     "442aecb73ee6e65433afd848459edfae153cae75",
+     "262742558ec1870f3f984198875ea33f881a26ca",
      [
       "pointerevents/coalesced_events_attributes_under_load.html?mouse",
       {
@@ -662505,8 +672029,29 @@
       ]
      ]
     },
+    "pointerevent_after_target_appended.html": [
+     "08af43626b39b0be18c2054f133a480f1d673c31",
+     [
+      "pointerevents/pointerevent_after_target_appended.html?mouse",
+      {
+       "testdriver": true
+      }
+     ],
+     [
+      "pointerevents/pointerevent_after_target_appended.html?pen",
+      {
+       "testdriver": true
+      }
+     ],
+     [
+      "pointerevents/pointerevent_after_target_appended.html?touch",
+      {
+       "testdriver": true
+      }
+     ]
+    ],
     "pointerevent_after_target_removed.html": [
-     "e426f4db6c962ba728e30f9a6179585edfee7a0f",
+     "2c5d88708d0118bb3804d15c0bb238cd68e2dc6c",
      [
       "pointerevents/pointerevent_after_target_removed.html?mouse",
       {
@@ -662777,7 +672322,7 @@
      ]
     ],
     "pointerevent_fractional_coordinates.html": [
-     "f794797704484dbecb22089219bdeef4637bf45d",
+     "7d18b9f2b77c6214a701d200d3f2a7bfd7312855",
      [
       "pointerevents/pointerevent_fractional_coordinates.html?mouse",
       {
@@ -664606,17 +674151,21 @@
    },
    "private-aggregation": {
     "protected-audience-surface-failure.https.html": [
-     "800bf503cf3972b32f6ce2cd25612c584e3d4adb",
+     "b512afc25dbe99441a0c57638e7b11e2e0681f36",
      [
       null,
-      {}
+      {
+       "timeout": "long"
+      }
      ]
     ],
     "protected-audience-surface-success.https.html": [
-     "b688d76c7f843205cd9bad58babb4c15d5a3b3ab",
+     "1d890321098cf5aa22a12a7035b71298496b19d2",
      [
       null,
-      {}
+      {
+       "timeout": "long"
+      }
      ]
     ],
     "shared-storage-permissions-policy-none.https.html": [
@@ -676915,28 +686464,28 @@
    },
    "remote-playback": {
     "cancel-watch-availability.html": [
-     "d83c8cecb006d738be1280f44d7d8d302f85003f",
+     "41cad7c272e2a32cf39e9a6d58fb1c728f4be4a2",
      [
       null,
       {}
      ]
     ],
     "disable-remote-playback-cancel-watch-availability-throws.html": [
-     "bdd35d8101bdf0e4ae96e63de9f51b1ba6a7b5d4",
+     "7b93f8e3af7aef11b77e795fbacad32964e95d3e",
      [
       null,
       {}
      ]
     ],
     "disable-remote-playback-prompt-throws.html": [
-     "18333842b6a180b668ad953530c04ba4fcd79e58",
+     "b47e30eebaa1082ed1d3c638b8aedb81bac96bdb",
      [
       null,
       {}
      ]
     ],
     "disable-remote-playback-watch-availability-throws.html": [
-     "b671d9f944da47c6638ff4d45512d835ec1cc405",
+     "7496b86fcde9049b9d725a407d83606752800e0b",
      [
       null,
       {}
@@ -676976,8 +686525,22 @@
       {}
      ]
     ],
+    "watch-availability-callback-parameter.html": [
+     "fe407a9c03cbddd467810168f7c43f36fd519e14",
+     [
+      null,
+      {}
+     ]
+    ],
     "watch-availability-initial-callback.html": [
-     "352321b06ae66c5a3e31c1d3d7cf40a5e3b4c460",
+     "b540d835b9b4e530f1570bcdbedb4281113ff8df",
+     [
+      null,
+      {}
+     ]
+    ],
+    "watch-availability-promise-return-callback-id.html": [
+     "c3df0b31f16af66ec81bf7a9c608fe64a80f7474",
      [
       null,
       {}
@@ -678218,6 +687781,20 @@
       {}
      ]
     ],
+    "resource-timing-failed-fetch-web-bundle.tentative.html": [
+     "b99183a49cd84c250115ea9ef6dd0a0dea57123d",
+     [
+      null,
+      {}
+     ]
+    ],
+    "resource-timing-failed-fetch.html": [
+     "5bab39e2760728a901b5abe62296b8144b23d13e",
+     [
+      null,
+      {}
+     ]
+    ],
     "resource-timing-level1.sub.html": [
      "093d2542218fbe48b134230b4d9d65e1ef1d4c10",
      [
@@ -680288,7 +689865,7 @@
      ]
     ],
     "getdisplaymedia-capture-controller.https.window.js": [
-     "fa1fd84b367804cc6c7e16d59b2b2c825a6891a1",
+     "0fe1a9fd26b2d151ed6d5d042718676885f8711b",
      [
       "screen-capture/getdisplaymedia-capture-controller.https.window.html",
       {
@@ -680321,7 +689898,7 @@
      ]
     ],
     "getdisplaymedia.https.html": [
-     "095b98dea4c5e5156731e97bcd9b1aba075e0ae7",
+     "4558786faa1183fe4a594455788769b2a74decee",
      [
       null,
       {
@@ -680794,6 +690371,13 @@
        {}
       ]
      ],
+     "animation-events.html": [
+      "be53af487a0f9a05787f60839a05d3c6aa948bc5",
+      [
+       null,
+       {}
+      ]
+     ],
      "animation-range-ignored.html": [
       "98a5d45c37f9349eb28b54406e6542e58cb5b2a0",
       [
@@ -681053,7 +690637,7 @@
        {}
       ]
      ],
-     "scroll-timeline-shorthand.tentative.html": [
+     "scroll-timeline-shorthand.html": [
       "0c8a47ae20d1894a05ed5b615d1cc7d74ebe881f",
       [
        null,
@@ -681214,8 +690798,8 @@
        {}
       ]
      ],
-     "view-timeline-shorthand.tentative.html": [
-      "e5bf8822932177d621ba80ef42cc2b24ae8bc8ae",
+     "view-timeline-shorthand.html": [
+      "c14c1c880678102ab031a480d28f0fabc2bf9ed6",
       [
        null,
        {}
@@ -681566,13 +691150,27 @@
        ]
       ]
      },
-     "svg-graphics-element.html": [
+     "svg-graphics-element-001.html": [
       "9b100a0b6420a35e33e130e48f0bfc6abd1c416c",
       [
        null,
        {}
       ]
      ],
+     "svg-graphics-element-002.html": [
+      "e173a649efc01b084b88f5a3911a166264874e82",
+      [
+       null,
+       {}
+      ]
+     ],
+     "svg-graphics-element-003.html": [
+      "48e238c8eddc3413f401f66ed776596056ff4237",
+      [
+       null,
+       {}
+      ]
+     ],
      "timeline-offset-in-keyframe.html": [
       "1168893854297560262e03c28bdf71580955b8ae",
       [
@@ -681752,6 +691350,15 @@
       }
      ]
     ],
+    "percent-encoding.html": [
+     "696734b663d2cbd49adbb6a2a400d0747be5ebc6",
+     [
+      null,
+      {
+       "testdriver": true
+      }
+     ]
+    ],
     "redirects.html": [
      "5ad910affe55f6dd5ff63cdd3e019cf969fc6653",
      [
@@ -681762,7 +691369,7 @@
      ]
     ],
     "same-document-tests.html": [
-     "be9bed9fd8b6f58626866bff132634e8dc60d51c",
+     "85db2de0a227c694d2168e49dfb7f9cffb5d9eff",
      [
       null,
       {}
@@ -686696,7 +696303,7 @@
         ]
        ],
        "static-router-subresource.https.html": [
-        "721c2797603bb568172c6804b07e195d14d2018e",
+        "7d956363e681c1c3ee03ade088fbf371ae5b0b8c",
         [
          null,
          {}
@@ -687506,7 +697113,7 @@
       ]
      ],
      "focus-navigation-slot-fallback-default-tabindex.html": [
-      "e8e0293e77bd28aba469bccffcb8d6c4245a7691",
+      "365edb00b814f84fa55507bffced887b3c2bea2a",
       [
        null,
        {
@@ -687515,7 +697122,7 @@
       ]
      ],
      "focus-navigation-slot-fallback.html": [
-      "8b29558b50475719484ff221c8c7ef95a3b7cc43",
+      "54ee14c34bec4f7a4cb6f1fce813ec345712034a",
       [
        null,
        {
@@ -687524,7 +697131,7 @@
       ]
      ],
      "focus-navigation-slot-nested-2levels.html": [
-      "54def5ce7e56a5cdb75f46c91e8851b9121b76bd",
+      "7d733ea7c2ec1f1eaa93cf1977be53fd8ff3ad4c",
       [
        null,
        {
@@ -687533,7 +697140,7 @@
       ]
      ],
      "focus-navigation-slot-nested-delegatesFocus.html": [
-      "94d8ce8e1f04b963151edcab4a9989e75b28d05c",
+      "5e4ab3ce4bacf12de69a04d6ed216bc0a9a6e795",
       [
        null,
        {
@@ -687542,7 +697149,7 @@
       ]
      ],
      "focus-navigation-slot-nested-fallback.html": [
-      "93a6240fe3e8f1452303d3d1075240bccc2d33d6",
+      "66d8c14b2b9a18235f4e82507b805041455ef52d",
       [
        null,
        {
@@ -687551,7 +697158,7 @@
       ]
      ],
      "focus-navigation-slot-nested.html": [
-      "7bfe5dc7844040902b499874e2cf6a72e03af9f6",
+      "ae966afc76adbb29efb605039ac4db3ba6f87e93",
       [
        null,
        {
@@ -687560,7 +697167,7 @@
       ]
      ],
      "focus-navigation-slot-shadow-in-fallback.html": [
-      "7192a42584b1f77759b1ce4222bc032b73b5c8f1",
+      "418da8f5ff72ae9baee6bca9f8b1943e04c8cbe4",
       [
        null,
        {
@@ -687569,7 +697176,7 @@
       ]
      ],
      "focus-navigation-slot-shadow-in-slot.html": [
-      "4f320574ed58fad6d4e6b01504e434bf1ce3bb2d",
+      "eef3e1b61193807c5a92e27351cb3c8005d8484c",
       [
        null,
        {
@@ -687578,7 +697185,7 @@
       ]
      ],
      "focus-navigation-slot-with-tabindex.html": [
-      "880fb83130bbf23adb2196300743ca58fc76bb89",
+      "d43085e984503a0b393d4bf447db6682d1698bc4",
       [
        null,
        {
@@ -687587,7 +697194,7 @@
       ]
      ],
      "focus-navigation-slots-in-slot.html": [
-      "5cc8abbf019211d627826b5836c790e4078f09f5",
+      "39b080660344038a3e9a836ca819cb737a2f688c",
       [
        null,
        {
@@ -687596,7 +697203,7 @@
       ]
      ],
      "focus-navigation-slots.html": [
-      "f2de50f6eba190a81390bda953625bf4f125eecf",
+      "0d129ae77124c41e2936af81e97d65aad77c9dba",
       [
        null,
        {
@@ -687614,7 +697221,7 @@
       ]
      ],
      "focus-navigation-with-delegatesFocus.html": [
-      "e09726152678e20721fd28925fb27e372dee1535",
+      "64942a109e0281a5e0806214428ffbc8f05f8c6c",
       [
        null,
        {
@@ -687623,7 +697230,7 @@
       ]
      ],
      "focus-navigation.html": [
-      "fabcf881708d337f81611bbdf7ff939b0dfeb492",
+      "9e593eb1003a26a9957d04ddca8cd522e7a0872e",
       [
        null,
        {
@@ -687668,7 +697275,7 @@
       ]
      ],
      "focus-with-negative-index.html": [
-      "95dc98fc02dc61f0414d6e43bd9ac212e0ae773c",
+      "ed3fac9a6cfb4cbcc1210ecb2eee43bfa65015f3",
       [
        null,
        {
@@ -688719,6 +698326,34 @@
       {}
      ]
     ],
+    "shared-storage-writable-iframe-content-attribute.tentative.https.sub.html": [
+     "f27c8548cb14cd103ebcacae5fb87d427ffc8d59",
+     [
+      null,
+      {}
+     ]
+    ],
+    "shared-storage-writable-iframe-idl-attribute-included.tentative.https.sub.html": [
+     "2947ea51e0ef537009b77017d041797c02f8c43b",
+     [
+      null,
+      {}
+     ]
+    ],
+    "shared-storage-writable-iframe-idl-attribute-not-included.tentative.https.sub.html": [
+     "13a45a275be7c40cb1a89c59419e0cc51c639ee1",
+     [
+      null,
+      {}
+     ]
+    ],
+    "shared-storage-writable-iframe-in-fenced.tentative.https.sub.html": [
+     "e3a9803f0162bfad782987d1c7eafd12bbecc82b",
+     [
+      null,
+      {}
+     ]
+    ],
     "shared-storage-writable-img-content-attribute.tentative.https.sub.html": [
      "5bce34d91a97c34d1a57f21cc4e27aadc55a91c1",
      [
@@ -688791,8 +698426,8 @@
     ]
    },
    "shared-storage-selecturl-limit": {
-    "run-url-selection-operation-limit-multiple-origins.tentative.https.sub.html": [
-     "df69597ee8549f9f3652410c680a09b0f8aacc26",
+    "run-url-selection-operation-limit-multiple-sites.tentative.https.sub.html": [
+     "b71c368704bb9ca2bb7878fbbb6f37264c8dfa73",
      [
       null,
       {}
@@ -689258,6 +698893,15 @@
       }
      ]
     ],
+    "disabled.html": [
+     "b53c2f701222c4a85e80d2f604ea34baef2b859b",
+     [
+      null,
+      {
+       "testdriver": true
+      }
+     ]
+    ],
     "dropped-entries.tentative.html": [
      "425f91a7c3ca4810d023661967c6550af92442af",
      [
@@ -689296,7 +698940,34 @@
      ]
     ],
     "image-lcp-followed-by-two-image-softnavs-lcp.tentative.html": [
-     "25151cdd79ea4f1127c4925b00930897bf13fae7",
+     "0e1b9a4d679cb99f0479f24a0a9ba46cfafc10d3",
+     [
+      null,
+      {
+       "testdriver": true
+      }
+     ]
+    ],
+    "keydown.tentative.html": [
+     "fac86d71d2cc04c17fedc98e4d8ba8133050725a",
+     [
+      null,
+      {
+       "testdriver": true
+      }
+     ]
+    ],
+    "load-classic-script-history-push.tentative.html": [
+     "4e375b2164db87258132f4a6edba4b68c1c2b99b",
+     [
+      null,
+      {
+       "testdriver": true
+      }
+     ]
+    ],
+    "load-module-script-history-push.tentative.html": [
+     "e82cd13f4a5dcc0c5cb54a59829cb64a3f5ca50a",
      [
       null,
       {
@@ -689315,7 +698986,7 @@
      ]
     ],
     "navigate-child.html": [
-     "63a8adb208f2a0c8cfeae4f36871578bb0bf20e4",
+     "e3c17e2dbaa2148b0dd35632d0651592f9696bec",
      [
       null,
       {
@@ -689404,6 +699075,15 @@
       }
      ]
     ],
+    "popstate-multiple-backs.tentative.html": [
+     "2a12a352bffc3fed4f207daaf877c781b0799ff3",
+     [
+      null,
+      {
+       "testdriver": true
+      }
+     ]
+    ],
     "popstate.tentative.html": [
      "60a5ff72292c15abd281b1264e747a8f3c0d0d2b",
      [
@@ -689561,11 +699241,19 @@
       ]
      ],
      "document-rules.https.html": [
-      "0eed29dbefca9fc495dd225d3bd17d4181ee09cd",
+      "070037704ff9e63c0825714775092d3be02cae21",
       [
        "speculation-rules/prefetch/document-rules.https.html?include=and",
        {}
       ],
+      [
+       "speculation-rules/prefetch/document-rules.https.html?include=baseURLChangedByBaseElement",
+       {}
+      ],
+      [
+       "speculation-rules/prefetch/document-rules.https.html?include=baseURLChangedBySameDocumentNavigation",
+       {}
+      ],
       [
        "speculation-rules/prefetch/document-rules.https.html?include=defaultPredicate",
        {}
@@ -689590,6 +699278,10 @@
        "speculation-rules/prefetch/document-rules.https.html?include=linkInShadowTree",
        {}
       ],
+      [
+       "speculation-rules/prefetch/document-rules.https.html?include=linkToSelfFragment",
+       {}
+      ],
       [
        "speculation-rules/prefetch/document-rules.https.html?include=newRuleSetAdded",
        {}
@@ -689634,6 +699326,13 @@
        {}
       ]
      ],
+     "fragment.https.html": [
+      "7b35500303e16b6e9e68661d83daeb0c76bffd45",
+      [
+       null,
+       {}
+      ]
+     ],
      "initiators-a-element.sub.https.html": [
       "9cfedb20efa5eb1cf192a3256834b3316fbe743f",
       [
@@ -690093,7 +699792,7 @@
       ]
      ],
      "redirect-url.sub.https.html": [
-      "324bdd0b589d02dfdd7b8fb0aa67648c907f04fe",
+      "02bb35349ff9f72e74d0244473447b9ea89ce9a4",
       [
        null,
        {
@@ -691131,15 +700830,6 @@
        }
       ]
      ],
-     "web-database.https.html": [
-      "b6d2d7ddeb9c7ea743a4ec13f0cac751222622c5",
-      [
-       null,
-       {
-        "timeout": "long"
-       }
-      ]
-     ],
      "windowclient-navigate-to-cross-origin-url-on-iframe.https.html": [
       "1bfc2e0eb07560850108f973f01f8f1cbc7a15cc",
       [
@@ -691293,7 +700983,7 @@
    "storage": {
     "buckets": {
      "bucket-quota-indexeddb.tentative.https.any.js": [
-      "ba82edb72ec6fc1656be169a14c3a025e1ab6a23",
+      "e03aaa802d0869fbab732fc133c613f88837f3b5",
       [
        "storage/buckets/bucket-quota-indexeddb.tentative.https.any.html",
        {
@@ -691911,7 +701601,7 @@
      ]
     ],
     "requestStorageAccess-cross-origin-iframe-navigation.sub.https.window.js": [
-     "24595ed340856e0f667dbd2671614e5c23ba712c",
+     "691c8c86b62005880c0babeb686cfc18113579ec",
      [
       "storage-access-api/requestStorageAccess-cross-origin-iframe-navigation.sub.https.window.html",
       {
@@ -691959,7 +701649,7 @@
      ]
     ],
     "requestStorageAccess-cross-site-sibling-iframes.sub.https.window.js": [
-     "c93673887c4dafe4a60f8cb00ad65c6203bd2376",
+     "06ee80e5a08951c7300dcb446d3e6bcf39a35583",
      [
       "storage-access-api/requestStorageAccess-cross-site-sibling-iframes.sub.https.window.html",
       {
@@ -691985,7 +701675,7 @@
      ]
     ],
     "requestStorageAccess-insecure.sub.window.js": [
-     "1b00aee00a56be91117eb6732594d06289cf2401",
+     "1ad04321db7f4ce9e55d8676fecee8fd6604c8ca",
      [
       "storage-access-api/requestStorageAccess-insecure.sub.window.html",
       {
@@ -692073,7 +701763,7 @@
      ]
     ],
     "requestStorageAccess-non-fully-active.sub.https.window.js": [
-     "18f451975ad313f64c068d464953d9a14afb8bf2",
+     "79b4a7959f4f94adc09bc5f44175bc9f8eed2880",
      [
       "storage-access-api/requestStorageAccess-non-fully-active.sub.https.window.html",
       {
@@ -692297,14 +701987,14 @@
     ],
     "piping": {
      "abort.any.js": [
-      "503de9dcaf0893ad7471d001edacb30cbc7d0786",
+      "c9929df91cf68816a6a3381249616b4c38085dc5",
       [
        "streams/piping/abort.any.html",
        {
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -692323,7 +702013,26 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
+         ],
+         [
+          "script",
+          "../resources/recording-streams.js"
+         ],
+         [
+          "script",
+          "../resources/test-utils.js"
+         ]
+        ]
+       }
+      ],
+      [
+       "streams/piping/abort.any.shadowrealm.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -692342,7 +702051,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -692361,7 +702070,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -692376,14 +702085,14 @@
       ]
      ],
      "close-propagation-backward.any.js": [
-      "5ea47ab85c0c1fe78f71962d55a615d7a078f2d4",
+      "25bd475ed13e77d9021a5228021ab23e1b945a91",
       [
        "streams/piping/close-propagation-backward.any.html",
        {
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -692398,7 +702107,22 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
+         ],
+         [
+          "script",
+          "../resources/recording-streams.js"
+         ]
+        ]
+       }
+      ],
+      [
+       "streams/piping/close-propagation-backward.any.shadowrealm.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -692413,7 +702137,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -692428,7 +702152,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -692439,14 +702163,14 @@
       ]
      ],
      "close-propagation-forward.any.js": [
-      "71b6e262840090202301539601571f18a701c1e8",
+      "0ec94f80abf04b2093e3297a0bbb81a63bbb6a74",
       [
        "streams/piping/close-propagation-forward.any.html",
        {
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -692465,7 +702189,26 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
+         ],
+         [
+          "script",
+          "../resources/test-utils.js"
+         ],
+         [
+          "script",
+          "../resources/recording-streams.js"
+         ]
+        ]
+       }
+      ],
+      [
+       "streams/piping/close-propagation-forward.any.shadowrealm.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -692484,7 +702227,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -692503,7 +702246,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -692518,14 +702261,14 @@
       ]
      ],
      "error-propagation-backward.any.js": [
-      "ec74592f86effe41d5e9d07a8bb5acdbe839c7cd",
+      "f786469d6c1d408573ea385d8fce19252f20f86f",
       [
        "streams/piping/error-propagation-backward.any.html",
        {
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -692544,7 +702287,26 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
+         ],
+         [
+          "script",
+          "../resources/test-utils.js"
+         ],
+         [
+          "script",
+          "../resources/recording-streams.js"
+         ]
+        ]
+       }
+      ],
+      [
+       "streams/piping/error-propagation-backward.any.shadowrealm.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -692563,7 +702325,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -692582,7 +702344,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -692597,14 +702359,14 @@
       ]
      ],
      "error-propagation-forward.any.js": [
-      "482da2f8a88e1870882fc6be54c562f4110568df",
+      "e9260f9ea22c4189ce2c5344db24b706cc367063",
       [
        "streams/piping/error-propagation-forward.any.html",
        {
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -692623,7 +702385,26 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
+         ],
+         [
+          "script",
+          "../resources/test-utils.js"
+         ],
+         [
+          "script",
+          "../resources/recording-streams.js"
+         ]
+        ]
+       }
+      ],
+      [
+       "streams/piping/error-propagation-forward.any.shadowrealm.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -692642,7 +702423,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -692661,7 +702442,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -692676,14 +702457,14 @@
       ]
      ],
      "flow-control.any.js": [
-      "09c4420f872adcf77a61b79ecf4f982cfe3e0a29",
+      "e2318da375ab9044dc105c15613c375c9e68ae9d",
       [
        "streams/piping/flow-control.any.html",
        {
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -692706,7 +702487,30 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
+         ],
+         [
+          "script",
+          "../resources/test-utils.js"
+         ],
+         [
+          "script",
+          "../resources/rs-utils.js"
+         ],
+         [
+          "script",
+          "../resources/recording-streams.js"
+         ]
+        ]
+       }
+      ],
+      [
+       "streams/piping/flow-control.any.shadowrealm.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -692729,7 +702533,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -692752,7 +702556,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -692771,14 +702575,14 @@
       ]
      ],
      "general-addition.any.js": [
-      "2562b7064338ee607ee878c7ea111fd1df0830f5",
+      "cf4aa9bea6a1a45e38e00614bb15547e6a9ab33c",
       [
        "streams/piping/general-addition.any.html",
        {
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -692789,7 +702593,18 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
+         ]
+        ]
+       }
+      ],
+      [
+       "streams/piping/general-addition.any.shadowrealm.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -692800,7 +702615,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -692811,21 +702626,21 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
       ]
      ],
      "general.any.js": [
-      "bec3480f65394461dea9cbdda84a5fe4c21e8ed5",
+      "09e01536325ccaee1467b6330d0dff6105356003",
       [
        "streams/piping/general.any.html",
        {
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -692844,7 +702659,26 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
+         ],
+         [
+          "script",
+          "../resources/test-utils.js"
+         ],
+         [
+          "script",
+          "../resources/recording-streams.js"
+         ]
+        ]
+       }
+      ],
+      [
+       "streams/piping/general.any.shadowrealm.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -692863,7 +702697,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -692882,7 +702716,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -692897,14 +702731,14 @@
       ]
      ],
      "multiple-propagation.any.js": [
-      "a78652fc06795e8f3f253871bf92fc557c286503",
+      "9be828a23269a520c200f86a09b97cf7d4a28f1d",
       [
        "streams/piping/multiple-propagation.any.html",
        {
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -692923,7 +702757,26 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
+         ],
+         [
+          "script",
+          "../resources/test-utils.js"
+         ],
+         [
+          "script",
+          "../resources/recording-streams.js"
+         ]
+        ]
+       }
+      ],
+      [
+       "streams/piping/multiple-propagation.any.shadowrealm.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -692942,7 +702795,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -692961,7 +702814,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -692976,14 +702829,14 @@
       ]
      ],
      "pipe-through.any.js": [
-      "26b1cd26a3c82f4fe2cd1ddadd7ed360a89335ce",
+      "339cee19993346f9535ba4de5a5983e354b33fa1",
       [
        "streams/piping/pipe-through.any.html",
        {
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -693006,7 +702859,30 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
+         ],
+         [
+          "script",
+          "../resources/rs-utils.js"
+         ],
+         [
+          "script",
+          "../resources/test-utils.js"
+         ],
+         [
+          "script",
+          "../resources/recording-streams.js"
+         ]
+        ]
+       }
+      ],
+      [
+       "streams/piping/pipe-through.any.shadowrealm.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -693029,7 +702905,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -693052,7 +702928,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -693071,14 +702947,14 @@
       ]
      ],
      "then-interception.any.js": [
-      "543f916d940d9aecfd522e275238c36aeedbfd4d",
+      "fc48c3683114785d7187038a9d520d0c4c1039d2",
       [
        "streams/piping/then-interception.any.html",
        {
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -693097,7 +702973,26 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
+         ],
+         [
+          "script",
+          "../resources/test-utils.js"
+         ],
+         [
+          "script",
+          "../resources/recording-streams.js"
+         ]
+        ]
+       }
+      ],
+      [
+       "streams/piping/then-interception.any.shadowrealm.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -693116,7 +703011,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -693135,7 +703030,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -693150,14 +703045,14 @@
       ]
      ],
      "throwing-options.any.js": [
-      "b9f906778f632b32a83800c806c8fc72294ae3cc",
+      "186f8ded1968a4f1b4f25cf8dd2e5d2ccbb3bfdb",
       [
        "streams/piping/throwing-options.any.html",
        {
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -693168,7 +703063,18 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
+         ]
+        ]
+       }
+      ],
+      [
+       "streams/piping/throwing-options.any.shadowrealm.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -693179,7 +703085,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -693190,21 +703096,21 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
       ]
      ],
      "transform-streams.any.js": [
-      "caae9fbad8848a54d39ab3434a855e5eabcc5e43",
+      "e079bb637cad0da3f2bb6a28569e49b84d540c2a",
       [
        "streams/piping/transform-streams.any.html",
        {
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -693215,7 +703121,18 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
+         ]
+        ]
+       }
+      ],
+      [
+       "streams/piping/transform-streams.any.shadowrealm.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -693226,7 +703143,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -693237,7 +703154,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -693252,14 +703169,14 @@
      ]
     ],
     "queuing-strategies.any.js": [
-     "fa959ebba283388cdd13a626a41de7f4323bfcfc",
+     "9efc4570cf2ee2e2eb1525434351420ddc0d5e97",
      [
       "streams/queuing-strategies.any.html",
       {
        "script_metadata": [
         [
          "global",
-         "window,worker"
+         "window,worker,shadowrealm"
         ]
        ]
       }
@@ -693270,7 +703187,18 @@
        "script_metadata": [
         [
          "global",
-         "window,worker"
+         "window,worker,shadowrealm"
+        ]
+       ]
+      }
+     ],
+     [
+      "streams/queuing-strategies.any.shadowrealm.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker,shadowrealm"
         ]
        ]
       }
@@ -693281,7 +703209,7 @@
        "script_metadata": [
         [
          "global",
-         "window,worker"
+         "window,worker,shadowrealm"
         ]
        ]
       }
@@ -693292,7 +703220,7 @@
        "script_metadata": [
         [
          "global",
-         "window,worker"
+         "window,worker,shadowrealm"
         ]
        ]
       }
@@ -693300,14 +703228,14 @@
     ],
     "readable-byte-streams": {
      "bad-buffers-and-views.any.js": [
-      "3322116b19184039131594e4cf5898983a808ea2",
+      "afcc61e6800a28e0c8acaccf79d3cfadc4237b60",
       [
        "streams/readable-byte-streams/bad-buffers-and-views.any.html",
        {
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -693318,7 +703246,18 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
+         ]
+        ]
+       }
+      ],
+      [
+       "streams/readable-byte-streams/bad-buffers-and-views.any.shadowrealm.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -693329,7 +703268,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -693340,21 +703279,21 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
       ]
      ],
      "construct-byob-request.any.js": [
-      "8d460a1c81b7bdc74bb56b856f0f3a07bd982585",
+      "a26f949ee29d945a264f368dda9e890f26fa3fdc",
       [
        "streams/readable-byte-streams/construct-byob-request.any.html",
        {
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -693369,7 +703308,22 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
+         ],
+         [
+          "script",
+          "../resources/rs-utils.js"
+         ]
+        ]
+       }
+      ],
+      [
+       "streams/readable-byte-streams/construct-byob-request.any.shadowrealm.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -693384,7 +703338,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -693399,7 +703353,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -693410,14 +703364,14 @@
       ]
      ],
      "enqueue-with-detached-buffer.any.js": [
-      "d2b37f00a9d697243433ddc7f2eb44a3d2e3d7f3",
+      "92bd0a26a0ec05c2c3b8dcd25ce347964d1705d5",
       [
        "streams/readable-byte-streams/enqueue-with-detached-buffer.any.html",
        {
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -693428,7 +703382,18 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
+         ]
+        ]
+       }
+      ],
+      [
+       "streams/readable-byte-streams/enqueue-with-detached-buffer.any.shadowrealm.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -693439,7 +703404,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -693450,21 +703415,21 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
       ]
      ],
      "general.any.js": [
-      "dd4fdc855786f296202905b0aeae8dd160dd7bd5",
+      "cdce2244c3c84b75414fca50361f8780333cbfd6",
       [
        "streams/readable-byte-streams/general.any.html",
        {
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -693483,7 +703448,26 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
+         ],
+         [
+          "script",
+          "../resources/rs-utils.js"
+         ],
+         [
+          "script",
+          "../resources/test-utils.js"
+         ]
+        ]
+       }
+      ],
+      [
+       "streams/readable-byte-streams/general.any.shadowrealm.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -693502,7 +703486,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -693521,7 +703505,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -693536,14 +703520,14 @@
       ]
      ],
      "non-transferable-buffers.any.js": [
-      "e8ea3c4f9667630923fc8d6f0235912abc68b881",
+      "47d7b2e653e5ec5379f1da4eb13740d3b5bb75d6",
       [
        "streams/readable-byte-streams/non-transferable-buffers.any.html",
        {
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -693554,7 +703538,18 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
+         ]
+        ]
+       }
+      ],
+      [
+       "streams/readable-byte-streams/non-transferable-buffers.any.shadowrealm.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -693565,7 +703560,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -693576,21 +703571,21 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
       ]
      ],
      "respond-after-enqueue.any.js": [
-      "b93cec97391e13eb60d8d5dc9d580da4bcc303fd",
+      "e51efa061a6511b2c22a6df541b99209827c11be",
       [
        "streams/readable-byte-streams/respond-after-enqueue.any.html",
        {
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -693601,7 +703596,18 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
+         ]
+        ]
+       }
+      ],
+      [
+       "streams/readable-byte-streams/respond-after-enqueue.any.shadowrealm.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -693612,7 +703618,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -693623,21 +703629,21 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
       ]
      ],
      "tee.any.js": [
-      "85844669cd9088e041e13ffaa3bac90beead916a",
+      "7dd5ba3f3fb013964b738d50d0c76a05d7c9d583",
       [
        "streams/readable-byte-streams/tee.any.html",
        {
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -693664,7 +703670,34 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
+         ],
+         [
+          "script",
+          "../resources/rs-utils.js"
+         ],
+         [
+          "script",
+          "../resources/test-utils.js"
+         ],
+         [
+          "script",
+          "../resources/recording-streams.js"
+         ],
+         [
+          "script",
+          "../resources/rs-test-templates.js"
+         ]
+        ]
+       }
+      ],
+      [
+       "streams/readable-byte-streams/tee.any.shadowrealm.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -693691,7 +703724,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -693718,7 +703751,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -693743,14 +703776,14 @@
     },
     "readable-streams": {
      "async-iterator.any.js": [
-      "3ccaca17bc1ac705f488d7f20e19c400d79d098c",
+      "4b674bea8430f3bc4ab8539c6671f37ba498d75d",
       [
        "streams/readable-streams/async-iterator.any.html",
        {
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -693773,7 +703806,30 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
+         ],
+         [
+          "script",
+          "../resources/rs-utils.js"
+         ],
+         [
+          "script",
+          "../resources/test-utils.js"
+         ],
+         [
+          "script",
+          "../resources/recording-streams.js"
+         ]
+        ]
+       }
+      ],
+      [
+       "streams/readable-streams/async-iterator.any.shadowrealm.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -693796,7 +703852,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -693819,7 +703875,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -693838,14 +703894,14 @@
       ]
      ],
      "bad-strategies.any.js": [
-      "409c63b8177e25222922d0a9eedb3e51a5a4a96a",
+      "49fa4bdbece5b58dfa159b52d615c3505deb269c",
       [
        "streams/readable-streams/bad-strategies.any.html",
        {
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -693856,7 +703912,18 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
+         ]
+        ]
+       }
+      ],
+      [
+       "streams/readable-streams/bad-strategies.any.shadowrealm.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -693867,7 +703934,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -693878,21 +703945,21 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
       ]
      ],
      "bad-underlying-sources.any.js": [
-      "e9cf4c924930b2f209d5fdb4c1c6b9a65f096038",
+      "3d77b923d178a0134f3f3d0590be0f4fd836c7a5",
       [
        "streams/readable-streams/bad-underlying-sources.any.html",
        {
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -693903,7 +703970,18 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
+         ]
+        ]
+       }
+      ],
+      [
+       "streams/readable-streams/bad-underlying-sources.any.shadowrealm.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -693914,7 +703992,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -693925,21 +704003,21 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
       ]
      ],
      "cancel.any.js": [
-      "800bd9944172416638d9792ccbeaa2bcd136db15",
+      "9915c1fb6330c1f2a8143fb956abc9bec5504f3d",
       [
        "streams/readable-streams/cancel.any.html",
        {
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -693958,7 +704036,26 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
+         ],
+         [
+          "script",
+          "../resources/test-utils.js"
+         ],
+         [
+          "script",
+          "../resources/rs-utils.js"
+         ]
+        ]
+       }
+      ],
+      [
+       "streams/readable-streams/cancel.any.shadowrealm.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -693977,7 +704074,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -693996,7 +704093,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -694011,14 +704108,14 @@
       ]
      ],
      "constructor.any.js": [
-      "608dc48cfa39d7068d1364a0e1b629571c1782e6",
+      "0b995f0cb16bde21df887a717690eaa853a988b9",
       [
        "streams/readable-streams/constructor.any.html",
        {
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -694029,7 +704126,18 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
+         ]
+        ]
+       }
+      ],
+      [
+       "streams/readable-streams/constructor.any.shadowrealm.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -694040,7 +704148,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -694051,21 +704159,21 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
       ]
      ],
      "count-queuing-strategy-integration.any.js": [
-      "02ac5bae5c2f8ac6bae0606ac0a584b1b61b50c5",
+      "a8c1b91d0068e316463400395601c995b9f89f40",
       [
        "streams/readable-streams/count-queuing-strategy-integration.any.html",
        {
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -694076,7 +704184,18 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
+         ]
+        ]
+       }
+      ],
+      [
+       "streams/readable-streams/count-queuing-strategy-integration.any.shadowrealm.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -694087,7 +704206,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -694098,7 +704217,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -694112,14 +704231,14 @@
       ]
      ],
      "default-reader.any.js": [
-      "59d7ab2f74db63f734030df99d74a8e21bc4a57a",
+      "f92862719e47c178e3bdb1ddcf2cfa12b84b4514",
       [
        "streams/readable-streams/default-reader.any.html",
        {
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -694134,7 +704253,22 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
+         ],
+         [
+          "script",
+          "../resources/rs-utils.js"
+         ]
+        ]
+       }
+      ],
+      [
+       "streams/readable-streams/default-reader.any.shadowrealm.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -694149,7 +704283,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -694164,7 +704298,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -694175,14 +704309,14 @@
       ]
      ],
      "floating-point-total-queue-size.any.js": [
-      "50cca3d951a9424d4fb9e45597434912ef94ec52",
+      "8b88c21d7f0b531266bbec7cb6d764b51d63db66",
       [
        "streams/readable-streams/floating-point-total-queue-size.any.html",
        {
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -694193,7 +704327,18 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
+         ]
+        ]
+       }
+      ],
+      [
+       "streams/readable-streams/floating-point-total-queue-size.any.shadowrealm.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -694204,7 +704349,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -694215,21 +704360,21 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
       ]
      ],
      "from.any.js": [
-      "d53206d4aec0c8f93aa3b82e0897a64159d17359",
+      "58ad4d4add127d933c00af0b36c1d8c16b08f76d",
       [
        "streams/readable-streams/from.any.html",
        {
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -694244,7 +704389,22 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
+         ],
+         [
+          "script",
+          "../resources/test-utils.js"
+         ]
+        ]
+       }
+      ],
+      [
+       "streams/readable-streams/from.any.shadowrealm.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -694259,7 +704419,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -694274,7 +704434,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -694285,14 +704445,14 @@
       ]
      ],
      "garbage-collection.any.js": [
-      "e578176777adafe6ec370be6dd88337af083b3f0",
+      "13bd1fb34378773ddab521ab0e51e572dc54063a",
       [
        "streams/readable-streams/garbage-collection.any.html",
        {
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -694311,7 +704471,26 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
+         ],
+         [
+          "script",
+          "../resources/test-utils.js"
+         ],
+         [
+          "script",
+          "/common/gc.js"
+         ]
+        ]
+       }
+      ],
+      [
+       "streams/readable-streams/garbage-collection.any.shadowrealm.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -694330,7 +704509,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -694349,7 +704528,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -694364,14 +704543,14 @@
       ]
      ],
      "general.any.js": [
-      "2a32b27943c82f3e5701a0ed5fa05d7f16bb9c72",
+      "eee3f62215eeb07e6a1c06d004defd98324b270e",
       [
        "streams/readable-streams/general.any.html",
        {
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -694390,7 +704569,26 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
+         ],
+         [
+          "script",
+          "../resources/test-utils.js"
+         ],
+         [
+          "script",
+          "../resources/rs-utils.js"
+         ]
+        ]
+       }
+      ],
+      [
+       "streams/readable-streams/general.any.shadowrealm.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -694409,7 +704607,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -694428,7 +704626,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -694450,14 +704648,14 @@
       ]
      ],
      "owning-type-message-port.any.js": [
-      "e9961ce042256acad6ac94cb558d57e7dd3464d5",
+      "282c1f411485c0e8a17beadb0fad7d14ef634046",
       [
        "streams/readable-streams/owning-type-message-port.any.html",
        {
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -694476,7 +704674,26 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
+         ],
+         [
+          "script",
+          "../resources/test-utils.js"
+         ],
+         [
+          "script",
+          "../resources/rs-utils.js"
+         ]
+        ]
+       }
+      ],
+      [
+       "streams/readable-streams/owning-type-message-port.any.shadowrealm.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -694495,7 +704712,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -694514,7 +704731,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -694529,14 +704746,14 @@
       ]
      ],
      "owning-type-video-frame.any.js": [
-      "ec01fda0b3c737326e8ca7cd78101ca062eab58b",
+      "b652f9c5fcb4b67f7ab0405c834020001ad5afff",
       [
        "streams/readable-streams/owning-type-video-frame.any.html",
        {
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -694555,7 +704772,26 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
+         ],
+         [
+          "script",
+          "../resources/test-utils.js"
+         ],
+         [
+          "script",
+          "../resources/rs-utils.js"
+         ]
+        ]
+       }
+      ],
+      [
+       "streams/readable-streams/owning-type-video-frame.any.shadowrealm.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -694574,7 +704810,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -694593,7 +704829,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -694608,14 +704844,14 @@
       ]
      ],
      "owning-type.any.js": [
-      "27a3dda894e4d6e2b71524f1f6ae87a71fbdfdcd",
+      "34c2a55d5134a20ef9450a338278af2ef18612de",
       [
        "streams/readable-streams/owning-type.any.html",
        {
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -694634,7 +704870,26 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
+         ],
+         [
+          "script",
+          "../resources/test-utils.js"
+         ],
+         [
+          "script",
+          "../resources/rs-utils.js"
+         ]
+        ]
+       }
+      ],
+      [
+       "streams/readable-streams/owning-type.any.shadowrealm.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -694653,7 +704908,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -694672,7 +704927,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -694687,14 +704942,14 @@
       ]
      ],
      "patched-global.any.js": [
-      "a64a054a97f1f5f133ec961a02f75207b2cb4eee",
+      "c208824c8644695771cfbe4dd4ace71ed4b49df5",
       [
        "streams/readable-streams/patched-global.any.html",
        {
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -694705,7 +704960,18 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
+         ]
+        ]
+       }
+      ],
+      [
+       "streams/readable-streams/patched-global.any.shadowrealm.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -694716,7 +704982,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -694727,7 +704993,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -694748,14 +705014,14 @@
       ]
      ],
      "reentrant-strategies.any.js": [
-      "b4988bc2433fd56c6527f0546ab47fa14b4c9f54",
+      "8ae7b98e8d5eefbb603157c69c2d250c79702e29",
       [
        "streams/readable-streams/reentrant-strategies.any.html",
        {
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -694778,7 +705044,30 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
+         ],
+         [
+          "script",
+          "../resources/recording-streams.js"
+         ],
+         [
+          "script",
+          "../resources/rs-utils.js"
+         ],
+         [
+          "script",
+          "../resources/test-utils.js"
+         ]
+        ]
+       }
+      ],
+      [
+       "streams/readable-streams/reentrant-strategies.any.shadowrealm.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -694801,7 +705090,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -694824,7 +705113,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -694843,14 +705132,14 @@
       ]
      ],
      "tee.any.js": [
-      "00397932f4b6e346a16b019e5d299af0e65afac6",
+      "c2c2e48230721163c09f4d4f6d1aee0c9a0a66fa",
       [
        "streams/readable-streams/tee.any.html",
        {
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -694877,7 +705166,34 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
+         ],
+         [
+          "script",
+          "../resources/rs-utils.js"
+         ],
+         [
+          "script",
+          "../resources/test-utils.js"
+         ],
+         [
+          "script",
+          "../resources/recording-streams.js"
+         ],
+         [
+          "script",
+          "../resources/rs-test-templates.js"
+         ]
+        ]
+       }
+      ],
+      [
+       "streams/readable-streams/tee.any.shadowrealm.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -694904,7 +705220,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -694931,7 +705247,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -694954,14 +705270,14 @@
       ]
      ],
      "templated.any.js": [
-      "ecae3f4d8b129f760536564ab7d18e1a18bb3ef1",
+      "dc75b805a10d63ac933f9fd05af27c38d11b6fea",
       [
        "streams/readable-streams/templated.any.html",
        {
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -694980,7 +705296,26 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
+         ],
+         [
+          "script",
+          "../resources/test-utils.js"
+         ],
+         [
+          "script",
+          "../resources/rs-test-templates.js"
+         ]
+        ]
+       }
+      ],
+      [
+       "streams/readable-streams/templated.any.shadowrealm.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -694999,7 +705334,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -695018,7 +705353,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -695093,14 +705428,39 @@
       ]
      ],
      "transform-stream-members.any.js": [
-      "fca060b0c05fa3b4015688c20c13a0423365c9f7",
+      "05914e12ccbe574ffe006cb35dab0ec717828b5f",
       [
        "streams/transferable/transform-stream-members.any.html",
-       {}
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,dedicatedworker,shadowrealm"
+         ]
+        ]
+       }
+      ],
+      [
+       "streams/transferable/transform-stream-members.any.shadowrealm.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,dedicatedworker,shadowrealm"
+         ]
+        ]
+       }
       ],
       [
        "streams/transferable/transform-stream-members.any.worker.html",
-       {}
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,dedicatedworker,shadowrealm"
+         ]
+        ]
+       }
       ]
      ],
      "transform-stream.html": [
@@ -695134,14 +705494,14 @@
     },
     "transform-streams": {
      "backpressure.any.js": [
-      "6befba41b79542676551325e02026420dc0e634e",
+      "47a21fb7e71fed837832dd1b91b5100a3513131d",
       [
        "streams/transform-streams/backpressure.any.html",
        {
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -695160,7 +705520,26 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
+         ],
+         [
+          "script",
+          "../resources/recording-streams.js"
+         ],
+         [
+          "script",
+          "../resources/test-utils.js"
+         ]
+        ]
+       }
+      ],
+      [
+       "streams/transform-streams/backpressure.any.shadowrealm.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -695179,7 +705558,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -695198,7 +705577,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -695212,15 +705591,93 @@
        }
       ]
      ],
+     "cancel.any.js": [
+      "5c7fc4eae5d55b84a562192726066a82b3c19858",
+      [
+       "streams/transform-streams/cancel.any.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker,shadowrealm"
+         ],
+         [
+          "script",
+          "../resources/test-utils.js"
+         ]
+        ]
+       }
+      ],
+      [
+       "streams/transform-streams/cancel.any.serviceworker.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker,shadowrealm"
+         ],
+         [
+          "script",
+          "../resources/test-utils.js"
+         ]
+        ]
+       }
+      ],
+      [
+       "streams/transform-streams/cancel.any.shadowrealm.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker,shadowrealm"
+         ],
+         [
+          "script",
+          "../resources/test-utils.js"
+         ]
+        ]
+       }
+      ],
+      [
+       "streams/transform-streams/cancel.any.sharedworker.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker,shadowrealm"
+         ],
+         [
+          "script",
+          "../resources/test-utils.js"
+         ]
+        ]
+       }
+      ],
+      [
+       "streams/transform-streams/cancel.any.worker.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker,shadowrealm"
+         ],
+         [
+          "script",
+          "../resources/test-utils.js"
+         ]
+        ]
+       }
+      ]
+     ],
      "errors.any.js": [
-      "0cca4c75479d6df522c88203fd0b3121b37b2121",
+      "bea060b6590818f0d6c3e95309b1d1e8bcc2a9a1",
       [
        "streams/transform-streams/errors.any.html",
        {
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -695235,7 +705692,22 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
+         ],
+         [
+          "script",
+          "../resources/test-utils.js"
+         ]
+        ]
+       }
+      ],
+      [
+       "streams/transform-streams/errors.any.shadowrealm.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -695250,7 +705722,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -695265,7 +705737,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -695276,14 +705748,14 @@
       ]
      ],
      "flush.any.js": [
-      "9287f6f5eb78eb759447f722e943e1aa42a57d7a",
+      "c95d8ae1186518c507fccda83bf3d8f164f42f8c",
       [
        "streams/transform-streams/flush.any.html",
        {
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -695298,7 +705770,22 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
+         ],
+         [
+          "script",
+          "../resources/test-utils.js"
+         ]
+        ]
+       }
+      ],
+      [
+       "streams/transform-streams/flush.any.shadowrealm.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -695313,7 +705800,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -695328,7 +705815,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -695339,14 +705826,14 @@
       ]
      ],
      "general.any.js": [
-      "c95691f7bf49df14bdcf80e9da289ee998667330",
+      "a40ef30843ec4da7ccbe1b382a5b6132cf1e19c9",
       [
        "streams/transform-streams/general.any.html",
        {
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -695365,7 +705852,26 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
+         ],
+         [
+          "script",
+          "../resources/test-utils.js"
+         ],
+         [
+          "script",
+          "../resources/rs-utils.js"
+         ]
+        ]
+       }
+      ],
+      [
+       "streams/transform-streams/general.any.shadowrealm.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -695384,7 +705890,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -695403,7 +705909,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -695425,14 +705931,14 @@
       ]
      ],
      "lipfuzz.any.js": [
-      "f9f148aaf1c6a462afb7c93ebef775203315500a",
+      "e334705db44354cbb79c130f25cbbd65d58633ee",
       [
        "streams/transform-streams/lipfuzz.any.html",
        {
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -695443,7 +705949,18 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
+         ]
+        ]
+       }
+      ],
+      [
+       "streams/transform-streams/lipfuzz.any.shadowrealm.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -695454,7 +705971,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -695465,21 +705982,21 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
       ]
      ],
      "patched-global.any.js": [
-      "2d04e3b948b3246f339808770fc747a002728003",
+      "cc111eda452f0f771cd03f9f642ed7b596cc5ea0",
       [
        "streams/transform-streams/patched-global.any.html",
        {
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -695490,7 +706007,18 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
+         ]
+        ]
+       }
+      ],
+      [
+       "streams/transform-streams/patched-global.any.shadowrealm.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -695501,7 +706029,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -695512,21 +706040,21 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
       ]
      ],
      "properties.any.js": [
-      "02981b8bc76a5fccd20a9145fbf5b91eed0089d9",
+      "dbfd1aa372b907e1647c9101212c918eec7489b8",
       [
        "streams/transform-streams/properties.any.html",
        {
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -695537,7 +706065,18 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
+         ]
+        ]
+       }
+      ],
+      [
+       "streams/transform-streams/properties.any.shadowrealm.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -695548,7 +706087,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -695559,21 +706098,21 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
       ]
      ],
      "reentrant-strategies.any.js": [
-      "fc2f91886659f620867058306481b402970ef76d",
+      "a6d459655856a7da4f4185b33c5e516c73f51868",
       [
        "streams/transform-streams/reentrant-strategies.any.html",
        {
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -695596,7 +706135,30 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
+         ],
+         [
+          "script",
+          "../resources/recording-streams.js"
+         ],
+         [
+          "script",
+          "../resources/rs-utils.js"
+         ],
+         [
+          "script",
+          "../resources/test-utils.js"
+         ]
+        ]
+       }
+      ],
+      [
+       "streams/transform-streams/reentrant-strategies.any.shadowrealm.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -695619,7 +706181,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -695642,7 +706204,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -695661,14 +706223,14 @@
       ]
      ],
      "strategies.any.js": [
-      "94055ad99dc94b8e8f28854d63400ae17d89b535",
+      "57e113e668ce2478a654a4e5ae5c9872e002c7fa",
       [
        "streams/transform-streams/strategies.any.html",
        {
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -695687,7 +706249,26 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
+         ],
+         [
+          "script",
+          "../resources/recording-streams.js"
+         ],
+         [
+          "script",
+          "../resources/test-utils.js"
+         ]
+        ]
+       }
+      ],
+      [
+       "streams/transform-streams/strategies.any.shadowrealm.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -695706,7 +706287,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -695725,7 +706306,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -695740,14 +706321,14 @@
       ]
      ],
      "terminate.any.js": [
-      "670006366db2af711025caf1ac998c2c737614a2",
+      "a959e70fe693397a4a1a0f24d45fabead2cdc6f8",
       [
        "streams/transform-streams/terminate.any.html",
        {
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -695766,7 +706347,26 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
+         ],
+         [
+          "script",
+          "../resources/recording-streams.js"
+         ],
+         [
+          "script",
+          "../resources/test-utils.js"
+         ]
+        ]
+       }
+      ],
+      [
+       "streams/transform-streams/terminate.any.shadowrealm.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -695785,7 +706385,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -695804,7 +706404,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -695821,14 +706421,14 @@
     },
     "writable-streams": {
      "aborting.any.js": [
-      "e016cd191b876f2f262539f991d9109bbc70f9ad",
+      "9171dbe158f00ccbf6f6e4083cce3ec9f959e755",
       [
        "streams/writable-streams/aborting.any.html",
        {
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -695847,7 +706447,26 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
+         ],
+         [
+          "script",
+          "../resources/test-utils.js"
+         ],
+         [
+          "script",
+          "../resources/recording-streams.js"
+         ]
+        ]
+       }
+      ],
+      [
+       "streams/writable-streams/aborting.any.shadowrealm.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -695866,7 +706485,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -695885,7 +706504,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -695900,14 +706519,14 @@
       ]
      ],
      "bad-strategies.any.js": [
-      "63fa443065ee41481dab78547538a73cb9c617af",
+      "a1ef0791168f99186925acbe869ac8449e0f4e79",
       [
        "streams/writable-streams/bad-strategies.any.html",
        {
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -695918,7 +706537,18 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
+         ]
+        ]
+       }
+      ],
+      [
+       "streams/writable-streams/bad-strategies.any.shadowrealm.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -695929,7 +706559,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -695940,21 +706570,21 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
       ]
      ],
      "bad-underlying-sinks.any.js": [
-      "d0b3467978ea05f837ab70f56f6d11ff18ad898e",
+      "3c434ffe60ccb98f6c8eb96a06d0c61af46b283d",
       [
        "streams/writable-streams/bad-underlying-sinks.any.html",
        {
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -695973,7 +706603,26 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
+         ],
+         [
+          "script",
+          "../resources/test-utils.js"
+         ],
+         [
+          "script",
+          "../resources/recording-streams.js"
+         ]
+        ]
+       }
+      ],
+      [
+       "streams/writable-streams/bad-underlying-sinks.any.shadowrealm.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -695992,7 +706641,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -696011,7 +706660,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -696026,14 +706675,14 @@
       ]
      ],
      "byte-length-queuing-strategy.any.js": [
-      "ce1962e8917f324620e838e6795fb16b1b556c3a",
+      "eed86ee7004ea15e288def1f3d511ba6fe39d820",
       [
        "streams/writable-streams/byte-length-queuing-strategy.any.html",
        {
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -696044,7 +706693,18 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
+         ]
+        ]
+       }
+      ],
+      [
+       "streams/writable-streams/byte-length-queuing-strategy.any.shadowrealm.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -696055,7 +706715,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -696066,21 +706726,21 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
       ]
      ],
      "close.any.js": [
-      "88855a92efd5508fc4f6713466e98ee3cb4d2ba2",
+      "45261e7ca7e01dd056df13cbc8a6816ba7ba9b22",
       [
        "streams/writable-streams/close.any.html",
        {
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -696099,7 +706759,26 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
+         ],
+         [
+          "script",
+          "../resources/test-utils.js"
+         ],
+         [
+          "script",
+          "../resources/recording-streams.js"
+         ]
+        ]
+       }
+      ],
+      [
+       "streams/writable-streams/close.any.shadowrealm.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -696118,7 +706797,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -696137,7 +706816,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -696152,14 +706831,14 @@
       ]
      ],
      "constructor.any.js": [
-      "eaac90e48b8f8680f9d158400eac46eaeb55749d",
+      "0abc7ef545ea0bf8a220f501a401ead93d82bf7f",
       [
        "streams/writable-streams/constructor.any.html",
        {
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -696170,7 +706849,18 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
+         ]
+        ]
+       }
+      ],
+      [
+       "streams/writable-streams/constructor.any.shadowrealm.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -696181,7 +706871,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -696192,21 +706882,21 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
       ]
      ],
      "count-queuing-strategy.any.js": [
-      "064e16e81506f125a9a7cf16b22d14cca7d516fc",
+      "8211757530d3233e4bfeacd4d431861e6c7c7481",
       [
        "streams/writable-streams/count-queuing-strategy.any.html",
        {
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -696217,7 +706907,18 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
+         ]
+        ]
+       }
+      ],
+      [
+       "streams/writable-streams/count-queuing-strategy.any.shadowrealm.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -696228,7 +706929,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -696239,21 +706940,21 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
       ]
      ],
      "error.any.js": [
-      "faf3fdd95214304e3bc108057111a8a660117025",
+      "d08c8a54863bb9693e76116946bd118592d6928c",
       [
        "streams/writable-streams/error.any.html",
        {
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -696264,7 +706965,18 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
+         ]
+        ]
+       }
+      ],
+      [
+       "streams/writable-streams/error.any.shadowrealm.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -696275,7 +706987,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -696286,21 +706998,21 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
       ]
      ],
      "floating-point-total-queue-size.any.js": [
-      "bd34cc53a695799ed8f0bd36dc71f5751cc7284a",
+      "20a14fc19a51e004d16667fd78643ff48792d89c",
       [
        "streams/writable-streams/floating-point-total-queue-size.any.html",
        {
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -696311,7 +707023,18 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
+         ]
+        ]
+       }
+      ],
+      [
+       "streams/writable-streams/floating-point-total-queue-size.any.shadowrealm.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -696322,7 +707045,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -696333,21 +707056,21 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
       ]
      ],
      "general.any.js": [
-      "cede7fd0845b7402bfa663bf1dbec15d01868b1e",
+      "48f8eeb89e41eec32225b44be7c2e80132b970d4",
       [
        "streams/writable-streams/general.any.html",
        {
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -696358,7 +707081,18 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
+         ]
+        ]
+       }
+      ],
+      [
+       "streams/writable-streams/general.any.shadowrealm.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -696369,7 +707103,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -696380,21 +707114,21 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
       ]
      ],
      "properties.any.js": [
-      "c95bd7d0c080baf3e1a9d974b577d933737936e7",
+      "ae0549f0871b4866877dffbccf8803eeaa897d06",
       [
        "streams/writable-streams/properties.any.html",
        {
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -696405,7 +707139,18 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
+         ]
+        ]
+       }
+      ],
+      [
+       "streams/writable-streams/properties.any.shadowrealm.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -696416,7 +707161,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
@@ -696427,21 +707172,21 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ]
         ]
        }
       ]
      ],
      "reentrant-strategy.any.js": [
-      "eb05cc068043ea28fa3004d8cb6e241fe31cfe5f",
+      "18ce9e84759a11bed4f4b31f5e82cf6948a2b739",
       [
        "streams/writable-streams/reentrant-strategy.any.html",
        {
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -696460,7 +707205,26 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
+         ],
+         [
+          "script",
+          "../resources/test-utils.js"
+         ],
+         [
+          "script",
+          "../resources/recording-streams.js"
+         ]
+        ]
+       }
+      ],
+      [
+       "streams/writable-streams/reentrant-strategy.any.shadowrealm.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -696479,7 +707243,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -696498,7 +707262,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -696513,14 +707277,14 @@
       ]
      ],
      "start.any.js": [
-      "82d869430dd70088a54db856240f4fbe1d2a94d7",
+      "17972b568ceb24fee7a758a9d7a1147b26a030d6",
       [
        "streams/writable-streams/start.any.html",
        {
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -696539,7 +707303,26 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
+         ],
+         [
+          "script",
+          "../resources/test-utils.js"
+         ],
+         [
+          "script",
+          "../resources/recording-streams.js"
+         ]
+        ]
+       }
+      ],
+      [
+       "streams/writable-streams/start.any.shadowrealm.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -696558,7 +707341,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -696577,7 +707360,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -696592,14 +707375,14 @@
       ]
      ],
      "write.any.js": [
-      "f0246f6cad39fd380c1625998ba1e203cb0a612a",
+      "20a2885bf3512ab6da3bb9aeecbc0e48022e741c",
       [
        "streams/writable-streams/write.any.html",
        {
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -696618,7 +707401,26 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
+         ],
+         [
+          "script",
+          "../resources/test-utils.js"
+         ],
+         [
+          "script",
+          "../resources/recording-streams.js"
+         ]
+        ]
+       }
+      ],
+      [
+       "streams/writable-streams/write.any.shadowrealm.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -696637,7 +707439,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -696656,7 +707458,7 @@
         "script_metadata": [
          [
           "global",
-          "window,worker"
+          "window,worker,shadowrealm"
          ],
          [
           "script",
@@ -698605,6 +709407,13 @@
         {}
        ]
       ],
+      "svg-root-border-radius.html": [
+       "87d8d233be9cfdd060003bfcc5e8d10c1f20d7a5",
+       [
+        null,
+        {}
+       ]
+      ],
       "svg-small-big-path.html": [
        "ba0e403f6d690d4f176f4060ab4b1327091eb6ae",
        [
@@ -699427,13 +710236,41 @@
         {}
        ]
       ],
-      "svg-getIntersectionList.svg": [
+      "svg-checkIntersection-001.svg": [
+       "059cdef2a6b618385a7ae6f4f9522e4ca1a2a3d9",
+       [
+        null,
+        {}
+       ]
+      ],
+      "svg-getIntersectionList-001.svg": [
        "a360bad3d35af84f0d65a4d00391cf454332691e",
        [
         null,
         {}
        ]
       ],
+      "svg-getIntersectionList-002.svg": [
+       "c2c1f8e425af84c68e4dc7a51c68e1c668e2b4b1",
+       [
+        null,
+        {}
+       ]
+      ],
+      "svg-getIntersectionList-003.svg": [
+       "b08ea71b36074e1153f6e5a43e9e5ce390a0dd3a",
+       [
+        null,
+        {}
+       ]
+      ],
+      "svg-getIntersectionList-004.svg": [
+       "c029a3b0702f6ac82bb6669c5da9d063fb10f5e3",
+       [
+        null,
+        {}
+       ]
+      ],
       "use-load-error-events.tentative.html": [
        "2c52072e16906575679ab654b7e901a08b5541c7",
        [
@@ -699931,6 +710768,13 @@
         {}
        ]
       ],
+      "SVGGraphicsElement-clone.svg": [
+       "2ef0e074809ebeebb6a115524e09385cb64080f1",
+       [
+        null,
+        {}
+       ]
+      ],
       "SVGGraphicsElement.getBBox-01.html": [
        "773b06e5043d8d942b793a03d967a8acc925d5b1",
        [
@@ -699959,6 +710803,20 @@
         {}
        ]
       ],
+      "SVGLength-cap.html": [
+       "1eb308b0b8ebed4b84c5b91705f370b85ffaf40b",
+       [
+        null,
+        {}
+       ]
+      ],
+      "SVGLength-ch.html": [
+       "fcacbd2e228fe9d63df701dd1a945f2cec3fb5fb",
+       [
+        null,
+        {}
+       ]
+      ],
       "SVGLength-ic.html": [
        "583a964444ecc5dc3878d11e62c3e884084a89b0",
        [
@@ -699987,6 +710845,20 @@
         {}
        ]
       ],
+      "SVGLength-rem.html": [
+       "c89f937cf37211c19b21c8a1812fb831820b28f7",
+       [
+        null,
+        {}
+       ]
+      ],
+      "SVGLength-viewport.html": [
+       "2a29c0ba54978fa732b60460689e34d08db93448",
+       [
+        null,
+        {}
+       ]
+      ],
       "SVGLength.html": [
        "7436f5940c5d7432ab318759d3bb83df597c35af",
        [
@@ -703281,7 +714153,7 @@
      ]
     ],
     "failure.html": [
-     "8a408412668fd37408d5787799214aafb2ae0d3c",
+     "e61f462f97456f34cc40ff37cbfdeac9d00545df",
      [
       null,
       {
@@ -704046,7 +714918,7 @@
      ]
     ],
     "urlsearchparams-delete.any.js": [
-     "f9c623b90b175d8811ed7ce3a6bc5e569a730ad7",
+     "c597142c51d5bf3cdea286cf7a6e191d4e3be828",
      [
       "url/urlsearchparams-delete.any.html",
       {}
@@ -704090,7 +714962,7 @@
      ]
     ],
     "urlsearchparams-has.any.js": [
-     "54cbf286db4a3d21fb764a1c93b7a16d34c47486",
+     "2133a5da2f8b91cbb070436f74be9a2b84f32699",
      [
       "url/urlsearchparams-has.any.html",
       {}
@@ -705242,6 +716114,15 @@
        }
       ]
      ],
+     "button-roles.html": [
+      "23d0cd22d619f0c25cef10241151f09b30d25211",
+      [
+       null,
+       {
+        "testdriver": true
+       }
+      ]
+     ],
      "fallback-roles.html": [
       "98011570b4f074bf23871a91f404e74ea6001674",
       [
@@ -705296,6 +716177,15 @@
        }
       ]
      ],
+     "menu-roles.html": [
+      "224cf335a05c1875d2552cd45503076426cfe20b",
+      [
+       null,
+       {
+        "testdriver": true
+       }
+      ]
+     ],
      "region-roles.html": [
       "d80570a97bcdddff7ba6669b792d76de72836913",
       [
@@ -705331,6 +716221,24 @@
         "testdriver": true
        }
       ]
+     ],
+     "tab-roles.html": [
+      "f84504e0b45c8c831a8eb60acbf2bd7d664070b0",
+      [
+       null,
+       {
+        "testdriver": true
+       }
+      ]
+     ],
+     "tree-roles.html": [
+      "9613312e9bd87f6336d03483e7c5f6c9962b00d5",
+      [
+       null,
+       {
+        "testdriver": true
+       }
+      ]
      ]
     }
    },
@@ -705345,7 +716253,7 @@
     "jsapi": {
      "constructor": {
       "compile.any.js": [
-       "e94ce11717369fb65ef04c6ec6a13da192893077",
+       "f822aa30e69eb954677d02730923a37b2a0bfabc",
        [
         null,
         {
@@ -705353,7 +716261,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -705368,7 +716276,22 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/wasm-module-builder.js"
+          ]
+         ]
+        }
+       ],
+       [
+        "wasm/jsapi/constructor/compile.any.shadowrealm.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -705383,7 +716306,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -705394,7 +716317,7 @@
        ]
       ],
       "instantiate-bad-imports.any.js": [
-       "30252bd6eeb3ab97286331aa76968225dad5a502",
+       "e4926c8d70a86e0d7ef241e05e0ca79fd6904178",
        [
         null,
         {
@@ -705402,7 +716325,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -705421,7 +716344,26 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/wasm-module-builder.js"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/bad-imports.js"
+          ]
+         ]
+        }
+       ],
+       [
+        "wasm/jsapi/constructor/instantiate-bad-imports.any.shadowrealm.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -705440,7 +716382,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -705455,7 +716397,7 @@
        ]
       ],
       "instantiate.any.js": [
-       "8152f3a56f3f43999765c349e488ddb313442134",
+       "34e005c4700932b0be2ee3370f20f8605d08d5bd",
        [
         null,
         {
@@ -705463,7 +716405,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -705486,7 +716428,30 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/wasm-module-builder.js"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/assertions.js"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/instanceTestFactory.js"
+          ]
+         ]
+        }
+       ],
+       [
+        "wasm/jsapi/constructor/instantiate.any.shadowrealm.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -705509,7 +716474,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -705528,7 +716493,7 @@
        ]
       ],
       "multi-value.any.js": [
-       "4b06d1da3c49b93406e99ecb3e6a72ca76c9d1bd",
+       "8786f9b953ba18bfceaf8af4c7307562c668d61a",
        [
         null,
         {
@@ -705536,7 +716501,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -705555,7 +716520,26 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/wasm-module-builder.js"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/assertions.js"
+          ]
+         ]
+        }
+       ],
+       [
+        "wasm/jsapi/constructor/multi-value.any.shadowrealm.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -705574,7 +716558,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -705589,7 +716573,7 @@
        ]
       ],
       "toStringTag.any.js": [
-       "c6d2cdaf662e8b91e47bbdb6422ca9f2ac58fc89",
+       "5fae8304f8c0f60aa47c6fcd8b6269a35784e759",
        [
         null,
         {
@@ -705597,7 +716581,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ]
          ]
         }
@@ -705608,7 +716592,18 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
+          ]
+         ]
+        }
+       ],
+       [
+        "wasm/jsapi/constructor/toStringTag.any.shadowrealm.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,dedicatedworker,jsshell,shadowrealm"
           ]
          ]
         }
@@ -705619,14 +716614,14 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ]
          ]
         }
        ]
       ],
       "validate.any.js": [
-       "8b4f4582ab2987732d404994899e9a77662e2a32",
+       "fce43d1e175f489cbf9e5fbb752038e739db9609",
        [
         null,
         {
@@ -705634,7 +716629,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -705649,7 +716644,22 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/wasm-module-builder.js"
+          ]
+         ]
+        }
+       ],
+       [
+        "wasm/jsapi/constructor/validate.any.shadowrealm.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -705664,7 +716674,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -705677,7 +716687,7 @@
      },
      "exception": {
       "basic.tentative.any.js": [
-       "acf644f904f53d54918d660c419f60a15c72eabb",
+       "869c64b6d303daed40c16e38bf68ee2dd559529d",
        [
         null,
         {
@@ -705685,7 +716695,7 @@
          "script_metadata": [
           [
            "global",
-           "window,worker,jsshell"
+           "window,worker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -705700,7 +716710,7 @@
          "script_metadata": [
           [
            "global",
-           "window,worker,jsshell"
+           "window,worker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -705715,7 +716725,22 @@
          "script_metadata": [
           [
            "global",
-           "window,worker,jsshell"
+           "window,worker,jsshell,shadowrealm"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/wasm-module-builder.js"
+          ]
+         ]
+        }
+       ],
+       [
+        "wasm/jsapi/exception/basic.tentative.any.shadowrealm.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,worker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -705730,7 +716755,7 @@
          "script_metadata": [
           [
            "global",
-           "window,worker,jsshell"
+           "window,worker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -705745,7 +716770,7 @@
          "script_metadata": [
           [
            "global",
-           "window,worker,jsshell"
+           "window,worker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -705756,7 +716781,7 @@
        ]
       ],
       "constructor.tentative.any.js": [
-       "7ad08e1883ba13c38fa9c21b1f053fc6e6d5b1a3",
+       "a46d1816c351d2e4fae1dbb962a0c2b59c1ef18a",
        [
         null,
         {
@@ -705764,7 +716789,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -705779,7 +716804,22 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/assertions.js"
+          ]
+         ]
+        }
+       ],
+       [
+        "wasm/jsapi/exception/constructor.tentative.any.shadowrealm.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -705794,7 +716834,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -705805,7 +716845,7 @@
        ]
       ],
       "getArg.tentative.any.js": [
-       "f0a568a857f0e733035675a0c0d97d7214ac5d61",
+       "87719c7ebdfb85ca378d668a83f743ff8da3a5b5",
        [
         null,
         {
@@ -705813,7 +716853,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -705828,7 +716868,22 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/memory/assertions.js"
+          ]
+         ]
+        }
+       ],
+       [
+        "wasm/jsapi/exception/getArg.tentative.any.shadowrealm.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -705843,7 +716898,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -705854,7 +716909,7 @@
        ]
       ],
       "identity.tentative.any.js": [
-       "65787c107e3c29f7e4cc1a2e34d6425fc7d56c86",
+       "2675668ec73a9545b53be2566094652d706e4571",
        [
         null,
         {
@@ -705862,7 +716917,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -705881,7 +716936,26 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/assertions.js"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/wasm-module-builder.js"
+          ]
+         ]
+        }
+       ],
+       [
+        "wasm/jsapi/exception/identity.tentative.any.shadowrealm.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -705900,7 +716974,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -705915,7 +716989,7 @@
        ]
       ],
       "is.tentative.any.js": [
-       "e28a88a3c5fdcfa0f08711a00fba8a1eaf97114e",
+       "840d00bf0d47a915505202085f88450e5b4632f5",
        [
         null,
         {
@@ -705923,7 +716997,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -705938,7 +717012,22 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/memory/assertions.js"
+          ]
+         ]
+        }
+       ],
+       [
+        "wasm/jsapi/exception/is.tentative.any.shadowrealm.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -705953,7 +717042,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -705964,7 +717053,7 @@
        ]
       ],
       "toString.tentative.any.js": [
-       "00e801a6fc1a4a2f0e361288d4d6bfb45745f446",
+       "6885cf0deb6918ccd5f49d9ecb98e9fc6619d250",
        [
         null,
         {
@@ -705972,7 +717061,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ]
          ]
         }
@@ -705983,7 +717072,18 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
+          ]
+         ]
+        }
+       ],
+       [
+        "wasm/jsapi/exception/toString.tentative.any.shadowrealm.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,dedicatedworker,jsshell,shadowrealm"
           ]
          ]
         }
@@ -705994,7 +717094,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ]
          ]
         }
@@ -706003,7 +717103,7 @@
      },
      "function": {
       "call.tentative.any.js": [
-       "626cd13c9f009543074e85d212ed870fda166ea8",
+       "2e63d5fa103fd1736200622525602a07287caa98",
        [
         null,
         {
@@ -706011,7 +717111,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -706026,7 +717126,22 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/assertions.js"
+          ]
+         ]
+        }
+       ],
+       [
+        "wasm/jsapi/function/call.tentative.any.shadowrealm.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -706041,7 +717156,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -706052,7 +717167,7 @@
        ]
       ],
       "constructor.tentative.any.js": [
-       "636aeca4dc1fa019e7a320cf7e5b94abcf449fa8",
+       "fc92fcfaf0cf497c2bab3fd3a78d22c91a343ab7",
        [
         null,
         {
@@ -706060,7 +717175,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -706075,7 +717190,22 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/assertions.js"
+          ]
+         ]
+        }
+       ],
+       [
+        "wasm/jsapi/function/constructor.tentative.any.shadowrealm.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -706090,7 +717220,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -706101,7 +717231,7 @@
        ]
       ],
       "table.tentative.any.js": [
-       "d7d0d86e3b6a88b4050d2e20a5bb4f565aa92817",
+       "f0dd6ea6f8589a01853e73cce565d01491f3c35e",
        [
         null,
         {
@@ -706109,7 +717239,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -706124,7 +717254,22 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/assertions.js"
+          ]
+         ]
+        }
+       ],
+       [
+        "wasm/jsapi/function/table.tentative.any.shadowrealm.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -706139,7 +717284,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -706150,7 +717295,7 @@
        ]
       ],
       "type.tentative.any.js": [
-       "e01a23a9e4339e555fc7c7b094f7c1097e219d9d",
+       "72a7f1bfbe5e0a91752bda2d06b3c1fcfaade6a3",
        [
         null,
         {
@@ -706158,7 +717303,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -706173,7 +717318,22 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/assertions.js"
+          ]
+         ]
+        }
+       ],
+       [
+        "wasm/jsapi/function/type.tentative.any.shadowrealm.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -706188,7 +717348,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -706224,7 +717384,7 @@
      },
      "global": {
       "constructor.any.js": [
-       "dade7b1f55a43303d21f5f8ed002e9ee8e5edcb4",
+       "f83f77a5c3ecf349ea63891f4ebcfc2109ae2606",
        [
         null,
         {
@@ -706232,7 +717392,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -706247,7 +717407,22 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/assertions.js"
+          ]
+         ]
+        }
+       ],
+       [
+        "wasm/jsapi/global/constructor.any.shadowrealm.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -706262,7 +717437,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -706273,7 +717448,7 @@
        ]
       ],
       "toString.any.js": [
-       "359c4273b5bd7867acda44fc46a6ddc00acc976e",
+       "b308498982ee5d62bb230f0d9f0503ad14e798ec",
        [
         null,
         {
@@ -706281,7 +717456,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ]
          ]
         }
@@ -706292,7 +717467,18 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
+          ]
+         ]
+        }
+       ],
+       [
+        "wasm/jsapi/global/toString.any.shadowrealm.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,dedicatedworker,jsshell,shadowrealm"
           ]
          ]
         }
@@ -706303,14 +717489,14 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ]
          ]
         }
        ]
       ],
       "type.tentative.any.js": [
-       "95adc2af0f6813c6f349889ff4d4d3a3305f5cc7",
+       "78d612529dd3f39a71bb37b073dbd725766b73ed",
        [
         null,
         {
@@ -706318,7 +717504,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -706333,7 +717519,22 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/assertions.js"
+          ]
+         ]
+        }
+       ],
+       [
+        "wasm/jsapi/global/type.tentative.any.shadowrealm.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -706348,7 +717549,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -706359,7 +717560,7 @@
        ]
       ],
       "value-get-set.any.js": [
-       "f95b7ca9e3f0d54863db6dfd66ea76c9f392c132",
+       "bee5581f41814e21578f285c8765a259a7f85a97",
        [
         null,
         {
@@ -706367,7 +717568,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ]
          ]
         }
@@ -706378,7 +717579,18 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
+          ]
+         ]
+        }
+       ],
+       [
+        "wasm/jsapi/global/value-get-set.any.shadowrealm.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,dedicatedworker,jsshell,shadowrealm"
           ]
          ]
         }
@@ -706389,14 +717601,14 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ]
          ]
         }
        ]
       ],
       "valueOf.any.js": [
-       "0695a5a61fbc6e245019a7bf42810cb84a0dfa36",
+       "5bcb171825898801643acb94bcb3242d5869e95e",
        [
         null,
         {
@@ -706404,7 +717616,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ]
          ]
         }
@@ -706415,7 +717627,18 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
+          ]
+         ]
+        }
+       ],
+       [
+        "wasm/jsapi/global/valueOf.any.shadowrealm.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,dedicatedworker,jsshell,shadowrealm"
           ]
          ]
         }
@@ -706426,7 +717649,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ]
          ]
         }
@@ -706476,7 +717699,7 @@
      ],
      "instance": {
       "constructor-bad-imports.any.js": [
-       "e4a5abb8eb2169fbce17b60da27312ba94a0b9d2",
+       "1ef4f8423de857d9a910f84d5199922d04e1f76d",
        [
         null,
         {
@@ -706484,7 +717707,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -706503,7 +717726,26 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/wasm-module-builder.js"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/bad-imports.js"
+          ]
+         ]
+        }
+       ],
+       [
+        "wasm/jsapi/instance/constructor-bad-imports.any.shadowrealm.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -706522,7 +717764,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -706537,7 +717779,7 @@
        ]
       ],
       "constructor-caching.any.js": [
-       "1aa4739b6294d0137ead3097d5dbcec3e3a1f222",
+       "f969364d93f4620b4c08b021c8bb98afbad84241",
        [
         null,
         {
@@ -706545,7 +717787,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -706560,7 +717802,22 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/wasm-module-builder.js"
+          ]
+         ]
+        }
+       ],
+       [
+        "wasm/jsapi/instance/constructor-caching.any.shadowrealm.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -706575,7 +717832,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -706586,7 +717843,7 @@
        ]
       ],
       "constructor.any.js": [
-       "26390ebd2cdb2e4c48dc30bd50f6e5794e807923",
+       "24bf97356c83a739e881a597cffd3dda5674db97",
        [
         null,
         {
@@ -706594,7 +717851,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -706617,7 +717874,30 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/wasm-module-builder.js"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/assertions.js"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/instanceTestFactory.js"
+          ]
+         ]
+        }
+       ],
+       [
+        "wasm/jsapi/instance/constructor.any.shadowrealm.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -706640,7 +717920,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -706659,7 +717939,7 @@
        ]
       ],
       "exports.any.js": [
-       "6dcfbcee950d871cd6ee3e5af94bee39fd8f51e6",
+       "f7244923d83c51037cfe6186da49ee909b11498f",
        [
         null,
         {
@@ -706667,7 +717947,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -706682,7 +717962,22 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/wasm-module-builder.js"
+          ]
+         ]
+        }
+       ],
+       [
+        "wasm/jsapi/instance/exports.any.shadowrealm.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -706697,7 +717992,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -706708,7 +718003,7 @@
        ]
       ],
       "toString.any.js": [
-       "547a9ca8295f5b6813a3d179bbfd3ca9054e4970",
+       "d77037d65b9c25a2114273ec4558479b92f29f08",
        [
         null,
         {
@@ -706716,7 +718011,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -706731,7 +718026,22 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/wasm-module-builder.js"
+          ]
+         ]
+        }
+       ],
+       [
+        "wasm/jsapi/instance/toString.any.shadowrealm.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -706746,7 +718056,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -706758,7 +718068,7 @@
       ]
      },
      "interface.any.js": [
-      "19d29ead0a726441b1ee637a9f82d00125604763",
+      "8256fc209a7f6506d683bebd17e899b3b9e4a6eb",
       [
        null,
        {
@@ -706766,7 +718076,7 @@
         "script_metadata": [
          [
           "global",
-          "window,dedicatedworker,jsshell"
+          "window,dedicatedworker,jsshell,shadowrealm"
          ],
          [
           "script",
@@ -706781,7 +718091,22 @@
         "script_metadata": [
          [
           "global",
-          "window,dedicatedworker,jsshell"
+          "window,dedicatedworker,jsshell,shadowrealm"
+         ],
+         [
+          "script",
+          "/wasm/jsapi/assertions.js"
+         ]
+        ]
+       }
+      ],
+      [
+       "wasm/jsapi/interface.any.shadowrealm.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,dedicatedworker,jsshell,shadowrealm"
          ],
          [
           "script",
@@ -706796,7 +718121,7 @@
         "script_metadata": [
          [
           "global",
-          "window,dedicatedworker,jsshell"
+          "window,dedicatedworker,jsshell,shadowrealm"
          ],
          [
           "script",
@@ -706845,7 +718170,7 @@
        ]
       ],
       "constructor-shared.tentative.any.js": [
-       "216fc4ca55591f1fa412aeadf5fd538c3afa0af3",
+       "0134b307749ed7004b9ac5f18597942409d72121",
        [
         null,
         {
@@ -706853,7 +718178,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -706872,7 +718197,26 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/assertions.js"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/memory/assertions.js"
+          ]
+         ]
+        }
+       ],
+       [
+        "wasm/jsapi/memory/constructor-shared.tentative.any.shadowrealm.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -706891,7 +718235,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -706906,7 +718250,7 @@
        ]
       ],
       "constructor-types.tentative.any.js": [
-       "d5378dbe82b00b98e036090a377f5e90cca57e57",
+       "4653c6686a78e4785f7f2293d7cee676467af55f",
        [
         null,
         {
@@ -706914,7 +718258,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -706933,7 +718277,26 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/assertions.js"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/memory/assertions.js"
+          ]
+         ]
+        }
+       ],
+       [
+        "wasm/jsapi/memory/constructor-types.tentative.any.shadowrealm.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -706952,7 +718315,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -706967,7 +718330,7 @@
        ]
       ],
       "constructor.any.js": [
-       "0a0be11e370877096aa543a179f6eca2633b4c81",
+       "8f413c9f48a86dee005b37d175dda03a322bb74a",
        [
         null,
         {
@@ -706975,7 +718338,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -706994,7 +718357,26 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/assertions.js"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/memory/assertions.js"
+          ]
+         ]
+        }
+       ],
+       [
+        "wasm/jsapi/memory/constructor.any.shadowrealm.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -707013,7 +718395,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -707028,7 +718410,7 @@
        ]
       ],
       "grow.any.js": [
-       "c511129491f4de423f6d6b3fac71d3bf02192326",
+       "2eafe5761eaa6d23dcfa459648bc69882361c8e9",
        [
         null,
         {
@@ -707036,7 +718418,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -707051,7 +718433,22 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/memory/assertions.js"
+          ]
+         ]
+        }
+       ],
+       [
+        "wasm/jsapi/memory/grow.any.shadowrealm.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -707066,7 +718463,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -707114,7 +718511,7 @@
        ]
       ],
       "type.tentative.any.js": [
-       "a96a3227adca7ff09de75e5f7c412ab95b0d503d",
+       "3f6531f5967ed74973b0b7aa715c83a97d2095a2",
        [
         null,
         {
@@ -707122,7 +718519,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -707137,7 +718534,22 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/assertions.js"
+          ]
+         ]
+        }
+       ],
+       [
+        "wasm/jsapi/memory/type.tentative.any.shadowrealm.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -707152,7 +718564,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -707165,7 +718577,7 @@
      },
      "module": {
       "constructor.any.js": [
-       "9978f7e6ac8f2b11bcaca823b877ea817dfe7e9f",
+       "95604aabe475a85ab282273a8a5cb9dce61380b7",
        [
         null,
         {
@@ -707173,7 +718585,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -707192,7 +718604,26 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/wasm-module-builder.js"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/assertions.js"
+          ]
+         ]
+        }
+       ],
+       [
+        "wasm/jsapi/module/constructor.any.shadowrealm.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -707211,7 +718642,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -707226,7 +718657,7 @@
        ]
       ],
       "customSections.any.js": [
-       "4029877e92c7b8b3bd321848539475c3af52edee",
+       "96958316e061d72f4ec3cbe0041bd75577f02097",
        [
         null,
         {
@@ -707234,7 +718665,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -707249,7 +718680,22 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/wasm-module-builder.js"
+          ]
+         ]
+        }
+       ],
+       [
+        "wasm/jsapi/module/customSections.any.shadowrealm.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -707264,7 +718710,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -707275,7 +718721,7 @@
        ]
       ],
       "exports.any.js": [
-       "40a3935a4a23ba9028a4eccd44ad3baf07c5b1da",
+       "499a2649b171739cfcee1087f9779b30bcde08bd",
        [
         null,
         {
@@ -707283,7 +718729,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -707298,7 +718744,22 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/wasm-module-builder.js"
+          ]
+         ]
+        }
+       ],
+       [
+        "wasm/jsapi/module/exports.any.shadowrealm.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -707313,7 +718774,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -707324,7 +718785,7 @@
        ]
       ],
       "imports.any.js": [
-       "ec550ce6c41af1dd958d2a981768da215368f27e",
+       "2ab1725359f187c8d321b8e8622bb7a453b590dc",
        [
         null,
         {
@@ -707332,7 +718793,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -707347,7 +718808,22 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/wasm-module-builder.js"
+          ]
+         ]
+        }
+       ],
+       [
+        "wasm/jsapi/module/imports.any.shadowrealm.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -707362,7 +718838,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -707373,7 +718849,7 @@
        ]
       ],
       "toString.any.js": [
-       "1c20cd6108c84e56e219f0e738e0672cd7c2d078",
+       "10c707979d5bdc16809f15627e407f862e6eac59",
        [
         null,
         {
@@ -707381,7 +718857,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -707396,7 +718872,22 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/wasm-module-builder.js"
+          ]
+         ]
+        }
+       ],
+       [
+        "wasm/jsapi/module/toString.any.shadowrealm.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -707411,7 +718902,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -707430,7 +718921,7 @@
       ]
      ],
      "prototypes.any.js": [
-      "714f4f8430e5eb35ff0ed9cd1d0c80662243eb1d",
+      "2316f7d9b4eeb5ea821df8cfa24cc3daf07030f3",
       [
        null,
        {
@@ -707438,7 +718929,7 @@
         "script_metadata": [
          [
           "global",
-          "window,dedicatedworker,jsshell"
+          "window,dedicatedworker,jsshell,shadowrealm"
          ],
          [
           "script",
@@ -707457,7 +718948,26 @@
         "script_metadata": [
          [
           "global",
-          "window,dedicatedworker,jsshell"
+          "window,dedicatedworker,jsshell,shadowrealm"
+         ],
+         [
+          "script",
+          "/wasm/jsapi/assertions.js"
+         ],
+         [
+          "script",
+          "/wasm/jsapi/wasm-module-builder.js"
+         ]
+        ]
+       }
+      ],
+      [
+       "wasm/jsapi/prototypes.any.shadowrealm.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,dedicatedworker,jsshell,shadowrealm"
          ],
          [
           "script",
@@ -707476,7 +718986,7 @@
         "script_metadata": [
          [
           "global",
-          "window,dedicatedworker,jsshell"
+          "window,dedicatedworker,jsshell,shadowrealm"
          ],
          [
           "script",
@@ -707492,7 +719002,7 @@
      ],
      "table": {
       "constructor-types.tentative.any.js": [
-       "99ca41b55a9152be82d86b8b73cc7962f16b2862",
+       "b4015bdc6f7503ded5e7c2cf3817d62949417bee",
        [
         null,
         {
@@ -707500,7 +719010,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -707519,7 +719029,26 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/assertions.js"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/table/assertions.js"
+          ]
+         ]
+        }
+       ],
+       [
+        "wasm/jsapi/table/constructor-types.tentative.any.shadowrealm.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -707538,7 +719067,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -707553,7 +719082,7 @@
        ]
       ],
       "constructor.any.js": [
-       "6d38d04e4f505031012362bec2929cc7a4c97a04",
+       "51b1070d413586d159ea3d38304a652f3efea947",
        [
         null,
         {
@@ -707561,7 +719090,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -707584,7 +719113,30 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/wasm-module-builder.js"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/assertions.js"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/table/assertions.js"
+          ]
+         ]
+        }
+       ],
+       [
+        "wasm/jsapi/table/constructor.any.shadowrealm.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -707607,7 +719159,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -707626,7 +719178,7 @@
        ]
       ],
       "get-set.any.js": [
-       "9301057a533ed48b72c9dfcc19173b59b26aa789",
+       "abe6fecac9860c09228218dc528786345315048e",
        [
         null,
         {
@@ -707634,7 +719186,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -707653,7 +719205,26 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/wasm-module-builder.js"
+          ],
+          [
+           "script",
+           "assertions.js"
+          ]
+         ]
+        }
+       ],
+       [
+        "wasm/jsapi/table/get-set.any.shadowrealm.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -707672,7 +719243,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -707687,7 +719258,7 @@
        ]
       ],
       "grow.any.js": [
-       "520d24bf4bafbb15e3990fd7f0296b27c9bcf93e",
+       "4038f1e64934b073fa0eae83a9e6115abcda99e1",
        [
         null,
         {
@@ -707695,7 +719266,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -707714,7 +719285,26 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/wasm-module-builder.js"
+          ],
+          [
+           "script",
+           "assertions.js"
+          ]
+         ]
+        }
+       ],
+       [
+        "wasm/jsapi/table/grow.any.shadowrealm.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -707733,7 +719323,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -707748,7 +719338,7 @@
        ]
       ],
       "length.any.js": [
-       "a9ef095ded44581d44dece59577577fa6fe2541a",
+       "0e6de3f83e1ecf584dbe3ff7b82c5ec03e128577",
        [
         null,
         {
@@ -707756,7 +719346,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ]
          ]
         }
@@ -707767,7 +719357,18 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
+          ]
+         ]
+        }
+       ],
+       [
+        "wasm/jsapi/table/length.any.shadowrealm.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,dedicatedworker,jsshell,shadowrealm"
           ]
          ]
         }
@@ -707778,14 +719379,14 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ]
          ]
         }
        ]
       ],
       "toString.any.js": [
-       "8a09f2832c1d64594182fae4651bc9b07a508d4e",
+       "b5fb25b9c1e95458b17c618bc8cf0faf75aaab84",
        [
         null,
         {
@@ -707793,7 +719394,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ]
          ]
         }
@@ -707804,7 +719405,18 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
+          ]
+         ]
+        }
+       ],
+       [
+        "wasm/jsapi/table/toString.any.shadowrealm.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,dedicatedworker,jsshell,shadowrealm"
           ]
          ]
         }
@@ -707815,14 +719427,14 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ]
          ]
         }
        ]
       ],
       "type.tentative.any.js": [
-       "ef1ceecb17d695cea4347a0732ba2aa17e074d9d",
+       "ef9bbc5aa4a228e4cdc10658ef9f14157103021d",
        [
         null,
         {
@@ -707830,7 +719442,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -707845,7 +719457,22 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/assertions.js"
+          ]
+         ]
+        }
+       ],
+       [
+        "wasm/jsapi/table/type.tentative.any.shadowrealm.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -707860,7 +719487,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -707873,7 +719500,7 @@
      },
      "tag": {
       "constructor.tentative.any.js": [
-       "de63e7bf46d1e86839cc6e7cbdf3ae8d087ede6e",
+       "54edf8c8f59258fbc9e6373fe737a22507640239",
        [
         null,
         {
@@ -707881,7 +719508,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -707896,7 +719523,22 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/assertions.js"
+          ]
+         ]
+        }
+       ],
+       [
+        "wasm/jsapi/tag/constructor.tentative.any.shadowrealm.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -707911,7 +719553,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -707922,7 +719564,7 @@
        ]
       ],
       "toString.tentative.any.js": [
-       "ad9a4ba152f4f82e93e3c5b04a94163312d5fb84",
+       "76fff0feef063d123b34618ec461c0f8b1303075",
        [
         null,
         {
@@ -707930,7 +719572,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ]
          ]
         }
@@ -707941,7 +719583,18 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
+          ]
+         ]
+        }
+       ],
+       [
+        "wasm/jsapi/tag/toString.tentative.any.shadowrealm.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,dedicatedworker,jsshell,shadowrealm"
           ]
          ]
         }
@@ -707952,14 +719605,14 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ]
          ]
         }
        ]
       ],
       "type.tentative.any.js": [
-       "9d2f0de1a00f202c4c196aaea0d6058f01cab124",
+       "58c96078bfe39daecb9dd821204a4969b5b4caa4",
        [
         null,
         {
@@ -707967,7 +719620,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -707982,7 +719635,22 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/assertions.js"
+          ]
+         ]
+        }
+       ],
+       [
+        "wasm/jsapi/tag/type.tentative.any.shadowrealm.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -707997,7 +719665,7 @@
          "script_metadata": [
           [
            "global",
-           "window,dedicatedworker,jsshell"
+           "window,dedicatedworker,jsshell,shadowrealm"
           ],
           [
            "script",
@@ -708453,7 +720121,7 @@
        ]
       ],
       "worker.tentative.html": [
-       "8002e07ce7f1cfea078329f0ed7a705eb830fdda",
+       "6145dd04ff8c8d33600570e63bc2bce871417420",
        [
         null,
         {}
@@ -709270,7 +720938,7 @@
        ]
       ],
       "constructor.html": [
-       "d599fd72ea6d1d429dad30008d11305afba52052",
+       "e964c10ee44ea2d3860e64ddd22853f9fdecad3d",
        [
         null,
         {}
@@ -709912,7 +721580,7 @@
        ]
       ],
       "timelines.html": [
-       "d570eed5c28637c001b1d1c178630bdb424afd31",
+       "1609f85939eaa76732910f29c9ae6024c052d25f",
        [
         null,
         {}
@@ -712200,6 +723868,13 @@
         {}
        ]
       ],
+      "audioparam-default-value.html": [
+       "fe0cf15b43d38ad271a2b62105810de45b4e8791",
+       [
+        null,
+        {}
+       ]
+      ],
       "audioparam-exceptional-values.html": [
        "982731d33843544d2f70af72a51e9bd878bbf486",
        [
@@ -712298,6 +723973,13 @@
         {}
        ]
       ],
+      "exponentialRamp-special-cases.html": [
+       "d1978098218f3aac04a6190b6c72377494dc5636",
+       [
+        null,
+        {}
+       ]
+      ],
       "k-rate-audiobuffersource-connections.html": [
        "0b94bd70f9f7c5da26654845ec784d6805f4117e",
        [
@@ -712460,7 +724142,7 @@
        ]
       ],
       "setTargetAtTime-after-event-within-block.html": [
-       "827aeeabd47962ca52ff187f770cce3deb58d077",
+       "ca02b0db975de7bd80b4b5cd701acdd7e512e0de",
        [
         null,
         {}
@@ -712897,7 +724579,7 @@
        ]
       ],
       "test-constantsourcenode.html": [
-       "04f61106c11b5338af87a362c2888ceccb07e8f0",
+       "9dd03ea1167eb983a8d67c1e3799ae8c796cca86",
        [
         null,
         {}
@@ -714031,7 +725713,7 @@
      ]
     ],
     "audio-decoder.https.any.js": [
-     "f83efe17a0ffd24042c3f7ae21f810dc25efab8b",
+     "606b052edc891ec023c832b9e7f877e835b375cc",
      [
       "webcodecs/audio-decoder.https.any.html",
       {
@@ -714064,7 +725746,7 @@
      ]
     ],
     "audio-encoder-codec-specific.https.any.js": [
-     "28c75d2a606679f605a7063aeeed57134c3f65fb",
+     "e3396f999aa54de36eacf49b2b3aceb2ec7e6c52",
      [
       "webcodecs/audio-encoder-codec-specific.https.any.html",
       {
@@ -714082,7 +725764,7 @@
      ]
     ],
     "audio-encoder-config.https.any.js": [
-     "845b399744ec142e55735cd36e94082ebbb5e039",
+     "98a9513b7dc301adce0e351307f0f7859f7f104c",
      [
       "webcodecs/audio-encoder-config.https.any.html",
       {
@@ -714115,7 +725797,7 @@
      ]
     ],
     "audio-encoder.https.any.js": [
-     "7db9148ed58433c0686b6117097a01f6dfc55b2f",
+     "cd7739bcd26deb4fb8e5970d39180d68e3a331d3",
      [
       "webcodecs/audio-encoder.https.any.html",
       {
@@ -715817,7 +727499,7 @@
      ]
     ],
     "reconfiguring-encoder.https.any.js": [
-     "bc7e9b74fb917639b581b72096741395df1b9198",
+     "5aec95f16d564b6847b3332594096caf0fa62c34",
      [
       "webcodecs/reconfiguring-encoder.https.any.html?av1",
       {
@@ -716538,6 +728220,31 @@
       }
      ]
     ],
+    "transfering.https.any.js": [
+     "b9487e589d833d8617eeae4d7f4cc513c30a9c69",
+     [
+      "webcodecs/transfering.https.any.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,dedicatedworker"
+        ]
+       ]
+      }
+     ],
+     [
+      "webcodecs/transfering.https.any.worker.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,dedicatedworker"
+        ]
+       ]
+      }
+     ]
+    ],
     "video-decoder.crossOriginIsolated.https.any.js": [
      "3232844a31b240eb0f46e1df7a71f3efdd76e1ce",
      [
@@ -716572,7 +728279,7 @@
      ]
     ],
     "video-decoder.https.any.js": [
-     "431ac4f34a95e510d6ade428cf9d555a046a7cf6",
+     "190a524dd6c75fdcb7675e936ee4f8813202d4a6",
      [
       "webcodecs/video-decoder.https.any.html",
       {
@@ -716605,7 +728312,7 @@
      ]
     ],
     "video-encoder-config.https.any.js": [
-     "be2574f7901b08eb8779d2093a061d5dddcf4ba7",
+     "e4807361fcaa4ed9de459deb4f441c4cf2f9be40",
      [
       "webcodecs/video-encoder-config.https.any.html",
       {
@@ -716637,8 +728344,270 @@
       }
      ]
     ],
+    "video-encoder-flush.https.any.js": [
+     "8f1724bc8571df44127cbb32a80915ded9b74687",
+     [
+      "webcodecs/video-encoder-flush.https.any.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,dedicatedworker"
+        ],
+        [
+         "script",
+         "/common/media.js"
+        ],
+        [
+         "script",
+         "/webcodecs/utils.js"
+        ],
+        [
+         "script",
+         "/webcodecs/video-encoder-utils.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "webcodecs/video-encoder-flush.https.any.worker.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,dedicatedworker"
+        ],
+        [
+         "script",
+         "/common/media.js"
+        ],
+        [
+         "script",
+         "/webcodecs/utils.js"
+        ],
+        [
+         "script",
+         "/webcodecs/video-encoder-utils.js"
+        ]
+       ]
+      }
+     ]
+    ],
+    "video-encoder-h264.https.any.js": [
+     "82370a8338c2c46a42449d0111cd5f97cd85ddbd",
+     [
+      "webcodecs/video-encoder-h264.https.any.html?baseline",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,dedicatedworker"
+        ],
+        [
+         "script",
+         "/common/media.js"
+        ],
+        [
+         "script",
+         "/webcodecs/utils.js"
+        ],
+        [
+         "script",
+         "/webcodecs/video-encoder-utils.js"
+        ],
+        [
+         "variant",
+         "?baseline"
+        ],
+        [
+         "variant",
+         "?main"
+        ],
+        [
+         "variant",
+         "?high"
+        ]
+       ]
+      }
+     ],
+     [
+      "webcodecs/video-encoder-h264.https.any.html?high",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,dedicatedworker"
+        ],
+        [
+         "script",
+         "/common/media.js"
+        ],
+        [
+         "script",
+         "/webcodecs/utils.js"
+        ],
+        [
+         "script",
+         "/webcodecs/video-encoder-utils.js"
+        ],
+        [
+         "variant",
+         "?baseline"
+        ],
+        [
+         "variant",
+         "?main"
+        ],
+        [
+         "variant",
+         "?high"
+        ]
+       ]
+      }
+     ],
+     [
+      "webcodecs/video-encoder-h264.https.any.html?main",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,dedicatedworker"
+        ],
+        [
+         "script",
+         "/common/media.js"
+        ],
+        [
+         "script",
+         "/webcodecs/utils.js"
+        ],
+        [
+         "script",
+         "/webcodecs/video-encoder-utils.js"
+        ],
+        [
+         "variant",
+         "?baseline"
+        ],
+        [
+         "variant",
+         "?main"
+        ],
+        [
+         "variant",
+         "?high"
+        ]
+       ]
+      }
+     ],
+     [
+      "webcodecs/video-encoder-h264.https.any.worker.html?baseline",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,dedicatedworker"
+        ],
+        [
+         "script",
+         "/common/media.js"
+        ],
+        [
+         "script",
+         "/webcodecs/utils.js"
+        ],
+        [
+         "script",
+         "/webcodecs/video-encoder-utils.js"
+        ],
+        [
+         "variant",
+         "?baseline"
+        ],
+        [
+         "variant",
+         "?main"
+        ],
+        [
+         "variant",
+         "?high"
+        ]
+       ]
+      }
+     ],
+     [
+      "webcodecs/video-encoder-h264.https.any.worker.html?high",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,dedicatedworker"
+        ],
+        [
+         "script",
+         "/common/media.js"
+        ],
+        [
+         "script",
+         "/webcodecs/utils.js"
+        ],
+        [
+         "script",
+         "/webcodecs/video-encoder-utils.js"
+        ],
+        [
+         "variant",
+         "?baseline"
+        ],
+        [
+         "variant",
+         "?main"
+        ],
+        [
+         "variant",
+         "?high"
+        ]
+       ]
+      }
+     ],
+     [
+      "webcodecs/video-encoder-h264.https.any.worker.html?main",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,dedicatedworker"
+        ],
+        [
+         "script",
+         "/common/media.js"
+        ],
+        [
+         "script",
+         "/webcodecs/utils.js"
+        ],
+        [
+         "script",
+         "/webcodecs/video-encoder-utils.js"
+        ],
+        [
+         "variant",
+         "?baseline"
+        ],
+        [
+         "variant",
+         "?main"
+        ],
+        [
+         "variant",
+         "?high"
+        ]
+       ]
+      }
+     ]
+    ],
     "video-encoder.https.any.js": [
-     "c8db068e12fa29ee2bb5c39840af6e1ab2636255",
+     "2746e60917b9e920a9015c925f7dc003021ebd04",
      [
       "webcodecs/video-encoder.https.any.html",
       {
@@ -716753,7 +728722,7 @@
      ]
     ],
     "videoDecoder-codec-specific.https.any.js": [
-     "09e20379898aad8035f683f6f0065b977ed14436",
+     "a3acb82ab2624970506d15680dd9730f5ff80fcb",
      [
       "webcodecs/videoDecoder-codec-specific.https.any.html?av1",
       {
@@ -717327,14 +729296,14 @@
      ]
     ],
     "videoFrame-canvasImageSource.html": [
-     "397404be4ec99b56efbef730085ddc2b8d73ebcc",
+     "a60040e56a8dcd8060e512c8240776b5cb723297",
      [
       null,
       {}
      ]
     ],
     "videoFrame-construction.any.js": [
-     "8e8a3eac18b74f3b5efd09c9fff6eb14be9a0c6a",
+     "9f2929aedec6c136c0738e2f96b4f4c32516f448",
      [
       "webcodecs/videoFrame-construction.any.html",
       {
@@ -717437,7 +729406,7 @@
      ]
     ],
     "videoFrame-copyTo.any.js": [
-     "79ba3c63043f1c949a7a37eaff072c0b1cf16d9e",
+     "0fa57f43105fd40a01ed83664f0ef46171af876f",
      [
       "webcodecs/videoFrame-copyTo.any.html",
       {
@@ -717601,8 +729570,48 @@
       }
      ]
     ],
+    "videoFrame-odd-size.any.js": [
+     "da9754077f511a70353db09c5fe17486f0430300",
+     [
+      "webcodecs/videoFrame-odd-size.any.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,dedicatedworker"
+        ],
+        [
+         "script",
+         "/webcodecs/videoFrame-utils.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "webcodecs/videoFrame-odd-size.any.worker.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,dedicatedworker"
+        ],
+        [
+         "script",
+         "/webcodecs/videoFrame-utils.js"
+        ]
+       ]
+      }
+     ]
+    ],
     "videoFrame-serialization.crossAgentCluster.https.html": [
-     "11b5e23124ecc4cb146570803a6c5d208bdcb36e",
+     "967f02ec2cb4a38259d7c0eaa18a8d9d64866a91",
+     [
+      null,
+      {}
+     ]
+    ],
+    "videoFrame-serialization.https.html": [
+     "53eeae28d88cff7f47a6cd25606c9ec8b50fac20",
      [
       null,
       {}
@@ -718174,6 +730183,13 @@
        {}
       ]
      ],
+     "replaceable-setter-throws-if-defineownproperty-fails.html": [
+      "872bbff960426523ec2bebb47aee22a3dca6e1bc",
+      [
+       null,
+       {}
+      ]
+     ],
      "sequence-conversion.html": [
       "40764e9f5776031cb333d79358c814fddc4b0b12",
       [
@@ -721187,7 +733203,7 @@
      ]
     ],
     "RTCDataChannel-binaryType.window.js": [
-     "c63281bd51b0a01de27785c1e14792a6b51e0625",
+     "f641f51976215f45d1177a53bdc17571ae7c707f",
      [
       "webrtc/RTCDataChannel-binaryType.window.html",
       {}
@@ -721993,7 +734009,7 @@
      ]
     ],
     "back-forward-cache-with-closed-webrtc-connection-ccns.https.tentative.window.js": [
-     "bc55a257a8e79fefbee8618df18db1a2366a98fe",
+     "20a0a65590636a4b551559df08f299c3513e0ae0",
      [
       "webrtc/back-forward-cache-with-closed-webrtc-connection-ccns.https.tentative.window.html",
       {
@@ -722061,7 +734077,7 @@
      ]
     ],
     "back-forward-cache-with-open-webrtc-connection-ccns.https.tentative.window.js": [
-     "01c6efe5b4ae3423fe217d6c640606f0a7cad2b4",
+     "5c1aad74806a656260c9a9a08f0125dead3bdfde",
      [
       "webrtc/back-forward-cache-with-open-webrtc-connection-ccns.https.tentative.window.html",
       {
@@ -722253,7 +734269,7 @@
       ]
      ],
      "dtls-fingerprint-validation.html": [
-      "0ddc8488ae57213c9b5810633437bca27e4ee9f3",
+      "9d1739244d005b6c8cda729e85b17500dcd3901b",
       [
        null,
        {}
@@ -722361,7 +734377,7 @@
       ]
      ],
      "rtp-headerextensions.html": [
-      "c377a613f6ea0b39502099b0eb0911ac1fd1d14c",
+      "d1d8bb62bf8005cc8f5f9fc06b88902fd9fab05a",
       [
        null,
        {}
@@ -722584,7 +734600,25 @@
    },
    "webrtc-encoded-transform": {
     "RTCEncodedAudioFrame-clone.https.html": [
-     "ec99338772029bf1e47de724edf85b96a3d0bc75",
+     "83cf642d77f486cca425160fbc5a0b91517a0197",
+     [
+      null,
+      {
+       "testdriver": true
+      }
+     ]
+    ],
+    "RTCEncodedAudioFrame-receive-cloned.https.html": [
+     "66ce0bbcefb80a6f143861179f55b5e121f0194d",
+     [
+      null,
+      {
+       "testdriver": true
+      }
+     ]
+    ],
+    "RTCEncodedAudioFrame-send-incoming.https.html": [
+     "1e2bbc95bd1d45131b98e7378ad0f9ad90b5bbdb",
      [
       null,
       {
@@ -722602,7 +734636,7 @@
      ]
     ],
     "RTCEncodedVideoFrame-clone.https.html": [
-     "29330729dcc778e0b0f816a6999aee25cdc6a424",
+     "0c51df25bbb3952772280ad5b9f46d96096c3079",
      [
       null,
       {
@@ -722620,7 +734654,7 @@
      ]
     ],
     "RTCPeerConnection-insertable-streams-audio.https.html": [
-     "ad5af10bd1e03322077848d53ff7d50915829445",
+     "9bf852763a570f200645fc7c8bb659114ebb8eca",
      [
       null,
       {
@@ -722673,15 +734707,6 @@
       }
      ]
     ],
-    "codec-specific-metadata.https.html": [
-     "bef61b39f3090fc88472abf60d7604a19fc96ffa",
-     [
-      null,
-      {
-       "testdriver": true
-      }
-     ]
-    ],
     "idlharness.https.window.js": [
      "2c6ef19ca82a56c799b97b5eb9af3edb900a40b5",
      [
@@ -722790,7 +734815,7 @@
      ]
     ],
     "set-metadata.https.html": [
-     "712971a62619236641c69445fd1aa99745813e5b",
+     "c4699598cf92f53fcf2c4765ef46704a4f7ef6fa",
      [
       null,
       {
@@ -722854,7 +734879,7 @@
      ]
     ],
     "RTCRtpParameters-codec.html": [
-     "5c81349b1528aaa17f8b17920c15e6664f9709e3",
+     "cce2c1661f7d7761da12d2ee4ba7be1446fcfe9b",
      [
       null,
       {}
@@ -730573,7 +742598,7 @@
      ]
     ],
     "back-forward-cache-with-closed-websocket-connection-ccns.tentative.window.js": [
-     "ccc45f2877da96e62110745c57fb06646ae59a45",
+     "f6ee5edeaa97894f9628e52f7969ef7b6fac0e1c",
      [
       "websockets/back-forward-cache-with-closed-websocket-connection-ccns.tentative.window.html",
       {
@@ -730649,7 +742674,7 @@
      ]
     ],
     "back-forward-cache-with-open-websocket-connection-ccns.tentative.window.js": [
-     "563fd4792ef524bae0561a77fa9282549554b8bc",
+     "f37a04af91a3a785c890b4ec38129cafd39c020a",
      [
       "websockets/back-forward-cache-with-open-websocket-connection-ccns.tentative.window.html",
       {
@@ -730687,7 +742712,7 @@
      ]
     ],
     "back-forward-cache-with-open-websocket-connection.window.js": [
-     "2baf38f303c3dfd3902b07f05c25523d9c1adfb0",
+     "6c48a57010191296c029b123380969040c30800c",
      [
       "websockets/back-forward-cache-with-open-websocket-connection.window.html",
       {
@@ -735579,7 +747604,7 @@
    },
    "webtransport": {
     "back-forward-cache-with-closed-webtransport-connection-ccns.https.tentative.window.js": [
-     "7dce255173723f1d5d37a2130de86e9bedb15e74",
+     "2133dce195fcbe6c0ca73c1fc9d7d08479561ee7",
      [
       "webtransport/back-forward-cache-with-closed-webtransport-connection-ccns.https.tentative.window.html",
       {
@@ -735655,7 +747680,7 @@
      ]
     ],
     "back-forward-cache-with-open-webtransport-connection-ccns.https.tentative.window.js": [
-     "077957a39d9a135fd3ddc1f30b43d0a9c30ae794",
+     "fbee105deb99e6b7acf9edf539220b2009815a11",
      [
       "webtransport/back-forward-cache-with-open-webtransport-connection-ccns.https.tentative.window.html",
       {
@@ -736222,6 +748247,101 @@
       {}
      ]
     ],
+    "sendorder.https.any.js": [
+     "40c6e9b17fc55ff64df2558e8d952ec86d165214",
+     [
+      "webtransport/sendorder.https.any.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "script",
+         "/common/get-host-info.sub.js"
+        ],
+        [
+         "script",
+         "resources/webtransport-test-helpers.sub.js"
+        ],
+        [
+         "script",
+         "/common/utils.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "webtransport/sendorder.https.any.serviceworker.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "script",
+         "/common/get-host-info.sub.js"
+        ],
+        [
+         "script",
+         "resources/webtransport-test-helpers.sub.js"
+        ],
+        [
+         "script",
+         "/common/utils.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "webtransport/sendorder.https.any.sharedworker.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "script",
+         "/common/get-host-info.sub.js"
+        ],
+        [
+         "script",
+         "resources/webtransport-test-helpers.sub.js"
+        ],
+        [
+         "script",
+         "/common/utils.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "webtransport/sendorder.https.any.worker.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "script",
+         "/common/get-host-info.sub.js"
+        ],
+        [
+         "script",
+         "resources/webtransport-test-helpers.sub.js"
+        ],
+        [
+         "script",
+         "/common/utils.js"
+        ]
+       ]
+      }
+     ]
+    ],
     "server-certificate-hashes.https.any.js": [
      "01efab1191b70398884e4cc5ac6ef0fc45e597b4",
      [
@@ -738840,6 +750960,16 @@
       }
      ]
     ],
+    "multi-screen-window-open-fullscreen.tentative.https.html": [
+     "008c53d4e749c6550b1824c69bf1467f7fe759c7",
+     [
+      null,
+      {
+       "testdriver": true,
+       "timeout": "long"
+      }
+     ]
+    ],
     "multi-screen-window-open.tentative.https.html": [
      "708e571c27f950ed414d5e5ea9981bfdec93880a",
      [
@@ -739871,7 +752001,7 @@
        ]
       ],
       "same-origin.html": [
-       "ad464ad50d13d59a12dd6780f33f7f59702a3043",
+       "4f1b62a6605b5c9bd9f00847b9ee4584e0637591",
        [
         null,
         {
@@ -739966,7 +752096,7 @@
        ]
       ],
       "same-origin.html": [
-       "7c86319c14d4842afb66ebfeb8735e1771f3af57",
+       "56dbfe3b3f3ac7683bbd3d757e01ba21d26ffa5e",
        [
         null,
         {
@@ -740958,14 +753088,14 @@
       ]
      ],
      "dedicated-worker-import-data-url-cross-origin.html": [
-      "37390947b642ebf1ff80434d6e870a0118d3b0be",
+      "2f790a06a5cd717bbda6bf1eb290ab55674b66c1",
       [
        null,
        {}
       ]
      ],
      "dedicated-worker-import-data-url.any.js": [
-      "0d8510da0c24ad378d1215157a70b4fd615a3d94",
+      "b837ad67da62cfaea0e7461df1b6edccf8f7c00b",
       [
        "workers/modules/dedicated-worker-import-data-url.any.html",
        {
@@ -741084,14 +753214,14 @@
       ]
      ],
      "shared-worker-import-data-url-cross-origin.html": [
-      "3f22c5094d1b8c167d76af14bdce1dc912451f43",
+      "06724a2b9ea58073f3f39910f2a5a7000ccd8d43",
       [
        null,
        {}
       ]
      ],
      "shared-worker-import-data-url.window.js": [
-      "6d54c0e2320553e2df1ec539a2e9368ed3b0e6a3",
+      "5c77f6d93661f9e266c40f1d2c7c5140b47f8777",
       [
        "workers/modules/shared-worker-import-data-url.window.html",
        {
@@ -741326,21 +753456,21 @@
      },
      "interface-objects": {
       "001.worker.js": [
-       "80fc597380a6c1bc89c05cd6395c173abf11bb27",
+       "873e8701bb6b2cac49ae9b1e377239d22c014d83",
        [
         "workers/semantics/interface-objects/001.worker.html",
         {}
        ]
       ],
       "002.worker.js": [
-       "d4f48354eda302ba0d912649c2b9af70aae0d54e",
+       "9c8dc6746e0711d9a366cad0d2f161cc796e72ba",
        [
         "workers/semantics/interface-objects/002.worker.html",
         {}
        ]
       ],
       "003.any.js": [
-       "4d595bccce6b011f04143bf48cb4f29bd60a82f2",
+       "974756c5080c8110110cae89bc7ff1d541036fc8",
        [
         "workers/semantics/interface-objects/003.any.sharedworker.html",
         {
@@ -741354,7 +753484,7 @@
        ]
       ],
       "004.any.js": [
-       "822379e2c90767ff8c37dde68d5419ef42927a51",
+       "1b0b93b5df0f9557497e61f60fa428453848c56c",
        [
         "workers/semantics/interface-objects/004.any.sharedworker.html",
         {
@@ -745011,7 +757141,7 @@
      ]
     ],
     "send-redirect.htm": [
-     "16b3231e25b4d78712f2f29df6ca5221c1964356",
+     "7d73f0f64cc4d7506e607f75d3bba37b9d3d74a9",
      [
       null,
       {}
@@ -765329,6 +777459,36 @@
        ]
       ]
      },
+     "text-autospace": {
+      "text-autospace-dynamic-text-001.html": [
+       "dfde20a265adbc64b38e198ebfbd45af27e3a68b",
+       [
+        null,
+        {}
+       ]
+      ],
+      "text-autospace-dynamic-text-002.html": [
+       "ffc3d907ee573861326042fb17dd45273d520b29",
+       [
+        null,
+        {}
+       ]
+      ],
+      "text-autospace-dynamic-text-003.html": [
+       "cf2237d48ef689b7ce36a358e38a267885ffd231",
+       [
+        null,
+        {}
+       ]
+      ],
+      "text-autospace-dynamic-text-004.html": [
+       "c1057fc90053005487b7ba0a30b760bd04a70edf",
+       [
+        null,
+        {}
+       ]
+      ]
+     },
      "text-justify": {
       "text-justify-002.html": [
        "91b6381e7c07f67554139d216180318fa676ccf9",
@@ -767390,6 +779550,13 @@
         ]
        },
        "handle_user_prompt": {
+        "handle_user_prompt.py": [
+         "5d9fe587b692a05e1f5773ac34b8f35594aeb613",
+         [
+          null,
+          {}
+         ]
+        ],
         "invalid.py": [
          "fd3c31a78647cfd9adc4c599f473d435703cec80",
          [
@@ -767472,9 +779639,18 @@
          ]
         ]
        },
+       "navigation_started": {
+        "navigation_started.py": [
+         "34f3a6246c8e84d631d111e89f61a446431aa327",
+         [
+          null,
+          {}
+         ]
+        ]
+       },
        "print": {
         "background.py": [
-         "1b854742eacf25458b3220532eec2d996aed5e37",
+         "5f1f518928a995326b540945118074959a7828ef",
          [
           null,
           {}
@@ -767488,14 +779664,14 @@
          ]
         ],
         "invalid.py": [
-         "7193ecd017269de841fb02d12d4e22ae2562d127",
+         "78f9a13cbab07d22570e4fc58c0ad6734a5d32ac",
          [
           null,
           {}
          ]
         ],
         "margin.py": [
-         "8ca1ef7077fefbe55140b5b144a10b17daf0d0af",
+         "0ceb68f4b09d9628a38e715db2316acfd215e222",
          [
           null,
           {
@@ -767543,7 +779719,7 @@
        },
        "reload": {
         "frame.py": [
-         "ce9281583f2369013850d4c074a8e4c345cc453e",
+         "dd2bf6a40f0b9273a94a0855f8e8b47f869b760a",
          [
           null,
           {}
@@ -767557,14 +779733,14 @@
          ]
         ],
         "reload.py": [
-         "b6e957e8a8c5cb0b6e89b7bd6ab73b0b4fac56ef",
+         "fb5157a36510ab3e11e8e1b9999f198cb69623ca",
          [
           null,
           {}
          ]
         ],
         "wait.py": [
-         "2b581c2f0dbc0e34e63641318006aeed20963c6b",
+         "2de09b9735edb81f62a1606fee478d38487b743d",
          [
           null,
           {
@@ -767588,6 +779764,24 @@
           {}
          ]
         ]
+       },
+       "user_prompt_closed": {
+        "user_prompt_closed.py": [
+         "f9283437234a294d36d49f8b051bf5da7796ac24",
+         [
+          null,
+          {}
+         ]
+        ]
+       },
+       "user_prompt_opened": {
+        "user_prompt_opened.py": [
+         "703f789caaf206947c713b709fcc1d500aff9b12",
+         [
+          null,
+          {}
+         ]
+        ]
        }
       },
       "errors": {
@@ -767602,21 +779796,23 @@
       "input": {
        "perform_actions": {
         "invalid.py": [
-         "19b7a57dd11b9294f339706fd2acf08acdb71b97",
+         "0269a1bc8f32a06bade66795fe61ba77aa85cbcf",
          [
           null,
-          {}
+          {
+           "timeout": "long"
+          }
          ]
         ],
         "key.py": [
-         "9189bc96cc426bc927ab355edc9ddaa032c1b587",
+         "ac3099a1ba34054a0d69ba516a7be71449043f9f",
          [
           null,
           {}
          ]
         ],
         "key_events.py": [
-         "f01f327b23441d9a6ed098abc8c013d1325d3b12",
+         "e93c132e0ac434e6c5f3cb2954d85da0e9c95551",
          [
           null,
           {
@@ -767631,13 +779827,29 @@
           {}
          ]
         ],
-        "pointer_mouse.py": [
-         "bb5d78f3013ed643b73b90bbfc4f5b876b21ead1",
+        "pointer.py": [
+         "6109450a23c1d49215a2cc4ef8547789d568eb79",
          [
           null,
           {}
          ]
         ],
+        "pointer_mouse.py": [
+         "c0c4d6ff9530464b8b39c934baf44e5e9e01641d",
+         [
+          null,
+          {}
+         ]
+        ],
+        "pointer_mouse_drag.py": [
+         "7cd2e386c67ee435401ee672d1ce142510d0bb38",
+         [
+          null,
+          {
+           "timeout": "long"
+          }
+         ]
+        ],
         "pointer_mouse_modifier.py": [
          "ea50951f37849991f44d7725611b227f358e6f10",
          [
@@ -767653,28 +779865,35 @@
          ]
         ],
         "pointer_origin.py": [
-         "8667574602d2363d7a16fb74ae346de20cd0f5ab",
+         "f6721e07f39bf1c5a4804d0b82ccaf061003fd22",
          [
           null,
           {}
          ]
         ],
         "pointer_pen.py": [
-         "30728f9a1368bf05928986f16b0d4e44ccdadd78",
+         "04fb24edccd3f33b4a22bd0fb0daf3af451a560a",
          [
           null,
           {}
          ]
         ],
         "pointer_touch.py": [
-         "126e72c76ed4e03f712fa8f3537964838a27ba42",
+         "c1c430765f7dfded519931c0fabd290886608b48",
          [
           null,
           {}
          ]
         ],
         "wheel.py": [
-         "cf96a9cd9bac3d728eec27fc72d0b64ad0b66ff2",
+         "2da3861f9377b00d30b0e9f9ba1c77e7ff79f066",
+         [
+          null,
+          {}
+         ]
+        ],
+        "wheel_origin.py": [
+         "999b1415006aa95d2eb91c141c7f3b4e26ca4781",
          [
           null,
           {}
@@ -767767,8 +779986,29 @@
       },
       "network": {
        "add_intercept": {
+        "add_intercept.py": [
+         "b68cf2789b9301783d82f3c9dc1e5d584fb1181b",
+         [
+          null,
+          {}
+         ]
+        ],
         "invalid.py": [
-         "dc15d5ea904e29c24aa23e1fd1a9d8ea68ddadf9",
+         "ac7b2738548425f8aab010e6be9145c2cad8f296",
+         [
+          null,
+          {}
+         ]
+        ],
+        "phases.py": [
+         "7dd13a46ac225ae50afdb76b5838f5b00faaff7c",
+         [
+          null,
+          {}
+         ]
+        ],
+        "url_patterns.py": [
+         "f32bc8df91d808472d6fc264040869ec24ebe0dd",
          [
           null,
           {}
@@ -767795,11 +780035,20 @@
        },
        "remove_intercept": {
         "invalid.py": [
-         "d6063d22ec39bc7404eb6e752fbf1cbc6222c05a",
+         "4b3526bfc37d8300eebc17b548040bde588ce18b",
          [
           null,
           {}
          ]
+        ],
+        "remove_intercept.py": [
+         "dbb439a9e52d3f1d073fd121f9519e9f0443159f",
+         [
+          null,
+          {
+           "timeout": "long"
+          }
+         ]
         ]
        },
        "response_completed": {
@@ -768179,6 +780428,24 @@
          ]
         ]
        },
+       "realm_created": {
+        "realm_created.py": [
+         "2a86adecb18b7cffff8686f1aac2aae6b4b9e65d",
+         [
+          null,
+          {}
+         ]
+        ]
+       },
+       "realm_destroyed": {
+        "realm_destroyed.py": [
+         "e3f4dc0af01106f4835098a65fb2bce50dcd7cd3",
+         [
+          null,
+          {}
+         ]
+        ]
+       },
        "remove_preload_script": {
         "invalid.py": [
          "f32c5f57cac33c3b367e4b61a7d85def0c08321a",
@@ -768818,7 +781085,7 @@
       },
       "fullscreen_window": {
        "fullscreen.py": [
-        "94f25ed9bdbd4a9cf619982f9b02582b5c137335",
+        "ce9e033d64131a14c719aee3842cd4e6303c7214",
         [
          null,
          {}
@@ -769217,7 +781484,7 @@
       },
       "maximize_window": {
        "maximize.py": [
-        "e233e45a10d7136929380e2a80f5d6fdd0c32a9e",
+        "3cbd47043f5db726f8df04cc41fc51dacbc6120c",
         [
          null,
          {
@@ -769246,7 +781513,7 @@
       },
       "minimize_window": {
        "minimize.py": [
-        "616b250c705a523f049c7c008c1c3b5c5dd9b095",
+        "ed02280a135f2b436bdef250d3511d5432efeea1",
         [
          null,
          {
@@ -769318,12 +781585,10 @@
         ]
        ],
        "default_values.py": [
-        "abd4a5a64c510ee90ef9f52660581a097873e96c",
+        "678d7a8e881ccc0b00c24539165bb38d2521bd40",
         [
          null,
-         {
-          "timeout": "long"
-         }
+         {}
         ]
        ],
        "invalid_capabilities.py": [
@@ -769342,6 +781607,13 @@
          }
         ]
        ],
+       "no_capabilities.py": [
+        "31ee90555a73a4bd084da29e409d26edb85f8041",
+        [
+         null,
+         {}
+        ]
+       ],
        "page_load_strategy.py": [
         "69288ef43335605e4c9d21cfa56bd2806f6e92b0",
         [
@@ -769412,7 +781684,7 @@
       },
       "perform_actions": {
        "invalid.py": [
-        "6c3f134140565dd4319bde7c092703227f2ff888",
+        "b0302131a0ac28b9c704806deaf4585f39919126",
         [
          null,
          {
@@ -769493,7 +781765,7 @@
         ]
        ],
        "pointer_mouse.py": [
-        "152447aeefdf143bf5643d836ca35b47f383b9da",
+        "97295f56f41324dc19925b2ea5109815a8c89a78",
         [
          null,
          {
@@ -769559,7 +781831,7 @@
         ]
        ],
        "wheel.py": [
-        "c83c90df3dea93f150666b7d6ac7bd774c541cc5",
+        "a75a84378a6ada5623096f858363cb7d7a1c5a5c",
         [
          null,
          {}
@@ -769591,7 +781863,7 @@
         ]
        ],
        "printcmd.py": [
-        "aec7769c3e890406508544b3d84410abf6a7a84f",
+        "07d419d1bb3732cb184342165c0626bdb076c910",
         [
          null,
          {
@@ -769674,7 +781946,7 @@
       },
       "set_window_rect": {
        "set.py": [
-        "23382288a3d87b6788c2809fd5335bffc2260e70",
+        "af37c2f70d32c30f2aed2f88883c70249ba96865",
         [
          null,
          {
@@ -769733,7 +782005,7 @@
       },
       "switch_to_parent_frame": {
        "switch.py": [
-        "9c6db8d2cd61d6e92f45ac1843dbe0f43f69af76",
+        "b6c500bcd8413721913c72631bfef2f637522b0d",
         [
          null,
          {}
diff --git a/tests/wpt/meta/WebCryptoAPI/import_export/ec_importKey.https.any.js.ini b/tests/wpt/meta/WebCryptoAPI/import_export/ec_importKey.https.any.js.ini
index ccb45e9861d..b3b3f10b250 100644
--- a/tests/wpt/meta/WebCryptoAPI/import_export/ec_importKey.https.any.js.ini
+++ b/tests/wpt/meta/WebCryptoAPI/import_export/ec_importKey.https.any.js.ini
@@ -395,6 +395,258 @@
   [Empty Usages: P-521 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-521}, false, [\])]
     expected: FAIL
 
+  [Good parameters: P-256 bits (spki, buffer(91), {name: ECDSA, namedCurve: P-256}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (spki, buffer(59, compressed), {name: ECDSA, namedCurve: P-256}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (jwk, object(kty, crv, x, y), {name: ECDSA, namedCurve: P-256}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (raw, buffer(65), {name: ECDSA, namedCurve: P-256}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (raw, buffer(33, compressed), {name: ECDSA, namedCurve: P-256}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (spki, buffer(91), {name: ECDSA, namedCurve: P-256}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (spki, buffer(59, compressed), {name: ECDSA, namedCurve: P-256}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (jwk, object(kty, crv, x, y), {name: ECDSA, namedCurve: P-256}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (raw, buffer(65), {name: ECDSA, namedCurve: P-256}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (raw, buffer(33, compressed), {name: ECDSA, namedCurve: P-256}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (pkcs8, buffer(138), {name: ECDSA, namedCurve: P-256}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (jwk, object(kty, crv, x, y, d), {name: ECDSA, namedCurve: P-256}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (spki, buffer(91), {name: ECDSA, namedCurve: P-256}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (spki, buffer(59, compressed), {name: ECDSA, namedCurve: P-256}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (jwk, object(kty, crv, x, y), {name: ECDSA, namedCurve: P-256}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (raw, buffer(65), {name: ECDSA, namedCurve: P-256}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (raw, buffer(33, compressed), {name: ECDSA, namedCurve: P-256}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (spki, buffer(91), {name: ECDSA, namedCurve: P-256}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (spki, buffer(59, compressed), {name: ECDSA, namedCurve: P-256}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (jwk, object(kty, crv, x, y), {name: ECDSA, namedCurve: P-256}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (raw, buffer(65), {name: ECDSA, namedCurve: P-256}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (raw, buffer(33, compressed), {name: ECDSA, namedCurve: P-256}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (pkcs8, buffer(138), {name: ECDSA, namedCurve: P-256}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (jwk, object(kty, crv, x, y, d), {name: ECDSA, namedCurve: P-256}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (spki, buffer(120), {name: ECDSA, namedCurve: P-384}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (spki, buffer(72, compressed), {name: ECDSA, namedCurve: P-384}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (jwk, object(kty, crv, x, y), {name: ECDSA, namedCurve: P-384}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (raw, buffer(97), {name: ECDSA, namedCurve: P-384}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (raw, buffer(49, compressed), {name: ECDSA, namedCurve: P-384}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (spki, buffer(120), {name: ECDSA, namedCurve: P-384}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (spki, buffer(72, compressed), {name: ECDSA, namedCurve: P-384}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (jwk, object(kty, crv, x, y), {name: ECDSA, namedCurve: P-384}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (raw, buffer(97), {name: ECDSA, namedCurve: P-384}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (raw, buffer(49, compressed), {name: ECDSA, namedCurve: P-384}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (pkcs8, buffer(185), {name: ECDSA, namedCurve: P-384}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (jwk, object(kty, crv, x, y, d), {name: ECDSA, namedCurve: P-384}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (spki, buffer(120), {name: ECDSA, namedCurve: P-384}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (spki, buffer(72, compressed), {name: ECDSA, namedCurve: P-384}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (jwk, object(kty, crv, x, y), {name: ECDSA, namedCurve: P-384}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (raw, buffer(97), {name: ECDSA, namedCurve: P-384}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (raw, buffer(49, compressed), {name: ECDSA, namedCurve: P-384}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (spki, buffer(120), {name: ECDSA, namedCurve: P-384}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (spki, buffer(72, compressed), {name: ECDSA, namedCurve: P-384}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (jwk, object(kty, crv, x, y), {name: ECDSA, namedCurve: P-384}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (raw, buffer(97), {name: ECDSA, namedCurve: P-384}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (raw, buffer(49, compressed), {name: ECDSA, namedCurve: P-384}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (pkcs8, buffer(185), {name: ECDSA, namedCurve: P-384}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (jwk, object(kty, crv, x, y, d), {name: ECDSA, namedCurve: P-384}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (spki, buffer(158), {name: ECDSA, namedCurve: P-521}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (spki, buffer(90, compressed), {name: ECDSA, namedCurve: P-521}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (jwk, object(kty, crv, x, y), {name: ECDSA, namedCurve: P-521}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (raw, buffer(133), {name: ECDSA, namedCurve: P-521}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (raw, buffer(67, compressed), {name: ECDSA, namedCurve: P-521}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (spki, buffer(158), {name: ECDSA, namedCurve: P-521}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (spki, buffer(90, compressed), {name: ECDSA, namedCurve: P-521}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (jwk, object(kty, crv, x, y), {name: ECDSA, namedCurve: P-521}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (raw, buffer(133), {name: ECDSA, namedCurve: P-521}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (raw, buffer(67, compressed), {name: ECDSA, namedCurve: P-521}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (pkcs8, buffer(241), {name: ECDSA, namedCurve: P-521}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (jwk, object(kty, crv, x, y, d), {name: ECDSA, namedCurve: P-521}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (spki, buffer(158), {name: ECDSA, namedCurve: P-521}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (spki, buffer(90, compressed), {name: ECDSA, namedCurve: P-521}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (jwk, object(kty, crv, x, y), {name: ECDSA, namedCurve: P-521}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (raw, buffer(133), {name: ECDSA, namedCurve: P-521}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (raw, buffer(67, compressed), {name: ECDSA, namedCurve: P-521}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (spki, buffer(158), {name: ECDSA, namedCurve: P-521}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (spki, buffer(90, compressed), {name: ECDSA, namedCurve: P-521}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (jwk, object(kty, crv, x, y), {name: ECDSA, namedCurve: P-521}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (raw, buffer(133), {name: ECDSA, namedCurve: P-521}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (raw, buffer(67, compressed), {name: ECDSA, namedCurve: P-521}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (pkcs8, buffer(241), {name: ECDSA, namedCurve: P-521}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (jwk, object(kty, crv, x, y, d), {name: ECDSA, namedCurve: P-521}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (pkcs8, buffer(138), {name: ECDH, namedCurve: P-256}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-256}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (pkcs8, buffer(138), {name: ECDH, namedCurve: P-256}, false, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-256}, false, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (pkcs8, buffer(185), {name: ECDH, namedCurve: P-384}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-384}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (pkcs8, buffer(185), {name: ECDH, namedCurve: P-384}, false, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-384}, false, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (pkcs8, buffer(241), {name: ECDH, namedCurve: P-521}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-521}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (pkcs8, buffer(241), {name: ECDH, namedCurve: P-521}, false, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-521}, false, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
 
 [ec_importKey.https.any.worker.html]
   [Good parameters: P-256 bits (spki, buffer(91), {name: ECDSA, namedCurve: P-256}, true, [\])]
@@ -792,3 +1044,255 @@
 
   [Empty Usages: P-521 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-521}, false, [\])]
     expected: FAIL
+
+  [Good parameters: P-256 bits (spki, buffer(91), {name: ECDSA, namedCurve: P-256}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (spki, buffer(59, compressed), {name: ECDSA, namedCurve: P-256}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (jwk, object(kty, crv, x, y), {name: ECDSA, namedCurve: P-256}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (raw, buffer(65), {name: ECDSA, namedCurve: P-256}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (raw, buffer(33, compressed), {name: ECDSA, namedCurve: P-256}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (spki, buffer(91), {name: ECDSA, namedCurve: P-256}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (spki, buffer(59, compressed), {name: ECDSA, namedCurve: P-256}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (jwk, object(kty, crv, x, y), {name: ECDSA, namedCurve: P-256}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (raw, buffer(65), {name: ECDSA, namedCurve: P-256}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (raw, buffer(33, compressed), {name: ECDSA, namedCurve: P-256}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (pkcs8, buffer(138), {name: ECDSA, namedCurve: P-256}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (jwk, object(kty, crv, x, y, d), {name: ECDSA, namedCurve: P-256}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (spki, buffer(91), {name: ECDSA, namedCurve: P-256}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (spki, buffer(59, compressed), {name: ECDSA, namedCurve: P-256}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (jwk, object(kty, crv, x, y), {name: ECDSA, namedCurve: P-256}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (raw, buffer(65), {name: ECDSA, namedCurve: P-256}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (raw, buffer(33, compressed), {name: ECDSA, namedCurve: P-256}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (spki, buffer(91), {name: ECDSA, namedCurve: P-256}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (spki, buffer(59, compressed), {name: ECDSA, namedCurve: P-256}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (jwk, object(kty, crv, x, y), {name: ECDSA, namedCurve: P-256}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (raw, buffer(65), {name: ECDSA, namedCurve: P-256}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (raw, buffer(33, compressed), {name: ECDSA, namedCurve: P-256}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (pkcs8, buffer(138), {name: ECDSA, namedCurve: P-256}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (jwk, object(kty, crv, x, y, d), {name: ECDSA, namedCurve: P-256}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (spki, buffer(120), {name: ECDSA, namedCurve: P-384}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (spki, buffer(72, compressed), {name: ECDSA, namedCurve: P-384}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (jwk, object(kty, crv, x, y), {name: ECDSA, namedCurve: P-384}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (raw, buffer(97), {name: ECDSA, namedCurve: P-384}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (raw, buffer(49, compressed), {name: ECDSA, namedCurve: P-384}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (spki, buffer(120), {name: ECDSA, namedCurve: P-384}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (spki, buffer(72, compressed), {name: ECDSA, namedCurve: P-384}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (jwk, object(kty, crv, x, y), {name: ECDSA, namedCurve: P-384}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (raw, buffer(97), {name: ECDSA, namedCurve: P-384}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (raw, buffer(49, compressed), {name: ECDSA, namedCurve: P-384}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (pkcs8, buffer(185), {name: ECDSA, namedCurve: P-384}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (jwk, object(kty, crv, x, y, d), {name: ECDSA, namedCurve: P-384}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (spki, buffer(120), {name: ECDSA, namedCurve: P-384}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (spki, buffer(72, compressed), {name: ECDSA, namedCurve: P-384}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (jwk, object(kty, crv, x, y), {name: ECDSA, namedCurve: P-384}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (raw, buffer(97), {name: ECDSA, namedCurve: P-384}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (raw, buffer(49, compressed), {name: ECDSA, namedCurve: P-384}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (spki, buffer(120), {name: ECDSA, namedCurve: P-384}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (spki, buffer(72, compressed), {name: ECDSA, namedCurve: P-384}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (jwk, object(kty, crv, x, y), {name: ECDSA, namedCurve: P-384}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (raw, buffer(97), {name: ECDSA, namedCurve: P-384}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (raw, buffer(49, compressed), {name: ECDSA, namedCurve: P-384}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (pkcs8, buffer(185), {name: ECDSA, namedCurve: P-384}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (jwk, object(kty, crv, x, y, d), {name: ECDSA, namedCurve: P-384}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (spki, buffer(158), {name: ECDSA, namedCurve: P-521}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (spki, buffer(90, compressed), {name: ECDSA, namedCurve: P-521}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (jwk, object(kty, crv, x, y), {name: ECDSA, namedCurve: P-521}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (raw, buffer(133), {name: ECDSA, namedCurve: P-521}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (raw, buffer(67, compressed), {name: ECDSA, namedCurve: P-521}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (spki, buffer(158), {name: ECDSA, namedCurve: P-521}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (spki, buffer(90, compressed), {name: ECDSA, namedCurve: P-521}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (jwk, object(kty, crv, x, y), {name: ECDSA, namedCurve: P-521}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (raw, buffer(133), {name: ECDSA, namedCurve: P-521}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (raw, buffer(67, compressed), {name: ECDSA, namedCurve: P-521}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (pkcs8, buffer(241), {name: ECDSA, namedCurve: P-521}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (jwk, object(kty, crv, x, y, d), {name: ECDSA, namedCurve: P-521}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (spki, buffer(158), {name: ECDSA, namedCurve: P-521}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (spki, buffer(90, compressed), {name: ECDSA, namedCurve: P-521}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (jwk, object(kty, crv, x, y), {name: ECDSA, namedCurve: P-521}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (raw, buffer(133), {name: ECDSA, namedCurve: P-521}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (raw, buffer(67, compressed), {name: ECDSA, namedCurve: P-521}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (spki, buffer(158), {name: ECDSA, namedCurve: P-521}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (spki, buffer(90, compressed), {name: ECDSA, namedCurve: P-521}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (jwk, object(kty, crv, x, y), {name: ECDSA, namedCurve: P-521}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (raw, buffer(133), {name: ECDSA, namedCurve: P-521}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (raw, buffer(67, compressed), {name: ECDSA, namedCurve: P-521}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (pkcs8, buffer(241), {name: ECDSA, namedCurve: P-521}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (jwk, object(kty, crv, x, y, d), {name: ECDSA, namedCurve: P-521}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (pkcs8, buffer(138), {name: ECDH, namedCurve: P-256}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-256}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (pkcs8, buffer(138), {name: ECDH, namedCurve: P-256}, false, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: P-256 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-256}, false, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (pkcs8, buffer(185), {name: ECDH, namedCurve: P-384}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-384}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (pkcs8, buffer(185), {name: ECDH, namedCurve: P-384}, false, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: P-384 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-384}, false, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (pkcs8, buffer(241), {name: ECDH, namedCurve: P-521}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-521}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (pkcs8, buffer(241), {name: ECDH, namedCurve: P-521}, false, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: P-521 bits (jwk, object(kty, crv, x, y, d), {name: ECDH, namedCurve: P-521}, false, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
diff --git a/tests/wpt/meta/WebCryptoAPI/import_export/okp_importKey.https.any.js.ini b/tests/wpt/meta/WebCryptoAPI/import_export/okp_importKey.https.any.js.ini
index bec3fcf8d84..5c65209a084 100644
--- a/tests/wpt/meta/WebCryptoAPI/import_export/okp_importKey.https.any.js.ini
+++ b/tests/wpt/meta/WebCryptoAPI/import_export/okp_importKey.https.any.js.ini
@@ -167,6 +167,126 @@
   [Good parameters: X448 bits (raw, buffer(56), {name: X448}, false, [\])]
     expected: FAIL
 
+  [Good parameters: Ed25519 bits (spki, buffer(44), {name: Ed25519}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (jwk, object(kty, crv, x), {name: Ed25519}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (raw, buffer(32), {name: Ed25519}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (spki, buffer(44), {name: Ed25519}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (jwk, object(kty, crv, x), {name: Ed25519}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (raw, buffer(32), {name: Ed25519}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (pkcs8, buffer(48), {name: Ed25519}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (jwk, object(crv, d, x, kty), {name: Ed25519}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (spki, buffer(44), {name: Ed25519}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (jwk, object(kty, crv, x), {name: Ed25519}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (raw, buffer(32), {name: Ed25519}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (spki, buffer(44), {name: Ed25519}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (jwk, object(kty, crv, x), {name: Ed25519}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (raw, buffer(32), {name: Ed25519}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (pkcs8, buffer(48), {name: Ed25519}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (jwk, object(crv, d, x, kty), {name: Ed25519}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (spki, buffer(69), {name: Ed448}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (jwk, object(kty, crv, x), {name: Ed448}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (raw, buffer(57), {name: Ed448}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (spki, buffer(69), {name: Ed448}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (jwk, object(kty, crv, x), {name: Ed448}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (raw, buffer(57), {name: Ed448}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (pkcs8, buffer(73), {name: Ed448}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (jwk, object(crv, d, x, kty), {name: Ed448}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (spki, buffer(69), {name: Ed448}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (jwk, object(kty, crv, x), {name: Ed448}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (raw, buffer(57), {name: Ed448}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (spki, buffer(69), {name: Ed448}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (jwk, object(kty, crv, x), {name: Ed448}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (raw, buffer(57), {name: Ed448}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (pkcs8, buffer(73), {name: Ed448}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (jwk, object(crv, d, x, kty), {name: Ed448}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (pkcs8, buffer(48), {name: X25519}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (jwk, object(crv, d, x, kty), {name: X25519}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (pkcs8, buffer(48), {name: X25519}, false, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (jwk, object(crv, d, x, kty), {name: X25519}, false, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (pkcs8, buffer(72), {name: X448}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (jwk, object(crv, d, x, kty), {name: X448}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (pkcs8, buffer(72), {name: X448}, false, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (jwk, object(crv, d, x, kty), {name: X448}, false, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
 
 [okp_importKey.https.any.html]
   [Good parameters: Ed25519 bits (spki, buffer(44), {name: Ed25519}, true, [\])]
@@ -336,3 +456,123 @@
 
   [Good parameters: X448 bits (raw, buffer(56), {name: X448}, false, [\])]
     expected: FAIL
+
+  [Good parameters: Ed25519 bits (spki, buffer(44), {name: Ed25519}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (jwk, object(kty, crv, x), {name: Ed25519}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (raw, buffer(32), {name: Ed25519}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (spki, buffer(44), {name: Ed25519}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (jwk, object(kty, crv, x), {name: Ed25519}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (raw, buffer(32), {name: Ed25519}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (pkcs8, buffer(48), {name: Ed25519}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (jwk, object(crv, d, x, kty), {name: Ed25519}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (spki, buffer(44), {name: Ed25519}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (jwk, object(kty, crv, x), {name: Ed25519}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (raw, buffer(32), {name: Ed25519}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (spki, buffer(44), {name: Ed25519}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (jwk, object(kty, crv, x), {name: Ed25519}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (raw, buffer(32), {name: Ed25519}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (pkcs8, buffer(48), {name: Ed25519}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed25519 bits (jwk, object(crv, d, x, kty), {name: Ed25519}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (spki, buffer(69), {name: Ed448}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (jwk, object(kty, crv, x), {name: Ed448}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (raw, buffer(57), {name: Ed448}, true, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (spki, buffer(69), {name: Ed448}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (jwk, object(kty, crv, x), {name: Ed448}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (raw, buffer(57), {name: Ed448}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (pkcs8, buffer(73), {name: Ed448}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (jwk, object(crv, d, x, kty), {name: Ed448}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (spki, buffer(69), {name: Ed448}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (jwk, object(kty, crv, x), {name: Ed448}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (raw, buffer(57), {name: Ed448}, false, [verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (spki, buffer(69), {name: Ed448}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (jwk, object(kty, crv, x), {name: Ed448}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (raw, buffer(57), {name: Ed448}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (pkcs8, buffer(73), {name: Ed448}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: Ed448 bits (jwk, object(crv, d, x, kty), {name: Ed448}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (pkcs8, buffer(48), {name: X25519}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (jwk, object(crv, d, x, kty), {name: X25519}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (pkcs8, buffer(48), {name: X25519}, false, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X25519 bits (jwk, object(crv, d, x, kty), {name: X25519}, false, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (pkcs8, buffer(72), {name: X448}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (jwk, object(crv, d, x, kty), {name: X448}, true, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (pkcs8, buffer(72), {name: X448}, false, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
+
+  [Good parameters: X448 bits (jwk, object(crv, d, x, kty), {name: X448}, false, [deriveKey, deriveBits, deriveKey, deriveBits\])]
+    expected: FAIL
diff --git a/tests/wpt/meta/WebCryptoAPI/import_export/rsa_importKey.https.any.js.ini b/tests/wpt/meta/WebCryptoAPI/import_export/rsa_importKey.https.any.js.ini
index 61aa19a5fc8..bc6aa957522 100644
--- a/tests/wpt/meta/WebCryptoAPI/import_export/rsa_importKey.https.any.js.ini
+++ b/tests/wpt/meta/WebCryptoAPI/import_export/rsa_importKey.https.any.js.ini
@@ -1871,6 +1871,1302 @@
   [Empty Usages: 4096 bits (jwk, object(spki, pkcs8, jwk), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, false, [\])]
     expected: FAIL
 
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-1, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-1, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-1, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-1, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-1, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-1, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-1, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-1, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-256, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-256, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-256, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-256, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-256, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-256, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-256, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-256, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-384, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-384, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-384, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-384, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-384, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-384, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-384, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-384, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-512, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-512, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-512, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-512, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-512, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-512, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-512, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-512, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-1, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-1, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-1, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-1, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-1, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-1, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-1, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-1, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-256, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-256, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-256, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-256, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-256, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-256, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-256, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-256, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-384, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-384, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-384, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-384, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-384, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-384, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-384, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-384, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-512, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-512, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-512, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-512, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-512, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-512, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-512, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-512, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-1, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-1, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-1, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-1, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-1, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-1, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-1, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-1, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-256, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-256, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-256, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-256, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-256, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-256, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-256, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-256, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-384, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-384, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-384, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-384, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-384, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-384, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-384, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-384, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-512, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-512, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-512, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-512, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-512, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-512, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-512, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-512, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-1, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-1, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-1, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-1, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-1, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-1, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-1, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-1, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-256, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-256, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-256, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-256, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-256, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-256, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-256, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-256, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-384, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-384, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-384, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-384, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-384, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-384, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-384, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-384, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-512, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-512, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-512, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-512, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-512, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-512, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-512, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-512, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-1, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-1, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-1, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-1, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-1, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-1, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-1, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-1, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-256, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-256, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-256, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-256, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-256, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-256, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-256, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-256, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-384, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-384, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-384, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-384, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-384, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-384, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-384, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-384, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-512, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-512, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-512, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-512, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-512, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-512, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-512, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-512, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-1, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-1, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-1, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-1, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-1, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-1, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-1, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-1, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-256, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-256, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-256, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-256, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-256, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-256, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-256, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-256, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-384, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-384, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-384, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-384, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-384, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-384, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-384, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-384, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-512, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-512, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-512, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-512, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-512, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-512, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-512, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-512, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
 
 [rsa_importKey.https.any.worker.html]
   [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-1, name: RSA-OAEP}, true, [encrypt\])]
@@ -3744,3 +5040,1299 @@
 
   [Empty Usages: 4096 bits (jwk, object(spki, pkcs8, jwk), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, false, [\])]
     expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-1, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-1, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-1, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-1, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-1, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-1, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-1, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-1, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-256, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-256, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-256, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-256, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-256, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-256, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-256, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-256, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-384, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-384, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-384, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-384, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-384, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-384, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-384, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-384, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-512, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-512, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-512, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-512, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-512, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-512, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-512, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-512, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-1, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-1, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-1, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-1, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-1, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-1, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-1, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-1, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-256, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-256, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-256, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-256, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-256, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-256, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-256, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-256, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-384, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-384, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-384, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-384, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-384, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-384, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-384, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-384, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-512, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-512, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-512, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-512, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-512, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-512, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-512, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-512, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-1, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-1, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-1, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-1, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-1, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-1, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-1, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-1, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-256, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-256, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-256, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-256, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-256, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-256, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-256, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-256, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-384, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-384, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-384, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-384, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-384, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-384, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-384, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-384, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-512, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-OAEP}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-512, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-OAEP}, true, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-512, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-512, name: RSA-OAEP}, true, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-512, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-OAEP}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-512, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-OAEP}, false, [encrypt, wrapKey, encrypt, wrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-512, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-512, name: RSA-OAEP}, false, [decrypt, unwrapKey, decrypt, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-1, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-1, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-1, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-1, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-1, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-1, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-1, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-1, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-256, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-256, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-256, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-256, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-256, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-256, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-256, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-256, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-384, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-384, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-384, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-384, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-384, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-384, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-384, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-384, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-512, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-512, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-512, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-512, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-512, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-512, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-512, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-512, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-1, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-1, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-1, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-1, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-1, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-1, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-1, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-1, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-256, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-256, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-256, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-256, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-256, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-256, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-256, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-256, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-384, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-384, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-384, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-384, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-384, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-384, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-384, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-384, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-512, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-512, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-512, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-512, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-512, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-512, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-512, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-512, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-1, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-1, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-1, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-1, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-1, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-1, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-1, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-1, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-256, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-256, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-256, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-256, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-256, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-256, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-256, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-256, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-384, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-384, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-384, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-384, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-384, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-384, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-384, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-384, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-512, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-PSS}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-512, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-PSS}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-512, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-512, name: RSA-PSS}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-512, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-PSS}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-512, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSA-PSS}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-512, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-512, name: RSA-PSS}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (spki, buffer(162), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (pkcs8, buffer(636), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 1024 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (spki, buffer(294), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (pkcs8, buffer(1218), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 2048 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-1, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-256, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-384, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, true, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, true, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, true, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, false, [\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (spki, buffer(550), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, false, [verify, verify\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (pkcs8, buffer(2376), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
+
+  [Good parameters: 4096 bits (jwk, object(kty, n, e, d, p, q, dp, dq, qi), {hash: SHA-512, name: RSASSA-PKCS1-v1_5}, false, [sign, sign\])]
+    expected: FAIL
diff --git a/tests/wpt/meta/WebCryptoAPI/import_export/symmetric_importKey.https.any.js.ini b/tests/wpt/meta/WebCryptoAPI/import_export/symmetric_importKey.https.any.js.ini
index 15a80d168ff..7a049b94164 100644
--- a/tests/wpt/meta/WebCryptoAPI/import_export/symmetric_importKey.https.any.js.ini
+++ b/tests/wpt/meta/WebCryptoAPI/import_export/symmetric_importKey.https.any.js.ini
@@ -935,6 +935,240 @@
   [Empty Usages: 256 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 24: 25, 25: 26, 26: 27, 27: 28, 28: 29, 29: 30, 3: 4, 30: 31, 31: 32, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: PBKDF2}, false, [\])]
     expected: FAIL
 
+  [Good parameters: 128 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 2: 3, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-CTR}, true, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (jwk, {alg: A128CTR, k: AQIDBAUGBwgJCgsMDQ4PEA, kty: oct}, {name: AES-CTR}, true, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 2: 3, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-CTR}, false, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (jwk, {alg: A128CTR, k: AQIDBAUGBwgJCgsMDQ4PEA, kty: oct}, {name: AES-CTR}, false, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-CTR}, true, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (jwk, {alg: A192CTR, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcY, kty: oct}, {name: AES-CTR}, true, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-CTR}, false, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (jwk, {alg: A192CTR, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcY, kty: oct}, {name: AES-CTR}, false, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 24: 25, 25: 26, 26: 27, 27: 28, 28: 29, 29: 30, 3: 4, 30: 31, 31: 32, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-CTR}, true, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (jwk, {alg: A256CTR, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eHyA, kty: oct}, {name: AES-CTR}, true, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 24: 25, 25: 26, 26: 27, 27: 28, 28: 29, 29: 30, 3: 4, 30: 31, 31: 32, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-CTR}, false, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (jwk, {alg: A256CTR, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eHyA, kty: oct}, {name: AES-CTR}, false, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 2: 3, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-CBC}, true, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (jwk, {alg: A128CBC, k: AQIDBAUGBwgJCgsMDQ4PEA, kty: oct}, {name: AES-CBC}, true, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 2: 3, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-CBC}, false, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (jwk, {alg: A128CBC, k: AQIDBAUGBwgJCgsMDQ4PEA, kty: oct}, {name: AES-CBC}, false, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-CBC}, true, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (jwk, {alg: A192CBC, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcY, kty: oct}, {name: AES-CBC}, true, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-CBC}, false, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (jwk, {alg: A192CBC, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcY, kty: oct}, {name: AES-CBC}, false, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 24: 25, 25: 26, 26: 27, 27: 28, 28: 29, 29: 30, 3: 4, 30: 31, 31: 32, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-CBC}, true, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (jwk, {alg: A256CBC, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eHyA, kty: oct}, {name: AES-CBC}, true, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 24: 25, 25: 26, 26: 27, 27: 28, 28: 29, 29: 30, 3: 4, 30: 31, 31: 32, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-CBC}, false, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (jwk, {alg: A256CBC, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eHyA, kty: oct}, {name: AES-CBC}, false, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 2: 3, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-GCM}, true, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (jwk, {alg: A128GCM, k: AQIDBAUGBwgJCgsMDQ4PEA, kty: oct}, {name: AES-GCM}, true, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 2: 3, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-GCM}, false, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (jwk, {alg: A128GCM, k: AQIDBAUGBwgJCgsMDQ4PEA, kty: oct}, {name: AES-GCM}, false, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-GCM}, true, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (jwk, {alg: A192GCM, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcY, kty: oct}, {name: AES-GCM}, true, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-GCM}, false, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (jwk, {alg: A192GCM, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcY, kty: oct}, {name: AES-GCM}, false, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 24: 25, 25: 26, 26: 27, 27: 28, 28: 29, 29: 30, 3: 4, 30: 31, 31: 32, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-GCM}, true, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (jwk, {alg: A256GCM, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eHyA, kty: oct}, {name: AES-GCM}, true, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 24: 25, 25: 26, 26: 27, 27: 28, 28: 29, 29: 30, 3: 4, 30: 31, 31: 32, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-GCM}, false, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (jwk, {alg: A256GCM, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eHyA, kty: oct}, {name: AES-GCM}, false, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 2: 3, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-KW}, true, [wrapKey, unwrapKey, wrapKey, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (jwk, {alg: A128KW, k: AQIDBAUGBwgJCgsMDQ4PEA, kty: oct}, {name: AES-KW}, true, [wrapKey, unwrapKey, wrapKey, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 2: 3, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-KW}, false, [wrapKey, unwrapKey, wrapKey, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (jwk, {alg: A128KW, k: AQIDBAUGBwgJCgsMDQ4PEA, kty: oct}, {name: AES-KW}, false, [wrapKey, unwrapKey, wrapKey, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-KW}, true, [wrapKey, unwrapKey, wrapKey, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (jwk, {alg: A192KW, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcY, kty: oct}, {name: AES-KW}, true, [wrapKey, unwrapKey, wrapKey, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-KW}, false, [wrapKey, unwrapKey, wrapKey, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (jwk, {alg: A192KW, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcY, kty: oct}, {name: AES-KW}, false, [wrapKey, unwrapKey, wrapKey, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 24: 25, 25: 26, 26: 27, 27: 28, 28: 29, 29: 30, 3: 4, 30: 31, 31: 32, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-KW}, true, [wrapKey, unwrapKey, wrapKey, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (jwk, {alg: A256KW, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eHyA, kty: oct}, {name: AES-KW}, true, [wrapKey, unwrapKey, wrapKey, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 24: 25, 25: 26, 26: 27, 27: 28, 28: 29, 29: 30, 3: 4, 30: 31, 31: 32, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-KW}, false, [wrapKey, unwrapKey, wrapKey, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (jwk, {alg: A256KW, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eHyA, kty: oct}, {name: AES-KW}, false, [wrapKey, unwrapKey, wrapKey, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 2: 3, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {hash: SHA-1, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (jwk, {alg: HS1, k: AQIDBAUGBwgJCgsMDQ4PEA, kty: oct}, {hash: SHA-1, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {hash: SHA-1, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (jwk, {alg: HS1, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcY, kty: oct}, {hash: SHA-1, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 24: 25, 25: 26, 26: 27, 27: 28, 28: 29, 29: 30, 3: 4, 30: 31, 31: 32, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {hash: SHA-1, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (jwk, {alg: HS1, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eHyA, kty: oct}, {hash: SHA-1, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 2: 3, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {hash: SHA-256, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (jwk, {alg: HS256, k: AQIDBAUGBwgJCgsMDQ4PEA, kty: oct}, {hash: SHA-256, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {hash: SHA-256, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (jwk, {alg: HS256, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcY, kty: oct}, {hash: SHA-256, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 24: 25, 25: 26, 26: 27, 27: 28, 28: 29, 29: 30, 3: 4, 30: 31, 31: 32, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {hash: SHA-256, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (jwk, {alg: HS256, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eHyA, kty: oct}, {hash: SHA-256, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 2: 3, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {hash: SHA-384, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (jwk, {alg: HS384, k: AQIDBAUGBwgJCgsMDQ4PEA, kty: oct}, {hash: SHA-384, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {hash: SHA-384, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (jwk, {alg: HS384, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcY, kty: oct}, {hash: SHA-384, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 24: 25, 25: 26, 26: 27, 27: 28, 28: 29, 29: 30, 3: 4, 30: 31, 31: 32, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {hash: SHA-384, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (jwk, {alg: HS384, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eHyA, kty: oct}, {hash: SHA-384, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 2: 3, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {hash: SHA-512, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (jwk, {alg: HS512, k: AQIDBAUGBwgJCgsMDQ4PEA, kty: oct}, {hash: SHA-512, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {hash: SHA-512, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (jwk, {alg: HS512, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcY, kty: oct}, {hash: SHA-512, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 24: 25, 25: 26, 26: 27, 27: 28, 28: 29, 29: 30, 3: 4, 30: 31, 31: 32, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {hash: SHA-512, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (jwk, {alg: HS512, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eHyA, kty: oct}, {hash: SHA-512, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 2: 3, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: HKDF}, false, [deriveBits, deriveKey, deriveBits, deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: HKDF}, false, [deriveBits, deriveKey, deriveBits, deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 24: 25, 25: 26, 26: 27, 27: 28, 28: 29, 29: 30, 3: 4, 30: 31, 31: 32, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: HKDF}, false, [deriveBits, deriveKey, deriveBits, deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 2: 3, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: PBKDF2}, false, [deriveBits, deriveKey, deriveBits, deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: PBKDF2}, false, [deriveBits, deriveKey, deriveBits, deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 24: 25, 25: 26, 26: 27, 27: 28, 28: 29, 29: 30, 3: 4, 30: 31, 31: 32, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: PBKDF2}, false, [deriveBits, deriveKey, deriveBits, deriveKey\])]
+    expected: FAIL
+
 
 [symmetric_importKey.https.any.worker.html]
   [Good parameters: 128 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 2: 3, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-CTR}, true, [encrypt\])]
@@ -1872,3 +2106,237 @@
 
   [Empty Usages: 256 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 24: 25, 25: 26, 26: 27, 27: 28, 28: 29, 29: 30, 3: 4, 30: 31, 31: 32, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: PBKDF2}, false, [\])]
     expected: FAIL
+
+  [Good parameters: 128 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 2: 3, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-CTR}, true, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (jwk, {alg: A128CTR, k: AQIDBAUGBwgJCgsMDQ4PEA, kty: oct}, {name: AES-CTR}, true, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 2: 3, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-CTR}, false, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (jwk, {alg: A128CTR, k: AQIDBAUGBwgJCgsMDQ4PEA, kty: oct}, {name: AES-CTR}, false, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-CTR}, true, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (jwk, {alg: A192CTR, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcY, kty: oct}, {name: AES-CTR}, true, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-CTR}, false, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (jwk, {alg: A192CTR, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcY, kty: oct}, {name: AES-CTR}, false, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 24: 25, 25: 26, 26: 27, 27: 28, 28: 29, 29: 30, 3: 4, 30: 31, 31: 32, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-CTR}, true, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (jwk, {alg: A256CTR, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eHyA, kty: oct}, {name: AES-CTR}, true, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 24: 25, 25: 26, 26: 27, 27: 28, 28: 29, 29: 30, 3: 4, 30: 31, 31: 32, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-CTR}, false, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (jwk, {alg: A256CTR, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eHyA, kty: oct}, {name: AES-CTR}, false, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 2: 3, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-CBC}, true, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (jwk, {alg: A128CBC, k: AQIDBAUGBwgJCgsMDQ4PEA, kty: oct}, {name: AES-CBC}, true, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 2: 3, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-CBC}, false, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (jwk, {alg: A128CBC, k: AQIDBAUGBwgJCgsMDQ4PEA, kty: oct}, {name: AES-CBC}, false, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-CBC}, true, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (jwk, {alg: A192CBC, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcY, kty: oct}, {name: AES-CBC}, true, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-CBC}, false, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (jwk, {alg: A192CBC, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcY, kty: oct}, {name: AES-CBC}, false, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 24: 25, 25: 26, 26: 27, 27: 28, 28: 29, 29: 30, 3: 4, 30: 31, 31: 32, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-CBC}, true, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (jwk, {alg: A256CBC, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eHyA, kty: oct}, {name: AES-CBC}, true, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 24: 25, 25: 26, 26: 27, 27: 28, 28: 29, 29: 30, 3: 4, 30: 31, 31: 32, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-CBC}, false, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (jwk, {alg: A256CBC, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eHyA, kty: oct}, {name: AES-CBC}, false, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 2: 3, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-GCM}, true, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (jwk, {alg: A128GCM, k: AQIDBAUGBwgJCgsMDQ4PEA, kty: oct}, {name: AES-GCM}, true, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 2: 3, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-GCM}, false, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (jwk, {alg: A128GCM, k: AQIDBAUGBwgJCgsMDQ4PEA, kty: oct}, {name: AES-GCM}, false, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-GCM}, true, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (jwk, {alg: A192GCM, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcY, kty: oct}, {name: AES-GCM}, true, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-GCM}, false, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (jwk, {alg: A192GCM, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcY, kty: oct}, {name: AES-GCM}, false, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 24: 25, 25: 26, 26: 27, 27: 28, 28: 29, 29: 30, 3: 4, 30: 31, 31: 32, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-GCM}, true, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (jwk, {alg: A256GCM, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eHyA, kty: oct}, {name: AES-GCM}, true, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 24: 25, 25: 26, 26: 27, 27: 28, 28: 29, 29: 30, 3: 4, 30: 31, 31: 32, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-GCM}, false, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (jwk, {alg: A256GCM, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eHyA, kty: oct}, {name: AES-GCM}, false, [encrypt, decrypt, encrypt, decrypt\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 2: 3, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-KW}, true, [wrapKey, unwrapKey, wrapKey, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (jwk, {alg: A128KW, k: AQIDBAUGBwgJCgsMDQ4PEA, kty: oct}, {name: AES-KW}, true, [wrapKey, unwrapKey, wrapKey, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 2: 3, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-KW}, false, [wrapKey, unwrapKey, wrapKey, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (jwk, {alg: A128KW, k: AQIDBAUGBwgJCgsMDQ4PEA, kty: oct}, {name: AES-KW}, false, [wrapKey, unwrapKey, wrapKey, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-KW}, true, [wrapKey, unwrapKey, wrapKey, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (jwk, {alg: A192KW, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcY, kty: oct}, {name: AES-KW}, true, [wrapKey, unwrapKey, wrapKey, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-KW}, false, [wrapKey, unwrapKey, wrapKey, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (jwk, {alg: A192KW, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcY, kty: oct}, {name: AES-KW}, false, [wrapKey, unwrapKey, wrapKey, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 24: 25, 25: 26, 26: 27, 27: 28, 28: 29, 29: 30, 3: 4, 30: 31, 31: 32, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-KW}, true, [wrapKey, unwrapKey, wrapKey, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (jwk, {alg: A256KW, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eHyA, kty: oct}, {name: AES-KW}, true, [wrapKey, unwrapKey, wrapKey, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 24: 25, 25: 26, 26: 27, 27: 28, 28: 29, 29: 30, 3: 4, 30: 31, 31: 32, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: AES-KW}, false, [wrapKey, unwrapKey, wrapKey, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (jwk, {alg: A256KW, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eHyA, kty: oct}, {name: AES-KW}, false, [wrapKey, unwrapKey, wrapKey, unwrapKey\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 2: 3, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {hash: SHA-1, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (jwk, {alg: HS1, k: AQIDBAUGBwgJCgsMDQ4PEA, kty: oct}, {hash: SHA-1, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {hash: SHA-1, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (jwk, {alg: HS1, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcY, kty: oct}, {hash: SHA-1, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 24: 25, 25: 26, 26: 27, 27: 28, 28: 29, 29: 30, 3: 4, 30: 31, 31: 32, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {hash: SHA-1, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (jwk, {alg: HS1, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eHyA, kty: oct}, {hash: SHA-1, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 2: 3, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {hash: SHA-256, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (jwk, {alg: HS256, k: AQIDBAUGBwgJCgsMDQ4PEA, kty: oct}, {hash: SHA-256, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {hash: SHA-256, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (jwk, {alg: HS256, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcY, kty: oct}, {hash: SHA-256, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 24: 25, 25: 26, 26: 27, 27: 28, 28: 29, 29: 30, 3: 4, 30: 31, 31: 32, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {hash: SHA-256, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (jwk, {alg: HS256, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eHyA, kty: oct}, {hash: SHA-256, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 2: 3, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {hash: SHA-384, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (jwk, {alg: HS384, k: AQIDBAUGBwgJCgsMDQ4PEA, kty: oct}, {hash: SHA-384, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {hash: SHA-384, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (jwk, {alg: HS384, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcY, kty: oct}, {hash: SHA-384, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 24: 25, 25: 26, 26: 27, 27: 28, 28: 29, 29: 30, 3: 4, 30: 31, 31: 32, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {hash: SHA-384, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (jwk, {alg: HS384, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eHyA, kty: oct}, {hash: SHA-384, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 2: 3, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {hash: SHA-512, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (jwk, {alg: HS512, k: AQIDBAUGBwgJCgsMDQ4PEA, kty: oct}, {hash: SHA-512, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {hash: SHA-512, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (jwk, {alg: HS512, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcY, kty: oct}, {hash: SHA-512, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 24: 25, 25: 26, 26: 27, 27: 28, 28: 29, 29: 30, 3: 4, 30: 31, 31: 32, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {hash: SHA-512, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (jwk, {alg: HS512, k: AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eHyA, kty: oct}, {hash: SHA-512, name: HMAC}, false, [sign, verify, sign, verify\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 2: 3, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: HKDF}, false, [deriveBits, deriveKey, deriveBits, deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: HKDF}, false, [deriveBits, deriveKey, deriveBits, deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 24: 25, 25: 26, 26: 27, 27: 28, 28: 29, 29: 30, 3: 4, 30: 31, 31: 32, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: HKDF}, false, [deriveBits, deriveKey, deriveBits, deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: 128 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 2: 3, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: PBKDF2}, false, [deriveBits, deriveKey, deriveBits, deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: 192 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 3: 4, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: PBKDF2}, false, [deriveBits, deriveKey, deriveBits, deriveKey\])]
+    expected: FAIL
+
+  [Good parameters: 256 bits (raw, {0: 1, 1: 2, 10: 11, 11: 12, 12: 13, 13: 14, 14: 15, 15: 16, 16: 17, 17: 18, 18: 19, 19: 20, 2: 3, 20: 21, 21: 22, 22: 23, 23: 24, 24: 25, 25: 26, 26: 27, 27: 28, 28: 29, 29: 30, 3: 4, 30: 31, 31: 32, 4: 5, 5: 6, 6: 7, 7: 8, 8: 9, 9: 10}, {name: PBKDF2}, false, [deriveBits, deriveKey, deriveBits, deriveKey\])]
+    expected: FAIL
diff --git a/tests/wpt/meta/cookies/third-party-cookies/third-party-cookies.tentative.https.html.ini b/tests/wpt/meta/cookies/third-party-cookies/third-party-cookies.tentative.https.html.ini
new file mode 100644
index 00000000000..5c59aab6090
--- /dev/null
+++ b/tests/wpt/meta/cookies/third-party-cookies/third-party-cookies.tentative.https.html.ini
@@ -0,0 +1,2 @@
+[third-party-cookies.tentative.https.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/css/CSS2/linebox/inline-negative-margin-001.html.ini b/tests/wpt/meta/css/CSS2/linebox/inline-negative-margin-001.html.ini
index beb199e6c0f..2c180891ceb 100644
--- a/tests/wpt/meta/css/CSS2/linebox/inline-negative-margin-001.html.ini
+++ b/tests/wpt/meta/css/CSS2/linebox/inline-negative-margin-001.html.ini
@@ -40,6 +40,3 @@
 
   [[data-expected-height\] 4]
     expected: FAIL
-
-  [[data-expected-height\] 2]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/compositing/canvas-composite-modes.html.ini b/tests/wpt/meta/css/compositing/canvas-composite-modes.html.ini
new file mode 100644
index 00000000000..b015086cf5c
--- /dev/null
+++ b/tests/wpt/meta/css/compositing/canvas-composite-modes.html.ini
@@ -0,0 +1,21 @@
+[canvas-composite-modes.html]
+  [globalCompositeOperation destination]
+    expected: FAIL
+
+  [globalCompositeOperation source-out]
+    expected: FAIL
+
+  [globalCompositeOperation destination-out]
+    expected: FAIL
+
+  [globalCompositeOperation xor]
+    expected: FAIL
+
+  [globalCompositeOperation lighter]
+    expected: FAIL
+
+  [globalCompositeOperation plus-darker]
+    expected: FAIL
+
+  [globalCompositeOperation plus-lighter]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/compositing/compositing_simple_div.html.ini b/tests/wpt/meta/css/compositing/compositing_simple_div.html.ini
deleted file mode 100644
index 1165bec7977..00000000000
--- a/tests/wpt/meta/css/compositing/compositing_simple_div.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[compositing_simple_div.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-align/blocks/align-content-block-001.html.ini b/tests/wpt/meta/css/css-align/blocks/align-content-block-001.html.ini
new file mode 100644
index 00000000000..9cec50f1501
--- /dev/null
+++ b/tests/wpt/meta/css/css-align/blocks/align-content-block-001.html.ini
@@ -0,0 +1,2 @@
+[align-content-block-001.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-align/blocks/align-content-block-002.html.ini b/tests/wpt/meta/css/css-align/blocks/align-content-block-002.html.ini
new file mode 100644
index 00000000000..5f0d16e9286
--- /dev/null
+++ b/tests/wpt/meta/css/css-align/blocks/align-content-block-002.html.ini
@@ -0,0 +1,2 @@
+[align-content-block-002.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-align/blocks/align-content-block-003.html.ini b/tests/wpt/meta/css/css-align/blocks/align-content-block-003.html.ini
new file mode 100644
index 00000000000..c1bb4746647
--- /dev/null
+++ b/tests/wpt/meta/css/css-align/blocks/align-content-block-003.html.ini
@@ -0,0 +1,2 @@
+[align-content-block-003.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-align/blocks/align-content-block-004.html.ini b/tests/wpt/meta/css/css-align/blocks/align-content-block-004.html.ini
new file mode 100644
index 00000000000..229571e9dfa
--- /dev/null
+++ b/tests/wpt/meta/css/css-align/blocks/align-content-block-004.html.ini
@@ -0,0 +1,2 @@
+[align-content-block-004.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-align/blocks/align-content-block-005.html.ini b/tests/wpt/meta/css/css-align/blocks/align-content-block-005.html.ini
new file mode 100644
index 00000000000..5fe5827c538
--- /dev/null
+++ b/tests/wpt/meta/css/css-align/blocks/align-content-block-005.html.ini
@@ -0,0 +1,2 @@
+[align-content-block-005.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-align/blocks/align-content-block-006.html.ini b/tests/wpt/meta/css/css-align/blocks/align-content-block-006.html.ini
new file mode 100644
index 00000000000..3cd1af3ea35
--- /dev/null
+++ b/tests/wpt/meta/css/css-align/blocks/align-content-block-006.html.ini
@@ -0,0 +1,2 @@
+[align-content-block-006.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/css/css-align/blocks/align-content-block-007.html.ini b/tests/wpt/meta/css/css-align/blocks/align-content-block-007.html.ini
new file mode 100644
index 00000000000..1311a1028d4
--- /dev/null
+++ b/tests/wpt/meta/css/css-align/blocks/align-content-block-007.html.ini
@@ -0,0 +1,2 @@
+[align-content-block-007.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/css/css-align/blocks/align-content-block-008.html.ini b/tests/wpt/meta/css/css-align/blocks/align-content-block-008.html.ini
new file mode 100644
index 00000000000..561a9cca389
--- /dev/null
+++ b/tests/wpt/meta/css/css-align/blocks/align-content-block-008.html.ini
@@ -0,0 +1,2 @@
+[align-content-block-008.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/css/css-align/blocks/align-content-block-009.html.ini b/tests/wpt/meta/css/css-align/blocks/align-content-block-009.html.ini
new file mode 100644
index 00000000000..0d75e4f3a29
--- /dev/null
+++ b/tests/wpt/meta/css/css-align/blocks/align-content-block-009.html.ini
@@ -0,0 +1,2 @@
+[align-content-block-009.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/css/css-align/blocks/align-content-block-010.html.ini b/tests/wpt/meta/css/css-align/blocks/align-content-block-010.html.ini
new file mode 100644
index 00000000000..cccd55e5e31
--- /dev/null
+++ b/tests/wpt/meta/css/css-align/blocks/align-content-block-010.html.ini
@@ -0,0 +1,2 @@
+[align-content-block-010.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/css/css-align/blocks/align-content-block-011.html.ini b/tests/wpt/meta/css/css-align/blocks/align-content-block-011.html.ini
new file mode 100644
index 00000000000..cf02c4422cc
--- /dev/null
+++ b/tests/wpt/meta/css/css-align/blocks/align-content-block-011.html.ini
@@ -0,0 +1,2 @@
+[align-content-block-011.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/css/css-align/blocks/align-content-block-break-content-020.html.ini b/tests/wpt/meta/css/css-align/blocks/align-content-block-break-content-020.html.ini
new file mode 100644
index 00000000000..c19c67ff247
--- /dev/null
+++ b/tests/wpt/meta/css/css-align/blocks/align-content-block-break-content-020.html.ini
@@ -0,0 +1,2 @@
+[align-content-block-break-content-020.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-align/blocks/align-content-block-break-overflow-010.html.ini b/tests/wpt/meta/css/css-align/blocks/align-content-block-break-overflow-010.html.ini
new file mode 100644
index 00000000000..e653232eafb
--- /dev/null
+++ b/tests/wpt/meta/css/css-align/blocks/align-content-block-break-overflow-010.html.ini
@@ -0,0 +1,2 @@
+[align-content-block-break-overflow-010.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-align/blocks/align-content-block-break-overflow-020.html.ini b/tests/wpt/meta/css/css-align/blocks/align-content-block-break-overflow-020.html.ini
new file mode 100644
index 00000000000..e1ec410dff5
--- /dev/null
+++ b/tests/wpt/meta/css/css-align/blocks/align-content-block-break-overflow-020.html.ini
@@ -0,0 +1,2 @@
+[align-content-block-break-overflow-020.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-backgrounds/animations/box-shadow-interpolation.html.ini b/tests/wpt/meta/css/css-backgrounds/animations/box-shadow-interpolation.html.ini
index 2598ae20eb0..3bd96fa26fc 100644
--- a/tests/wpt/meta/css/css-backgrounds/animations/box-shadow-interpolation.html.ini
+++ b/tests/wpt/meta/css/css-backgrounds/animations/box-shadow-interpolation.html.ini
@@ -955,3 +955,219 @@
 
   [CSS Transitions: property <box-shadow> from [10px 20px yellow, 5px 10px green\] to [inset 5px 10px green, 15px 20px blue\] at (0.3) should be [inset 5px 10px green, 15px 20px blue\]]
     expected: FAIL
+
+  [CSS Transitions: property <box-shadow> from [10px 10px 10px 10px rgb(0 0 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (-0.3) should be [10px 10px 10px 10px oklab(0 0 0)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <box-shadow> from [10px 10px 10px 10px rgb(0 0 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (0) should be [10px 10px 10px 10px oklab(0 0 0)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <box-shadow> from [10px 10px 10px 10px rgb(0 0 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (0.3) should be [10px 10px 10px 10px oklab(0.3 0 0)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <box-shadow> from [10px 10px 10px 10px rgb(0 0 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (0.6) should be [10px 10px 10px 10px oklab(0.6 0 0)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <box-shadow> from [10px 10px 10px 10px rgb(0 0 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (1) should be [10px 10px 10px 10px oklab(1 0 0)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <box-shadow> from [10px 10px 10px 10px rgb(0 0 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (1.5) should be [10px 10px 10px 10px oklab(1 0 0)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <box-shadow> from [10px 10px 10px 10px rgb(0 0 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (-0.3) should be [10px 10px 10px 10px oklab(0 0 0)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <box-shadow> from [10px 10px 10px 10px rgb(0 0 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (0) should be [10px 10px 10px 10px oklab(0 0 0)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <box-shadow> from [10px 10px 10px 10px rgb(0 0 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (0.3) should be [10px 10px 10px 10px oklab(0.3 0 0)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <box-shadow> from [10px 10px 10px 10px rgb(0 0 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (0.6) should be [10px 10px 10px 10px oklab(0.6 0 0)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <box-shadow> from [10px 10px 10px 10px rgb(0 0 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (1) should be [10px 10px 10px 10px oklab(1 0 0)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <box-shadow> from [10px 10px 10px 10px rgb(0 0 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (1.5) should be [10px 10px 10px 10px oklab(1 0 0)\]]
+    expected: FAIL
+
+  [CSS Animations: property <box-shadow> from [10px 10px 10px 10px rgb(0 0 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (-0.3) should be [10px 10px 10px 10px oklab(0 0 0)\]]
+    expected: FAIL
+
+  [CSS Animations: property <box-shadow> from [10px 10px 10px 10px rgb(0 0 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (0) should be [10px 10px 10px 10px oklab(0 0 0)\]]
+    expected: FAIL
+
+  [CSS Animations: property <box-shadow> from [10px 10px 10px 10px rgb(0 0 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (0.3) should be [10px 10px 10px 10px oklab(0.3 0 0)\]]
+    expected: FAIL
+
+  [CSS Animations: property <box-shadow> from [10px 10px 10px 10px rgb(0 0 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (0.6) should be [10px 10px 10px 10px oklab(0.6 0 0)\]]
+    expected: FAIL
+
+  [CSS Animations: property <box-shadow> from [10px 10px 10px 10px rgb(0 0 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (1) should be [10px 10px 10px 10px oklab(1 0 0)\]]
+    expected: FAIL
+
+  [CSS Animations: property <box-shadow> from [10px 10px 10px 10px rgb(0 0 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (1.5) should be [10px 10px 10px 10px oklab(1 0 0)\]]
+    expected: FAIL
+
+  [Web Animations: property <box-shadow> from [10px 10px 10px 10px rgb(0 0 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (-0.3) should be [10px 10px 10px 10px oklab(0 0 0)\]]
+    expected: FAIL
+
+  [Web Animations: property <box-shadow> from [10px 10px 10px 10px rgb(0 0 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (0) should be [10px 10px 10px 10px oklab(0 0 0)\]]
+    expected: FAIL
+
+  [Web Animations: property <box-shadow> from [10px 10px 10px 10px rgb(0 0 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (0.3) should be [10px 10px 10px 10px oklab(0.3 0 0)\]]
+    expected: FAIL
+
+  [Web Animations: property <box-shadow> from [10px 10px 10px 10px rgb(0 0 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (0.6) should be [10px 10px 10px 10px oklab(0.6 0 0)\]]
+    expected: FAIL
+
+  [Web Animations: property <box-shadow> from [10px 10px 10px 10px rgb(0 0 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (1) should be [10px 10px 10px 10px oklab(1 0 0)\]]
+    expected: FAIL
+
+  [Web Animations: property <box-shadow> from [10px 10px 10px 10px rgb(0 0 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (1.5) should be [10px 10px 10px 10px oklab(1 0 0)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px rgb(255 255 255)\] at (-0.3) should be [10px 10px 10px 10px oklab(0 0 0)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px rgb(255 255 255)\] at (0) should be [10px 10px 10px 10px oklab(0 0 0)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px rgb(255 255 255)\] at (0.3) should be [10px 10px 10px 10px oklab(0.3 0 0)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px rgb(255 255 255)\] at (0.6) should be [10px 10px 10px 10px oklab(0.6 0 0)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px rgb(255 255 255)\] at (1) should be [10px 10px 10px 10px oklab(1 0 0)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px rgb(255 255 255)\] at (1.5) should be [10px 10px 10px 10px oklab(1 0 0)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px rgb(255 255 255)\] at (-0.3) should be [10px 10px 10px 10px oklab(0 0 0)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px rgb(255 255 255)\] at (0) should be [10px 10px 10px 10px oklab(0 0 0)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px rgb(255 255 255)\] at (0.3) should be [10px 10px 10px 10px oklab(0.3 0 0)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px rgb(255 255 255)\] at (0.6) should be [10px 10px 10px 10px oklab(0.6 0 0)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px rgb(255 255 255)\] at (1) should be [10px 10px 10px 10px oklab(1 0 0)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px rgb(255 255 255)\] at (1.5) should be [10px 10px 10px 10px oklab(1 0 0)\]]
+    expected: FAIL
+
+  [CSS Animations: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px rgb(255 255 255)\] at (-0.3) should be [10px 10px 10px 10px oklab(0 0 0)\]]
+    expected: FAIL
+
+  [CSS Animations: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px rgb(255 255 255)\] at (0) should be [10px 10px 10px 10px oklab(0 0 0)\]]
+    expected: FAIL
+
+  [CSS Animations: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px rgb(255 255 255)\] at (0.3) should be [10px 10px 10px 10px oklab(0.3 0 0)\]]
+    expected: FAIL
+
+  [CSS Animations: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px rgb(255 255 255)\] at (0.6) should be [10px 10px 10px 10px oklab(0.6 0 0)\]]
+    expected: FAIL
+
+  [CSS Animations: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px rgb(255 255 255)\] at (1) should be [10px 10px 10px 10px oklab(1 0 0)\]]
+    expected: FAIL
+
+  [CSS Animations: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px rgb(255 255 255)\] at (1.5) should be [10px 10px 10px 10px oklab(1 0 0)\]]
+    expected: FAIL
+
+  [Web Animations: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px rgb(255 255 255)\] at (-0.3) should be [10px 10px 10px 10px oklab(0 0 0)\]]
+    expected: FAIL
+
+  [Web Animations: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px rgb(255 255 255)\] at (0) should be [10px 10px 10px 10px oklab(0 0 0)\]]
+    expected: FAIL
+
+  [Web Animations: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px rgb(255 255 255)\] at (0.3) should be [10px 10px 10px 10px oklab(0.3 0 0)\]]
+    expected: FAIL
+
+  [Web Animations: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px rgb(255 255 255)\] at (0.6) should be [10px 10px 10px 10px oklab(0.6 0 0)\]]
+    expected: FAIL
+
+  [Web Animations: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px rgb(255 255 255)\] at (1) should be [10px 10px 10px 10px oklab(1 0 0)\]]
+    expected: FAIL
+
+  [Web Animations: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px rgb(255 255 255)\] at (1.5) should be [10px 10px 10px 10px oklab(1 0 0)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (-0.3) should be [10px 10px 10px 10px oklab(0 0 0)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (0) should be [10px 10px 10px 10px oklab(0 0 0)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (0.3) should be [10px 10px 10px 10px oklab(0.3 0 0)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (0.6) should be [10px 10px 10px 10px oklab(0.6 0 0)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (1) should be [10px 10px 10px 10px oklab(1 0 0)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (1.5) should be [10px 10px 10px 10px oklab(1 0 0)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (-0.3) should be [10px 10px 10px 10px oklab(0 0 0)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (0) should be [10px 10px 10px 10px oklab(0 0 0)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (0.3) should be [10px 10px 10px 10px oklab(0.3 0 0)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (0.6) should be [10px 10px 10px 10px oklab(0.6 0 0)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (1) should be [10px 10px 10px 10px oklab(1 0 0)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (1.5) should be [10px 10px 10px 10px oklab(1 0 0)\]]
+    expected: FAIL
+
+  [CSS Animations: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (-0.3) should be [10px 10px 10px 10px oklab(0 0 0)\]]
+    expected: FAIL
+
+  [CSS Animations: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (0) should be [10px 10px 10px 10px oklab(0 0 0)\]]
+    expected: FAIL
+
+  [CSS Animations: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (0.3) should be [10px 10px 10px 10px oklab(0.3 0 0)\]]
+    expected: FAIL
+
+  [CSS Animations: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (0.6) should be [10px 10px 10px 10px oklab(0.6 0 0)\]]
+    expected: FAIL
+
+  [CSS Animations: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (1) should be [10px 10px 10px 10px oklab(1 0 0)\]]
+    expected: FAIL
+
+  [CSS Animations: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (1.5) should be [10px 10px 10px 10px oklab(1 0 0)\]]
+    expected: FAIL
+
+  [Web Animations: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (-0.3) should be [10px 10px 10px 10px oklab(0 0 0)\]]
+    expected: FAIL
+
+  [Web Animations: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (0) should be [10px 10px 10px 10px oklab(0 0 0)\]]
+    expected: FAIL
+
+  [Web Animations: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (0.3) should be [10px 10px 10px 10px oklab(0.3 0 0)\]]
+    expected: FAIL
+
+  [Web Animations: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (0.6) should be [10px 10px 10px 10px oklab(0.6 0 0)\]]
+    expected: FAIL
+
+  [Web Animations: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (1) should be [10px 10px 10px 10px oklab(1 0 0)\]]
+    expected: FAIL
+
+  [Web Animations: property <box-shadow> from [10px 10px 10px 10px color(srgb 0, 0, 0)\] to [10px 10px 10px 10px color(srgb 1 1 1)\] at (1.5) should be [10px 10px 10px 10px oklab(1 0 0)\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-color/color-mix-currentcolor-visited-getcomputedstyle.html.ini b/tests/wpt/meta/css/css-color/color-mix-currentcolor-visited-getcomputedstyle.html.ini
new file mode 100644
index 00000000000..29b03c297c1
--- /dev/null
+++ b/tests/wpt/meta/css/css-color/color-mix-currentcolor-visited-getcomputedstyle.html.ini
@@ -0,0 +1,3 @@
+[color-mix-currentcolor-visited-getcomputedstyle.html]
+  [Property background-color value 'color-mix(in srgb, currentcolor, white)' should not leak :visited for computed style]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-color/color-mix-currentcolor-visited.html.ini b/tests/wpt/meta/css/css-color/color-mix-currentcolor-visited.html.ini
new file mode 100644
index 00000000000..162c497b79e
--- /dev/null
+++ b/tests/wpt/meta/css/css-color/color-mix-currentcolor-visited.html.ini
@@ -0,0 +1,2 @@
+[color-mix-currentcolor-visited.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-color/currentcolor-004.html.ini b/tests/wpt/meta/css/css-color/currentcolor-004.html.ini
new file mode 100644
index 00000000000..87284767cf0
--- /dev/null
+++ b/tests/wpt/meta/css/css-color/currentcolor-004.html.ini
@@ -0,0 +1,2 @@
+[currentcolor-004.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-color/parsing/color-computed-color-mix-function.html.ini b/tests/wpt/meta/css/css-color/parsing/color-computed-color-mix-function.html.ini
index 5d561ec3883..d3d886aa5ee 100644
--- a/tests/wpt/meta/css/css-color/parsing/color-computed-color-mix-function.html.ini
+++ b/tests/wpt/meta/css/css-color/parsing/color-computed-color-mix-function.html.ini
@@ -1798,3 +1798,15 @@
 
   [Property color value 'color-mix(in xyz-d65, color(xyz-d65 0.1 0.2 0.3 / 0) 10%, color(xyz-d65 0.3 0.4 0.5))']
     expected: FAIL
+
+  [Property color value 'color-mix(in oklch, transparent, oklch(0.3 40 30deg))']
+    expected: FAIL
+
+  [Property color value 'color-mix(in oklch, transparent 10%, oklch(0.3 40 30deg))']
+    expected: FAIL
+
+  [Property color value 'color-mix(in oklch, oklch(0.1 20 120deg / 0), oklch(0.3 40 30deg))']
+    expected: FAIL
+
+  [Property color value 'color-mix(in oklch, oklch(0.1 20 120deg / 0) 10%, oklch(0.3 40 30deg))']
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-color/parsing/color-computed-relative-color.html.ini b/tests/wpt/meta/css/css-color/parsing/color-computed-relative-color.html.ini
index f6ca762dc07..f2843c40203 100644
--- a/tests/wpt/meta/css/css-color/parsing/color-computed-relative-color.html.ini
+++ b/tests/wpt/meta/css/css-color/parsing/color-computed-relative-color.html.ini
@@ -3196,3 +3196,75 @@
 
   [Property color value 'oklch(from oklch(.7 0.45 30 / 40%) alpha c c / alpha)']
     expected: FAIL
+
+  [Property color value 'color(from color(srgb-linear 0.25 0.5 0.75) srgb r g b)']
+    expected: FAIL
+
+  [Property color value 'color(from color(srgb 0.25 0.5 0.75) srgb-linear r g b)']
+    expected: FAIL
+
+  [Property color value 'color(from color(display-p3 0.25 0.5 0.75) srgb r g b)']
+    expected: FAIL
+
+  [Property color value 'color(from color(srgb 0.25 0.5 0.75) display-p3 r g b)']
+    expected: FAIL
+
+  [Property color value 'color(from color(a98-rgb 0.25 0.5 0.75) srgb r g b)']
+    expected: FAIL
+
+  [Property color value 'color(from color(srgb 0.25 0.5 0.75) a98-rgb r g b)']
+    expected: FAIL
+
+  [Property color value 'color(from color(prophoto-rgb 0.25 0.5 0.75) srgb r g b)']
+    expected: FAIL
+
+  [Property color value 'color(from color(srgb 0.25 0.5 0.75) prophoto-rgb r g b)']
+    expected: FAIL
+
+  [Property color value 'color(from color(rec2020 0.25 0.5 0.75) srgb r g b)']
+    expected: FAIL
+
+  [Property color value 'color(from color(srgb 0.25 0.5 0.75) rec2020 r g b)']
+    expected: FAIL
+
+  [Property color value 'color(from color(xyz-d50 0.25 0.5 0.75) srgb r g b)']
+    expected: FAIL
+
+  [Property color value 'color(from color(srgb 0.25 0.5 0.75) xyz-d50 r g b)']
+    expected: FAIL
+
+  [Property color value 'color(from color(xyz-d65 0.25 0.5 0.75) srgb r g b)']
+    expected: FAIL
+
+  [Property color value 'color(from color(srgb 0.25 0.5 0.75) xyz-d65 r g b)']
+    expected: FAIL
+
+  [Property color value 'lab(from color(srgb 0.25 0.5 0.75) l a b)']
+    expected: FAIL
+
+  [Property color value 'color(from lab(67.5345 -8.6911 -41.6019) srgb r g b)']
+    expected: FAIL
+
+  [Property color value 'oklab(from color(srgb 0.25 0.5 0.75) l a b)']
+    expected: FAIL
+
+  [Property color value 'color(from oklab(72.322% -0.0465 -0.1150) srgb r g b)']
+    expected: FAIL
+
+  [Property color value 'lch(from color(srgb 0.25 0.5 0.75) l c h)']
+    expected: FAIL
+
+  [Property color value 'color(from lch(67.5345% 42.5 258.2) srgb r g b)']
+    expected: FAIL
+
+  [Property color value 'oklch(from color(srgb 0.25 0.5 0.75) l c h)']
+    expected: FAIL
+
+  [Property color value 'color(from oklch(72.322% 0.12403 247.996) srgb r g b)']
+    expected: FAIL
+
+  [Property color value 'hsl(from var(--accent) calc(h + 180) s l)']
+    expected: FAIL
+
+  [Property color value 'LCH(from var(--accent) l c calc(h + 180))']
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-color/parsing/color-valid-hsl.html.ini b/tests/wpt/meta/css/css-color/parsing/color-valid-hsl.html.ini
index efd69fefe4d..47af398a3b9 100644
--- a/tests/wpt/meta/css/css-color/parsing/color-valid-hsl.html.ini
+++ b/tests/wpt/meta/css/css-color/parsing/color-valid-hsl.html.ini
@@ -25,3 +25,21 @@
 
   [e.style['color'\] = "hsl(none 100% 50%)" should set the property value]
     expected: FAIL
+
+  [e.style['color'\] = "hsl(calc(infinity) 100% 50%)" should set the property value]
+    expected: FAIL
+
+  [e.style['color'\] = "hsl(calc(-infinity) 100% 50%)" should set the property value]
+    expected: FAIL
+
+  [e.style['color'\] = "hsl(calc(0 / 0) 100% 50%)" should set the property value]
+    expected: FAIL
+
+  [e.style['color'\] = "hsl(90 50% 50% / calc(infinity))" should set the property value]
+    expected: FAIL
+
+  [e.style['color'\] = "hsl(90 50% 50% / calc(-infinity))" should set the property value]
+    expected: FAIL
+
+  [e.style['color'\] = "hsl(90 50% 50% / calc(0 / 0))" should set the property value]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-color/parsing/color-valid-hwb.html.ini b/tests/wpt/meta/css/css-color/parsing/color-valid-hwb.html.ini
index b52a2cd54fa..05538c78502 100644
--- a/tests/wpt/meta/css/css-color/parsing/color-valid-hwb.html.ini
+++ b/tests/wpt/meta/css/css-color/parsing/color-valid-hwb.html.ini
@@ -22,3 +22,21 @@
 
   [e.style['color'\] = "hwb(320deg 30% 40%)" should set the property value]
     expected: FAIL
+
+  [e.style['color'\] = "hwb(calc(infinity) 20% 10%)" should set the property value]
+    expected: FAIL
+
+  [e.style['color'\] = "hwb(calc(-infinity) 20% 10%)" should set the property value]
+    expected: FAIL
+
+  [e.style['color'\] = "hwb(calc(0 / 0) 20% 10%)" should set the property value]
+    expected: FAIL
+
+  [e.style['color'\] = "hwb(90 20% 10% / calc(infinity))" should set the property value]
+    expected: FAIL
+
+  [e.style['color'\] = "hwb(90 20% 10% / calc(-infinity))" should set the property value]
+    expected: FAIL
+
+  [e.style['color'\] = "hwb(90 20% 10% / calc(0 / 0))" should set the property value]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-color/parsing/color-valid-relative-color.html.ini b/tests/wpt/meta/css/css-color/parsing/color-valid-relative-color.html.ini
index 64ebd2cd7b1..4bdb4add61a 100644
--- a/tests/wpt/meta/css/css-color/parsing/color-valid-relative-color.html.ini
+++ b/tests/wpt/meta/css/css-color/parsing/color-valid-relative-color.html.ini
@@ -3157,3 +3157,51 @@
 
   [e.style['color'\] = "oklch(from oklch(.7 0.45 30 / 40%) alpha c c / alpha)" should set the property value]
     expected: FAIL
+
+  [e.style['color'\] = "rgb(from currentColor r g b)" should set the property value]
+    expected: FAIL
+
+  [e.style['color'\] = "hsl(from currentColor h s l)" should set the property value]
+    expected: FAIL
+
+  [e.style['color'\] = "hwb(from currentColor h w b)" should set the property value]
+    expected: FAIL
+
+  [e.style['color'\] = "lab(from currentColor l a b)" should set the property value]
+    expected: FAIL
+
+  [e.style['color'\] = "oklab(from currentColor l a b)" should set the property value]
+    expected: FAIL
+
+  [e.style['color'\] = "lch(from currentColor) l c h)" should set the property value]
+    expected: FAIL
+
+  [e.style['color'\] = "oklch(from currentColor l c h)" should set the property value]
+    expected: FAIL
+
+  [e.style['color'\] = "color(from currentColor srgb r g b)" should set the property value]
+    expected: FAIL
+
+  [e.style['color'\] = "color(from currentColor srgb-linear r g b)" should set the property value]
+    expected: FAIL
+
+  [e.style['color'\] = "color(from currentColor a98-rgb r g b)" should set the property value]
+    expected: FAIL
+
+  [e.style['color'\] = "color(from currentColor rec2020 r g b)" should set the property value]
+    expected: FAIL
+
+  [e.style['color'\] = "color(from currentColor prophoto-rgb r g b)" should set the property value]
+    expected: FAIL
+
+  [e.style['color'\] = "color(from currentColor display-p3 r g b)" should set the property value]
+    expected: FAIL
+
+  [e.style['color'\] = "color(from currentColor xyz x y z)" should set the property value]
+    expected: FAIL
+
+  [e.style['color'\] = "color(from currentColor xyz-d50 x y z)" should set the property value]
+    expected: FAIL
+
+  [e.style['color'\] = "color(from currentColor xyz-d65 x y z)" should set the property value]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-color/parsing/relative-color-out-of-gamut.html.ini b/tests/wpt/meta/css/css-color/parsing/relative-color-out-of-gamut.html.ini
new file mode 100644
index 00000000000..33f7c5c6858
--- /dev/null
+++ b/tests/wpt/meta/css/css-color/parsing/relative-color-out-of-gamut.html.ini
@@ -0,0 +1,81 @@
+[relative-color-out-of-gamut.html]
+  [Property color value 'rgb(from color(display-p3 0 1 0) r g b / alpha)']
+    expected: FAIL
+
+  [Property color value 'rgb(from lab(100 104.3 -50.9) r g b)']
+    expected: FAIL
+
+  [Property color value 'rgb(from lab(0 104.3 -50.9) r g b)']
+    expected: FAIL
+
+  [Property color value 'rgb(from lch(100 116 334) r g b)']
+    expected: FAIL
+
+  [Property color value 'rgb(from lch(0 116 334) r g b)']
+    expected: FAIL
+
+  [Property color value 'rgb(from oklab(1 0.365 -0.16) r g b)']
+    expected: FAIL
+
+  [Property color value 'rgb(from oklab(0 0.365 -0.16) r g b)']
+    expected: FAIL
+
+  [Property color value 'rgb(from oklch(1 0.399 336.3) r g b)']
+    expected: FAIL
+
+  [Property color value 'rgb(from oklch(0 0.399 336.3) r g b)']
+    expected: FAIL
+
+  [Property color value 'hsl(from color(display-p3 0 1 0) h s l / alpha)']
+    expected: FAIL
+
+  [Property color value 'hsl(from lab(100 104.3 -50.9) h s l)']
+    expected: FAIL
+
+  [Property color value 'hsl(from lab(0 104.3 -50.9) h s l)']
+    expected: FAIL
+
+  [Property color value 'hsl(from lch(100 116 334) h s l)']
+    expected: FAIL
+
+  [Property color value 'hsl(from lch(0 116 334) h s l)']
+    expected: FAIL
+
+  [Property color value 'hsl(from oklab(1 0.365 -0.16) h s l)']
+    expected: FAIL
+
+  [Property color value 'hsl(from oklab(0 0.365 -0.16) h s l)']
+    expected: FAIL
+
+  [Property color value 'hsl(from oklch(1 0.399 336.3) h s l)']
+    expected: FAIL
+
+  [Property color value 'hsl(from oklch(0 0.399 336.3) h s l)']
+    expected: FAIL
+
+  [Property color value 'hwb(from color(display-p3 0 1 0) h w b / alpha)']
+    expected: FAIL
+
+  [Property color value 'hwb(from lab(100 104.3 -50.9) h w b)']
+    expected: FAIL
+
+  [Property color value 'hwb(from lab(0 104.3 -50.9) h w b)']
+    expected: FAIL
+
+  [Property color value 'hwb(from lch(100 116 334) h w b)']
+    expected: FAIL
+
+  [Property color value 'hwb(from lch(0 116 334) h w b)']
+    expected: FAIL
+
+  [Property color value 'hwb(from oklab(1 0.365 -0.16) h w b)']
+    expected: FAIL
+
+  [Property color value 'hwb(from oklab(0 0.365 -0.16) h w b)']
+    expected: FAIL
+
+  [Property color value 'hwb(from oklch(1 0.399 336.3) h w b)']
+    expected: FAIL
+
+  [Property color value 'hwb(from oklch(0 0.399 336.3) h w b)']
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-color/relative-currentcolor-a98rgb-01.html.ini b/tests/wpt/meta/css/css-color/relative-currentcolor-a98rgb-01.html.ini
new file mode 100644
index 00000000000..1e125b3cb7b
--- /dev/null
+++ b/tests/wpt/meta/css/css-color/relative-currentcolor-a98rgb-01.html.ini
@@ -0,0 +1,2 @@
+[relative-currentcolor-a98rgb-01.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-color/relative-currentcolor-displayp3-01.html.ini b/tests/wpt/meta/css/css-color/relative-currentcolor-displayp3-01.html.ini
new file mode 100644
index 00000000000..36098b34aaf
--- /dev/null
+++ b/tests/wpt/meta/css/css-color/relative-currentcolor-displayp3-01.html.ini
@@ -0,0 +1,2 @@
+[relative-currentcolor-displayp3-01.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-color/relative-currentcolor-hsl-01.html.ini b/tests/wpt/meta/css/css-color/relative-currentcolor-hsl-01.html.ini
new file mode 100644
index 00000000000..4ddc9dfa968
--- /dev/null
+++ b/tests/wpt/meta/css/css-color/relative-currentcolor-hsl-01.html.ini
@@ -0,0 +1,2 @@
+[relative-currentcolor-hsl-01.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-color/relative-currentcolor-hsl-02.html.ini b/tests/wpt/meta/css/css-color/relative-currentcolor-hsl-02.html.ini
new file mode 100644
index 00000000000..cb42bb3bba7
--- /dev/null
+++ b/tests/wpt/meta/css/css-color/relative-currentcolor-hsl-02.html.ini
@@ -0,0 +1,2 @@
+[relative-currentcolor-hsl-02.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-color/relative-currentcolor-hwb-01.html.ini b/tests/wpt/meta/css/css-color/relative-currentcolor-hwb-01.html.ini
new file mode 100644
index 00000000000..17c350bbadd
--- /dev/null
+++ b/tests/wpt/meta/css/css-color/relative-currentcolor-hwb-01.html.ini
@@ -0,0 +1,2 @@
+[relative-currentcolor-hwb-01.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-color/relative-currentcolor-lab-01.html.ini b/tests/wpt/meta/css/css-color/relative-currentcolor-lab-01.html.ini
new file mode 100644
index 00000000000..6912822578c
--- /dev/null
+++ b/tests/wpt/meta/css/css-color/relative-currentcolor-lab-01.html.ini
@@ -0,0 +1,2 @@
+[relative-currentcolor-lab-01.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-color/relative-currentcolor-lch-01.html.ini b/tests/wpt/meta/css/css-color/relative-currentcolor-lch-01.html.ini
new file mode 100644
index 00000000000..5ebf684f72b
--- /dev/null
+++ b/tests/wpt/meta/css/css-color/relative-currentcolor-lch-01.html.ini
@@ -0,0 +1,2 @@
+[relative-currentcolor-lch-01.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-color/relative-currentcolor-oklab-01.html.ini b/tests/wpt/meta/css/css-color/relative-currentcolor-oklab-01.html.ini
new file mode 100644
index 00000000000..8d3142bb410
--- /dev/null
+++ b/tests/wpt/meta/css/css-color/relative-currentcolor-oklab-01.html.ini
@@ -0,0 +1,2 @@
+[relative-currentcolor-oklab-01.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-color/relative-currentcolor-oklch-01.html.ini b/tests/wpt/meta/css/css-color/relative-currentcolor-oklch-01.html.ini
new file mode 100644
index 00000000000..163add2a14b
--- /dev/null
+++ b/tests/wpt/meta/css/css-color/relative-currentcolor-oklch-01.html.ini
@@ -0,0 +1,2 @@
+[relative-currentcolor-oklch-01.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-color/relative-currentcolor-prophoto-01.html.ini b/tests/wpt/meta/css/css-color/relative-currentcolor-prophoto-01.html.ini
new file mode 100644
index 00000000000..89b27a45012
--- /dev/null
+++ b/tests/wpt/meta/css/css-color/relative-currentcolor-prophoto-01.html.ini
@@ -0,0 +1,2 @@
+[relative-currentcolor-prophoto-01.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-color/relative-currentcolor-rec2020-01.html.ini b/tests/wpt/meta/css/css-color/relative-currentcolor-rec2020-01.html.ini
new file mode 100644
index 00000000000..6cc93af43e5
--- /dev/null
+++ b/tests/wpt/meta/css/css-color/relative-currentcolor-rec2020-01.html.ini
@@ -0,0 +1,2 @@
+[relative-currentcolor-rec2020-01.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-color/relative-currentcolor-rec2020-02.html.ini b/tests/wpt/meta/css/css-color/relative-currentcolor-rec2020-02.html.ini
new file mode 100644
index 00000000000..76c5b14f311
--- /dev/null
+++ b/tests/wpt/meta/css/css-color/relative-currentcolor-rec2020-02.html.ini
@@ -0,0 +1,2 @@
+[relative-currentcolor-rec2020-02.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-color/relative-currentcolor-rgb-01.html.ini b/tests/wpt/meta/css/css-color/relative-currentcolor-rgb-01.html.ini
new file mode 100644
index 00000000000..c9657c151a9
--- /dev/null
+++ b/tests/wpt/meta/css/css-color/relative-currentcolor-rgb-01.html.ini
@@ -0,0 +1,2 @@
+[relative-currentcolor-rgb-01.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-color/relative-currentcolor-rgb-02.html.ini b/tests/wpt/meta/css/css-color/relative-currentcolor-rgb-02.html.ini
new file mode 100644
index 00000000000..e1b99630d8d
--- /dev/null
+++ b/tests/wpt/meta/css/css-color/relative-currentcolor-rgb-02.html.ini
@@ -0,0 +1,2 @@
+[relative-currentcolor-rgb-02.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-color/relative-currentcolor-xyzd50-01.html.ini b/tests/wpt/meta/css/css-color/relative-currentcolor-xyzd50-01.html.ini
new file mode 100644
index 00000000000..7f68b11108e
--- /dev/null
+++ b/tests/wpt/meta/css/css-color/relative-currentcolor-xyzd50-01.html.ini
@@ -0,0 +1,2 @@
+[relative-currentcolor-xyzd50-01.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-color/relative-currentcolor-xyzd65-01.html.ini b/tests/wpt/meta/css/css-color/relative-currentcolor-xyzd65-01.html.ini
new file mode 100644
index 00000000000..843a21cbbca
--- /dev/null
+++ b/tests/wpt/meta/css/css-color/relative-currentcolor-xyzd65-01.html.ini
@@ -0,0 +1,2 @@
+[relative-currentcolor-xyzd65-01.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-flexbox/percentage-heights-013.html.ini b/tests/wpt/meta/css/css-flexbox/percentage-heights-013.html.ini
index 1d1440de603..42578a38613 100644
--- a/tests/wpt/meta/css/css-flexbox/percentage-heights-013.html.ini
+++ b/tests/wpt/meta/css/css-flexbox/percentage-heights-013.html.ini
@@ -1,6 +1,3 @@
 [percentage-heights-013.html]
-  [.flexbox 4]
-    expected: FAIL
-
   [.flexbox 3]
     expected: FAIL
diff --git a/tests/wpt/meta/css/css-fonts/animations/font-palette-interpolation.html.ini b/tests/wpt/meta/css/css-fonts/animations/font-palette-interpolation.html.ini
new file mode 100644
index 00000000000..d1bfaf95897
--- /dev/null
+++ b/tests/wpt/meta/css/css-fonts/animations/font-palette-interpolation.html.ini
@@ -0,0 +1,342 @@
+[font-palette-interpolation.html]
+  [CSS Transitions: property <font-palette> from [light\] to [dark\] at (-2) should be [light\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-palette> from [light\] to [dark\] at (-0.25) should be [light\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-palette> from [light\] to [dark\] at (0) should be [light\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-palette> from [light\] to [dark\] at (0.3) should be [palette-mix(in oklab, light, dark 30%)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-palette> from [light\] to [dark\] at (0.6) should be [palette-mix(in oklab, light, dark 60%)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-palette> from [light\] to [dark\] at (1) should be [dark\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-palette> from [light\] to [dark\] at (1.5) should be [dark\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <font-palette> from [light\] to [dark\] at (-2) should be [light\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <font-palette> from [light\] to [dark\] at (-0.25) should be [light\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <font-palette> from [light\] to [dark\] at (0) should be [light\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <font-palette> from [light\] to [dark\] at (0.3) should be [palette-mix(in oklab, light, dark 30%)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <font-palette> from [light\] to [dark\] at (0.6) should be [palette-mix(in oklab, light, dark 60%)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <font-palette> from [light\] to [dark\] at (1) should be [dark\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <font-palette> from [light\] to [dark\] at (1.5) should be [dark\]]
+    expected: FAIL
+
+  [CSS Animations: property <font-palette> from [light\] to [dark\] at (-2) should be [light\]]
+    expected: FAIL
+
+  [CSS Animations: property <font-palette> from [light\] to [dark\] at (-0.25) should be [light\]]
+    expected: FAIL
+
+  [CSS Animations: property <font-palette> from [light\] to [dark\] at (0) should be [light\]]
+    expected: FAIL
+
+  [CSS Animations: property <font-palette> from [light\] to [dark\] at (0.3) should be [palette-mix(in oklab, light, dark 30%)\]]
+    expected: FAIL
+
+  [CSS Animations: property <font-palette> from [light\] to [dark\] at (0.6) should be [palette-mix(in oklab, light, dark 60%)\]]
+    expected: FAIL
+
+  [CSS Animations: property <font-palette> from [light\] to [dark\] at (1) should be [dark\]]
+    expected: FAIL
+
+  [CSS Animations: property <font-palette> from [light\] to [dark\] at (1.5) should be [dark\]]
+    expected: FAIL
+
+  [Web Animations: property <font-palette> from [light\] to [dark\] at (-2) should be [light\]]
+    expected: FAIL
+
+  [Web Animations: property <font-palette> from [light\] to [dark\] at (-0.25) should be [light\]]
+    expected: FAIL
+
+  [Web Animations: property <font-palette> from [light\] to [dark\] at (0) should be [light\]]
+    expected: FAIL
+
+  [Web Animations: property <font-palette> from [light\] to [dark\] at (0.3) should be [palette-mix(in oklab, light, dark 30%)\]]
+    expected: FAIL
+
+  [Web Animations: property <font-palette> from [light\] to [dark\] at (0.6) should be [palette-mix(in oklab, light, dark 60%)\]]
+    expected: FAIL
+
+  [Web Animations: property <font-palette> from [light\] to [dark\] at (1) should be [dark\]]
+    expected: FAIL
+
+  [Web Animations: property <font-palette> from [light\] to [dark\] at (1.5) should be [dark\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-palette> from [initial\] to [inherit\] at (-2) should be [normal\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-palette> from [initial\] to [inherit\] at (-0.25) should be [normal\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-palette> from [initial\] to [inherit\] at (0) should be [normal\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-palette> from [initial\] to [inherit\] at (0.3) should be [palette-mix(in oklab, normal, light 30%)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-palette> from [initial\] to [inherit\] at (0.6) should be [palette-mix(in oklab, normal, light 60%)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-palette> from [initial\] to [inherit\] at (1) should be [light\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-palette> from [initial\] to [inherit\] at (1.5) should be [light\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <font-palette> from [initial\] to [inherit\] at (-2) should be [normal\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <font-palette> from [initial\] to [inherit\] at (-0.25) should be [normal\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <font-palette> from [initial\] to [inherit\] at (0) should be [normal\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <font-palette> from [initial\] to [inherit\] at (0.3) should be [palette-mix(in oklab, normal, light 30%)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <font-palette> from [initial\] to [inherit\] at (0.6) should be [palette-mix(in oklab, normal, light 60%)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <font-palette> from [initial\] to [inherit\] at (1) should be [light\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <font-palette> from [initial\] to [inherit\] at (1.5) should be [light\]]
+    expected: FAIL
+
+  [CSS Animations: property <font-palette> from [initial\] to [inherit\] at (-2) should be [normal\]]
+    expected: FAIL
+
+  [CSS Animations: property <font-palette> from [initial\] to [inherit\] at (-0.25) should be [normal\]]
+    expected: FAIL
+
+  [CSS Animations: property <font-palette> from [initial\] to [inherit\] at (0) should be [normal\]]
+    expected: FAIL
+
+  [CSS Animations: property <font-palette> from [initial\] to [inherit\] at (0.3) should be [palette-mix(in oklab, normal, light 30%)\]]
+    expected: FAIL
+
+  [CSS Animations: property <font-palette> from [initial\] to [inherit\] at (0.6) should be [palette-mix(in oklab, normal, light 60%)\]]
+    expected: FAIL
+
+  [CSS Animations: property <font-palette> from [initial\] to [inherit\] at (1) should be [light\]]
+    expected: FAIL
+
+  [CSS Animations: property <font-palette> from [initial\] to [inherit\] at (1.5) should be [light\]]
+    expected: FAIL
+
+  [Web Animations: property <font-palette> from [initial\] to [inherit\] at (-2) should be [normal\]]
+    expected: FAIL
+
+  [Web Animations: property <font-palette> from [initial\] to [inherit\] at (-0.25) should be [normal\]]
+    expected: FAIL
+
+  [Web Animations: property <font-palette> from [initial\] to [inherit\] at (0) should be [normal\]]
+    expected: FAIL
+
+  [Web Animations: property <font-palette> from [initial\] to [inherit\] at (0.3) should be [palette-mix(in oklab, normal, light 30%)\]]
+    expected: FAIL
+
+  [Web Animations: property <font-palette> from [initial\] to [inherit\] at (0.6) should be [palette-mix(in oklab, normal, light 60%)\]]
+    expected: FAIL
+
+  [Web Animations: property <font-palette> from [initial\] to [inherit\] at (1) should be [light\]]
+    expected: FAIL
+
+  [Web Animations: property <font-palette> from [initial\] to [inherit\] at (1.5) should be [light\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-palette> from [--custom-palette\] to [normal\] at (-2) should be [--custom-palette\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-palette> from [--custom-palette\] to [normal\] at (-0.25) should be [--custom-palette\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-palette> from [--custom-palette\] to [normal\] at (0) should be [--custom-palette\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-palette> from [--custom-palette\] to [normal\] at (0.3) should be [palette-mix(in oklab, --custom-palette, normal 30%)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-palette> from [--custom-palette\] to [normal\] at (0.6) should be [palette-mix(in oklab, --custom-palette, normal 60%)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-palette> from [--custom-palette\] to [normal\] at (1) should be [normal\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-palette> from [--custom-palette\] to [normal\] at (1.5) should be [normal\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <font-palette> from [--custom-palette\] to [normal\] at (-2) should be [--custom-palette\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <font-palette> from [--custom-palette\] to [normal\] at (-0.25) should be [--custom-palette\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <font-palette> from [--custom-palette\] to [normal\] at (0) should be [--custom-palette\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <font-palette> from [--custom-palette\] to [normal\] at (0.3) should be [palette-mix(in oklab, --custom-palette, normal 30%)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <font-palette> from [--custom-palette\] to [normal\] at (0.6) should be [palette-mix(in oklab, --custom-palette, normal 60%)\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <font-palette> from [--custom-palette\] to [normal\] at (1) should be [normal\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <font-palette> from [--custom-palette\] to [normal\] at (1.5) should be [normal\]]
+    expected: FAIL
+
+  [CSS Animations: property <font-palette> from [--custom-palette\] to [normal\] at (-2) should be [--custom-palette\]]
+    expected: FAIL
+
+  [CSS Animations: property <font-palette> from [--custom-palette\] to [normal\] at (-0.25) should be [--custom-palette\]]
+    expected: FAIL
+
+  [CSS Animations: property <font-palette> from [--custom-palette\] to [normal\] at (0) should be [--custom-palette\]]
+    expected: FAIL
+
+  [CSS Animations: property <font-palette> from [--custom-palette\] to [normal\] at (0.3) should be [palette-mix(in oklab, --custom-palette, normal 30%)\]]
+    expected: FAIL
+
+  [CSS Animations: property <font-palette> from [--custom-palette\] to [normal\] at (0.6) should be [palette-mix(in oklab, --custom-palette, normal 60%)\]]
+    expected: FAIL
+
+  [CSS Animations: property <font-palette> from [--custom-palette\] to [normal\] at (1) should be [normal\]]
+    expected: FAIL
+
+  [CSS Animations: property <font-palette> from [--custom-palette\] to [normal\] at (1.5) should be [normal\]]
+    expected: FAIL
+
+  [Web Animations: property <font-palette> from [--custom-palette\] to [normal\] at (-2) should be [--custom-palette\]]
+    expected: FAIL
+
+  [Web Animations: property <font-palette> from [--custom-palette\] to [normal\] at (-0.25) should be [--custom-palette\]]
+    expected: FAIL
+
+  [Web Animations: property <font-palette> from [--custom-palette\] to [normal\] at (0) should be [--custom-palette\]]
+    expected: FAIL
+
+  [Web Animations: property <font-palette> from [--custom-palette\] to [normal\] at (0.3) should be [palette-mix(in oklab, --custom-palette, normal 30%)\]]
+    expected: FAIL
+
+  [Web Animations: property <font-palette> from [--custom-palette\] to [normal\] at (0.6) should be [palette-mix(in oklab, --custom-palette, normal 60%)\]]
+    expected: FAIL
+
+  [Web Animations: property <font-palette> from [--custom-palette\] to [normal\] at (1) should be [normal\]]
+    expected: FAIL
+
+  [Web Animations: property <font-palette> from [--custom-palette\] to [normal\] at (1.5) should be [normal\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-palette> from [initial\] to [normal\] at (-2) should be [normal\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-palette> from [initial\] to [normal\] at (-0.25) should be [normal\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-palette> from [initial\] to [normal\] at (0) should be [normal\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-palette> from [initial\] to [normal\] at (0.3) should be [normal\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-palette> from [initial\] to [normal\] at (0.6) should be [normal\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-palette> from [initial\] to [normal\] at (1) should be [normal\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-palette> from [initial\] to [normal\] at (1.5) should be [normal\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <font-palette> from [initial\] to [normal\] at (-2) should be [normal\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <font-palette> from [initial\] to [normal\] at (-0.25) should be [normal\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <font-palette> from [initial\] to [normal\] at (0) should be [normal\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <font-palette> from [initial\] to [normal\] at (0.3) should be [normal\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <font-palette> from [initial\] to [normal\] at (0.6) should be [normal\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <font-palette> from [initial\] to [normal\] at (1) should be [normal\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <font-palette> from [initial\] to [normal\] at (1.5) should be [normal\]]
+    expected: FAIL
+
+  [CSS Animations: property <font-palette> from [initial\] to [normal\] at (-2) should be [normal\]]
+    expected: FAIL
+
+  [CSS Animations: property <font-palette> from [initial\] to [normal\] at (-0.25) should be [normal\]]
+    expected: FAIL
+
+  [CSS Animations: property <font-palette> from [initial\] to [normal\] at (0) should be [normal\]]
+    expected: FAIL
+
+  [CSS Animations: property <font-palette> from [initial\] to [normal\] at (0.3) should be [normal\]]
+    expected: FAIL
+
+  [CSS Animations: property <font-palette> from [initial\] to [normal\] at (0.6) should be [normal\]]
+    expected: FAIL
+
+  [CSS Animations: property <font-palette> from [initial\] to [normal\] at (1) should be [normal\]]
+    expected: FAIL
+
+  [CSS Animations: property <font-palette> from [initial\] to [normal\] at (1.5) should be [normal\]]
+    expected: FAIL
+
+  [Web Animations: property <font-palette> from [initial\] to [normal\] at (-2) should be [normal\]]
+    expected: FAIL
+
+  [Web Animations: property <font-palette> from [initial\] to [normal\] at (-0.25) should be [normal\]]
+    expected: FAIL
+
+  [Web Animations: property <font-palette> from [initial\] to [normal\] at (0) should be [normal\]]
+    expected: FAIL
+
+  [Web Animations: property <font-palette> from [initial\] to [normal\] at (0.3) should be [normal\]]
+    expected: FAIL
+
+  [Web Animations: property <font-palette> from [initial\] to [normal\] at (0.6) should be [normal\]]
+    expected: FAIL
+
+  [Web Animations: property <font-palette> from [initial\] to [normal\] at (1) should be [normal\]]
+    expected: FAIL
+
+  [Web Animations: property <font-palette> from [initial\] to [normal\] at (1.5) should be [normal\]]
+    expected: FAIL
+
+  [An interpolation to inherit updates correctly on a parent style change.]
+    expected: FAIL
+
+  [Test additive animations]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-fonts/palette-mix-computed.html.ini b/tests/wpt/meta/css/css-fonts/palette-mix-computed.html.ini
new file mode 100644
index 00000000000..30c4656acac
--- /dev/null
+++ b/tests/wpt/meta/css/css-fonts/palette-mix-computed.html.ini
@@ -0,0 +1,81 @@
+[palette-mix-computed.html]
+  [Property font-palette value 'palette-mix(in oklab, light 30%, dark)']
+    expected: FAIL
+
+  [Property font-palette value 'palette-mix(in oklab, light 30%, light)']
+    expected: FAIL
+
+  [Property font-palette value 'palette-mix(in oklab, light 30%, normal)']
+    expected: FAIL
+
+  [Property font-palette value 'palette-mix(in oklab, --custom-palette 30%, normal)']
+    expected: FAIL
+
+  [Property font-palette value 'palette-mix(in oklab, light 50%, dark 50%)']
+    expected: FAIL
+
+  [Property font-palette value 'palette-mix(in oklab, light, dark 50%)']
+    expected: FAIL
+
+  [Property font-palette value 'palette-mix(in oklab, light 50%, dark)']
+    expected: FAIL
+
+  [Property font-palette value 'palette-mix(in oklab, light, dark)']
+    expected: FAIL
+
+  [Property font-palette value 'palette-mix(in oklab, light 50%, dark 70%)']
+    expected: FAIL
+
+  [Property font-palette value 'palette-mix(in oklab, light 70%, dark 70%)']
+    expected: FAIL
+
+  [Property font-palette value 'palette-mix(in oklab, light, dark 70%)']
+    expected: FAIL
+
+  [Property font-palette value 'palette-mix(in oklab, light 30%, dark 70%)']
+    expected: FAIL
+
+  [Property font-palette value 'palette-mix(in oklab, light 60%, dark)']
+    expected: FAIL
+
+  [Property font-palette value 'palette-mix(in oklab, light 10%, dark 40%)']
+    expected: FAIL
+
+  [Property font-palette value 'palette-mix(in hsl, light 10%, dark)']
+    expected: FAIL
+
+  [Property font-palette value 'palette-mix(in hwb, light 10%, dark)']
+    expected: FAIL
+
+  [Property font-palette value 'palette-mix(in lch, light 10%, dark)']
+    expected: FAIL
+
+  [Property font-palette value 'palette-mix(in oklch, light 10%, dark)']
+    expected: FAIL
+
+  [Property font-palette value 'palette-mix(in lab, light 10%, dark)']
+    expected: FAIL
+
+  [Property font-palette value 'palette-mix(in oklab, light 10%, dark)']
+    expected: FAIL
+
+  [Property font-palette value 'palette-mix(in srgb, light 10%, dark)']
+    expected: FAIL
+
+  [Property font-palette value 'palette-mix(in srgb-linear, light 10%, dark)']
+    expected: FAIL
+
+  [Property font-palette value 'palette-mix(in xyz, light 10%, dark)']
+    expected: FAIL
+
+  [Property font-palette value 'palette-mix(in xyz-d50, light 10%, dark)']
+    expected: FAIL
+
+  [Property font-palette value 'palette-mix(in xyz-d65, light 10%, dark)']
+    expected: FAIL
+
+  [Property font-palette value 'palette-mix(in oklab, palette-mix(in srgb, light 30%, normal) 20%, dark)']
+    expected: FAIL
+
+  [Property font-palette value 'palette-mix(in oklab, palette-mix(in srgb, light 30%, normal) 30%, palette-mix(in srgb, --custom-palette 30%, dark))']
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-fonts/rcap-in-monospace.html.ini b/tests/wpt/meta/css/css-fonts/rcap-in-monospace.html.ini
new file mode 100644
index 00000000000..43c07d772f2
--- /dev/null
+++ b/tests/wpt/meta/css/css-fonts/rcap-in-monospace.html.ini
@@ -0,0 +1,2 @@
+[rcap-in-monospace.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-fonts/rch-in-monospace.html.ini b/tests/wpt/meta/css/css-fonts/rch-in-monospace.html.ini
new file mode 100644
index 00000000000..a17b4e5c53f
--- /dev/null
+++ b/tests/wpt/meta/css/css-fonts/rch-in-monospace.html.ini
@@ -0,0 +1,2 @@
+[rch-in-monospace.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-fonts/rex-in-monospace.html.ini b/tests/wpt/meta/css/css-fonts/rex-in-monospace.html.ini
new file mode 100644
index 00000000000..0567da868b8
--- /dev/null
+++ b/tests/wpt/meta/css/css-fonts/rex-in-monospace.html.ini
@@ -0,0 +1,2 @@
+[rex-in-monospace.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-fonts/ric-in-monospace.html.ini b/tests/wpt/meta/css/css-fonts/ric-in-monospace.html.ini
new file mode 100644
index 00000000000..45092377da0
--- /dev/null
+++ b/tests/wpt/meta/css/css-fonts/ric-in-monospace.html.ini
@@ -0,0 +1,2 @@
+[ric-in-monospace.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-fonts/variations/at-font-face-font-matching.html.ini b/tests/wpt/meta/css/css-fonts/variations/at-font-face-font-matching.html.ini
index 4a5a9bad41f..d12a4482f02 100644
--- a/tests/wpt/meta/css/css-fonts/variations/at-font-face-font-matching.html.ini
+++ b/tests/wpt/meta/css/css-fonts/variations/at-font-face-font-matching.html.ini
@@ -50,21 +50,12 @@
   [Matching font-stretch: '110%' should prefer '115% 116%' over '105%']
     expected: FAIL
 
-  [Matching font-stretch: '110%' should prefer '100%' over '50% 80%']
-    expected: FAIL
-
   [Matching font-stretch: '90%' should prefer '90% 100%' over '50% 80%']
     expected: FAIL
 
-  [Matching font-stretch: '90%' should prefer '50% 80%' over '60% 70%']
-    expected: FAIL
-
   [Matching font-style: 'normal' should prefer 'oblique 0deg' over 'oblique 10deg 40deg']
     expected: FAIL
 
-  [Matching font-style: 'italic' should prefer 'oblique 20deg' over 'oblique 30deg 60deg']
-    expected: FAIL
-
   [Matching font-style: 'italic' should prefer 'oblique 40deg 50deg' over 'oblique 5deg 10deg']
     expected: FAIL
 
@@ -107,21 +98,12 @@
   [Matching font-style: 'oblique -20deg' should prefer 'oblique 0deg' over 'oblique 30deg 60deg']
     expected: FAIL
 
-  [Matching font-style: 'oblique -21deg' should prefer 'oblique 0deg' over 'oblique 30deg 60deg']
-    expected: FAIL
-
-  [Matching font-style: 'oblique 0deg' should prefer 'italic' over 'oblique -50deg -20deg']
-    expected: FAIL
-
   [Matching font-style: 'oblique 21deg' should prefer 'oblique 40deg 50deg' over 'oblique 20deg']
     expected: FAIL
 
   [Matching font-style: 'oblique -10deg' should prefer 'oblique -1deg 0deg' over 'oblique -20deg -15deg']
     expected: FAIL
 
-  [Matching font-style: 'italic' should prefer 'oblique 5deg' over 'normal']
-    expected: FAIL
-
   [Matching font-weight: '430' should prefer '340 398' over '501 550']
     expected: FAIL
 
@@ -143,9 +125,6 @@
   [Matching font-style: 'oblique -20deg' should prefer 'oblique -20deg' over 'oblique -60deg -40deg']
     expected: FAIL
 
-  [Matching font-style: 'oblique 20deg' should prefer 'oblique 10deg' over 'italic']
-    expected: FAIL
-
   [Matching font-style: 'oblique 21deg' should prefer 'oblique 21deg' over 'oblique 30deg 60deg']
     expected: FAIL
 
@@ -158,9 +137,6 @@
   [Matching font-style: 'italic' should prefer 'oblique 5deg 10deg' over 'oblique 5deg']
     expected: FAIL
 
-  [Matching font-style: 'oblique 10deg' should prefer 'oblique 0deg' over 'oblique -50deg -20deg']
-    expected: FAIL
-
   [Matching font-style: 'oblique -10deg' should prefer 'oblique -60deg -30deg' over 'oblique -50deg -40deg']
     expected: FAIL
 
@@ -182,9 +158,6 @@
   [Matching font-stretch: '100%' should prefer '110% 120%' over '115% 116%']
     expected: FAIL
 
-  [Matching font-style: 'italic' should prefer 'oblique 30deg 60deg' over 'oblique 40deg 50deg']
-    expected: FAIL
-
   [Matching font-weight: '501' should prefer '503 520' over '500']
     expected: FAIL
 
@@ -203,9 +176,6 @@
   [Matching font-weight: '399' should prefer '500 501' over '502 510']
     expected: FAIL
 
-  [Matching font-stretch: '90%' should prefer '110% 140%' over '120% 130%']
-    expected: FAIL
-
   [Matching font-style: 'oblique 21deg' should prefer 'oblique 30deg 60deg' over 'oblique 40deg 50deg']
     expected: FAIL
 
@@ -236,39 +206,24 @@
   [Matching font-weight: '430' should prefer '500' over '400 425']
     expected: FAIL
 
-  [Matching font-weight: '500' should prefer '450 460' over '400']
-    expected: FAIL
-
   [Matching font-weight: '500' should prefer '350 399' over '351 398']
     expected: FAIL
 
   [Matching font-weight: '501' should prefer '500' over '450 460']
     expected: FAIL
 
-  [Matching font-style: 'oblique -21deg' should prefer 'oblique -60deg -40deg' over 'oblique -10deg']
-    expected: FAIL
-
   [Matching font-weight: '400' should prefer '351 398' over '501 550']
     expected: FAIL
 
-  [Matching font-style: 'oblique -21deg' should prefer 'oblique -21deg' over 'oblique -60deg -40deg']
-    expected: FAIL
-
   [Matching font-weight: '399' should prefer '200 300' over '400']
     expected: FAIL
 
-  [Matching font-weight: '399' should prefer '350 399' over '340 360']
-    expected: FAIL
-
   [Matching font-style: 'oblique 21deg' should prefer 'italic' over 'oblique 0deg']
     expected: FAIL
 
   [Matching font-style: 'oblique -10deg' should prefer 'oblique -50deg -40deg' over 'italic']
     expected: FAIL
 
-  [Matching font-style: 'oblique -20deg' should prefer 'oblique -60deg -40deg' over 'oblique -10deg']
-    expected: FAIL
-
   [Matching font-style: 'normal' should prefer 'normal' over 'oblique 0deg']
     expected: FAIL
 
@@ -298,3 +253,27 @@
 
   [Matching font-style: 'oblique 20deg' should prefer 'oblique 0deg' over 'oblique -50deg -20deg']
     expected: FAIL
+
+  [Matching font-weight: '430' should prefer '400 425' over '350 399']
+    expected: FAIL
+
+  [Matching font-weight: '500' should prefer '500' over '450 460']
+    expected: FAIL
+
+  [Matching font-weight: '501' should prefer '501' over '502 510']
+    expected: FAIL
+
+  [Matching font-style: 'normal' should prefer 'oblique -50deg -20deg' over 'oblique -40deg -30deg']
+    expected: FAIL
+
+  [Matching font-style: 'oblique 21deg' should prefer 'oblique 20deg' over 'oblique 10deg']
+    expected: FAIL
+
+  [Matching font-style: 'oblique 21deg' should prefer 'oblique 0deg' over 'oblique -50deg -20deg']
+    expected: FAIL
+
+  [Matching font-style: 'oblique -21deg' should prefer 'oblique -10deg' over 'italic']
+    expected: FAIL
+
+  [Matching font-style: 'oblique -21deg' should prefer 'italic' over 'oblique 0deg']
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-position/backdrop-inherit-computed.html.ini b/tests/wpt/meta/css/css-position/backdrop-inherit-computed.html.ini
new file mode 100644
index 00000000000..2a9378d9bbb
--- /dev/null
+++ b/tests/wpt/meta/css/css-position/backdrop-inherit-computed.html.ini
@@ -0,0 +1,2 @@
+[backdrop-inherit-computed.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/css/css-text-decor/invalidation/selection-pseudo-with-decoration-invalidation-001.html.ini b/tests/wpt/meta/css/css-text-decor/invalidation/selection-pseudo-with-decoration-invalidation-001.html.ini
new file mode 100644
index 00000000000..1a98d8ff779
--- /dev/null
+++ b/tests/wpt/meta/css/css-text-decor/invalidation/selection-pseudo-with-decoration-invalidation-001.html.ini
@@ -0,0 +1,2 @@
+[selection-pseudo-with-decoration-invalidation-001.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text-decor/invalidation/selection-pseudo-with-decoration-invalidation-002.html.ini b/tests/wpt/meta/css/css-text-decor/invalidation/selection-pseudo-with-decoration-invalidation-002.html.ini
new file mode 100644
index 00000000000..17d161ef076
--- /dev/null
+++ b/tests/wpt/meta/css/css-text-decor/invalidation/selection-pseudo-with-decoration-invalidation-002.html.ini
@@ -0,0 +1,2 @@
+[selection-pseudo-with-decoration-invalidation-002.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/hanging-punctuation/hanging-punctuation-first-002.html.ini b/tests/wpt/meta/css/css-text/hanging-punctuation/hanging-punctuation-first-002.html.ini
new file mode 100644
index 00000000000..3c88e7c0734
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/hanging-punctuation/hanging-punctuation-first-002.html.ini
@@ -0,0 +1,2 @@
+[hanging-punctuation-first-002.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/parsing/text-autospace-valid.html.ini b/tests/wpt/meta/css/css-text/parsing/text-autospace-valid.html.ini
index 77015f212ee..bbfd554dad3 100644
--- a/tests/wpt/meta/css/css-text/parsing/text-autospace-valid.html.ini
+++ b/tests/wpt/meta/css/css-text/parsing/text-autospace-valid.html.ini
@@ -28,3 +28,81 @@
 
   [e.style['text-autospace'\] = "punctuation ideograph-alpha ideograph-numeric" should set the property value]
     expected: FAIL
+
+  [e.style['text-autospace'\] = "ideograph-alpha insert" should set the property value]
+    expected: FAIL
+
+  [e.style['text-autospace'\] = "ideograph-numeric insert" should set the property value]
+    expected: FAIL
+
+  [e.style['text-autospace'\] = "ideograph-alpha ideograph-numeric insert" should set the property value]
+    expected: FAIL
+
+  [e.style['text-autospace'\] = "punctuation insert" should set the property value]
+    expected: FAIL
+
+  [e.style['text-autospace'\] = "punctuation normal insert" should set the property value]
+    expected: FAIL
+
+  [e.style['text-autospace'\] = "punctuation ideograph-alpha insert" should set the property value]
+    expected: FAIL
+
+  [e.style['text-autospace'\] = "insert ideograph-alpha" should set the property value]
+    expected: FAIL
+
+  [e.style['text-autospace'\] = "insert ideograph-numeric" should set the property value]
+    expected: FAIL
+
+  [e.style['text-autospace'\] = "insert ideograph-alpha ideograph-numeric" should set the property value]
+    expected: FAIL
+
+  [e.style['text-autospace'\] = "insert punctuation" should set the property value]
+    expected: FAIL
+
+  [e.style['text-autospace'\] = "insert punctuation normal" should set the property value]
+    expected: FAIL
+
+  [e.style['text-autospace'\] = "insert punctuation ideograph-alpha" should set the property value]
+    expected: FAIL
+
+  [e.style['text-autospace'\] = "insert punctuation ideograph-alpha ideograph-numeric" should set the property value]
+    expected: FAIL
+
+  [e.style['text-autospace'\] = "ideograph-alpha replace" should set the property value]
+    expected: FAIL
+
+  [e.style['text-autospace'\] = "ideograph-numeric replace" should set the property value]
+    expected: FAIL
+
+  [e.style['text-autospace'\] = "ideograph-alpha ideograph-numeric replace" should set the property value]
+    expected: FAIL
+
+  [e.style['text-autospace'\] = "punctuation replace" should set the property value]
+    expected: FAIL
+
+  [e.style['text-autospace'\] = "punctuation normal replace" should set the property value]
+    expected: FAIL
+
+  [e.style['text-autospace'\] = "punctuation ideograph-alpha replace" should set the property value]
+    expected: FAIL
+
+  [e.style['text-autospace'\] = "replace ideograph-alpha" should set the property value]
+    expected: FAIL
+
+  [e.style['text-autospace'\] = "replace ideograph-numeric" should set the property value]
+    expected: FAIL
+
+  [e.style['text-autospace'\] = "replace ideograph-alpha ideograph-numeric" should set the property value]
+    expected: FAIL
+
+  [e.style['text-autospace'\] = "replace punctuation" should set the property value]
+    expected: FAIL
+
+  [e.style['text-autospace'\] = "replace punctuation normal" should set the property value]
+    expected: FAIL
+
+  [e.style['text-autospace'\] = "replace punctuation ideograph-alpha" should set the property value]
+    expected: FAIL
+
+  [e.style['text-autospace'\] = "replace punctuation ideograph-alpha ideograph-numeric" should set the property value]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/parsing/text-spacing-trim-computed.html.ini b/tests/wpt/meta/css/css-text/parsing/text-spacing-trim-computed.html.ini
new file mode 100644
index 00000000000..55f43aa1353
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/parsing/text-spacing-trim-computed.html.ini
@@ -0,0 +1,24 @@
+[text-spacing-trim-computed.html]
+  [Property text-spacing-trim value 'auto']
+    expected: FAIL
+
+  [Property text-spacing-trim value 'space-all']
+    expected: FAIL
+
+  [Property text-spacing-trim value 'trim-auto']
+    expected: FAIL
+
+  [Property text-spacing-trim value 'trim-all']
+    expected: FAIL
+
+  [Property text-spacing-trim value 'allow-end']
+    expected: FAIL
+
+  [Property text-spacing-trim value 'space-first']
+    expected: FAIL
+
+  [Property text-spacing-trim value 'allow-end space-first']
+    expected: FAIL
+
+  [Property text-spacing-trim value 'space-first allow-end']
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/parsing/text-spacing-trim-valid.html.ini b/tests/wpt/meta/css/css-text/parsing/text-spacing-trim-valid.html.ini
new file mode 100644
index 00000000000..dc325c5f4c5
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/parsing/text-spacing-trim-valid.html.ini
@@ -0,0 +1,24 @@
+[text-spacing-trim-valid.html]
+  [e.style['text-spacing-trim'\] = "auto" should set the property value]
+    expected: FAIL
+
+  [e.style['text-spacing-trim'\] = "space-all" should set the property value]
+    expected: FAIL
+
+  [e.style['text-spacing-trim'\] = "trim-auto" should set the property value]
+    expected: FAIL
+
+  [e.style['text-spacing-trim'\] = "trim-all" should set the property value]
+    expected: FAIL
+
+  [e.style['text-spacing-trim'\] = "allow-end" should set the property value]
+    expected: FAIL
+
+  [e.style['text-spacing-trim'\] = "space-first" should set the property value]
+    expected: FAIL
+
+  [e.style['text-spacing-trim'\] = "allow-end space-first" should set the property value]
+    expected: FAIL
+
+  [e.style['text-spacing-trim'\] = "space-first allow-end" should set the property value]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/parsing/text-wrap-valid.html.ini b/tests/wpt/meta/css/css-text/parsing/text-wrap-valid.html.ini
index 6900f7a1f73..9eb9caae38e 100644
--- a/tests/wpt/meta/css/css-text/parsing/text-wrap-valid.html.ini
+++ b/tests/wpt/meta/css/css-text/parsing/text-wrap-valid.html.ini
@@ -28,3 +28,54 @@
 
   [e.style['text-wrap'\] = "revert-layer" should set the property value]
     expected: FAIL
+
+  [e.style['text-wrap'\] = "auto" should set the property value]
+    expected: FAIL
+
+  [e.style['text-wrap'\] = "wrap auto" should set the property value]
+    expected: FAIL
+
+  [e.style['text-wrap'\] = "wrap balance" should set the property value]
+    expected: FAIL
+
+  [e.style['text-wrap'\] = "wrap pretty" should set the property value]
+    expected: FAIL
+
+  [e.style['text-wrap'\] = "wrap stable" should set the property value]
+    expected: FAIL
+
+  [e.style['text-wrap'\] = "auto wrap" should set the property value]
+    expected: FAIL
+
+  [e.style['text-wrap'\] = "balance wrap" should set the property value]
+    expected: FAIL
+
+  [e.style['text-wrap'\] = "pretty wrap" should set the property value]
+    expected: FAIL
+
+  [e.style['text-wrap'\] = "stable wrap" should set the property value]
+    expected: FAIL
+
+  [e.style['text-wrap'\] = "nowrap auto" should set the property value]
+    expected: FAIL
+
+  [e.style['text-wrap'\] = "nowrap balance" should set the property value]
+    expected: FAIL
+
+  [e.style['text-wrap'\] = "nowrap pretty" should set the property value]
+    expected: FAIL
+
+  [e.style['text-wrap'\] = "nowrap stable" should set the property value]
+    expected: FAIL
+
+  [e.style['text-wrap'\] = "auto nowrap" should set the property value]
+    expected: FAIL
+
+  [e.style['text-wrap'\] = "balance nowrap" should set the property value]
+    expected: FAIL
+
+  [e.style['text-wrap'\] = "pretty nowrap" should set the property value]
+    expected: FAIL
+
+  [e.style['text-wrap'\] = "stable nowrap" should set the property value]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/parsing/word-boundary-detection-computed.html.ini b/tests/wpt/meta/css/css-text/parsing/word-boundary-detection-computed.html.ini
deleted file mode 100644
index ac397c364d3..00000000000
--- a/tests/wpt/meta/css/css-text/parsing/word-boundary-detection-computed.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[word-boundary-detection-computed.html]
-  [Property word-boundary-detection value 'normal']
-    expected: FAIL
-
-  [Property word-boundary-detection value 'manual']
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/parsing/word-boundary-detection-valid.html.ini b/tests/wpt/meta/css/css-text/parsing/word-boundary-detection-valid.html.ini
deleted file mode 100644
index fdd2a316ceb..00000000000
--- a/tests/wpt/meta/css/css-text/parsing/word-boundary-detection-valid.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[word-boundary-detection-valid.html]
-  [e.style['word-boundary-detection'\] = "normal" should set the property value]
-    expected: FAIL
-
-  [e.style['word-boundary-detection'\] = "manual" should set the property value]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/parsing/word-boundary-expansion-computed.html.ini b/tests/wpt/meta/css/css-text/parsing/word-boundary-expansion-computed.html.ini
deleted file mode 100644
index 501387c036d..00000000000
--- a/tests/wpt/meta/css/css-text/parsing/word-boundary-expansion-computed.html.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[word-boundary-expansion-computed.html]
-  [Property word-boundary-expansion value 'none']
-    expected: FAIL
-
-  [Property word-boundary-expansion value 'space']
-    expected: FAIL
-
-  [Property word-boundary-expansion value 'ideographic-space']
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/parsing/word-boundary-expansion-valid.html.ini b/tests/wpt/meta/css/css-text/parsing/word-boundary-expansion-valid.html.ini
deleted file mode 100644
index 3df060e1f23..00000000000
--- a/tests/wpt/meta/css/css-text/parsing/word-boundary-expansion-valid.html.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[word-boundary-expansion-valid.html]
-  [e.style['word-boundary-expansion'\] = "none" should set the property value]
-    expected: FAIL
-
-  [e.style['word-boundary-expansion'\] = "space" should set the property value]
-    expected: FAIL
-
-  [e.style['word-boundary-expansion'\] = "ideographic-space" should set the property value]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/parsing/word-break-valid.html.ini b/tests/wpt/meta/css/css-text/parsing/word-break-valid.html.ini
index 21080b77bc2..78a0b53e5cf 100644
--- a/tests/wpt/meta/css/css-text/parsing/word-break-valid.html.ini
+++ b/tests/wpt/meta/css/css-text/parsing/word-break-valid.html.ini
@@ -13,3 +13,6 @@
 
   [e.style['word-break'\] = "auto-phrase" should set the property value]
     expected: FAIL
+
+  [e.style['word-break'\] = "manual" should set the property value]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/parsing/word-space-transform-computed.html.ini b/tests/wpt/meta/css/css-text/parsing/word-space-transform-computed.html.ini
new file mode 100644
index 00000000000..42cbfb34cf9
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/parsing/word-space-transform-computed.html.ini
@@ -0,0 +1,15 @@
+[word-space-transform-computed.html]
+  [Property word-space-transform value 'none']
+    expected: FAIL
+
+  [Property word-space-transform value 'space']
+    expected: FAIL
+
+  [Property word-space-transform value 'ideographic-space']
+    expected: FAIL
+
+  [Property word-space-transform value 'space auto-phrase']
+    expected: FAIL
+
+  [Property word-space-transform value 'ideographic-space auto-phrase']
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/parsing/word-space-transform-valid.html.ini b/tests/wpt/meta/css/css-text/parsing/word-space-transform-valid.html.ini
new file mode 100644
index 00000000000..fefac5f0336
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/parsing/word-space-transform-valid.html.ini
@@ -0,0 +1,21 @@
+[word-space-transform-valid.html]
+  [e.style['word-space-transform'\] = "none" should set the property value]
+    expected: FAIL
+
+  [e.style['word-space-transform'\] = "space" should set the property value]
+    expected: FAIL
+
+  [e.style['word-space-transform'\] = "ideographic-space" should set the property value]
+    expected: FAIL
+
+  [e.style['word-space-transform'\] = "space auto-phrase" should set the property value]
+    expected: FAIL
+
+  [e.style['word-space-transform'\] = "ideographic-space auto-phrase" should set the property value]
+    expected: FAIL
+
+  [e.style['word-space-transform'\] = "auto-phrase space" should set the property value]
+    expected: FAIL
+
+  [e.style['word-space-transform'\] = "auto-phrase ideographic-space" should set the property value]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/tab-size/tab-size-integer-005.html.ini b/tests/wpt/meta/css/css-text/tab-size/tab-size-integer-005.html.ini
new file mode 100644
index 00000000000..50ef08178ba
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/tab-size/tab-size-integer-005.html.ini
@@ -0,0 +1,2 @@
+[tab-size-integer-005.html]
+  expected: CRASH
diff --git a/tests/wpt/meta/css/css-text/text-autospace/text-autospace-001.html.ini b/tests/wpt/meta/css/css-text/text-autospace/text-autospace-001.html.ini
new file mode 100644
index 00000000000..81c60721b6b
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/text-autospace/text-autospace-001.html.ini
@@ -0,0 +1,2 @@
+[text-autospace-001.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/css/css-text/text-autospace/text-autospace-dynamic-001.html.ini b/tests/wpt/meta/css/css-text/text-autospace/text-autospace-dynamic-001.html.ini
new file mode 100644
index 00000000000..95739378448
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/text-autospace/text-autospace-dynamic-001.html.ini
@@ -0,0 +1,2 @@
+[text-autospace-dynamic-001.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/text-autospace/text-autospace-first-line-001.html.ini b/tests/wpt/meta/css/css-text/text-autospace/text-autospace-first-line-001.html.ini
new file mode 100644
index 00000000000..3f928a6194d
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/text-autospace/text-autospace-first-line-001.html.ini
@@ -0,0 +1,3 @@
+[text-autospace-first-line-001.html]
+  [text-autospace-first-line-001]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/text-autospace/text-autospace-ligature-001.html.ini b/tests/wpt/meta/css/css-text/text-autospace/text-autospace-ligature-001.html.ini
new file mode 100644
index 00000000000..67c2adbfe7e
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/text-autospace/text-autospace-ligature-001.html.ini
@@ -0,0 +1,2 @@
+[text-autospace-ligature-001.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/css/css-text/text-autospace/text-autospace-no-001.html.ini b/tests/wpt/meta/css/css-text/text-autospace/text-autospace-no-001.html.ini
new file mode 100644
index 00000000000..853b10e9a36
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/text-autospace/text-autospace-no-001.html.ini
@@ -0,0 +1,2 @@
+[text-autospace-no-001.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/text-spacing-trim/text-spacing-trim-colon-001.html.ini b/tests/wpt/meta/css/css-text/text-spacing-trim/text-spacing-trim-colon-001.html.ini
new file mode 100644
index 00000000000..fd495eb2ba9
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/text-spacing-trim/text-spacing-trim-colon-001.html.ini
@@ -0,0 +1,5 @@
+[text-spacing-trim-colon-001.html?class=chws,vrl]
+  expected: FAIL
+
+[text-spacing-trim-colon-001.html?class=halt,vrl]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/text-spacing-trim/text-spacing-trim-combinations-001.html.ini b/tests/wpt/meta/css/css-text/text-spacing-trim/text-spacing-trim-combinations-001.html.ini
new file mode 100644
index 00000000000..52b0d0166bc
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/text-spacing-trim/text-spacing-trim-combinations-001.html.ini
@@ -0,0 +1,27 @@
+[text-spacing-trim-combinations-001.html]
+  ["国（（国"]
+    expected: FAIL
+
+  ["国・（国"]
+    expected: FAIL
+
+  ["国）（国"]
+    expected: FAIL
+
+  ["国　（国"]
+    expected: FAIL
+
+  ["国））国"]
+    expected: FAIL
+
+  ["国）・国"]
+    expected: FAIL
+
+  ["国）　国"]
+    expected: FAIL
+
+  ["国（（（国"]
+    expected: FAIL
+
+  ["国）））国"]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/text-spacing-trim/text-spacing-trim-dot-001.html.ini b/tests/wpt/meta/css/css-text/text-spacing-trim/text-spacing-trim-dot-001.html.ini
new file mode 100644
index 00000000000..d32610f01e8
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/text-spacing-trim/text-spacing-trim-dot-001.html.ini
@@ -0,0 +1,5 @@
+[text-spacing-trim-dot-001.html?class=chws,vrl]
+  expected: FAIL
+
+[text-spacing-trim-dot-001.html?class=halt,vrl]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/text-transform/text-transform-capitalize-035.html.ini b/tests/wpt/meta/css/css-text/text-transform/text-transform-capitalize-035.html.ini
new file mode 100644
index 00000000000..fdc75e592ee
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/text-transform/text-transform-capitalize-035.html.ini
@@ -0,0 +1,2 @@
+[text-transform-capitalize-035.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/white-space/text-space-collapse-discard-001.xht.ini b/tests/wpt/meta/css/css-text/white-space/text-space-collapse-discard-001.xht.ini
deleted file mode 100644
index c7046e79914..00000000000
--- a/tests/wpt/meta/css/css-text/white-space/text-space-collapse-discard-001.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[text-space-collapse-discard-001.xht]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/white-space/text-space-collapse-preserve-breaks-001.xht.ini b/tests/wpt/meta/css/css-text/white-space/text-space-collapse-preserve-breaks-001.xht.ini
deleted file mode 100644
index 343f85988a2..00000000000
--- a/tests/wpt/meta/css/css-text/white-space/text-space-collapse-preserve-breaks-001.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[text-space-collapse-preserve-breaks-001.xht]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/white-space/text-space-trim-trim-inner-001.xht.ini b/tests/wpt/meta/css/css-text/white-space/text-space-trim-trim-inner-001.xht.ini
deleted file mode 100644
index 52470fe1c5b..00000000000
--- a/tests/wpt/meta/css/css-text/white-space/text-space-trim-trim-inner-001.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[text-space-trim-trim-inner-001.xht]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/white-space/text-wrap-balance-float-001.html.ini b/tests/wpt/meta/css/css-text/white-space/text-wrap-balance-float-001.html.ini
new file mode 100644
index 00000000000..7cd37398508
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/white-space/text-wrap-balance-float-001.html.ini
@@ -0,0 +1,2 @@
+[text-wrap-balance-float-001.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/white-space/text-wrap-balance-float-002.html.ini b/tests/wpt/meta/css/css-text/white-space/text-wrap-balance-float-002.html.ini
new file mode 100644
index 00000000000..656abfbba7b
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/white-space/text-wrap-balance-float-002.html.ini
@@ -0,0 +1,2 @@
+[text-wrap-balance-float-002.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/white-space/text-wrap-balance-float-003.html.ini b/tests/wpt/meta/css/css-text/white-space/text-wrap-balance-float-003.html.ini
new file mode 100644
index 00000000000..c0fb44fa721
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/white-space/text-wrap-balance-float-003.html.ini
@@ -0,0 +1,2 @@
+[text-wrap-balance-float-003.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/white-space/text-wrap-balance-float-004.html.ini b/tests/wpt/meta/css/css-text/white-space/text-wrap-balance-float-004.html.ini
new file mode 100644
index 00000000000..6ab8fe344ba
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/white-space/text-wrap-balance-float-004.html.ini
@@ -0,0 +1,2 @@
+[text-wrap-balance-float-004.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/white-space/text-wrap-balance-float-005.html.ini b/tests/wpt/meta/css/css-text/white-space/text-wrap-balance-float-005.html.ini
new file mode 100644
index 00000000000..68ca02454b8
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/white-space/text-wrap-balance-float-005.html.ini
@@ -0,0 +1,2 @@
+[text-wrap-balance-float-005.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/white-space/trailing-space-position-001.html.ini b/tests/wpt/meta/css/css-text/white-space/trailing-space-position-001.html.ini
deleted file mode 100644
index f78e6b94672..00000000000
--- a/tests/wpt/meta/css/css-text/white-space/trailing-space-position-001.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[trailing-space-position-001.html]
-  [CSS Test: Positions of trailing collapsible spaces 1]
-    expected: FAIL
-
-  [CSS Test: Positions of trailing collapsible spaces 3]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/white-space/white-space-collapse-discard-001.xht.ini b/tests/wpt/meta/css/css-text/white-space/white-space-collapse-discard-001.xht.ini
new file mode 100644
index 00000000000..16d18cbbbcf
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/white-space/white-space-collapse-discard-001.xht.ini
@@ -0,0 +1,2 @@
+[white-space-collapse-discard-001.xht]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/white-space/white-space-collapse-preserve-breaks-001.xht.ini b/tests/wpt/meta/css/css-text/white-space/white-space-collapse-preserve-breaks-001.xht.ini
new file mode 100644
index 00000000000..338c942aeab
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/white-space/white-space-collapse-preserve-breaks-001.xht.ini
@@ -0,0 +1,2 @@
+[white-space-collapse-preserve-breaks-001.xht]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/white-space/white-space-trim-discard-inner-001.xht.ini b/tests/wpt/meta/css/css-text/white-space/white-space-trim-discard-inner-001.xht.ini
new file mode 100644
index 00000000000..b360d5c85e6
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/white-space/white-space-trim-discard-inner-001.xht.ini
@@ -0,0 +1,2 @@
+[white-space-trim-discard-inner-001.xht]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-001.html.ini b/tests/wpt/meta/css/css-text/word-boundary/word-boundary-001.html.ini
deleted file mode 100644
index 201a7f68bc6..00000000000
--- a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-001.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-001.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-002.html.ini b/tests/wpt/meta/css/css-text/word-boundary/word-boundary-002.html.ini
deleted file mode 100644
index 671edc8c6b6..00000000000
--- a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-002.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-002.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-003.html.ini b/tests/wpt/meta/css/css-text/word-boundary/word-boundary-003.html.ini
deleted file mode 100644
index dcc7ea518e3..00000000000
--- a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-003.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-003.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-004.html.ini b/tests/wpt/meta/css/css-text/word-boundary/word-boundary-004.html.ini
deleted file mode 100644
index c2ed0704079..00000000000
--- a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-004.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-004.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-005.html.ini b/tests/wpt/meta/css/css-text/word-boundary/word-boundary-005.html.ini
deleted file mode 100644
index 5c8f8888bf1..00000000000
--- a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-005.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-005.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-006.html.ini b/tests/wpt/meta/css/css-text/word-boundary/word-boundary-006.html.ini
deleted file mode 100644
index 59990e91eff..00000000000
--- a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-006.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-006.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-007.html.ini b/tests/wpt/meta/css/css-text/word-boundary/word-boundary-007.html.ini
deleted file mode 100644
index e4f9fe57f1c..00000000000
--- a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-007.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-007.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-008.html.ini b/tests/wpt/meta/css/css-text/word-boundary/word-boundary-008.html.ini
deleted file mode 100644
index 3d3bda613ff..00000000000
--- a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-008.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-008.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-009.html.ini b/tests/wpt/meta/css/css-text/word-boundary/word-boundary-009.html.ini
deleted file mode 100644
index bf153d1a569..00000000000
--- a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-009.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-009.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-010.html.ini b/tests/wpt/meta/css/css-text/word-boundary/word-boundary-010.html.ini
deleted file mode 100644
index bb02af24b3d..00000000000
--- a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-010.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-010.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-011.html.ini b/tests/wpt/meta/css/css-text/word-boundary/word-boundary-011.html.ini
deleted file mode 100644
index bacbc5fdf59..00000000000
--- a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-011.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-011.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-012.html.ini b/tests/wpt/meta/css/css-text/word-boundary/word-boundary-012.html.ini
deleted file mode 100644
index 00e16d20863..00000000000
--- a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-012.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-012.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-013.html.ini b/tests/wpt/meta/css/css-text/word-boundary/word-boundary-013.html.ini
deleted file mode 100644
index 0171725420f..00000000000
--- a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-013.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-013.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-014.html.ini b/tests/wpt/meta/css/css-text/word-boundary/word-boundary-014.html.ini
deleted file mode 100644
index 705d9e14464..00000000000
--- a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-014.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-014.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-102.html.ini b/tests/wpt/meta/css/css-text/word-boundary/word-boundary-102.html.ini
deleted file mode 100644
index 0e40fcb9f09..00000000000
--- a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-102.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-102.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-103.html.ini b/tests/wpt/meta/css/css-text/word-boundary/word-boundary-103.html.ini
deleted file mode 100644
index 27899b63155..00000000000
--- a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-103.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-103.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-104.html.ini b/tests/wpt/meta/css/css-text/word-boundary/word-boundary-104.html.ini
deleted file mode 100644
index 77f96a47ac0..00000000000
--- a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-104.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-104.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-105.html.ini b/tests/wpt/meta/css/css-text/word-boundary/word-boundary-105.html.ini
deleted file mode 100644
index 840044bc006..00000000000
--- a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-105.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-105.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-107.html.ini b/tests/wpt/meta/css/css-text/word-boundary/word-boundary-107.html.ini
deleted file mode 100644
index 63d6fcc1168..00000000000
--- a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-107.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-107.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-108.html.ini b/tests/wpt/meta/css/css-text/word-boundary/word-boundary-108.html.ini
deleted file mode 100644
index 767d3ca5a00..00000000000
--- a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-108.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-108.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-109.html.ini b/tests/wpt/meta/css/css-text/word-boundary/word-boundary-109.html.ini
deleted file mode 100644
index 7fcf6cd2867..00000000000
--- a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-109.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-109.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-110.html.ini b/tests/wpt/meta/css/css-text/word-boundary/word-boundary-110.html.ini
deleted file mode 100644
index a17d0a24611..00000000000
--- a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-110.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-110.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-112.html.ini b/tests/wpt/meta/css/css-text/word-boundary/word-boundary-112.html.ini
deleted file mode 100644
index ee07c319feb..00000000000
--- a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-112.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-112.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-113.html.ini b/tests/wpt/meta/css/css-text/word-boundary/word-boundary-113.html.ini
deleted file mode 100644
index abea305088f..00000000000
--- a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-113.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-113.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-114.html.ini b/tests/wpt/meta/css/css-text/word-boundary/word-boundary-114.html.ini
deleted file mode 100644
index da95790bcf8..00000000000
--- a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-114.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-114.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-115.html.ini b/tests/wpt/meta/css/css-text/word-boundary/word-boundary-115.html.ini
deleted file mode 100644
index d85c5512b66..00000000000
--- a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-115.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-115.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-116.html.ini b/tests/wpt/meta/css/css-text/word-boundary/word-boundary-116.html.ini
deleted file mode 100644
index 6968d8f652c..00000000000
--- a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-116.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-116.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-117.html.ini b/tests/wpt/meta/css/css-text/word-boundary/word-boundary-117.html.ini
deleted file mode 100644
index f62025e8326..00000000000
--- a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-117.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-117.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-118.html.ini b/tests/wpt/meta/css/css-text/word-boundary/word-boundary-118.html.ini
deleted file mode 100644
index 7d7e9975994..00000000000
--- a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-118.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-118.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-119.html.ini b/tests/wpt/meta/css/css-text/word-boundary/word-boundary-119.html.ini
deleted file mode 100644
index fab9077f0b5..00000000000
--- a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-119.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-119.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-120.html.ini b/tests/wpt/meta/css/css-text/word-boundary/word-boundary-120.html.ini
deleted file mode 100644
index 450539a5df9..00000000000
--- a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-120.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-120.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-121.html.ini b/tests/wpt/meta/css/css-text/word-boundary/word-boundary-121.html.ini
deleted file mode 100644
index 0337c634dd9..00000000000
--- a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-121.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-121.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-122.html.ini b/tests/wpt/meta/css/css-text/word-boundary/word-boundary-122.html.ini
deleted file mode 100644
index ece305eb8a4..00000000000
--- a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-122.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-122.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-123.html.ini b/tests/wpt/meta/css/css-text/word-boundary/word-boundary-123.html.ini
deleted file mode 100644
index 2ec608aa4fd..00000000000
--- a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-123.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-123.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-124.html.ini b/tests/wpt/meta/css/css-text/word-boundary/word-boundary-124.html.ini
deleted file mode 100644
index 199463f5151..00000000000
--- a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-124.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-124.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-125.html.ini b/tests/wpt/meta/css/css-text/word-boundary/word-boundary-125.html.ini
deleted file mode 100644
index 0acaeca9615..00000000000
--- a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-125.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-125.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-126.html.ini b/tests/wpt/meta/css/css-text/word-boundary/word-boundary-126.html.ini
deleted file mode 100644
index 024b35d55b2..00000000000
--- a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-126.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-126.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-127.html.ini b/tests/wpt/meta/css/css-text/word-boundary/word-boundary-127.html.ini
deleted file mode 100644
index 7e43d876903..00000000000
--- a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-127.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-127.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-128.html.ini b/tests/wpt/meta/css/css-text/word-boundary/word-boundary-128.html.ini
deleted file mode 100644
index c517a4e1d54..00000000000
--- a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-128.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-128.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-129.html.ini b/tests/wpt/meta/css/css-text/word-boundary/word-boundary-129.html.ini
deleted file mode 100644
index d14e053675b..00000000000
--- a/tests/wpt/meta/css/css-text/word-boundary/word-boundary-129.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-boundary-129.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/word-break/word-break-normal-002.html.ini b/tests/wpt/meta/css/css-text/word-break/word-break-normal-002.html.ini
new file mode 100644
index 00000000000..db03fede0af
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/word-break/word-break-normal-002.html.ini
@@ -0,0 +1,2 @@
+[word-break-normal-002.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/word-break/word-break-normal-003.html.ini b/tests/wpt/meta/css/css-text/word-break/word-break-normal-003.html.ini
new file mode 100644
index 00000000000..795ac13c70b
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/word-break/word-break-normal-003.html.ini
@@ -0,0 +1,2 @@
+[word-break-normal-003.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/word-break/word-break-normal-th-001.html.ini b/tests/wpt/meta/css/css-text/word-break/word-break-normal-th-001.html.ini
new file mode 100644
index 00000000000..ae690e382e8
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/word-break/word-break-normal-th-001.html.ini
@@ -0,0 +1,2 @@
+[word-break-normal-th-001.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/word-space-transform/word-space-transform-001.html.ini b/tests/wpt/meta/css/css-text/word-space-transform/word-space-transform-001.html.ini
new file mode 100644
index 00000000000..ed36235dcec
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/word-space-transform/word-space-transform-001.html.ini
@@ -0,0 +1,2 @@
+[word-space-transform-001.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/word-space-transform/word-space-transform-002.html.ini b/tests/wpt/meta/css/css-text/word-space-transform/word-space-transform-002.html.ini
new file mode 100644
index 00000000000..fb4d1903d09
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/word-space-transform/word-space-transform-002.html.ini
@@ -0,0 +1,2 @@
+[word-space-transform-002.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/word-space-transform/word-space-transform-003.html.ini b/tests/wpt/meta/css/css-text/word-space-transform/word-space-transform-003.html.ini
new file mode 100644
index 00000000000..1caf1da34db
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/word-space-transform/word-space-transform-003.html.ini
@@ -0,0 +1,2 @@
+[word-space-transform-003.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/word-space-transform/word-space-transform-004.html.ini b/tests/wpt/meta/css/css-text/word-space-transform/word-space-transform-004.html.ini
new file mode 100644
index 00000000000..e100a5456f0
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/word-space-transform/word-space-transform-004.html.ini
@@ -0,0 +1,2 @@
+[word-space-transform-004.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/word-space-transform/word-space-transform-005.html.ini b/tests/wpt/meta/css/css-text/word-space-transform/word-space-transform-005.html.ini
new file mode 100644
index 00000000000..4488941951d
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/word-space-transform/word-space-transform-005.html.ini
@@ -0,0 +1,2 @@
+[word-space-transform-005.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/word-space-transform/word-space-transform-006.html.ini b/tests/wpt/meta/css/css-text/word-space-transform/word-space-transform-006.html.ini
new file mode 100644
index 00000000000..569650aae57
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/word-space-transform/word-space-transform-006.html.ini
@@ -0,0 +1,2 @@
+[word-space-transform-006.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/word-space-transform/word-space-transform-007.html.ini b/tests/wpt/meta/css/css-text/word-space-transform/word-space-transform-007.html.ini
new file mode 100644
index 00000000000..a1f2b899404
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/word-space-transform/word-space-transform-007.html.ini
@@ -0,0 +1,2 @@
+[word-space-transform-007.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/word-space-transform/word-space-transform-008.html.ini b/tests/wpt/meta/css/css-text/word-space-transform/word-space-transform-008.html.ini
new file mode 100644
index 00000000000..049a1f539ec
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/word-space-transform/word-space-transform-008.html.ini
@@ -0,0 +1,2 @@
+[word-space-transform-008.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/word-space-transform/word-space-transform-009.html.ini b/tests/wpt/meta/css/css-text/word-space-transform/word-space-transform-009.html.ini
new file mode 100644
index 00000000000..c624473164b
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/word-space-transform/word-space-transform-009.html.ini
@@ -0,0 +1,2 @@
+[word-space-transform-009.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/word-space-transform/word-space-transform-010.html.ini b/tests/wpt/meta/css/css-text/word-space-transform/word-space-transform-010.html.ini
new file mode 100644
index 00000000000..d8629a7ab48
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/word-space-transform/word-space-transform-010.html.ini
@@ -0,0 +1,2 @@
+[word-space-transform-010.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/word-space-transform/word-space-transform-011.html.ini b/tests/wpt/meta/css/css-text/word-space-transform/word-space-transform-011.html.ini
new file mode 100644
index 00000000000..e5c52041b3b
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/word-space-transform/word-space-transform-011.html.ini
@@ -0,0 +1,2 @@
+[word-space-transform-011.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/word-space-transform/word-space-transform-012.html.ini b/tests/wpt/meta/css/css-text/word-space-transform/word-space-transform-012.html.ini
new file mode 100644
index 00000000000..51355eea6e6
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/word-space-transform/word-space-transform-012.html.ini
@@ -0,0 +1,2 @@
+[word-space-transform-012.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/word-space-transform/word-space-transform-013.html.ini b/tests/wpt/meta/css/css-text/word-space-transform/word-space-transform-013.html.ini
new file mode 100644
index 00000000000..e02e91b487d
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/word-space-transform/word-space-transform-013.html.ini
@@ -0,0 +1,2 @@
+[word-space-transform-013.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/word-space-transform/word-space-transform-014.html.ini b/tests/wpt/meta/css/css-text/word-space-transform/word-space-transform-014.html.ini
new file mode 100644
index 00000000000..010bd971a8d
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/word-space-transform/word-space-transform-014.html.ini
@@ -0,0 +1,2 @@
+[word-space-transform-014.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/word-space-transform/word-space-transform-016.html.ini b/tests/wpt/meta/css/css-text/word-space-transform/word-space-transform-016.html.ini
new file mode 100644
index 00000000000..da648618bdd
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/word-space-transform/word-space-transform-016.html.ini
@@ -0,0 +1,2 @@
+[word-space-transform-016.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/word-space-transform/word-space-transform-017.html.ini b/tests/wpt/meta/css/css-text/word-space-transform/word-space-transform-017.html.ini
new file mode 100644
index 00000000000..4d3381aef7e
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/word-space-transform/word-space-transform-017.html.ini
@@ -0,0 +1,2 @@
+[word-space-transform-017.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/word-space-transform/word-space-transform-018.html.ini b/tests/wpt/meta/css/css-text/word-space-transform/word-space-transform-018.html.ini
new file mode 100644
index 00000000000..5936b3509b0
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/word-space-transform/word-space-transform-018.html.ini
@@ -0,0 +1,2 @@
+[word-space-transform-018.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/word-space-transform/word-space-transform-019.html.ini b/tests/wpt/meta/css/css-text/word-space-transform/word-space-transform-019.html.ini
new file mode 100644
index 00000000000..60151dc8599
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/word-space-transform/word-space-transform-019.html.ini
@@ -0,0 +1,2 @@
+[word-space-transform-019.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/word-space-transform/word-space-transform-023.html.ini b/tests/wpt/meta/css/css-text/word-space-transform/word-space-transform-023.html.ini
new file mode 100644
index 00000000000..3e71717adb4
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/word-space-transform/word-space-transform-023.html.ini
@@ -0,0 +1,2 @@
+[word-space-transform-023.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/word-space-transform/word-space-transform-030.html.ini b/tests/wpt/meta/css/css-text/word-space-transform/word-space-transform-030.html.ini
new file mode 100644
index 00000000000..a256c81a56d
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/word-space-transform/word-space-transform-030.html.ini
@@ -0,0 +1,2 @@
+[word-space-transform-030.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-transforms/backface-visibility-hidden-003.html.ini b/tests/wpt/meta/css/css-transforms/backface-visibility-hidden-003.html.ini
new file mode 100644
index 00000000000..423ef90b4fa
--- /dev/null
+++ b/tests/wpt/meta/css/css-transforms/backface-visibility-hidden-003.html.ini
@@ -0,0 +1,2 @@
+[backface-visibility-hidden-003.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-transforms/backface-visibility-hidden-004.html.ini b/tests/wpt/meta/css/css-transforms/backface-visibility-hidden-004.html.ini
new file mode 100644
index 00000000000..9b7a0872986
--- /dev/null
+++ b/tests/wpt/meta/css/css-transforms/backface-visibility-hidden-004.html.ini
@@ -0,0 +1,2 @@
+[backface-visibility-hidden-004.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-transforms/backface-visibility-hidden-004.tentative.html.ini b/tests/wpt/meta/css/css-transforms/backface-visibility-hidden-004.tentative.html.ini
deleted file mode 100644
index 19791a86a38..00000000000
--- a/tests/wpt/meta/css/css-transforms/backface-visibility-hidden-004.tentative.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[backface-visibility-hidden-004.tentative.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-transforms/backface-visibility-hidden-005.tentative.html.ini b/tests/wpt/meta/css/css-transforms/backface-visibility-hidden-005.tentative.html.ini
deleted file mode 100644
index c620983e3b0..00000000000
--- a/tests/wpt/meta/css/css-transforms/backface-visibility-hidden-005.tentative.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[backface-visibility-hidden-005.tentative.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-transforms/backface-visibility-hidden-animated-002.html.ini b/tests/wpt/meta/css/css-transforms/backface-visibility-hidden-animated-002.html.ini
deleted file mode 100644
index 90198176f4d..00000000000
--- a/tests/wpt/meta/css/css-transforms/backface-visibility-hidden-animated-002.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[backface-visibility-hidden-animated-002.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/meta/css/css-transforms/transform-2d-getComputedStyle-001.html.ini b/tests/wpt/meta/css/css-transforms/transform-2d-getComputedStyle-001.html.ini
index 6d5dd225b5d..f66d22c4412 100644
--- a/tests/wpt/meta/css/css-transforms/transform-2d-getComputedStyle-001.html.ini
+++ b/tests/wpt/meta/css/css-transforms/transform-2d-getComputedStyle-001.html.ini
@@ -10,6 +10,3 @@
 
   [Matrix for scaling]
     expected: FAIL
-
-  [Matrix for general transform]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-transitions/idlharness-2.html.ini b/tests/wpt/meta/css/css-transitions/idlharness-2.html.ini
index ec9b24fdaeb..565a1224007 100644
--- a/tests/wpt/meta/css/css-transitions/idlharness-2.html.ini
+++ b/tests/wpt/meta/css/css-transitions/idlharness-2.html.ini
@@ -19,3 +19,27 @@
 
   [CSSTransition interface: attribute transitionProperty]
     expected: FAIL
+
+  [CSSStartingStyleRule interface: existence and properties of interface object]
+    expected: FAIL
+
+  [CSSStartingStyleRule interface object length]
+    expected: FAIL
+
+  [CSSStartingStyleRule interface object name]
+    expected: FAIL
+
+  [CSSStartingStyleRule interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [CSSStartingStyleRule interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [CSSStartingStyleRule interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [CSSStartingStyleRule must be primary interface of sheet.cssRules[0\]]
+    expected: FAIL
+
+  [Stringification of sheet.cssRules[0\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-ui/negative-outline-offset.html.ini b/tests/wpt/meta/css/css-ui/negative-outline-offset.html.ini
new file mode 100644
index 00000000000..5883faa6763
--- /dev/null
+++ b/tests/wpt/meta/css/css-ui/negative-outline-offset.html.ini
@@ -0,0 +1,2 @@
+[negative-outline-offset.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-ui/outline-006.html.ini b/tests/wpt/meta/css/css-ui/outline-006.html.ini
deleted file mode 100644
index 8966d814474..00000000000
--- a/tests/wpt/meta/css/css-ui/outline-006.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[outline-006.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-ui/parsing/form-sizing-computed.html.ini b/tests/wpt/meta/css/css-ui/parsing/form-sizing-computed.html.ini
new file mode 100644
index 00000000000..39141cebc56
--- /dev/null
+++ b/tests/wpt/meta/css/css-ui/parsing/form-sizing-computed.html.ini
@@ -0,0 +1,6 @@
+[form-sizing-computed.html]
+  [Property form-sizing value 'auto']
+    expected: FAIL
+
+  [Property form-sizing value 'normal']
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-ui/parsing/form-sizing-valid.html.ini b/tests/wpt/meta/css/css-ui/parsing/form-sizing-valid.html.ini
new file mode 100644
index 00000000000..cda7dbed687
--- /dev/null
+++ b/tests/wpt/meta/css/css-ui/parsing/form-sizing-valid.html.ini
@@ -0,0 +1,6 @@
+[form-sizing-valid.html]
+  [e.style['form-sizing'\] = "auto" should set the property value]
+    expected: FAIL
+
+  [e.style['form-sizing'\] = "normal" should set the property value]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-ui/parsing/outline-color-computed.html.ini b/tests/wpt/meta/css/css-ui/parsing/outline-color-computed.html.ini
new file mode 100644
index 00000000000..9b6d67c9ca8
--- /dev/null
+++ b/tests/wpt/meta/css/css-ui/parsing/outline-color-computed.html.ini
@@ -0,0 +1,3 @@
+[outline-color-computed.html]
+  [auto computes to itself or to currentColor depending on the value of outline-style]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-ui/parsing/outline-color-valid-optional.html.ini b/tests/wpt/meta/css/css-ui/parsing/outline-color-valid-optional.html.ini
deleted file mode 100644
index 9b4b531885b..00000000000
--- a/tests/wpt/meta/css/css-ui/parsing/outline-color-valid-optional.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[outline-color-valid-optional.html]
-  [e.style['outline-color'\] = "invert" should set the property value]
-    expected: FAIL
-
diff --git a/tests/wpt/meta/css/css-ui/parsing/outline-color-valid.html.ini b/tests/wpt/meta/css/css-ui/parsing/outline-color-valid.html.ini
new file mode 100644
index 00000000000..d751a6aa1b1
--- /dev/null
+++ b/tests/wpt/meta/css/css-ui/parsing/outline-color-valid.html.ini
@@ -0,0 +1,3 @@
+[outline-color-valid.html]
+  [e.style['outline-color'\] = "auto" should set the property value]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-ui/parsing/outline-valid-optional.html.ini b/tests/wpt/meta/css/css-ui/parsing/outline-valid-optional.html.ini
deleted file mode 100644
index 14be5edbd3c..00000000000
--- a/tests/wpt/meta/css/css-ui/parsing/outline-valid-optional.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[outline-valid-optional.html]
-  [e.style['outline'\] = "invert dotted 1px" should set the property value]
-    expected: FAIL
-
-  [e.style['outline'\] = "invert" should set the property value]
-    expected: FAIL
-
diff --git a/tests/wpt/meta/css/css-values/acos-asin-atan-atan2-computed.html.ini b/tests/wpt/meta/css/css-values/acos-asin-atan-atan2-computed.html.ini
index 11c22e299d5..3b8371f8577 100644
--- a/tests/wpt/meta/css/css-values/acos-asin-atan-atan2-computed.html.ini
+++ b/tests/wpt/meta/css/css-values/acos-asin-atan-atan2-computed.html.ini
@@ -124,3 +124,9 @@
 
   [calc(atan2(0,-1) / 4) should be used-value-equivalent to 45deg]
     expected: FAIL
+
+  [atan2(1rem + 1px - 1px, -1rem) should be used-value-equivalent to 135deg]
+    expected: FAIL
+
+  [atan2(1vh + 0px, -1vh + 0px) should be used-value-equivalent to 135deg]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-values/attr-notype-fallback.html.ini b/tests/wpt/meta/css/css-values/attr-notype-fallback.html.ini
new file mode 100644
index 00000000000..bf0e390649f
--- /dev/null
+++ b/tests/wpt/meta/css/css-values/attr-notype-fallback.html.ini
@@ -0,0 +1,2 @@
+[attr-notype-fallback.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-values/clamp-length-computed.html.ini b/tests/wpt/meta/css/css-values/clamp-length-computed.html.ini
new file mode 100644
index 00000000000..dc0b1693871
--- /dev/null
+++ b/tests/wpt/meta/css/css-values/clamp-length-computed.html.ini
@@ -0,0 +1,3 @@
+[clamp-length-computed.html]
+  [Property letter-spacing value 'calc(0px - clamp(30px, 100px, 20px))']
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-values/clamp-length-serialize.html.ini b/tests/wpt/meta/css/css-values/clamp-length-serialize.html.ini
new file mode 100644
index 00000000000..944c6860e3e
--- /dev/null
+++ b/tests/wpt/meta/css/css-values/clamp-length-serialize.html.ini
@@ -0,0 +1,12 @@
+[clamp-length-serialize.html]
+  [e.style['letter-spacing'\] = "calc(0px - clamp(30px, 100px, 20px))" should set the property value]
+    expected: FAIL
+
+  [e.style['letter-spacing'\] = "calc(calc(0px - clamp(30px, 100px, 20px)))" should set the property value]
+    expected: FAIL
+
+  [e.style['letter-spacing'\] = "calc(0px - clamp(1px, 1em, 1vh))" should set the property value]
+    expected: FAIL
+
+  [e.style['letter-spacing'\] = "calc(calc(0px - clamp(1px, 1em, 1vh)))" should set the property value]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-values/lh-unit-005.html.ini b/tests/wpt/meta/css/css-values/lh-unit-005.html.ini
new file mode 100644
index 00000000000..e2cc94a5f11
--- /dev/null
+++ b/tests/wpt/meta/css/css-values/lh-unit-005.html.ini
@@ -0,0 +1,3 @@
+[lh-unit-005.html]
+  [lh relative to line-height inherited from parent]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/cssom/getComputedStyle-pseudo.html.ini b/tests/wpt/meta/css/cssom/getComputedStyle-pseudo.html.ini
index fdc40ba6edc..3981b0fb657 100644
--- a/tests/wpt/meta/css/cssom/getComputedStyle-pseudo.html.ini
+++ b/tests/wpt/meta/css/cssom/getComputedStyle-pseudo.html.ini
@@ -10,3 +10,6 @@
 
   [Unknown pseudo-elements]
     expected: FAIL
+
+  [Unknown pseudo-element with a known string (ex: marker)]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/cssom/serialize-values.html.ini b/tests/wpt/meta/css/cssom/serialize-values.html.ini
index 6bce7638028..47b32e3de44 100644
--- a/tests/wpt/meta/css/cssom/serialize-values.html.ini
+++ b/tests/wpt/meta/css/cssom/serialize-values.html.ini
@@ -83,51 +83,6 @@
   [list-style-type: lower-roman]
     expected: FAIL
 
-  [background-position: 5% center]
-    expected: FAIL
-
-  [background-position: .5% center]
-    expected: FAIL
-
-  [background-position: -5% center]
-    expected: FAIL
-
-  [background-position: -.5% center]
-    expected: FAIL
-
-  [background-position: 0px center]
-    expected: FAIL
-
-  [background-position: 1px center]
-    expected: FAIL
-
-  [background-position: .1em center]
-    expected: FAIL
-
-  [background-position: -0px center]
-    expected: FAIL
-
-  [background-position: -1px center]
-    expected: FAIL
-
-  [background-position: -.1em center]
-    expected: FAIL
-
-  [background-position: left center]
-    expected: FAIL
-
-  [background-position: center top]
-    expected: FAIL
-
-  [background-position: center center]
-    expected: FAIL
-
-  [background-position: center bottom]
-    expected: FAIL
-
-  [background-position: right center]
-    expected: FAIL
-
   [border-collapse: collapse]
     expected: FAIL
 
@@ -271,3 +226,21 @@
 
   [vertical-align: inherit]
     expected: FAIL
+
+  [content: attr( |bar )]
+    expected: FAIL
+
+  [content: attr(foo-bar, "fallback")]
+    expected: FAIL
+
+  [content: attr(foo_bar, "fallback")]
+    expected: FAIL
+
+  [content: attr(|bar, "fallback")]
+    expected: FAIL
+
+  [content: attr(foo, "")]
+    expected: FAIL
+
+  [content: attr( |foo ,  "" )]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/filter-effects/drop-shadow-currentcolor-dynamic-002.html.ini b/tests/wpt/meta/css/filter-effects/drop-shadow-currentcolor-dynamic-002.html.ini
new file mode 100644
index 00000000000..118b2b9c5ae
--- /dev/null
+++ b/tests/wpt/meta/css/filter-effects/drop-shadow-currentcolor-dynamic-002.html.ini
@@ -0,0 +1,2 @@
+[drop-shadow-currentcolor-dynamic-002.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/mediaqueries/display-mode.html.ini b/tests/wpt/meta/css/mediaqueries/display-mode.html.ini
new file mode 100644
index 00000000000..07c8a260134
--- /dev/null
+++ b/tests/wpt/meta/css/mediaqueries/display-mode.html.ini
@@ -0,0 +1,33 @@
+[display-mode.html]
+  [Should be known: '(display-mode)']
+    expected: FAIL
+
+  [Should be known: '(display-mode: standalone)']
+    expected: FAIL
+
+  [Should be known: '(display-mode: browser)']
+    expected: FAIL
+
+  [Should be known: '(display-mode: minimal-ui)']
+    expected: FAIL
+
+  [Should be known: '(display-mode: fullscreen)']
+    expected: FAIL
+
+  [Should be parseable: '(display-mode: 0)']
+    expected: FAIL
+
+  [Should be parseable: '(display-mode: none)']
+    expected: FAIL
+
+  [Should be parseable: '(display-mode: random)']
+    expected: FAIL
+
+  [Should be parseable: '(display-mode: 10px)']
+    expected: FAIL
+
+  [Should be parseable: '(display-mode: 1%)']
+    expected: FAIL
+
+  [Check that display-mode evaluates to true in the boolean context]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/mediaqueries/display-mode.tentative.html.ini b/tests/wpt/meta/css/mediaqueries/display-mode.tentative.html.ini
new file mode 100644
index 00000000000..1d1233a85e9
--- /dev/null
+++ b/tests/wpt/meta/css/mediaqueries/display-mode.tentative.html.ini
@@ -0,0 +1,6 @@
+[display-mode.tentative.html]
+  [Should be known: '(display-mode: borderless)']
+    expected: FAIL
+
+  [Should be known: '(display-mode: window-controls-overlay)']
+    expected: FAIL
diff --git a/tests/wpt/meta/css/selectors/dir-pseudo-on-input-element.html.ini b/tests/wpt/meta/css/selectors/dir-pseudo-on-input-element.html.ini
index d00922ca86d..2d9fe551053 100644
--- a/tests/wpt/meta/css/selectors/dir-pseudo-on-input-element.html.ini
+++ b/tests/wpt/meta/css/selectors/dir-pseudo-on-input-element.html.ini
@@ -52,3 +52,6 @@
 
   [input element whose type attribute is in the button state]
     expected: FAIL
+
+  [dynamic changes to type of input elements affect whether value is used for dir=auto]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/selectors/invalidation/empty-pseudo-in-has.html.ini b/tests/wpt/meta/css/selectors/invalidation/empty-pseudo-in-has.html.ini
index f98c5d0c507..417afceab88 100644
--- a/tests/wpt/meta/css/selectors/invalidation/empty-pseudo-in-has.html.ini
+++ b/tests/wpt/meta/css/selectors/invalidation/empty-pseudo-in-has.html.ini
@@ -4,3 +4,12 @@
 
   [Insert div to div.#child]
     expected: FAIL
+
+  [Remove div from div.#child]
+    expected: FAIL
+
+  [Insert text into div.#child]
+    expected: FAIL
+
+  [Remove text from div.#child]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/selectors/invalidation/has-sibling-insertion-removal.html.ini b/tests/wpt/meta/css/selectors/invalidation/has-sibling-insertion-removal.html.ini
new file mode 100644
index 00000000000..76513c88a16
--- /dev/null
+++ b/tests/wpt/meta/css/selectors/invalidation/has-sibling-insertion-removal.html.ini
@@ -0,0 +1,36 @@
+[has-sibling-insertion-removal.html]
+  [subject1: color after #sibling1_1 inserted should be rgb(255, 0, 0)]
+    expected: FAIL
+
+  [subject2: color after #sibling2_1 removed should be rgb(0, 128, 0)]
+    expected: FAIL
+
+  [subject3: color after #sibling3_1 inserted should be rgb(0, 0, 255)]
+    expected: FAIL
+
+  [subject4: color after #sibling4_1 removed should be rgb(255, 255, 0)]
+    expected: FAIL
+
+  [subject5: initial color should be rgb(255, 0, 0)]
+    expected: FAIL
+
+  [subject6: initial color should be rgb(0, 128, 0)]
+    expected: FAIL
+
+  [subject7: initial color should be rgb(0, 0, 255)]
+    expected: FAIL
+
+  [subject8: initial color should be rgb(255, 255, 0)]
+    expected: FAIL
+
+  [subject9: color after #sibling9_1 inserted should be rgb(255, 0, 0)]
+    expected: FAIL
+
+  [subject10: color after #sibling10_1 removed should be rgb(0, 128, 0)]
+    expected: FAIL
+
+  [subject11: color after #sibling11_1 inserted should be rgb(0, 0, 255)]
+    expected: FAIL
+
+  [subject12: color after #sibling12_1 removed should be rgb(255, 255, 0)]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/selectors/invalidation/has-side-effect.html.ini b/tests/wpt/meta/css/selectors/invalidation/has-side-effect.html.ini
new file mode 100644
index 00000000000..3f185795710
--- /dev/null
+++ b/tests/wpt/meta/css/selectors/invalidation/has-side-effect.html.ini
@@ -0,0 +1,3 @@
+[has-side-effect.html]
+  [Matches after #blocks_match removed]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/selectors/invalidation/has-unstyled.html.ini b/tests/wpt/meta/css/selectors/invalidation/has-unstyled.html.ini
new file mode 100644
index 00000000000..188649ade83
--- /dev/null
+++ b/tests/wpt/meta/css/selectors/invalidation/has-unstyled.html.ini
@@ -0,0 +1,12 @@
+[has-unstyled.html]
+  [add test to subject_descendant]
+    expected: FAIL
+
+  [add test to sibling_descendant]
+    expected: FAIL
+
+  [add test_inner to subject_child]
+    expected: FAIL
+
+  [add test_inner to sibling_child]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/selectors/invalidation/host-context-pseudo-class-in-has.html.ini b/tests/wpt/meta/css/selectors/invalidation/host-context-pseudo-class-in-has.html.ini
new file mode 100644
index 00000000000..b9fdb7253a3
--- /dev/null
+++ b/tests/wpt/meta/css/selectors/invalidation/host-context-pseudo-class-in-has.html.ini
@@ -0,0 +1,2 @@
+[host-context-pseudo-class-in-has.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/css/selectors/invalidation/input-pseudo-classes-in-has.html.ini b/tests/wpt/meta/css/selectors/invalidation/input-pseudo-classes-in-has.html.ini
index b0a26dc9513..a238d3f6b87 100644
--- a/tests/wpt/meta/css/selectors/invalidation/input-pseudo-classes-in-has.html.ini
+++ b/tests/wpt/meta/css/selectors/invalidation/input-pseudo-classes-in-has.html.ini
@@ -25,3 +25,6 @@
 
   [:placeholder-shown invalidation]
     expected: FAIL
+
+  [:default invalidation with input[type=checkbox\] and assignment to .checked]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/selectors/invalidation/part-pseudo.html.ini b/tests/wpt/meta/css/selectors/invalidation/part-pseudo.html.ini
new file mode 100644
index 00000000000..10f1aa0b918
--- /dev/null
+++ b/tests/wpt/meta/css/selectors/invalidation/part-pseudo.html.ini
@@ -0,0 +1,2 @@
+[part-pseudo.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/selectors/invalidation/placeholder-shown.html.ini b/tests/wpt/meta/css/selectors/invalidation/placeholder-shown.html.ini
new file mode 100644
index 00000000000..b13be0abf60
--- /dev/null
+++ b/tests/wpt/meta/css/selectors/invalidation/placeholder-shown.html.ini
@@ -0,0 +1,3 @@
+[placeholder-shown.html]
+  [Set placeholder text to empty string]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/selectors/parsing/parse-has-disallow-nesting-has-inside-has.html.ini b/tests/wpt/meta/css/selectors/parsing/parse-has-disallow-nesting-has-inside-has.html.ini
index 48b39b6115a..7b4af3d0cd3 100644
--- a/tests/wpt/meta/css/selectors/parsing/parse-has-disallow-nesting-has-inside-has.html.ini
+++ b/tests/wpt/meta/css/selectors/parsing/parse-has-disallow-nesting-has-inside-has.html.ini
@@ -13,3 +13,6 @@
 
   [".a:has(:is(.b:has(.c), .d))" should be a valid selector]
     expected: FAIL
+
+  [CSS Selectors: The relational pseudo-class (disallow nesting :has() inside :has())]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/selectors/placeholder-shown.html.ini b/tests/wpt/meta/css/selectors/placeholder-shown.html.ini
new file mode 100644
index 00000000000..2a504fb4c85
--- /dev/null
+++ b/tests/wpt/meta/css/selectors/placeholder-shown.html.ini
@@ -0,0 +1,6 @@
+[placeholder-shown.html]
+  [CSS Selectors Test: :placeholder-shown matching 1]
+    expected: FAIL
+
+  [CSS Selectors Test: :placeholder-shown matching 2]
+    expected: FAIL
diff --git a/tests/wpt/meta/custom-elements/form-associated/focusability.html.ini b/tests/wpt/meta/custom-elements/form-associated/focusability.html.ini
new file mode 100644
index 00000000000..2d7bc2a0f73
--- /dev/null
+++ b/tests/wpt/meta/custom-elements/form-associated/focusability.html.ini
@@ -0,0 +1,3 @@
+[focusability.html]
+  [Focusability of form-associated custom elements]
+    expected: FAIL
diff --git a/tests/wpt/meta/custom-elements/scoped-registry/ShadowRoot-createElement.tentative.html.ini b/tests/wpt/meta/custom-elements/scoped-registry/ShadowRoot-createElement.tentative.html.ini
new file mode 100644
index 00000000000..47b3baabc52
--- /dev/null
+++ b/tests/wpt/meta/custom-elements/scoped-registry/ShadowRoot-createElement.tentative.html.ini
@@ -0,0 +1,12 @@
+[ShadowRoot-createElement.tentative.html]
+  [ShadowRoot.createElement() for autonomous custom element]
+    expected: FAIL
+
+  [ShadowRoot.createElementNS() for autonomous custom element]
+    expected: FAIL
+
+  [ShadowRoot.createElement() for customized built-in element]
+    expected: FAIL
+
+  [ShadowRoot.createElementNS() for customized built-in element]
+    expected: FAIL
diff --git a/tests/wpt/meta/dom/events/Event-dispatch-single-activation-behavior.html.ini b/tests/wpt/meta/dom/events/Event-dispatch-single-activation-behavior.html.ini
new file mode 100644
index 00000000000..a464f5a1f72
--- /dev/null
+++ b/tests/wpt/meta/dom/events/Event-dispatch-single-activation-behavior.html.ini
@@ -0,0 +1,117 @@
+[Event-dispatch-single-activation-behavior.html]
+  [When clicking child <FORM><INPUT type=submit></INPUT></FORM> of parent <FORM><INPUT type=image></INPUT></FORM>, only child should be activated.]
+    expected: FAIL
+
+  [When clicking child <FORM><INPUT type=submit></INPUT></FORM> of parent <FORM><BUTTON type=submit></BUTTON></FORM>, only child should be activated.]
+    expected: FAIL
+
+  [When clicking child <FORM><INPUT type=image></INPUT></FORM> of parent <INPUT type=checkbox></INPUT>, only child should be activated.]
+    expected: FAIL
+
+  [When clicking child <FORM><INPUT type=image></INPUT></FORM> of parent <INPUT type=radio></INPUT>, only child should be activated.]
+    expected: FAIL
+
+  [When clicking child <FORM><INPUT type=image></INPUT></FORM> of parent <FORM><INPUT type=submit></INPUT></FORM>, only child should be activated.]
+    expected: FAIL
+
+  [When clicking child <FORM><INPUT type=image></INPUT></FORM> of parent <FORM><INPUT type=reset></INPUT></FORM>, only child should be activated.]
+    expected: FAIL
+
+  [When clicking child <FORM><INPUT type=image></INPUT></FORM> of parent <FORM><BUTTON type=submit></BUTTON></FORM>, only child should be activated.]
+    expected: FAIL
+
+  [When clicking child <FORM><INPUT type=image></INPUT></FORM> of parent <FORM><BUTTON type=reset></BUTTON></FORM>, only child should be activated.]
+    expected: FAIL
+
+  [When clicking child <FORM><INPUT type=image></INPUT></FORM> of parent <A></A>, only child should be activated.]
+    expected: FAIL
+
+  [When clicking child <FORM><INPUT type=image></INPUT></FORM> of parent <AREA></AREA>, only child should be activated.]
+    expected: FAIL
+
+  [When clicking child <FORM><INPUT type=image></INPUT></FORM> of parent <DETAILS><SUMMARY></SUMMARY></DETAILS>, only child should be activated.]
+    expected: FAIL
+
+  [When clicking child <FORM><INPUT type=image></INPUT></FORM> of parent <LABEL><INPUT type=checkbox></INPUT><SPAN></SPAN></LABEL>, only child should be activated.]
+    expected: FAIL
+
+  [When clicking child <FORM><INPUT type=image></INPUT></FORM> of parent <LABEL><BUTTON type=button></BUTTON></LABEL>, only child should be activated.]
+    expected: FAIL
+
+  [When clicking child <FORM><INPUT type=reset></INPUT></FORM> of parent <FORM><BUTTON type=reset></BUTTON></FORM>, only child should be activated.]
+    expected: FAIL
+
+  [When clicking child <FORM><BUTTON type=submit></BUTTON></FORM> of parent <FORM><INPUT type=submit></INPUT></FORM>, only child should be activated.]
+    expected: FAIL
+
+  [When clicking child <FORM><BUTTON type=submit></BUTTON></FORM> of parent <FORM><INPUT type=image></INPUT></FORM>, only child should be activated.]
+    expected: FAIL
+
+  [When clicking child <FORM><BUTTON type=reset></BUTTON></FORM> of parent <FORM><INPUT type=reset></INPUT></FORM>, only child should be activated.]
+    expected: FAIL
+
+  [When clicking child <A></A> of parent <INPUT type=checkbox></INPUT>, only child should be activated.]
+    expected: FAIL
+
+  [When clicking child <A></A> of parent <INPUT type=radio></INPUT>, only child should be activated.]
+    expected: FAIL
+
+  [When clicking child <A></A> of parent <FORM><INPUT type=submit></INPUT></FORM>, only child should be activated.]
+    expected: FAIL
+
+  [When clicking child <A></A> of parent <FORM><INPUT type=image></INPUT></FORM>, only child should be activated.]
+    expected: FAIL
+
+  [When clicking child <A></A> of parent <FORM><INPUT type=reset></INPUT></FORM>, only child should be activated.]
+    expected: FAIL
+
+  [When clicking child <A></A> of parent <FORM><BUTTON type=submit></BUTTON></FORM>, only child should be activated.]
+    expected: FAIL
+
+  [When clicking child <A></A> of parent <FORM><BUTTON type=reset></BUTTON></FORM>, only child should be activated.]
+    expected: FAIL
+
+  [When clicking child <A></A> of parent <AREA></AREA>, only child should be activated.]
+    expected: FAIL
+
+  [When clicking child <A></A> of parent <DETAILS><SUMMARY></SUMMARY></DETAILS>, only child should be activated.]
+    expected: FAIL
+
+  [When clicking child <A></A> of parent <LABEL><INPUT type=checkbox></INPUT><SPAN></SPAN></LABEL>, only child should be activated.]
+    expected: FAIL
+
+  [When clicking child <A></A> of parent <LABEL><BUTTON type=button></BUTTON></LABEL>, only child should be activated.]
+    expected: FAIL
+
+  [When clicking child <AREA></AREA> of parent <INPUT type=checkbox></INPUT>, only child should be activated.]
+    expected: FAIL
+
+  [When clicking child <AREA></AREA> of parent <INPUT type=radio></INPUT>, only child should be activated.]
+    expected: FAIL
+
+  [When clicking child <AREA></AREA> of parent <FORM><INPUT type=submit></INPUT></FORM>, only child should be activated.]
+    expected: FAIL
+
+  [When clicking child <AREA></AREA> of parent <FORM><INPUT type=image></INPUT></FORM>, only child should be activated.]
+    expected: FAIL
+
+  [When clicking child <AREA></AREA> of parent <FORM><INPUT type=reset></INPUT></FORM>, only child should be activated.]
+    expected: FAIL
+
+  [When clicking child <AREA></AREA> of parent <FORM><BUTTON type=submit></BUTTON></FORM>, only child should be activated.]
+    expected: FAIL
+
+  [When clicking child <AREA></AREA> of parent <FORM><BUTTON type=reset></BUTTON></FORM>, only child should be activated.]
+    expected: FAIL
+
+  [When clicking child <AREA></AREA> of parent <A></A>, only child should be activated.]
+    expected: FAIL
+
+  [When clicking child <AREA></AREA> of parent <DETAILS><SUMMARY></SUMMARY></DETAILS>, only child should be activated.]
+    expected: FAIL
+
+  [When clicking child <AREA></AREA> of parent <LABEL><INPUT type=checkbox></INPUT><SPAN></SPAN></LABEL>, only child should be activated.]
+    expected: FAIL
+
+  [When clicking child <AREA></AREA> of parent <LABEL><BUTTON type=button></BUTTON></LABEL>, only child should be activated.]
+    expected: FAIL
diff --git a/tests/wpt/meta/dom/parts/basic-dom-part-declarative-brace-syntax.tentative.html.ini b/tests/wpt/meta/dom/parts/basic-dom-part-declarative-brace-syntax.tentative.html.ini
new file mode 100644
index 00000000000..99e1e6ade1a
--- /dev/null
+++ b/tests/wpt/meta/dom/parts/basic-dom-part-declarative-brace-syntax.tentative.html.ini
@@ -0,0 +1,33 @@
+[basic-dom-part-declarative-brace-syntax.tentative.html]
+  [Basic declarative DOM Parts (Main Document)]
+    expected: FAIL
+
+  [Basic declarative DOM Parts (Template)]
+    expected: FAIL
+
+  [Basic declarative DOM Parts (Clone)]
+    expected: FAIL
+
+  [Basic declarative DOM Parts (PartClone)]
+    expected: FAIL
+
+  [Post-parsing structure of child parts, and stickiness]
+    expected: FAIL
+
+  [Parser only behavior - adding parseparts does nothing]
+    expected: FAIL
+
+  [Just parts, no text before]
+    expected: FAIL
+
+  [Self closing elements can't use parseparts]
+    expected: FAIL
+
+  [Second head element can't use parseparts]
+    expected: FAIL
+
+  [Foreign content should support Parts]
+    expected: FAIL
+
+  [Not quite parts syntax - none should become parts, and nothing should crash]
+    expected: FAIL
diff --git a/tests/wpt/meta/dom/parts/basic-dom-part-declarative-pi-syntax.tentative.html.ini b/tests/wpt/meta/dom/parts/basic-dom-part-declarative-pi-syntax.tentative.html.ini
new file mode 100644
index 00000000000..3982572f016
--- /dev/null
+++ b/tests/wpt/meta/dom/parts/basic-dom-part-declarative-pi-syntax.tentative.html.ini
@@ -0,0 +1,12 @@
+[basic-dom-part-declarative-pi-syntax.tentative.html]
+  [Basic declarative DOM Parts (Main Document)]
+    expected: FAIL
+
+  [Basic declarative DOM Parts (Template)]
+    expected: FAIL
+
+  [Basic declarative DOM Parts (Clone)]
+    expected: FAIL
+
+  [Basic declarative DOM Parts (PartClone)]
+    expected: FAIL
diff --git a/tests/wpt/meta/dom/parts/basic-dom-part-objects.tentative.html.ini b/tests/wpt/meta/dom/parts/basic-dom-part-objects.tentative.html.ini
index 5188133b831..98b27fc8ae3 100644
--- a/tests/wpt/meta/dom/parts/basic-dom-part-objects.tentative.html.ini
+++ b/tests/wpt/meta/dom/parts/basic-dom-part-objects.tentative.html.ini
@@ -73,3 +73,9 @@
 
   [Basic declarative DOM Parts (DeclarativeShadowDOM)]
     expected: FAIL
+
+  [DOM mutations are not tracked (Document)]
+    expected: FAIL
+
+  [DOM mutations are not tracked (DocumentFragment)]
+    expected: FAIL
diff --git a/tests/wpt/meta/dom/parts/dom-parts-parseparts-on-body.tentative.html.ini b/tests/wpt/meta/dom/parts/dom-parts-parseparts-on-body.tentative.html.ini
new file mode 100644
index 00000000000..ef4028dacc8
--- /dev/null
+++ b/tests/wpt/meta/dom/parts/dom-parts-parseparts-on-body.tentative.html.ini
@@ -0,0 +1,3 @@
+[dom-parts-parseparts-on-body.tentative.html]
+  [It is possible to put parseparts on the body element]
+    expected: FAIL
diff --git a/tests/wpt/meta/dom/parts/dom-parts-parseparts-on-head.tentative.html.ini b/tests/wpt/meta/dom/parts/dom-parts-parseparts-on-head.tentative.html.ini
new file mode 100644
index 00000000000..293e6143439
--- /dev/null
+++ b/tests/wpt/meta/dom/parts/dom-parts-parseparts-on-head.tentative.html.ini
@@ -0,0 +1,3 @@
+[dom-parts-parseparts-on-head.tentative.html]
+  [It is not possible to put parseparts on the head element]
+    expected: FAIL
diff --git a/tests/wpt/meta/dom/parts/dom-parts-parseparts-on-root.tentative.html.ini b/tests/wpt/meta/dom/parts/dom-parts-parseparts-on-root.tentative.html.ini
new file mode 100644
index 00000000000..1f2b307165f
--- /dev/null
+++ b/tests/wpt/meta/dom/parts/dom-parts-parseparts-on-root.tentative.html.ini
@@ -0,0 +1,3 @@
+[dom-parts-parseparts-on-root.tentative.html]
+  [It is not possible to put parseparts on the root element]
+    expected: FAIL
diff --git a/tests/wpt/meta/encoding/api-basics.any.js.ini b/tests/wpt/meta/encoding/api-basics.any.js.ini
new file mode 100644
index 00000000000..81e89c26d43
--- /dev/null
+++ b/tests/wpt/meta/encoding/api-basics.any.js.ini
@@ -0,0 +1,6 @@
+[api-basics.any.html]
+
+[api-basics.any.worker.html]
+
+[api-basics.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/encoding/api-surrogates-utf8.any.js.ini b/tests/wpt/meta/encoding/api-surrogates-utf8.any.js.ini
new file mode 100644
index 00000000000..60499a3c040
--- /dev/null
+++ b/tests/wpt/meta/encoding/api-surrogates-utf8.any.js.ini
@@ -0,0 +1,6 @@
+[api-surrogates-utf8.any.shadowrealm.html]
+  expected: ERROR
+
+[api-surrogates-utf8.any.worker.html]
+
+[api-surrogates-utf8.any.html]
diff --git a/tests/wpt/meta/encoding/iso-2022-jp-decoder.any.js.ini b/tests/wpt/meta/encoding/iso-2022-jp-decoder.any.js.ini
new file mode 100644
index 00000000000..aeafa9ce3f3
--- /dev/null
+++ b/tests/wpt/meta/encoding/iso-2022-jp-decoder.any.js.ini
@@ -0,0 +1,6 @@
+[iso-2022-jp-decoder.any.shadowrealm.html]
+  expected: ERROR
+
+[iso-2022-jp-decoder.any.worker.html]
+
+[iso-2022-jp-decoder.any.html]
diff --git a/tests/wpt/meta/encoding/streams/backpressure.any.js.ini b/tests/wpt/meta/encoding/streams/backpressure.any.js.ini
index da0dea7370a..adb7e8f5736 100644
--- a/tests/wpt/meta/encoding/streams/backpressure.any.js.ini
+++ b/tests/wpt/meta/encoding/streams/backpressure.any.js.ini
@@ -30,3 +30,7 @@
 
   [additional writes should wait for backpressure to be relieved for class TextEncoderStream]
     expected: FAIL
+
+
+[backpressure.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/encoding/streams/decode-attributes.any.js.ini b/tests/wpt/meta/encoding/streams/decode-attributes.any.js.ini
index 4e3245e847e..683e2569481 100644
--- a/tests/wpt/meta/encoding/streams/decode-attributes.any.js.ini
+++ b/tests/wpt/meta/encoding/streams/decode-attributes.any.js.ini
@@ -174,3 +174,7 @@
 
   [a throwing ignoreBOM member should cause the constructor to throw]
     expected: FAIL
+
+
+[decode-attributes.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/encoding/streams/decode-bad-chunks.any.js.ini b/tests/wpt/meta/encoding/streams/decode-bad-chunks.any.js.ini
index d75c9928dc1..8b804dc5b5f 100644
--- a/tests/wpt/meta/encoding/streams/decode-bad-chunks.any.js.ini
+++ b/tests/wpt/meta/encoding/streams/decode-bad-chunks.any.js.ini
@@ -37,3 +37,6 @@
 
 [decode-bad-chunks.any.serviceworker.html]
   expected: ERROR
+
+[decode-bad-chunks.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/encoding/streams/decode-non-utf8.any.js.ini b/tests/wpt/meta/encoding/streams/decode-non-utf8.any.js.ini
index ec7a3e8334c..830caa3590c 100644
--- a/tests/wpt/meta/encoding/streams/decode-non-utf8.any.js.ini
+++ b/tests/wpt/meta/encoding/streams/decode-non-utf8.any.js.ini
@@ -85,3 +85,6 @@
 
 [decode-non-utf8.any.serviceworker.html]
   expected: ERROR
+
+[decode-non-utf8.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/encoding/streams/readable-writable-properties.any.js.ini b/tests/wpt/meta/encoding/streams/readable-writable-properties.any.js.ini
index c957aa3bc6e..8bf60886a1e 100644
--- a/tests/wpt/meta/encoding/streams/readable-writable-properties.any.js.ini
+++ b/tests/wpt/meta/encoding/streams/readable-writable-properties.any.js.ini
@@ -18,3 +18,7 @@
 
   [TextDecoderStream readable and writable properties must pass brand checks]
     expected: FAIL
+
+
+[readable-writable-properties.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/encoding/textdecoder-arguments.any.js.ini b/tests/wpt/meta/encoding/textdecoder-arguments.any.js.ini
new file mode 100644
index 00000000000..54c4964bd79
--- /dev/null
+++ b/tests/wpt/meta/encoding/textdecoder-arguments.any.js.ini
@@ -0,0 +1,6 @@
+[textdecoder-arguments.any.html]
+
+[textdecoder-arguments.any.worker.html]
+
+[textdecoder-arguments.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/encoding/textdecoder-byte-order-marks.any.js.ini b/tests/wpt/meta/encoding/textdecoder-byte-order-marks.any.js.ini
new file mode 100644
index 00000000000..fd19c9c3453
--- /dev/null
+++ b/tests/wpt/meta/encoding/textdecoder-byte-order-marks.any.js.ini
@@ -0,0 +1,6 @@
+[textdecoder-byte-order-marks.any.shadowrealm.html]
+  expected: ERROR
+
+[textdecoder-byte-order-marks.any.html]
+
+[textdecoder-byte-order-marks.any.worker.html]
diff --git a/tests/wpt/meta/encoding/textdecoder-fatal-streaming.any.js.ini b/tests/wpt/meta/encoding/textdecoder-fatal-streaming.any.js.ini
new file mode 100644
index 00000000000..f529609ed9e
--- /dev/null
+++ b/tests/wpt/meta/encoding/textdecoder-fatal-streaming.any.js.ini
@@ -0,0 +1,6 @@
+[textdecoder-fatal-streaming.any.shadowrealm.html]
+  expected: ERROR
+
+[textdecoder-fatal-streaming.any.worker.html]
+
+[textdecoder-fatal-streaming.any.html]
diff --git a/tests/wpt/meta/encoding/textdecoder-fatal.any.js.ini b/tests/wpt/meta/encoding/textdecoder-fatal.any.js.ini
new file mode 100644
index 00000000000..4b75f73496a
--- /dev/null
+++ b/tests/wpt/meta/encoding/textdecoder-fatal.any.js.ini
@@ -0,0 +1,6 @@
+[textdecoder-fatal.any.shadowrealm.html]
+  expected: ERROR
+
+[textdecoder-fatal.any.html]
+
+[textdecoder-fatal.any.worker.html]
diff --git a/tests/wpt/meta/encoding/textdecoder-ignorebom.any.js.ini b/tests/wpt/meta/encoding/textdecoder-ignorebom.any.js.ini
new file mode 100644
index 00000000000..d56d51737b0
--- /dev/null
+++ b/tests/wpt/meta/encoding/textdecoder-ignorebom.any.js.ini
@@ -0,0 +1,6 @@
+[textdecoder-ignorebom.any.worker.html]
+
+[textdecoder-ignorebom.any.shadowrealm.html]
+  expected: ERROR
+
+[textdecoder-ignorebom.any.html]
diff --git a/tests/wpt/meta/encoding/textdecoder-utf16-surrogates.any.js.ini b/tests/wpt/meta/encoding/textdecoder-utf16-surrogates.any.js.ini
new file mode 100644
index 00000000000..04a81b31b72
--- /dev/null
+++ b/tests/wpt/meta/encoding/textdecoder-utf16-surrogates.any.js.ini
@@ -0,0 +1,6 @@
+[textdecoder-utf16-surrogates.any.worker.html]
+
+[textdecoder-utf16-surrogates.any.shadowrealm.html]
+  expected: ERROR
+
+[textdecoder-utf16-surrogates.any.html]
diff --git a/tests/wpt/meta/encoding/textencoder-utf16-surrogates.any.js.ini b/tests/wpt/meta/encoding/textencoder-utf16-surrogates.any.js.ini
new file mode 100644
index 00000000000..2b27123fc41
--- /dev/null
+++ b/tests/wpt/meta/encoding/textencoder-utf16-surrogates.any.js.ini
@@ -0,0 +1,6 @@
+[textencoder-utf16-surrogates.any.worker.html]
+
+[textencoder-utf16-surrogates.any.html]
+
+[textencoder-utf16-surrogates.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/fetch/api/basic/request-private-network-headers.tentative.any.js.ini b/tests/wpt/meta/fetch/api/basic/request-private-network-headers.tentative.any.js.ini
new file mode 100644
index 00000000000..2a7b7f92e92
--- /dev/null
+++ b/tests/wpt/meta/fetch/api/basic/request-private-network-headers.tentative.any.js.ini
@@ -0,0 +1,21 @@
+[request-private-network-headers.tentative.any.worker.html]
+  [Access-Control-Request-Private-Network is a forbidden request header]
+    expected: FAIL
+
+  [Adding invalid request header "Access-Control-Request-Private-Network: KO"]
+    expected: FAIL
+
+
+[request-private-network-headers.tentative.any.serviceworker.html]
+  expected: ERROR
+
+[request-private-network-headers.tentative.any.html]
+  [Access-Control-Request-Private-Network is a forbidden request header]
+    expected: FAIL
+
+  [Adding invalid request header "Access-Control-Request-Private-Network: KO"]
+    expected: FAIL
+
+
+[request-private-network-headers.tentative.any.sharedworker.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/fetch/api/basic/scheme-blob.sub.any.js.ini b/tests/wpt/meta/fetch/api/basic/scheme-blob.sub.any.js.ini
index 29d48144419..7d2b04113b7 100644
--- a/tests/wpt/meta/fetch/api/basic/scheme-blob.sub.any.js.ini
+++ b/tests/wpt/meta/fetch/api/basic/scheme-blob.sub.any.js.ini
@@ -20,6 +20,9 @@
   [Blob.slice should not sniff the content for a content type]
     expected: FAIL
 
+  [Fetching URL.createObjectURL(invalid_type_blob) is OK]
+    expected: FAIL
+
 
 [scheme-blob.sub.any.html]
   [Fetching URL.createObjectURL(empty_blob) is OK]
@@ -42,3 +45,6 @@
 
   [Blob.slice should not sniff the content for a content type]
     expected: FAIL
+
+  [Fetching URL.createObjectURL(invalid_type_blob) is OK]
+    expected: FAIL
diff --git a/tests/wpt/meta/fetch/api/response/response-headers-guard.any.js.ini b/tests/wpt/meta/fetch/api/response/response-headers-guard.any.js.ini
new file mode 100644
index 00000000000..2824e6e0c89
--- /dev/null
+++ b/tests/wpt/meta/fetch/api/response/response-headers-guard.any.js.ini
@@ -0,0 +1,9 @@
+[response-headers-guard.any.html]
+
+[response-headers-guard.any.sharedworker.html]
+  expected: ERROR
+
+[response-headers-guard.any.worker.html]
+
+[response-headers-guard.any.serviceworker.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/fetch/fetch-later/basic.tentative.https.window.js.ini b/tests/wpt/meta/fetch/fetch-later/basic.tentative.https.window.js.ini
index 4a6e75b55f7..c3859cd2643 100644
--- a/tests/wpt/meta/fetch/fetch-later/basic.tentative.https.window.js.ini
+++ b/tests/wpt/meta/fetch/fetch-later/basic.tentative.https.window.js.ini
@@ -4,3 +4,18 @@
 
   [fetchLater()'s return tells the deferred request is not yet sent.]
     expected: FAIL
+
+  [fetchLater() throws TypeError on non-HTTPS URL.]
+    expected: FAIL
+
+  [fetchLater() throws RangeError on negative activationTimeout.]
+    expected: FAIL
+
+  [fetchLater() throws TypeError when mutating its returned state.]
+    expected: FAIL
+
+  [fetchLater() throws AbortError when its initial abort signal is aborted.]
+    expected: FAIL
+
+  [fetchLater() does not throw error when it is aborted before sending.]
+    expected: FAIL
diff --git a/tests/wpt/meta/fetch/fetch-later/quota.tentative.https.window.js.ini b/tests/wpt/meta/fetch/fetch-later/quota.tentative.https.window.js.ini
new file mode 100644
index 00000000000..d520b45dd61
--- /dev/null
+++ b/tests/wpt/meta/fetch/fetch-later/quota.tentative.https.window.js.ini
@@ -0,0 +1,2 @@
+[quota.tentative.https.window.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/fetch/fetch-later/send-on-deactivate.tentative.https.window.js.ini b/tests/wpt/meta/fetch/fetch-later/send-on-deactivate.tentative.https.window.js.ini
new file mode 100644
index 00000000000..a2b0463bd23
--- /dev/null
+++ b/tests/wpt/meta/fetch/fetch-later/send-on-deactivate.tentative.https.window.js.ini
@@ -0,0 +1,2 @@
+[send-on-deactivate.tentative.https.window.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/fetch/fetch-later/send-on-discard.tentative.https.window.js.ini b/tests/wpt/meta/fetch/fetch-later/send-on-discard.tentative.https.window.js.ini
new file mode 100644
index 00000000000..26a34475368
--- /dev/null
+++ b/tests/wpt/meta/fetch/fetch-later/send-on-discard.tentative.https.window.js.ini
@@ -0,0 +1,2 @@
+[send-on-discard.tentative.https.window.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/fetch/fetch-later/sendondiscard.tentative.https.window.js.ini b/tests/wpt/meta/fetch/fetch-later/sendondiscard.tentative.https.window.js.ini
deleted file mode 100644
index 33db434fab3..00000000000
--- a/tests/wpt/meta/fetch/fetch-later/sendondiscard.tentative.https.window.js.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[sendondiscard.tentative.https.window.html]
-  expected: ERROR
diff --git a/tests/wpt/meta/fetch/fetch-later/timeout.tentative.https.window.js.ini b/tests/wpt/meta/fetch/fetch-later/timeout.tentative.https.window.js.ini
new file mode 100644
index 00000000000..2d32eaebde7
--- /dev/null
+++ b/tests/wpt/meta/fetch/fetch-later/timeout.tentative.https.window.js.ini
@@ -0,0 +1,2 @@
+[timeout.tentative.https.window.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/fetch/orb/tentative/content-range.sub.any.js.ini b/tests/wpt/meta/fetch/orb/tentative/content-range.sub.any.js.ini
index c397469e41d..446864c62b3 100644
--- a/tests/wpt/meta/fetch/orb/tentative/content-range.sub.any.js.ini
+++ b/tests/wpt/meta/fetch/orb/tentative/content-range.sub.any.js.ini
@@ -2,7 +2,13 @@
   [ORB should block opaque range of image/png not starting at zero, that isn't subsequent]
     expected: FAIL
 
+  [ORB should block opaque range of image/png not starting at zero, that isn't subsequent: fetch(..., {mode: "no-cors"})]
+    expected: FAIL
+
 
 [content-range.sub.any.worker.html]
   [ORB should block opaque range of image/png not starting at zero, that isn't subsequent]
     expected: FAIL
+
+  [ORB should block opaque range of image/png not starting at zero, that isn't subsequent: fetch(..., {mode: "no-cors"})]
+    expected: FAIL
diff --git a/tests/wpt/meta/fetch/orb/tentative/known-mime-type.sub.any.js.ini b/tests/wpt/meta/fetch/orb/tentative/known-mime-type.sub.any.js.ini
index f757e2241ee..b05b6f9e2bd 100644
--- a/tests/wpt/meta/fetch/orb/tentative/known-mime-type.sub.any.js.ini
+++ b/tests/wpt/meta/fetch/orb/tentative/known-mime-type.sub.any.js.ini
@@ -1,4 +1,5 @@
 [known-mime-type.sub.any.html]
+  expected: ERROR
   [ORB should block opaque font/ttf]
     expected: FAIL
 
@@ -17,6 +18,111 @@
   [ORB should block opaque application/json which contains non ascii characters]
     expected: FAIL
 
+  [ORB should block opaque font/ttf: fetch(..., {mode: "no-cors"})]
+    expected: FAIL
+
+  [ORB should block opaque font/ttf: <script src=...>]
+    expected: FAIL
+
+  [ORB should block opaque text/plain: fetch(..., {mode: "no-cors"})]
+    expected: FAIL
+
+  [ORB should block opaque text/plain: <audio src=...>]
+    expected: TIMEOUT
+
+  [ORB should block opaque text/plain: <video src=...>]
+    expected: NOTRUN
+
+  [ORB should block opaque text/plain: <script src=...>]
+    expected: NOTRUN
+
+  [ORB should block opaque application/json (non-empty): fetch(..., {mode: "no-cors"})]
+    expected: NOTRUN
+
+  [ORB should block opaque application/json (non-empty): <img src=...>]
+    expected: NOTRUN
+
+  [ORB should block opaque application/json (non-empty): <audio src=...>]
+    expected: NOTRUN
+
+  [ORB should block opaque application/json (non-empty): <video src=...>]
+    expected: NOTRUN
+
+  [ORB should block opaque application/json (non-empty): <script src=...>]
+    expected: NOTRUN
+
+  [ORB should block opaque application/json (empty): fetch(..., {mode: "no-cors"})]
+    expected: NOTRUN
+
+  [ORB should block opaque application/json (empty): <img src=...>]
+    expected: NOTRUN
+
+  [ORB should block opaque application/json (empty): <audio src=...>]
+    expected: NOTRUN
+
+  [ORB should block opaque application/json (empty): <video src=...>]
+    expected: NOTRUN
+
+  [ORB should block opaque application/json (empty): <script src=...>]
+    expected: NOTRUN
+
+  [ORB should block opaque application/json which contains non ascii characters: fetch(..., {mode: "no-cors"})]
+    expected: NOTRUN
+
+  [ORB should block opaque application/json which contains non ascii characters: <img src=...>]
+    expected: NOTRUN
+
+  [ORB should block opaque application/json which contains non ascii characters: <audio src=...>]
+    expected: NOTRUN
+
+  [ORB should block opaque application/json which contains non ascii characters: <video src=...>]
+    expected: NOTRUN
+
+  [ORB should block opaque application/json which contains non ascii characters: <script src=...>]
+    expected: NOTRUN
+
+  [ORB shouldn't block opaque image/png: fetch(..., {mode: "no-cors"})]
+    expected: NOTRUN
+
+  [ORB shouldn't block opaque image/png: <img src=...>]
+    expected: NOTRUN
+
+  [ORB shouldn't block opaque text/javascript: fetch(..., {mode: "no-cors"})]
+    expected: NOTRUN
+
+  [ORB shouldn't block opaque text/javascript: <script src=...>]
+    expected: NOTRUN
+
+  [ORB shouldn't block opaque text/javascript (utf16 encoded with BOM): fetch(..., {mode: "no-cors"})]
+    expected: NOTRUN
+
+  [ORB shouldn't block opaque text/javascript (utf16 encoded with BOM): <script src=...>]
+    expected: NOTRUN
+
+  [ORB shouldn't block opaque text/javascript (utf16 encoded without BOM but charset is provided in content-type): fetch(..., {mode: "no-cors"})]
+    expected: NOTRUN
+
+  [ORB shouldn't block opaque text/javascript (utf16 encoded without BOM but charset is provided in content-type): <script src=...>]
+    expected: NOTRUN
+
+  [ORB shouldn't block opaque text/javascript (iso-8559-1 encoded): fetch(..., {mode: "no-cors"})]
+    expected: NOTRUN
+
+  [ORB shouldn't block opaque text/javascript (iso-8559-1 encoded): <script src=...>]
+    expected: NOTRUN
+
+  [ORB shouldn't block text/javascript with valid asm.js: fetch(..., {mode: "no-cors"})]
+    expected: NOTRUN
+
+  [ORB shouldn't block text/javascript with valid asm.js: <script src=...>]
+    expected: NOTRUN
+
+  [ORB shouldn't block text/javascript with invalid asm.js: fetch(..., {mode: "no-cors"})]
+    expected: NOTRUN
+
+  [ORB shouldn't block text/javascript with invalid asm.js: <script src=...>]
+    expected: NOTRUN
+
 
 [known-mime-type.sub.any.worker.html]
   [ORB should block opaque font/ttf]
@@ -36,3 +142,18 @@
 
   [ORB should block opaque application/json which contains non ascii characters]
     expected: FAIL
+
+  [ORB should block opaque font/ttf: fetch(..., {mode: "no-cors"})]
+    expected: FAIL
+
+  [ORB should block opaque text/plain: fetch(..., {mode: "no-cors"})]
+    expected: FAIL
+
+  [ORB should block opaque application/json (non-empty): fetch(..., {mode: "no-cors"})]
+    expected: FAIL
+
+  [ORB should block opaque application/json (empty): fetch(..., {mode: "no-cors"})]
+    expected: FAIL
+
+  [ORB should block opaque application/json which contains non ascii characters: fetch(..., {mode: "no-cors"})]
+    expected: FAIL
diff --git a/tests/wpt/meta/fetch/orb/tentative/nosniff.sub.any.js.ini b/tests/wpt/meta/fetch/orb/tentative/nosniff.sub.any.js.ini
index 134f31556a2..d922a3ef99a 100644
--- a/tests/wpt/meta/fetch/orb/tentative/nosniff.sub.any.js.ini
+++ b/tests/wpt/meta/fetch/orb/tentative/nosniff.sub.any.js.ini
@@ -1,4 +1,5 @@
 [nosniff.sub.any.html]
+  expected: TIMEOUT
   [ORB should block opaque text/plain with nosniff]
     expected: FAIL
 
@@ -8,6 +9,54 @@
   [ORB should block opaque response with empty Content-Type and nosniff]
     expected: FAIL
 
+  [ORB should block opaque text/plain with nosniff: fetch(..., {mode: "no-cors"})]
+    expected: FAIL
+
+  [ORB should block opaque text/plain with nosniff: <audio src=...>]
+    expected: TIMEOUT
+
+  [ORB should block opaque text/plain with nosniff: <video src=...>]
+    expected: NOTRUN
+
+  [ORB should block opaque text/plain with nosniff: <script src=...>]
+    expected: NOTRUN
+
+  [ORB should block opaque-response-blocklisted MIME type with nosniff: fetch(..., {mode: "no-cors"})]
+    expected: NOTRUN
+
+  [ORB should block opaque-response-blocklisted MIME type with nosniff: <img src=...>]
+    expected: NOTRUN
+
+  [ORB should block opaque-response-blocklisted MIME type with nosniff: <audio src=...>]
+    expected: NOTRUN
+
+  [ORB should block opaque-response-blocklisted MIME type with nosniff: <video src=...>]
+    expected: NOTRUN
+
+  [ORB should block opaque-response-blocklisted MIME type with nosniff: <script src=...>]
+    expected: NOTRUN
+
+  [ORB should block opaque response with empty Content-Type and nosniff: fetch(..., {mode: "no-cors"})]
+    expected: NOTRUN
+
+  [ORB should block opaque response with empty Content-Type and nosniff: <img src=...>]
+    expected: NOTRUN
+
+  [ORB should block opaque response with empty Content-Type and nosniff: <audio src=...>]
+    expected: NOTRUN
+
+  [ORB should block opaque response with empty Content-Type and nosniff: <video src=...>]
+    expected: NOTRUN
+
+  [ORB should block opaque response with empty Content-Type and nosniff: <script src=...>]
+    expected: NOTRUN
+
+  [ORB shouldn't block opaque image with empty Content-Type and nosniff: fetch(..., {mode: "no-cors"})]
+    expected: NOTRUN
+
+  [ORB shouldn't block opaque image with empty Content-Type and nosniff: <img src=...>]
+    expected: NOTRUN
+
 
 [nosniff.sub.any.worker.html]
   [ORB should block opaque text/plain with nosniff]
@@ -18,3 +67,12 @@
 
   [ORB should block opaque response with empty Content-Type and nosniff]
     expected: FAIL
+
+  [ORB should block opaque text/plain with nosniff: fetch(..., {mode: "no-cors"})]
+    expected: FAIL
+
+  [ORB should block opaque-response-blocklisted MIME type with nosniff: fetch(..., {mode: "no-cors"})]
+    expected: FAIL
+
+  [ORB should block opaque response with empty Content-Type and nosniff: fetch(..., {mode: "no-cors"})]
+    expected: FAIL
diff --git a/tests/wpt/meta/fetch/orb/tentative/status.sub.any.js.ini b/tests/wpt/meta/fetch/orb/tentative/status.sub.any.js.ini
index 55c1fca1894..688ca1007ca 100644
--- a/tests/wpt/meta/fetch/orb/tentative/status.sub.any.js.ini
+++ b/tests/wpt/meta/fetch/orb/tentative/status.sub.any.js.ini
@@ -1,10 +1,38 @@
 [status.sub.any.html]
+  expected: TIMEOUT
   [ORB should block opaque-response-blocklisted MIME type with status 206]
     expected: FAIL
 
   [ORB should block opaque response with non-ok status]
     expected: FAIL
 
+  [ORB should block opaque-response-blocklisted MIME type with status 206: fetch(..., {mode: "no-cors"})]
+    expected: FAIL
+
+  [ORB should block opaque-response-blocklisted MIME type with status 206: <audio src=...>]
+    expected: TIMEOUT
+
+  [ORB should block opaque-response-blocklisted MIME type with status 206: <video src=...>]
+    expected: NOTRUN
+
+  [ORB should block opaque-response-blocklisted MIME type with status 206: <script src=...>]
+    expected: NOTRUN
+
+  [ORB should block opaque response with non-ok status: fetch(..., {mode: "no-cors"})]
+    expected: NOTRUN
+
+  [ORB should block opaque response with non-ok status: <img src=...>]
+    expected: NOTRUN
+
+  [ORB should block opaque response with non-ok status: <audio src=...>]
+    expected: NOTRUN
+
+  [ORB should block opaque response with non-ok status: <video src=...>]
+    expected: NOTRUN
+
+  [ORB should block opaque response with non-ok status: <script src=...>]
+    expected: NOTRUN
+
 
 [status.sub.any.worker.html]
   [ORB should block opaque-response-blocklisted MIME type with status 206]
@@ -12,3 +40,9 @@
 
   [ORB should block opaque response with non-ok status]
     expected: FAIL
+
+  [ORB should block opaque-response-blocklisted MIME type with status 206: fetch(..., {mode: "no-cors"})]
+    expected: FAIL
+
+  [ORB should block opaque response with non-ok status: fetch(..., {mode: "no-cors"})]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/browsers/browsing-the-web/history-traversal/PopStateEvent.html.ini b/tests/wpt/meta/html/browsers/browsing-the-web/history-traversal/PopStateEvent.html.ini
new file mode 100644
index 00000000000..9ce210ac840
--- /dev/null
+++ b/tests/wpt/meta/html/browsers/browsing-the-web/history-traversal/PopStateEvent.html.ini
@@ -0,0 +1,6 @@
+[PopStateEvent.html]
+  [Initial value of PopStateEvent.hasUAVisualTransition must be false]
+    expected: FAIL
+
+  [Dispatching a synthetic PopStateEvent]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-src-aboutblank-navigate-immediately.html.ini b/tests/wpt/meta/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-src-aboutblank-navigate-immediately.html.ini
index 856bb1c9901..530635e744f 100644
--- a/tests/wpt/meta/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-src-aboutblank-navigate-immediately.html.ini
+++ b/tests/wpt/meta/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-src-aboutblank-navigate-immediately.html.ini
@@ -1,10 +1,6 @@
 [iframe-src-aboutblank-navigate-immediately.html]
-  expected: TIMEOUT
   [Navigating to a different document with window.open]
     expected: FAIL
 
-  [Navigating to a different document with form submission]
-    expected: TIMEOUT
-
   [Navigating to a different document with link click]
     expected: FAIL
diff --git a/tests/wpt/meta/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-iframe-contentWindow.html.ini b/tests/wpt/meta/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-iframe-contentWindow.html.ini
index d19311abec9..51fd557bd7f 100644
--- a/tests/wpt/meta/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-iframe-contentWindow.html.ini
+++ b/tests/wpt/meta/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-iframe-contentWindow.html.ini
@@ -7,9 +7,3 @@
 
   [load & pageshow events do not fire on contentWindow of <iframe> element created with src='about:blank#foo']
     expected: FAIL
-
-  [load & pageshow events do not fire on contentWindow of <iframe> element created with src='']
-    expected: FAIL
-
-  [load & pageshow events do not fire on contentWindow of <iframe> element created with src='about:blank']
-    expected: FAIL
diff --git a/tests/wpt/meta/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-load-as-html.xhtml.ini b/tests/wpt/meta/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-load-as-html.xhtml.ini
new file mode 100644
index 00000000000..3956f08d5bb
--- /dev/null
+++ b/tests/wpt/meta/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-load-as-html.xhtml.ini
@@ -0,0 +1,4 @@
+[javascript-url-load-as-html.xhtml]
+  expected: TIMEOUT
+  [javascript: URL navigation to a string must create a HTML document using the correct properties]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-return-value-handling-dynamic.html.ini b/tests/wpt/meta/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-return-value-handling-dynamic.html.ini
index 4b89cb499f8..f27acdd3b9d 100644
--- a/tests/wpt/meta/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-return-value-handling-dynamic.html.ini
+++ b/tests/wpt/meta/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-return-value-handling-dynamic.html.ini
@@ -4,12 +4,3 @@
 
   [Test javascript URL string return values in direct and indirect (target) frame contexts. 9]
     expected: FAIL
-
-  [0041 set in href="" targeting a frame and clicked]
-    expected: FAIL
-
-  [0080 00FF set in href="" targeting a frame and clicked]
-    expected: FAIL
-
-  [0080 00FF 0100 set in href="" targeting a frame and clicked]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-same-origin.window.js.ini b/tests/wpt/meta/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-same-origin.window.js.ini
new file mode 100644
index 00000000000..7dc346632a4
--- /dev/null
+++ b/tests/wpt/meta/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-same-origin.window.js.ini
@@ -0,0 +1,3 @@
+[navigation-unload-same-origin.window.html]
+  [Same-origin navigation started from unload handler must be ignored]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/a-click.html.ini b/tests/wpt/meta/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/a-click.html.ini
similarity index 100%
rename from tests/wpt/meta-legacy-layout/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/a-click.html.ini
rename to tests/wpt/meta/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/a-click.html.ini
diff --git a/tests/wpt/meta/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/nav-cancelation-2.sub.html.ini b/tests/wpt/meta/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/nav-cancelation-2.sub.html.ini
index 9f7f24f662e..0e40ffc0656 100644
--- a/tests/wpt/meta/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/nav-cancelation-2.sub.html.ini
+++ b/tests/wpt/meta/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/nav-cancelation-2.sub.html.ini
@@ -1,3 +1,4 @@
 [nav-cancelation-2.sub.html]
+  expected: TIMEOUT
   [grandparent cancels a pending navigation in a cross-origin grandchild]
-    expected: FAIL
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/html/browsers/history/the-location-interface/location-protocol-setter.html.ini b/tests/wpt/meta/html/browsers/history/the-location-interface/location-protocol-setter.html.ini
deleted file mode 100644
index 64698598e8a..00000000000
--- a/tests/wpt/meta/html/browsers/history/the-location-interface/location-protocol-setter.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[location-protocol-setter.html]
-  [Equivalent tests for data URL and srcdoc <iframe>s]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/browsers/the-window-object/open-close/creating_browsing_context_test_01.html.ini b/tests/wpt/meta/html/browsers/the-window-object/open-close/creating_browsing_context_test_01.html.ini
new file mode 100644
index 00000000000..4b4820d1729
--- /dev/null
+++ b/tests/wpt/meta/html/browsers/the-window-object/open-close/creating_browsing_context_test_01.html.ini
@@ -0,0 +1,3 @@
+[creating_browsing_context_test_01.html]
+  [first argument: absolute url]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/browsers/windows/dangling-markup-window-name.html.ini b/tests/wpt/meta/html/browsers/windows/dangling-markup-window-name.html.ini
new file mode 100644
index 00000000000..3ab80f5d5e3
--- /dev/null
+++ b/tests/wpt/meta/html/browsers/windows/dangling-markup-window-name.html.ini
@@ -0,0 +1,2 @@
+[dangling-markup-window-name.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/html/browsers/windows/dangling-markup-window-name.tentative.html.ini b/tests/wpt/meta/html/browsers/windows/dangling-markup-window-name.tentative.html.ini
deleted file mode 100644
index 4f7e41cd752..00000000000
--- a/tests/wpt/meta/html/browsers/windows/dangling-markup-window-name.tentative.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[dangling-markup-window-name.tentative.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/meta/html/canvas/element/layers/2d.layer.shadow-from-outside-canvas.long-distance.html.ini b/tests/wpt/meta/html/canvas/element/layers/2d.layer.shadow-from-outside-canvas.long-distance.html.ini
new file mode 100644
index 00000000000..4f2ae62125b
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/element/layers/2d.layer.shadow-from-outside-canvas.long-distance.html.ini
@@ -0,0 +1,2 @@
+[2d.layer.shadow-from-outside-canvas.long-distance.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/layers/2d.layer.shadow-from-outside-canvas.short-distance.html.ini b/tests/wpt/meta/html/canvas/element/layers/2d.layer.shadow-from-outside-canvas.short-distance.html.ini
new file mode 100644
index 00000000000..46f724b3e99
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/element/layers/2d.layer.shadow-from-outside-canvas.short-distance.html.ini
@@ -0,0 +1,2 @@
+[2d.layer.shadow-from-outside-canvas.short-distance.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/reset/2d.reset.render.drop_shadow.html.ini b/tests/wpt/meta/html/canvas/element/reset/2d.reset.render.drop_shadow.html.ini
new file mode 100644
index 00000000000..de427924922
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/element/reset/2d.reset.render.drop_shadow.html.ini
@@ -0,0 +1,2 @@
+[2d.reset.render.drop_shadow.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/reset/2d.reset.render.global_composite_operation.html.ini b/tests/wpt/meta/html/canvas/element/reset/2d.reset.render.global_composite_operation.html.ini
new file mode 100644
index 00000000000..8c93940d805
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/element/reset/2d.reset.render.global_composite_operation.html.ini
@@ -0,0 +1,2 @@
+[2d.reset.render.global_composite_operation.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/reset/2d.reset.render.line.html.ini b/tests/wpt/meta/html/canvas/element/reset/2d.reset.render.line.html.ini
new file mode 100644
index 00000000000..46b6c887ca4
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/element/reset/2d.reset.render.line.html.ini
@@ -0,0 +1,2 @@
+[2d.reset.render.line.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/reset/2d.reset.render.misc.html.ini b/tests/wpt/meta/html/canvas/element/reset/2d.reset.render.misc.html.ini
new file mode 100644
index 00000000000..4a50e35fd10
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/element/reset/2d.reset.render.misc.html.ini
@@ -0,0 +1,2 @@
+[2d.reset.render.misc.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/reset/2d.reset.render.miter_limit.html.ini b/tests/wpt/meta/html/canvas/element/reset/2d.reset.render.miter_limit.html.ini
new file mode 100644
index 00000000000..dcbf36db069
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/element/reset/2d.reset.render.miter_limit.html.ini
@@ -0,0 +1,2 @@
+[2d.reset.render.miter_limit.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/reset/2d.reset.render.text.html.ini b/tests/wpt/meta/html/canvas/element/reset/2d.reset.render.text.html.ini
new file mode 100644
index 00000000000..bab41d308bf
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/element/reset/2d.reset.render.text.html.ini
@@ -0,0 +1,2 @@
+[2d.reset.render.text.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/text/2d.text.fontVariantCaps2.html.ini b/tests/wpt/meta/html/canvas/element/text/2d.text.fontVariantCaps2.html.ini
index 2d73809345f..53142ddcd6c 100644
--- a/tests/wpt/meta/html/canvas/element/text/2d.text.fontVariantCaps2.html.ini
+++ b/tests/wpt/meta/html/canvas/element/text/2d.text.fontVariantCaps2.html.ini
@@ -1,2 +1,3 @@
 [2d.text.fontVariantCaps2.html]
-  expected: FAIL
+  [Testing small caps setting in fontVariant]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/text/2d.text.fontVariantCaps3.html.ini b/tests/wpt/meta/html/canvas/element/text/2d.text.fontVariantCaps3.html.ini
deleted file mode 100644
index 72b037dc26c..00000000000
--- a/tests/wpt/meta/html/canvas/element/text/2d.text.fontVariantCaps3.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[2d.text.fontVariantCaps3.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/text/2d.text.fontVariantCaps4.html.ini b/tests/wpt/meta/html/canvas/element/text/2d.text.fontVariantCaps4.html.ini
deleted file mode 100644
index 9614b6a8b10..00000000000
--- a/tests/wpt/meta/html/canvas/element/text/2d.text.fontVariantCaps4.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[2d.text.fontVariantCaps4.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/canvas-context/2d.canvas.context.arguments.missing.html.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-context/2d.canvas.context.arguments.missing.html.ini
new file mode 100644
index 00000000000..7eb049056a3
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-context/2d.canvas.context.arguments.missing.html.ini
@@ -0,0 +1,3 @@
+[2d.canvas.context.arguments.missing.html]
+  [OffscreenCanvas test: 2d.canvas.context.arguments.missing]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/canvas-context/2d.canvas.context.arguments.missing.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-context/2d.canvas.context.arguments.missing.worker.js.ini
new file mode 100644
index 00000000000..697bf57c839
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-context/2d.canvas.context.arguments.missing.worker.js.ini
@@ -0,0 +1,3 @@
+[2d.canvas.context.arguments.missing.worker.html]
+  [2d]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/context.casesensitive.html.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-context/2d.canvas.context.casesensitive.html.ini
similarity index 68%
rename from tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/context.casesensitive.html.ini
rename to tests/wpt/meta/html/canvas/offscreen/canvas-context/2d.canvas.context.casesensitive.html.ini
index d1e49fdef97..64e281aae16 100644
--- a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/context.casesensitive.html.ini
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-context/2d.canvas.context.casesensitive.html.ini
@@ -1,4 +1,3 @@
-[context.casesensitive.html]
+[2d.canvas.context.casesensitive.html]
   [Context name "2D" is unrecognised; matching is case sensitive]
     expected: FAIL
-
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/context.casesensitive.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-context/2d.canvas.context.casesensitive.worker.js.ini
similarity index 64%
rename from tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/context.casesensitive.worker.js.ini
rename to tests/wpt/meta/html/canvas/offscreen/canvas-context/2d.canvas.context.casesensitive.worker.js.ini
index 540b6170978..27e9dca7c02 100644
--- a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/context.casesensitive.worker.js.ini
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-context/2d.canvas.context.casesensitive.worker.js.ini
@@ -1,4 +1,3 @@
-[context.casesensitive.worker.html]
+[2d.canvas.context.casesensitive.worker.html]
   [Context name "2D" is unrecognised; matching is case sensitive]
     expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/context.emptystring.html.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-context/2d.canvas.context.emptystring.html.ini
similarity index 63%
rename from tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/context.emptystring.html.ini
rename to tests/wpt/meta/html/canvas/offscreen/canvas-context/2d.canvas.context.emptystring.html.ini
index f3ca915d04a..2c3eefedcd0 100644
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/context.emptystring.html.ini
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-context/2d.canvas.context.emptystring.html.ini
@@ -1,4 +1,3 @@
-[context.emptystring.html]
+[2d.canvas.context.emptystring.html]
   [getContext with empty string returns null]
     expected: FAIL
-
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/context.emptystring.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-context/2d.canvas.context.emptystring.worker.js.ini
similarity index 59%
rename from tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/context.emptystring.worker.js.ini
rename to tests/wpt/meta/html/canvas/offscreen/canvas-context/2d.canvas.context.emptystring.worker.js.ini
index ee99fcfc67c..cc368ac511e 100644
--- a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/context.emptystring.worker.js.ini
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-context/2d.canvas.context.emptystring.worker.js.ini
@@ -1,4 +1,3 @@
-[context.emptystring.worker.html]
+[2d.canvas.context.emptystring.worker.html]
   [getContext with empty string returns null]
     expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.exists.html.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-context/2d.canvas.context.exists.html.ini
similarity index 62%
rename from tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.exists.html.ini
rename to tests/wpt/meta/html/canvas/offscreen/canvas-context/2d.canvas.context.exists.html.ini
index 1eab3d85a7b..16cabbf4561 100644
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.exists.html.ini
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-context/2d.canvas.context.exists.html.ini
@@ -1,4 +1,3 @@
-[2d.getcontext.exists.html]
+[2d.canvas.context.exists.html]
   [The 2D context is implemented]
     expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.exists.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-context/2d.canvas.context.exists.worker.js.ini
similarity index 57%
rename from tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.exists.worker.js.ini
rename to tests/wpt/meta/html/canvas/offscreen/canvas-context/2d.canvas.context.exists.worker.js.ini
index 1da9076cee5..f2b4e8886d3 100644
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.exists.worker.js.ini
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-context/2d.canvas.context.exists.worker.js.ini
@@ -1,4 +1,3 @@
-[2d.getcontext.exists.worker.html]
+[2d.canvas.context.exists.worker.html]
   [The 2D context is implemented]
     expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.extraargs.cache.html.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-context/2d.canvas.context.extraargs.cache.html.ini
similarity index 69%
rename from tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.extraargs.cache.html.ini
rename to tests/wpt/meta/html/canvas/offscreen/canvas-context/2d.canvas.context.extraargs.cache.html.ini
index 71541fbdba0..da632187df8 100644
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.extraargs.cache.html.ini
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-context/2d.canvas.context.extraargs.cache.html.ini
@@ -1,3 +1,3 @@
-[2d.getcontext.extraargs.cache.html]
+[2d.canvas.context.extraargs.cache.html]
   [The 2D context doesn't throw with extra getContext arguments (cached)]
     expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.extraargs.cache.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-context/2d.canvas.context.extraargs.cache.worker.js.ini
similarity index 65%
rename from tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.extraargs.cache.worker.js.ini
rename to tests/wpt/meta/html/canvas/offscreen/canvas-context/2d.canvas.context.extraargs.cache.worker.js.ini
index 551bb3b381b..9de13b7f7a8 100644
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.extraargs.cache.worker.js.ini
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-context/2d.canvas.context.extraargs.cache.worker.js.ini
@@ -1,3 +1,3 @@
-[2d.getcontext.extraargs.cache.worker.html]
+[2d.canvas.context.extraargs.cache.worker.html]
   [The 2D context doesn't throw with extra getContext arguments (cached)]
     expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.extraargs.create.html.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-context/2d.canvas.context.extraargs.create.html.ini
similarity index 70%
rename from tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.extraargs.create.html.ini
rename to tests/wpt/meta/html/canvas/offscreen/canvas-context/2d.canvas.context.extraargs.create.html.ini
index 79fe1a01e5a..8ea6b579874 100644
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.extraargs.create.html.ini
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-context/2d.canvas.context.extraargs.create.html.ini
@@ -1,3 +1,3 @@
-[2d.getcontext.extraargs.create.html]
+[2d.canvas.context.extraargs.create.html]
   [The 2D context doesn't throw with extra getContext arguments (new context)]
     expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.extraargs.create.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-context/2d.canvas.context.extraargs.create.worker.js.ini
similarity index 66%
rename from tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.extraargs.create.worker.js.ini
rename to tests/wpt/meta/html/canvas/offscreen/canvas-context/2d.canvas.context.extraargs.create.worker.js.ini
index a528e9bfb3c..b33f744d3e2 100644
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.extraargs.create.worker.js.ini
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-context/2d.canvas.context.extraargs.create.worker.js.ini
@@ -1,3 +1,3 @@
-[2d.getcontext.extraargs.create.worker.html]
+[2d.canvas.context.extraargs.create.worker.html]
   [The 2D context doesn't throw with extra getContext arguments (new context)]
     expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.shared.html.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-context/2d.canvas.context.shared.html.ini
similarity index 71%
rename from tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.shared.html.ini
rename to tests/wpt/meta/html/canvas/offscreen/canvas-context/2d.canvas.context.shared.html.ini
index c6b5c595f54..037460cef24 100644
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.shared.html.ini
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-context/2d.canvas.context.shared.html.ini
@@ -1,4 +1,3 @@
-[2d.getcontext.shared.html]
+[2d.canvas.context.shared.html]
   [getContext('2d') returns objects which share canvas state]
     expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.shared.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-context/2d.canvas.context.shared.worker.js.ini
similarity index 67%
rename from tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.shared.worker.js.ini
rename to tests/wpt/meta/html/canvas/offscreen/canvas-context/2d.canvas.context.shared.worker.js.ini
index 3d723aa2d2a..0cb88704320 100644
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.shared.worker.js.ini
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-context/2d.canvas.context.shared.worker.js.ini
@@ -1,4 +1,3 @@
-[2d.getcontext.shared.worker.html]
+[2d.canvas.context.shared.worker.html]
   [getContext('2d') returns objects which share canvas state]
     expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.unique.html.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-context/2d.canvas.context.unique.html.ini
similarity index 66%
rename from tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.unique.html.ini
rename to tests/wpt/meta/html/canvas/offscreen/canvas-context/2d.canvas.context.unique.html.ini
index 4ee4a912270..7a180e184a9 100644
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.unique.html.ini
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-context/2d.canvas.context.unique.html.ini
@@ -1,4 +1,3 @@
-[2d.getcontext.unique.html]
+[2d.canvas.context.unique.html]
   [getContext('2d') returns the same object]
     expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.unique.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-context/2d.canvas.context.unique.worker.js.ini
similarity index 62%
rename from tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.unique.worker.js.ini
rename to tests/wpt/meta/html/canvas/offscreen/canvas-context/2d.canvas.context.unique.worker.js.ini
index b13a33ce5d6..4d41365a9b0 100644
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.unique.worker.js.ini
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-context/2d.canvas.context.unique.worker.js.ini
@@ -1,4 +1,3 @@
-[2d.getcontext.unique.worker.html]
+[2d.canvas.context.unique.worker.html]
   [getContext('2d') returns the same object]
     expected: FAIL
-
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.badname.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-context/2d.canvas.context.unrecognised.badname.html.ini
similarity index 62%
rename from tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.badname.worker.js.ini
rename to tests/wpt/meta/html/canvas/offscreen/canvas-context/2d.canvas.context.unrecognised.badname.html.ini
index 7eb5ae5a372..61f40bc0e2a 100644
--- a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.badname.worker.js.ini
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-context/2d.canvas.context.unrecognised.badname.html.ini
@@ -1,4 +1,3 @@
-[context.unrecognised.badname.worker.html]
+[2d.canvas.context.unrecognised.badname.html]
   [getContext with unrecognised context name returns null]
     expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.badname.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-context/2d.canvas.context.unrecognised.badname.worker.js.ini
similarity index 59%
rename from tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.badname.worker.js.ini
rename to tests/wpt/meta/html/canvas/offscreen/canvas-context/2d.canvas.context.unrecognised.badname.worker.js.ini
index 7eb5ae5a372..ba433ddb153 100644
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.badname.worker.js.ini
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-context/2d.canvas.context.unrecognised.badname.worker.js.ini
@@ -1,4 +1,3 @@
-[context.unrecognised.badname.worker.html]
+[2d.canvas.context.unrecognised.badname.worker.html]
   [getContext with unrecognised context name returns null]
     expected: FAIL
-
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.badsuffix.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-context/2d.canvas.context.unrecognised.badsuffix.html.ini
similarity index 59%
rename from tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.badsuffix.worker.js.ini
rename to tests/wpt/meta/html/canvas/offscreen/canvas-context/2d.canvas.context.unrecognised.badsuffix.html.ini
index b733d071786..42e7640cc34 100644
--- a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.badsuffix.worker.js.ini
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-context/2d.canvas.context.unrecognised.badsuffix.html.ini
@@ -1,4 +1,3 @@
-[context.unrecognised.badsuffix.worker.html]
+[2d.canvas.context.unrecognised.badsuffix.html]
   [Context name "2d" plus a suffix is unrecognised]
     expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.badsuffix.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-context/2d.canvas.context.unrecognised.badsuffix.worker.js.ini
similarity index 56%
rename from tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.badsuffix.worker.js.ini
rename to tests/wpt/meta/html/canvas/offscreen/canvas-context/2d.canvas.context.unrecognised.badsuffix.worker.js.ini
index b733d071786..89c114b0e1d 100644
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.badsuffix.worker.js.ini
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-context/2d.canvas.context.unrecognised.badsuffix.worker.js.ini
@@ -1,4 +1,3 @@
-[context.unrecognised.badsuffix.worker.html]
+[2d.canvas.context.unrecognised.badsuffix.worker.html]
   [Context name "2d" plus a suffix is unrecognised]
     expected: FAIL
-
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.nullsuffix.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-context/2d.canvas.context.unrecognised.nullsuffix.html.ini
similarity index 61%
rename from tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.nullsuffix.worker.js.ini
rename to tests/wpt/meta/html/canvas/offscreen/canvas-context/2d.canvas.context.unrecognised.nullsuffix.html.ini
index 69b63938e9b..8cd6b8b614c 100644
--- a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.nullsuffix.worker.js.ini
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-context/2d.canvas.context.unrecognised.nullsuffix.html.ini
@@ -1,4 +1,3 @@
-[context.unrecognised.nullsuffix.worker.html]
+[2d.canvas.context.unrecognised.nullsuffix.html]
   [Context name "2d" plus a "\\0" suffix is unrecognised]
     expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.nullsuffix.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-context/2d.canvas.context.unrecognised.nullsuffix.worker.js.ini
similarity index 57%
rename from tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.nullsuffix.worker.js.ini
rename to tests/wpt/meta/html/canvas/offscreen/canvas-context/2d.canvas.context.unrecognised.nullsuffix.worker.js.ini
index 69b63938e9b..e850767487e 100644
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.nullsuffix.worker.js.ini
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-context/2d.canvas.context.unrecognised.nullsuffix.worker.js.ini
@@ -1,4 +1,3 @@
-[context.unrecognised.nullsuffix.worker.html]
+[2d.canvas.context.unrecognised.nullsuffix.worker.html]
   [Context name "2d" plus a "\\0" suffix is unrecognised]
     expected: FAIL
-
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.unicode.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-context/2d.canvas.context.unrecognised.unicode.html.ini
similarity index 64%
rename from tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.unicode.worker.js.ini
rename to tests/wpt/meta/html/canvas/offscreen/canvas-context/2d.canvas.context.unrecognised.unicode.html.ini
index 0e9273916b5..88eff7740fd 100644
--- a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.unicode.worker.js.ini
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-context/2d.canvas.context.unrecognised.unicode.html.ini
@@ -1,4 +1,3 @@
-[context.unrecognised.unicode.worker.html]
+[2d.canvas.context.unrecognised.unicode.html]
   [Context name which kind of looks like "2d" is unrecognised]
     expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.unicode.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-context/2d.canvas.context.unrecognised.unicode.worker.js.ini
similarity index 60%
rename from tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.unicode.worker.js.ini
rename to tests/wpt/meta/html/canvas/offscreen/canvas-context/2d.canvas.context.unrecognised.unicode.worker.js.ini
index 0e9273916b5..7cf8fcb7e38 100644
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.unicode.worker.js.ini
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-context/2d.canvas.context.unrecognised.unicode.worker.js.ini
@@ -1,4 +1,3 @@
-[context.unrecognised.unicode.worker.html]
+[2d.canvas.context.unrecognised.unicode.worker.html]
   [Context name which kind of looks like "2d" is unrecognised]
     expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/canvas-context/2d.getContext.options.any.js.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-context/2d.getContext.options.any.js.ini
new file mode 100644
index 00000000000..99ae2bb3fe3
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-context/2d.getContext.options.any.js.ini
@@ -0,0 +1,8 @@
+[2d.getContext.options.any.worker.html]
+  [2d]
+    expected: FAIL
+
+
+[2d.getContext.options.any.html]
+  [2d]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/initial.color.html.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.color.html.ini
similarity index 61%
rename from tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/initial.color.html.ini
rename to tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.color.html.ini
index 7c17f2f4d67..e0bd23e40ea 100644
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/initial.color.html.ini
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.color.html.ini
@@ -1,3 +1,3 @@
-[initial.color.html]
+[2d.canvas.host.initial.color.html]
   [Initial state is transparent black]
     expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/initial.color.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.color.worker.js.ini
similarity index 57%
rename from tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/initial.color.worker.js.ini
rename to tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.color.worker.js.ini
index 835a1edffba..ae7b831efed 100644
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/initial.color.worker.js.ini
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.color.worker.js.ini
@@ -1,3 +1,3 @@
-[initial.color.worker.html]
+[2d.canvas.host.initial.color.worker.html]
   [Initial state is transparent black]
     expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/initial.reset.2dstate.html.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.2dstate.html.ini
similarity index 63%
rename from tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/initial.reset.2dstate.html.ini
rename to tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.2dstate.html.ini
index 6bb1b2ab136..2d232ad9f05 100644
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/initial.reset.2dstate.html.ini
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.2dstate.html.ini
@@ -1,4 +1,3 @@
-[initial.reset.2dstate.html]
+[2d.canvas.host.initial.reset.2dstate.html]
   [Resetting the canvas state resets 2D state variables]
     expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/initial.reset.2dstate.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.2dstate.worker.js.ini
similarity index 59%
rename from tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/initial.reset.2dstate.worker.js.ini
rename to tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.2dstate.worker.js.ini
index 65b5e704ef8..260e9d29e74 100644
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/initial.reset.2dstate.worker.js.ini
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.2dstate.worker.js.ini
@@ -1,4 +1,3 @@
-[initial.reset.2dstate.worker.html]
+[2d.canvas.host.initial.reset.2dstate.worker.html]
   [Resetting the canvas state resets 2D state variables]
     expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/initial.reset.clip.html.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.clip.html.ini
similarity index 66%
rename from tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/initial.reset.clip.html.ini
rename to tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.clip.html.ini
index 831dfb2521c..9e3f27e602a 100644
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/initial.reset.clip.html.ini
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.clip.html.ini
@@ -1,4 +1,3 @@
-[initial.reset.clip.html]
+[2d.canvas.host.initial.reset.clip.html]
   [Resetting the canvas state resets the current clip region]
     expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/initial.reset.clip.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.clip.worker.js.ini
similarity index 62%
rename from tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/initial.reset.clip.worker.js.ini
rename to tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.clip.worker.js.ini
index 24edd2020ce..4da928863b2 100644
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/initial.reset.clip.worker.js.ini
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.clip.worker.js.ini
@@ -1,4 +1,3 @@
-[initial.reset.clip.worker.html]
+[2d.canvas.host.initial.reset.clip.worker.html]
   [Resetting the canvas state resets the current clip region]
     expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/initial.reset.different.html.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.different.html.ini
similarity index 61%
rename from tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/initial.reset.different.html.ini
rename to tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.different.html.ini
index 061e290fcd5..b3edd54fc32 100644
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/initial.reset.different.html.ini
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.different.html.ini
@@ -1,4 +1,3 @@
-[initial.reset.different.html]
+[2d.canvas.host.initial.reset.different.html]
   [Changing size resets canvas to transparent black]
     expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/initial.reset.different.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.different.worker.js.ini
similarity index 57%
rename from tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/initial.reset.different.worker.js.ini
rename to tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.different.worker.js.ini
index 247627d6ce7..f23bd4b253e 100644
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/initial.reset.different.worker.js.ini
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.different.worker.js.ini
@@ -1,4 +1,3 @@
-[initial.reset.different.worker.html]
+[2d.canvas.host.initial.reset.different.worker.html]
   [Changing size resets canvas to transparent black]
     expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/initial.reset.gradient.html.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.gradient.html.ini
similarity index 67%
rename from tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/initial.reset.gradient.html.ini
rename to tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.gradient.html.ini
index dcfe0bf696b..6f237a3f522 100644
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/initial.reset.gradient.html.ini
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.gradient.html.ini
@@ -1,4 +1,3 @@
-[initial.reset.gradient.html]
+[2d.canvas.host.initial.reset.gradient.html]
   [Resetting the canvas state does not invalidate any existing gradients]
     expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/initial.reset.gradient.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.gradient.worker.js.ini
similarity index 64%
rename from tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/initial.reset.gradient.worker.js.ini
rename to tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.gradient.worker.js.ini
index 7876111284e..8e7b27c59e1 100644
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/initial.reset.gradient.worker.js.ini
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.gradient.worker.js.ini
@@ -1,4 +1,3 @@
-[initial.reset.gradient.worker.html]
+[2d.canvas.host.initial.reset.gradient.worker.html]
   [Resetting the canvas state does not invalidate any existing gradients]
     expected: FAIL
-
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/initial.reset.path.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.path.html.ini
similarity index 64%
rename from tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/initial.reset.path.worker.js.ini
rename to tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.path.html.ini
index 660b0c5e4de..e12e364d828 100644
--- a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/initial.reset.path.worker.js.ini
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.path.html.ini
@@ -1,4 +1,3 @@
-[initial.reset.path.worker.html]
+[2d.canvas.host.initial.reset.path.html]
   [Resetting the canvas state resets the current path]
     expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/initial.reset.path.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.path.worker.js.ini
similarity index 60%
rename from tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/initial.reset.path.worker.js.ini
rename to tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.path.worker.js.ini
index 660b0c5e4de..d37d5bc29d9 100644
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/initial.reset.path.worker.js.ini
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.path.worker.js.ini
@@ -1,4 +1,3 @@
-[initial.reset.path.worker.html]
+[2d.canvas.host.initial.reset.path.worker.html]
   [Resetting the canvas state resets the current path]
     expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/initial.reset.pattern.html.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.pattern.html.ini
similarity index 67%
rename from tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/initial.reset.pattern.html.ini
rename to tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.pattern.html.ini
index 7b52b1415d7..71659d8e3b0 100644
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/initial.reset.pattern.html.ini
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.pattern.html.ini
@@ -1,4 +1,3 @@
-[initial.reset.pattern.html]
+[2d.canvas.host.initial.reset.pattern.html]
   [Resetting the canvas state does not invalidate any existing patterns]
     expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/initial.reset.pattern.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.pattern.worker.js.ini
similarity index 64%
rename from tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/initial.reset.pattern.worker.js.ini
rename to tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.pattern.worker.js.ini
index ca5f0eb582a..a87b303f295 100644
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/initial.reset.pattern.worker.js.ini
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.pattern.worker.js.ini
@@ -1,4 +1,3 @@
-[initial.reset.pattern.worker.html]
+[2d.canvas.host.initial.reset.pattern.worker.html]
   [Resetting the canvas state does not invalidate any existing patterns]
     expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/initial.reset.same.html.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.same.html.ini
similarity index 70%
rename from tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/initial.reset.same.html.ini
rename to tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.same.html.ini
index 5a08092726b..9853448ab3e 100644
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/initial.reset.same.html.ini
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.same.html.ini
@@ -1,4 +1,3 @@
-[initial.reset.same.html]
+[2d.canvas.host.initial.reset.same.html]
   [Setting size (not changing the value) resets canvas to transparent black]
     expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/initial.reset.same.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.same.worker.js.ini
similarity index 66%
rename from tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/initial.reset.same.worker.js.ini
rename to tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.same.worker.js.ini
index f11136a04df..47da06ffb2b 100644
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/initial.reset.same.worker.js.ini
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.same.worker.js.ini
@@ -1,4 +1,3 @@
-[initial.reset.same.worker.html]
+[2d.canvas.host.initial.reset.same.worker.html]
   [Setting size (not changing the value) resets canvas to transparent black]
     expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/initial.reset.transform.html.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.transform.html.ini
similarity index 66%
rename from tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/initial.reset.transform.html.ini
rename to tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.transform.html.ini
index 8dc1ce9f0f2..7d637e62681 100644
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/initial.reset.transform.html.ini
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.transform.html.ini
@@ -1,4 +1,3 @@
-[initial.reset.transform.html]
+[2d.canvas.host.initial.reset.transform.html]
   [Resetting the canvas state resets the current transformation matrix]
     expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/initial.reset.transform.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.transform.worker.js.ini
similarity index 63%
rename from tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/initial.reset.transform.worker.js.ini
rename to tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.transform.worker.js.ini
index 62bfb15adf0..0820e880069 100644
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/initial.reset.transform.worker.js.ini
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.transform.worker.js.ini
@@ -1,4 +1,3 @@
-[initial.reset.transform.worker.html]
+[2d.canvas.host.initial.reset.transform.worker.html]
   [Resetting the canvas state resets the current transformation matrix]
     expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/2d.canvas.readonly.html.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.readonly.html.ini
similarity index 57%
rename from tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/2d.canvas.readonly.html.ini
rename to tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.readonly.html.ini
index 132c0582fc6..dd83740eda3 100644
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/2d.canvas.readonly.html.ini
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.readonly.html.ini
@@ -1,4 +1,3 @@
-[2d.canvas.readonly.html]
+[2d.canvas.host.readonly.html]
   [canvas is readonly]
     expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/2d.canvas.readonly.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.readonly.worker.js.ini
similarity index 52%
rename from tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/2d.canvas.readonly.worker.js.ini
rename to tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.readonly.worker.js.ini
index 704f6012675..b2478bd393c 100644
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/2d.canvas.readonly.worker.js.ini
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.readonly.worker.js.ini
@@ -1,4 +1,3 @@
-[2d.canvas.readonly.worker.html]
+[2d.canvas.host.readonly.worker.html]
   [canvas is readonly]
     expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/2d.canvas.reference.html.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.reference.html.ini
similarity index 63%
rename from tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/2d.canvas.reference.html.ini
rename to tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.reference.html.ini
index ff5a9133f6c..b04583bada0 100644
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/2d.canvas.reference.html.ini
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.reference.html.ini
@@ -1,4 +1,3 @@
-[2d.canvas.reference.html]
+[2d.canvas.host.reference.html]
   [canvas refers back to its canvas]
     expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/2d.canvas.reference.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.reference.worker.js.ini
similarity index 58%
rename from tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/2d.canvas.reference.worker.js.ini
rename to tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.reference.worker.js.ini
index 725e0179219..87326757456 100644
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/2d.canvas.reference.worker.js.ini
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.reference.worker.js.ini
@@ -1,4 +1,3 @@
-[2d.canvas.reference.worker.html]
+[2d.canvas.host.reference.worker.html]
   [canvas refers back to its canvas]
     expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.default.html.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.default.html.ini
similarity index 61%
rename from tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.default.html.ini
rename to tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.default.html.ini
index dafa66450e5..34c53bd989e 100644
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.default.html.ini
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.default.html.ini
@@ -1,4 +1,3 @@
-[size.attributes.default.html]
+[2d.canvas.host.size.attributes.default.html]
   [Default width/height when attributes are missing]
     expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.default.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.default.worker.js.ini
similarity index 57%
rename from tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.default.worker.js.ini
rename to tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.default.worker.js.ini
index 983d8c6e69d..d54e1a21315 100644
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.default.worker.js.ini
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.default.worker.js.ini
@@ -1,4 +1,3 @@
-[size.attributes.default.worker.html]
+[2d.canvas.host.size.attributes.default.worker.html]
   [Default width/height when attributes are missing]
     expected: FAIL
-
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/size.attributes.idl.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.idl.html.ini
similarity index 61%
rename from tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/size.attributes.idl.worker.js.ini
rename to tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.idl.html.ini
index 8fdd6e800a5..7a67c55bf1d 100644
--- a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/size.attributes.idl.worker.js.ini
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.idl.html.ini
@@ -1,3 +1,3 @@
-[size.attributes.idl.worker.html]
+[2d.canvas.host.size.attributes.idl.html]
   [Getting/setting width/height IDL attributes]
     expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.idl.set.zero.html.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.idl.set.zero.html.ini
similarity index 55%
rename from tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.idl.set.zero.html.ini
rename to tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.idl.set.zero.html.ini
index 703640a7bd1..0a0d8142f3e 100644
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.idl.set.zero.html.ini
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.idl.set.zero.html.ini
@@ -1,4 +1,3 @@
-[size.attributes.idl.set.zero.html]
+[2d.canvas.host.size.attributes.idl.set.zero.html]
   [Setting width/height IDL attributes to 0]
     expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.idl.set.zero.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.idl.set.zero.worker.js.ini
similarity index 52%
rename from tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.idl.set.zero.worker.js.ini
rename to tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.idl.set.zero.worker.js.ini
index 062ba43c183..4ca56c01040 100644
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.idl.set.zero.worker.js.ini
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.idl.set.zero.worker.js.ini
@@ -1,4 +1,3 @@
-[size.attributes.idl.set.zero.worker.html]
+[2d.canvas.host.size.attributes.idl.set.zero.worker.html]
   [Setting width/height IDL attributes to 0]
     expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.idl.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.idl.worker.js.ini
similarity index 57%
rename from tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.idl.worker.js.ini
rename to tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.idl.worker.js.ini
index 8fdd6e800a5..0946b523e8a 100644
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.idl.worker.js.ini
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.idl.worker.js.ini
@@ -1,3 +1,3 @@
-[size.attributes.idl.worker.html]
+[2d.canvas.host.size.attributes.idl.worker.html]
   [Getting/setting width/height IDL attributes]
     expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.decimal.html.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.decimal.html.ini
new file mode 100644
index 00000000000..2dbeaa504eb
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.decimal.html.ini
@@ -0,0 +1,3 @@
+[2d.canvas.host.size.attributes.parse.decimal.html]
+  [Parsing of non-negative integers]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.decimal.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.decimal.worker.js.ini
new file mode 100644
index 00000000000..f6663a15103
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.decimal.worker.js.ini
@@ -0,0 +1,3 @@
+[2d.canvas.host.size.attributes.parse.decimal.worker.html]
+  [Parsing of non-negative integers]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.em.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.em.html.ini
similarity index 54%
rename from tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.em.worker.js.ini
rename to tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.em.html.ini
index e9a66d77588..d8ccbed5caa 100644
--- a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.em.worker.js.ini
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.em.html.ini
@@ -1,4 +1,3 @@
-[size.attributes.parse.em.worker.html]
+[2d.canvas.host.size.attributes.parse.em.html]
   [Parsing of non-negative integers]
     expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.em.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.em.worker.js.ini
new file mode 100644
index 00000000000..aa70cb2a565
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.em.worker.js.ini
@@ -0,0 +1,3 @@
+[2d.canvas.host.size.attributes.parse.em.worker.html]
+  [Parsing of non-negative integers]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.empty.html.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.empty.html.ini
new file mode 100644
index 00000000000..01739b9a336
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.empty.html.ini
@@ -0,0 +1,3 @@
+[2d.canvas.host.size.attributes.parse.empty.html]
+  [Parsing of non-negative integers]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.empty.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.empty.worker.js.ini
new file mode 100644
index 00000000000..5b8fd01e9a8
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.empty.worker.js.ini
@@ -0,0 +1,3 @@
+[2d.canvas.host.size.attributes.parse.empty.worker.html]
+  [Parsing of non-negative integers]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.junk.html.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.exp.html.ini
similarity index 53%
rename from tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.junk.html.ini
rename to tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.exp.html.ini
index 9ce93cb4094..c72dca55a59 100644
--- a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.junk.html.ini
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.exp.html.ini
@@ -1,4 +1,3 @@
-[size.attributes.parse.junk.html]
+[2d.canvas.host.size.attributes.parse.exp.html]
   [Parsing of non-negative integers]
     expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.exp.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.exp.worker.js.ini
new file mode 100644
index 00000000000..8ebe18aef30
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.exp.worker.js.ini
@@ -0,0 +1,3 @@
+[2d.canvas.host.size.attributes.parse.exp.worker.html]
+  [Parsing of non-negative integers]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.junk.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.hex.html.ini
similarity index 53%
rename from tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.junk.worker.js.ini
rename to tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.hex.html.ini
index 248eae45724..265e1b56ac6 100644
--- a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.junk.worker.js.ini
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.hex.html.ini
@@ -1,4 +1,3 @@
-[size.attributes.parse.junk.worker.html]
+[2d.canvas.host.size.attributes.parse.hex.html]
   [Parsing of non-negative integers]
     expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.hex.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.hex.worker.js.ini
new file mode 100644
index 00000000000..e27956d3d12
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.hex.worker.js.ini
@@ -0,0 +1,3 @@
+[2d.canvas.host.size.attributes.parse.hex.worker.html]
+  [Parsing of non-negative integers]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.junk.html.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.junk.html.ini
new file mode 100644
index 00000000000..2c79d5c389f
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.junk.html.ini
@@ -0,0 +1,3 @@
+[2d.canvas.host.size.attributes.parse.junk.html]
+  [Parsing of non-negative integers]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.junk.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.junk.worker.js.ini
new file mode 100644
index 00000000000..3d1ba9cd750
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.junk.worker.js.ini
@@ -0,0 +1,3 @@
+[2d.canvas.host.size.attributes.parse.junk.worker.html]
+  [Parsing of non-negative integers]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.minus.html.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.minus.html.ini
new file mode 100644
index 00000000000..a1700667887
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.minus.html.ini
@@ -0,0 +1,3 @@
+[2d.canvas.host.size.attributes.parse.minus.html]
+  [Parsing of non-negative integers]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.minus.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.minus.worker.js.ini
new file mode 100644
index 00000000000..f40514bce36
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.minus.worker.js.ini
@@ -0,0 +1,3 @@
+[2d.canvas.host.size.attributes.parse.minus.worker.html]
+  [Parsing of non-negative integers]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.octal.html.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.octal.html.ini
new file mode 100644
index 00000000000..039536a6844
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.octal.html.ini
@@ -0,0 +1,3 @@
+[2d.canvas.host.size.attributes.parse.octal.html]
+  [Parsing of non-negative integers]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.octal.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.octal.worker.js.ini
new file mode 100644
index 00000000000..649d54a993b
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.octal.worker.js.ini
@@ -0,0 +1,3 @@
+[2d.canvas.host.size.attributes.parse.octal.worker.html]
+  [Parsing of non-negative integers]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.onlyspace.html.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.onlyspace.html.ini
new file mode 100644
index 00000000000..4cfc27803c6
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.onlyspace.html.ini
@@ -0,0 +1,3 @@
+[2d.canvas.host.size.attributes.parse.onlyspace.html]
+  [Parsing of non-negative integers]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.onlyspace.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.onlyspace.worker.js.ini
new file mode 100644
index 00000000000..7777ce43e63
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.onlyspace.worker.js.ini
@@ -0,0 +1,3 @@
+[2d.canvas.host.size.attributes.parse.onlyspace.worker.html]
+  [Parsing of non-negative integers]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.percent.html.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.percent.html.ini
new file mode 100644
index 00000000000..83d334905c6
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.percent.html.ini
@@ -0,0 +1,3 @@
+[2d.canvas.host.size.attributes.parse.percent.html]
+  [Parsing of non-negative integers]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.percent.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.percent.worker.js.ini
new file mode 100644
index 00000000000..864ce77b029
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.percent.worker.js.ini
@@ -0,0 +1,3 @@
+[2d.canvas.host.size.attributes.parse.percent.worker.html]
+  [Parsing of non-negative integers]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.plus.html.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.plus.html.ini
new file mode 100644
index 00000000000..eb254f4ad5c
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.plus.html.ini
@@ -0,0 +1,3 @@
+[2d.canvas.host.size.attributes.parse.plus.html]
+  [Parsing of non-negative integers]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.plus.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.plus.worker.js.ini
new file mode 100644
index 00000000000..227c5721273
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.plus.worker.js.ini
@@ -0,0 +1,3 @@
+[2d.canvas.host.size.attributes.parse.plus.worker.html]
+  [Parsing of non-negative integers]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.space.html.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.space.html.ini
new file mode 100644
index 00000000000..bee63a085c3
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.space.html.ini
@@ -0,0 +1,3 @@
+[2d.canvas.host.size.attributes.parse.space.html]
+  [Parsing of non-negative integers]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.space.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.space.worker.js.ini
new file mode 100644
index 00000000000..c62c305c28c
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.space.worker.js.ini
@@ -0,0 +1,3 @@
+[2d.canvas.host.size.attributes.parse.space.worker.html]
+  [Parsing of non-negative integers]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.trailingjunk.html.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.trailingjunk.html.ini
new file mode 100644
index 00000000000..bbac2296e3d
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.trailingjunk.html.ini
@@ -0,0 +1,3 @@
+[2d.canvas.host.size.attributes.parse.trailingjunk.html]
+  [Parsing of non-negative integers]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.trailingjunk.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.trailingjunk.worker.js.ini
new file mode 100644
index 00000000000..3535cc12f38
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.trailingjunk.worker.js.ini
@@ -0,0 +1,3 @@
+[2d.canvas.host.size.attributes.parse.trailingjunk.worker.html]
+  [Parsing of non-negative integers]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.whitespace.html.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.whitespace.html.ini
new file mode 100644
index 00000000000..7999d372f55
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.whitespace.html.ini
@@ -0,0 +1,3 @@
+[2d.canvas.host.size.attributes.parse.whitespace.html]
+  [Parsing of non-negative integers]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.whitespace.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.whitespace.worker.js.ini
new file mode 100644
index 00000000000..ffd423bec1d
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.whitespace.worker.js.ini
@@ -0,0 +1,3 @@
+[2d.canvas.host.size.attributes.parse.whitespace.worker.html]
+  [Parsing of non-negative integers]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.zero.html.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.zero.html.ini
new file mode 100644
index 00000000000..2e40582f1b4
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.zero.html.ini
@@ -0,0 +1,3 @@
+[2d.canvas.host.size.attributes.parse.zero.html]
+  [Parsing of non-negative integers]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.zero.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.zero.worker.js.ini
new file mode 100644
index 00000000000..5ba209d8365
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.zero.worker.js.ini
@@ -0,0 +1,3 @@
+[2d.canvas.host.size.attributes.parse.zero.worker.html]
+  [Parsing of non-negative integers]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.reflect.setidl.html.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.reflect.setidl.html.ini
similarity index 60%
rename from tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.reflect.setidl.html.ini
rename to tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.reflect.setidl.html.ini
index fc488276666..fdc2cf23ccb 100644
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.reflect.setidl.html.ini
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.reflect.setidl.html.ini
@@ -1,4 +1,3 @@
-[size.attributes.reflect.setidl.html]
+[2d.canvas.host.size.attributes.reflect.setidl.html]
   [Setting IDL attributes updates IDL and content attributes]
     expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.reflect.setidl.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.reflect.setidl.worker.js.ini
similarity index 57%
rename from tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.reflect.setidl.worker.js.ini
rename to tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.reflect.setidl.worker.js.ini
index 7e3f3df11d3..63094ed909f 100644
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.reflect.setidl.worker.js.ini
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.reflect.setidl.worker.js.ini
@@ -1,4 +1,3 @@
-[size.attributes.reflect.setidl.worker.html]
+[2d.canvas.host.size.attributes.reflect.setidl.worker.html]
   [Setting IDL attributes updates IDL and content attributes]
     expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.reflect.setidlzero.html.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.reflect.setidlzero.html.ini
similarity index 60%
rename from tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.reflect.setidlzero.html.ini
rename to tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.reflect.setidlzero.html.ini
index d284e61640c..1ee6b3343bd 100644
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.reflect.setidlzero.html.ini
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.reflect.setidlzero.html.ini
@@ -1,4 +1,3 @@
-[size.attributes.reflect.setidlzero.html]
+[2d.canvas.host.size.attributes.reflect.setidlzero.html]
   [Setting IDL attributes to 0 updates IDL and content attributes]
     expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.reflect.setidlzero.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.reflect.setidlzero.worker.js.ini
similarity index 57%
rename from tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.reflect.setidlzero.worker.js.ini
rename to tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.reflect.setidlzero.worker.js.ini
index 0dc5249cdae..d5f1c1effb5 100644
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.reflect.setidlzero.worker.js.ini
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.reflect.setidlzero.worker.js.ini
@@ -1,4 +1,3 @@
-[size.attributes.reflect.setidlzero.worker.html]
+[2d.canvas.host.size.attributes.reflect.setidlzero.worker.html]
   [Setting IDL attributes to 0 updates IDL and content attributes]
     expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.large.html.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.large.html.ini
new file mode 100644
index 00000000000..ff8915cae80
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.large.html.ini
@@ -0,0 +1,3 @@
+[2d.canvas.host.size.large.html]
+  [OffscreenCanvas test: 2d.canvas.host.size.large]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.large.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.large.worker.js.ini
new file mode 100644
index 00000000000..ef343e82e54
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/canvas-host/2d.canvas.host.size.large.worker.js.ini
@@ -0,0 +1,3 @@
+[2d.canvas.host.size.large.worker.html]
+  [2d]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/layers/2d.layer.blur-from-outside-canvas.no-clipping.w.html.ini b/tests/wpt/meta/html/canvas/offscreen/layers/2d.layer.blur-from-outside-canvas.no-clipping.w.html.ini
new file mode 100644
index 00000000000..cfee0f0d2eb
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/layers/2d.layer.blur-from-outside-canvas.no-clipping.w.html.ini
@@ -0,0 +1,2 @@
+[2d.layer.blur-from-outside-canvas.no-clipping.w.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/html/canvas/offscreen/layers/2d.layer.blur-from-outside-canvas.with-clipping.w.html.ini b/tests/wpt/meta/html/canvas/offscreen/layers/2d.layer.blur-from-outside-canvas.with-clipping.w.html.ini
new file mode 100644
index 00000000000..aa4dc8d83e7
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/layers/2d.layer.blur-from-outside-canvas.with-clipping.w.html.ini
@@ -0,0 +1,2 @@
+[2d.layer.blur-from-outside-canvas.with-clipping.w.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.long-distance-with-clipping.w.html.ini b/tests/wpt/meta/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.long-distance-with-clipping.w.html.ini
new file mode 100644
index 00000000000..d8cea8cbc48
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.long-distance-with-clipping.w.html.ini
@@ -0,0 +1,2 @@
+[2d.layer.shadow-from-outside-canvas.long-distance-with-clipping.w.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.long-distance.html.ini b/tests/wpt/meta/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.long-distance.html.ini
new file mode 100644
index 00000000000..4f2ae62125b
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.long-distance.html.ini
@@ -0,0 +1,2 @@
+[2d.layer.shadow-from-outside-canvas.long-distance.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.long-distance.w.html.ini b/tests/wpt/meta/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.long-distance.w.html.ini
new file mode 100644
index 00000000000..c2d27b36e9d
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.long-distance.w.html.ini
@@ -0,0 +1,2 @@
+[2d.layer.shadow-from-outside-canvas.long-distance.w.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.short-distance-with-clipping.w.html.ini b/tests/wpt/meta/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.short-distance-with-clipping.w.html.ini
new file mode 100644
index 00000000000..b62852b1e7c
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.short-distance-with-clipping.w.html.ini
@@ -0,0 +1,2 @@
+[2d.layer.shadow-from-outside-canvas.short-distance-with-clipping.w.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.short-distance.html.ini b/tests/wpt/meta/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.short-distance.html.ini
new file mode 100644
index 00000000000..46f724b3e99
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.short-distance.html.ini
@@ -0,0 +1,2 @@
+[2d.layer.shadow-from-outside-canvas.short-distance.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.short-distance.w.html.ini b/tests/wpt/meta/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.short-distance.w.html.ini
new file mode 100644
index 00000000000..3fb227c88ef
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.short-distance.w.html.ini
@@ -0,0 +1,2 @@
+[2d.layer.shadow-from-outside-canvas.short-distance.w.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/html/canvas/offscreen/reset/2d.reset.render.drop_shadow.html.ini b/tests/wpt/meta/html/canvas/offscreen/reset/2d.reset.render.drop_shadow.html.ini
new file mode 100644
index 00000000000..de427924922
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/reset/2d.reset.render.drop_shadow.html.ini
@@ -0,0 +1,2 @@
+[2d.reset.render.drop_shadow.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/reset/2d.reset.render.drop_shadow.w.html.ini b/tests/wpt/meta/html/canvas/offscreen/reset/2d.reset.render.drop_shadow.w.html.ini
new file mode 100644
index 00000000000..3d88579b4eb
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/reset/2d.reset.render.drop_shadow.w.html.ini
@@ -0,0 +1,2 @@
+[2d.reset.render.drop_shadow.w.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/html/canvas/offscreen/reset/2d.reset.render.global_composite_operation.html.ini b/tests/wpt/meta/html/canvas/offscreen/reset/2d.reset.render.global_composite_operation.html.ini
new file mode 100644
index 00000000000..8c93940d805
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/reset/2d.reset.render.global_composite_operation.html.ini
@@ -0,0 +1,2 @@
+[2d.reset.render.global_composite_operation.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/reset/2d.reset.render.global_composite_operation.w.html.ini b/tests/wpt/meta/html/canvas/offscreen/reset/2d.reset.render.global_composite_operation.w.html.ini
new file mode 100644
index 00000000000..667bf479aac
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/reset/2d.reset.render.global_composite_operation.w.html.ini
@@ -0,0 +1,2 @@
+[2d.reset.render.global_composite_operation.w.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/html/canvas/offscreen/reset/2d.reset.render.line.html.ini b/tests/wpt/meta/html/canvas/offscreen/reset/2d.reset.render.line.html.ini
new file mode 100644
index 00000000000..46b6c887ca4
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/reset/2d.reset.render.line.html.ini
@@ -0,0 +1,2 @@
+[2d.reset.render.line.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/reset/2d.reset.render.line.w.html.ini b/tests/wpt/meta/html/canvas/offscreen/reset/2d.reset.render.line.w.html.ini
new file mode 100644
index 00000000000..cf5f87c380e
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/reset/2d.reset.render.line.w.html.ini
@@ -0,0 +1,2 @@
+[2d.reset.render.line.w.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/html/canvas/offscreen/reset/2d.reset.render.misc.html.ini b/tests/wpt/meta/html/canvas/offscreen/reset/2d.reset.render.misc.html.ini
new file mode 100644
index 00000000000..4a50e35fd10
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/reset/2d.reset.render.misc.html.ini
@@ -0,0 +1,2 @@
+[2d.reset.render.misc.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/reset/2d.reset.render.misc.w.html.ini b/tests/wpt/meta/html/canvas/offscreen/reset/2d.reset.render.misc.w.html.ini
new file mode 100644
index 00000000000..96c0af4b618
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/reset/2d.reset.render.misc.w.html.ini
@@ -0,0 +1,2 @@
+[2d.reset.render.misc.w.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/html/canvas/offscreen/reset/2d.reset.render.miter_limit.html.ini b/tests/wpt/meta/html/canvas/offscreen/reset/2d.reset.render.miter_limit.html.ini
new file mode 100644
index 00000000000..dcbf36db069
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/reset/2d.reset.render.miter_limit.html.ini
@@ -0,0 +1,2 @@
+[2d.reset.render.miter_limit.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/reset/2d.reset.render.miter_limit.w.html.ini b/tests/wpt/meta/html/canvas/offscreen/reset/2d.reset.render.miter_limit.w.html.ini
new file mode 100644
index 00000000000..f7e5dc24118
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/reset/2d.reset.render.miter_limit.w.html.ini
@@ -0,0 +1,2 @@
+[2d.reset.render.miter_limit.w.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/html/canvas/offscreen/reset/2d.reset.render.text.html.ini b/tests/wpt/meta/html/canvas/offscreen/reset/2d.reset.render.text.html.ini
new file mode 100644
index 00000000000..bab41d308bf
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/reset/2d.reset.render.text.html.ini
@@ -0,0 +1,2 @@
+[2d.reset.render.text.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/reset/2d.reset.render.text.w.html.ini b/tests/wpt/meta/html/canvas/offscreen/reset/2d.reset.render.text.w.html.ini
new file mode 100644
index 00000000000..c509ea86091
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/reset/2d.reset.render.text.w.html.ini
@@ -0,0 +1,2 @@
+[2d.reset.render.text.w.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/html/canvas/offscreen/text/2d.text.fontVariantCaps1.html.ini b/tests/wpt/meta/html/canvas/offscreen/text/2d.text.fontVariantCaps1.html.ini
deleted file mode 100644
index 89fd3194bc6..00000000000
--- a/tests/wpt/meta/html/canvas/offscreen/text/2d.text.fontVariantCaps1.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[2d.text.fontVariantCaps1.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/meta/html/canvas/offscreen/text/2d.text.fontVariantCaps1.w.html.ini b/tests/wpt/meta/html/canvas/offscreen/text/2d.text.fontVariantCaps1.w.html.ini
new file mode 100644
index 00000000000..31831438399
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/text/2d.text.fontVariantCaps1.w.html.ini
@@ -0,0 +1,2 @@
+[2d.text.fontVariantCaps1.w.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/html/canvas/offscreen/text/2d.text.fontVariantCaps2.html.ini b/tests/wpt/meta/html/canvas/offscreen/text/2d.text.fontVariantCaps2.html.ini
index fa58259ed38..53142ddcd6c 100644
--- a/tests/wpt/meta/html/canvas/offscreen/text/2d.text.fontVariantCaps2.html.ini
+++ b/tests/wpt/meta/html/canvas/offscreen/text/2d.text.fontVariantCaps2.html.ini
@@ -1,2 +1,3 @@
 [2d.text.fontVariantCaps2.html]
-  expected: TIMEOUT
+  [Testing small caps setting in fontVariant]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/text/2d.text.fontVariantCaps2.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/text/2d.text.fontVariantCaps2.worker.js.ini
new file mode 100644
index 00000000000..ee3ff3c0602
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/text/2d.text.fontVariantCaps2.worker.js.ini
@@ -0,0 +1,3 @@
+[2d.text.fontVariantCaps2.worker.html]
+  [Testing small caps setting in fontVariant]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/text/2d.text.fontVariantCaps3.html.ini b/tests/wpt/meta/html/canvas/offscreen/text/2d.text.fontVariantCaps3.html.ini
deleted file mode 100644
index 553d2bd4171..00000000000
--- a/tests/wpt/meta/html/canvas/offscreen/text/2d.text.fontVariantCaps3.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[2d.text.fontVariantCaps3.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/meta/html/canvas/offscreen/text/2d.text.fontVariantCaps3.w.html.ini b/tests/wpt/meta/html/canvas/offscreen/text/2d.text.fontVariantCaps3.w.html.ini
new file mode 100644
index 00000000000..377ba2603a1
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/text/2d.text.fontVariantCaps3.w.html.ini
@@ -0,0 +1,2 @@
+[2d.text.fontVariantCaps3.w.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/html/canvas/offscreen/text/2d.text.fontVariantCaps4.html.ini b/tests/wpt/meta/html/canvas/offscreen/text/2d.text.fontVariantCaps4.html.ini
deleted file mode 100644
index 9c5c9297054..00000000000
--- a/tests/wpt/meta/html/canvas/offscreen/text/2d.text.fontVariantCaps4.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[2d.text.fontVariantCaps4.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/meta/html/canvas/offscreen/text/2d.text.fontVariantCaps4.w.html.ini b/tests/wpt/meta/html/canvas/offscreen/text/2d.text.fontVariantCaps4.w.html.ini
new file mode 100644
index 00000000000..4d9c346b829
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/text/2d.text.fontVariantCaps4.w.html.ini
@@ -0,0 +1,2 @@
+[2d.text.fontVariantCaps4.w.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/html/canvas/offscreen/text/2d.text.fontVariantCaps5.html.ini b/tests/wpt/meta/html/canvas/offscreen/text/2d.text.fontVariantCaps5.html.ini
deleted file mode 100644
index 5b3007e7d4e..00000000000
--- a/tests/wpt/meta/html/canvas/offscreen/text/2d.text.fontVariantCaps5.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[2d.text.fontVariantCaps5.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/meta/html/canvas/offscreen/text/2d.text.fontVariantCaps5.w.html.ini b/tests/wpt/meta/html/canvas/offscreen/text/2d.text.fontVariantCaps5.w.html.ini
new file mode 100644
index 00000000000..c061380b6d5
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/text/2d.text.fontVariantCaps5.w.html.ini
@@ -0,0 +1,2 @@
+[2d.text.fontVariantCaps5.w.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/html/canvas/offscreen/text/2d.text.fontVariantCaps6.html.ini b/tests/wpt/meta/html/canvas/offscreen/text/2d.text.fontVariantCaps6.html.ini
deleted file mode 100644
index 73615053193..00000000000
--- a/tests/wpt/meta/html/canvas/offscreen/text/2d.text.fontVariantCaps6.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[2d.text.fontVariantCaps6.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/meta/html/canvas/offscreen/text/2d.text.fontVariantCaps6.w.html.ini b/tests/wpt/meta/html/canvas/offscreen/text/2d.text.fontVariantCaps6.w.html.ini
new file mode 100644
index 00000000000..919352eb84b
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/text/2d.text.fontVariantCaps6.w.html.ini
@@ -0,0 +1,2 @@
+[2d.text.fontVariantCaps6.w.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/2d-getcontext-options.any.js.ini b/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/2d-getcontext-options.any.js.ini
deleted file mode 100644
index 8578d7c6bc9..00000000000
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/2d-getcontext-options.any.js.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[2d-getcontext-options.any.worker.html]
-  [2d-getcontext-options]
-    expected: FAIL
-
-
-[2d-getcontext-options.any.html]
-  [2d-getcontext-options]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/context.arguments.missing.html.ini b/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/context.arguments.missing.html.ini
deleted file mode 100644
index 319d1e0d330..00000000000
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/context.arguments.missing.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[context.arguments.missing.html]
-  [OffscreenCanvas test: context.arguments.missing]
-    expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/context.arguments.missing.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/context.arguments.missing.worker.js.ini
deleted file mode 100644
index 286f5678067..00000000000
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/context.arguments.missing.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[context.arguments.missing.worker.html]
-  [context]
-    expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.decimal.html.ini b/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.decimal.html.ini
deleted file mode 100644
index c9290f41a14..00000000000
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.decimal.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[size.attributes.parse.decimal.html]
-  [Parsing of non-negative integers]
-    expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.decimal.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.decimal.worker.js.ini
deleted file mode 100644
index 3d7da0568e9..00000000000
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.decimal.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[size.attributes.parse.decimal.worker.html]
-  [Parsing of non-negative integers]
-    expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.em.html.ini b/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.em.html.ini
deleted file mode 100644
index 7a0512ad9f0..00000000000
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.em.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[size.attributes.parse.em.html]
-  [Parsing of non-negative integers]
-    expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.em.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.em.worker.js.ini
deleted file mode 100644
index e9a66d77588..00000000000
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.em.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[size.attributes.parse.em.worker.html]
-  [Parsing of non-negative integers]
-    expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.empty.html.ini b/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.empty.html.ini
deleted file mode 100644
index 45a67c24568..00000000000
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.empty.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[size.attributes.parse.empty.html]
-  [Parsing of non-negative integers]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.empty.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.empty.worker.js.ini
deleted file mode 100644
index 28621a5f1aa..00000000000
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.empty.worker.js.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[size.attributes.parse.empty.worker.html]
-  [Parsing of non-negative integers]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.exp.html.ini b/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.exp.html.ini
deleted file mode 100644
index 0fdfe97d92f..00000000000
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.exp.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[size.attributes.parse.exp.html]
-  [Parsing of non-negative integers]
-    expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.exp.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.exp.worker.js.ini
deleted file mode 100644
index 2ff615c5967..00000000000
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.exp.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[size.attributes.parse.exp.worker.html]
-  [Parsing of non-negative integers]
-    expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.hex.html.ini b/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.hex.html.ini
deleted file mode 100644
index 92aba62456d..00000000000
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.hex.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[size.attributes.parse.hex.html]
-  [Parsing of non-negative integers]
-    expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.hex.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.hex.worker.js.ini
deleted file mode 100644
index 0ac286dbfcd..00000000000
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.hex.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[size.attributes.parse.hex.worker.html]
-  [Parsing of non-negative integers]
-    expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.junk.html.ini b/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.junk.html.ini
deleted file mode 100644
index 9ce93cb4094..00000000000
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.junk.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[size.attributes.parse.junk.html]
-  [Parsing of non-negative integers]
-    expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.junk.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.junk.worker.js.ini
deleted file mode 100644
index 248eae45724..00000000000
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.junk.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[size.attributes.parse.junk.worker.html]
-  [Parsing of non-negative integers]
-    expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.minus.html.ini b/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.minus.html.ini
deleted file mode 100644
index 65f61338c7a..00000000000
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.minus.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[size.attributes.parse.minus.html]
-  [Parsing of non-negative integers]
-    expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.minus.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.minus.worker.js.ini
deleted file mode 100644
index 746b8f60fff..00000000000
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.minus.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[size.attributes.parse.minus.worker.html]
-  [Parsing of non-negative integers]
-    expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.octal.html.ini b/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.octal.html.ini
deleted file mode 100644
index ec82913cab0..00000000000
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.octal.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[size.attributes.parse.octal.html]
-  [Parsing of non-negative integers]
-    expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.octal.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.octal.worker.js.ini
deleted file mode 100644
index 28bc389b887..00000000000
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.octal.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[size.attributes.parse.octal.worker.html]
-  [Parsing of non-negative integers]
-    expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.onlyspace.html.ini b/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.onlyspace.html.ini
deleted file mode 100644
index 84d154c8621..00000000000
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.onlyspace.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[size.attributes.parse.onlyspace.html]
-  [Parsing of non-negative integers]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.onlyspace.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.onlyspace.worker.js.ini
deleted file mode 100644
index e305bd0ab43..00000000000
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.onlyspace.worker.js.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[size.attributes.parse.onlyspace.worker.html]
-  [Parsing of non-negative integers]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.percent.html.ini b/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.percent.html.ini
deleted file mode 100644
index 3616116f9d5..00000000000
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.percent.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[size.attributes.parse.percent.html]
-  [Parsing of non-negative integers]
-    expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.percent.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.percent.worker.js.ini
deleted file mode 100644
index 593e7be1da0..00000000000
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.percent.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[size.attributes.parse.percent.worker.html]
-  [Parsing of non-negative integers]
-    expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.plus.html.ini b/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.plus.html.ini
deleted file mode 100644
index 5aa34677035..00000000000
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.plus.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[size.attributes.parse.plus.html]
-  [Parsing of non-negative integers]
-    expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.plus.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.plus.worker.js.ini
deleted file mode 100644
index c79cf4008c1..00000000000
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.plus.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[size.attributes.parse.plus.worker.html]
-  [Parsing of non-negative integers]
-    expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.space.html.ini b/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.space.html.ini
deleted file mode 100644
index 89f99590885..00000000000
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.space.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[size.attributes.parse.space.html]
-  [Parsing of non-negative integers]
-    expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.space.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.space.worker.js.ini
deleted file mode 100644
index d93f08fbea0..00000000000
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.space.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[size.attributes.parse.space.worker.html]
-  [Parsing of non-negative integers]
-    expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.trailingjunk.html.ini b/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.trailingjunk.html.ini
deleted file mode 100644
index 9e3d3533a05..00000000000
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.trailingjunk.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[size.attributes.parse.trailingjunk.html]
-  [Parsing of non-negative integers]
-    expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.trailingjunk.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.trailingjunk.worker.js.ini
deleted file mode 100644
index bdbc4d4c968..00000000000
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.trailingjunk.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[size.attributes.parse.trailingjunk.worker.html]
-  [Parsing of non-negative integers]
-    expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.whitespace.html.ini b/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.whitespace.html.ini
deleted file mode 100644
index c2bed0c585f..00000000000
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.whitespace.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[size.attributes.parse.whitespace.html]
-  [Parsing of non-negative integers]
-    expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.whitespace.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.whitespace.worker.js.ini
deleted file mode 100644
index 8e7ad61369b..00000000000
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.whitespace.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[size.attributes.parse.whitespace.worker.html]
-  [Parsing of non-negative integers]
-    expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.zero.html.ini b/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.zero.html.ini
deleted file mode 100644
index ab7bd8091bb..00000000000
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.zero.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[size.attributes.parse.zero.html]
-  [Parsing of non-negative integers]
-    expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.zero.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.zero.worker.js.ini
deleted file mode 100644
index 767bad32801..00000000000
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.zero.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[size.attributes.parse.zero.worker.html]
-  [Parsing of non-negative integers]
-    expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.large.html.ini b/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.large.html.ini
deleted file mode 100644
index 1395fa8c564..00000000000
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.large.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[size.large.html]
-  [OffscreenCanvas test: size.large]
-    expected: FAIL
-
diff --git a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.large.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.large.worker.js.ini
deleted file mode 100644
index 1dac8e4a1aa..00000000000
--- a/tests/wpt/meta/html/canvas/offscreen/the-offscreen-canvas/size.large.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[size.large.worker.html]
-  [size]
-    expected: FAIL
-
diff --git a/tests/wpt/meta/html/dom/elements/global-attributes/dir-assorted.window.js.ini b/tests/wpt/meta/html/dom/elements/global-attributes/dir-assorted.window.js.ini
new file mode 100644
index 00000000000..a350126250c
--- /dev/null
+++ b/tests/wpt/meta/html/dom/elements/global-attributes/dir-assorted.window.js.ini
@@ -0,0 +1,21 @@
+[dir-assorted.window.html]
+  [Root element has a direction]
+    expected: FAIL
+
+  [Element outside the document tree has a direction]
+    expected: FAIL
+
+  [Non-HTML element outside the document tree has a direction]
+    expected: FAIL
+
+  [Element without direction has parent element direction]
+    expected: FAIL
+
+  [Non-HTML element without direction has parent element direction]
+    expected: FAIL
+
+  [dir inheritance is correct after insertion and removal from document]
+    expected: FAIL
+
+  [Non-HTML element text contents influence dir=auto]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/dom/elements/global-attributes/dir-auto-dynamic-changes.window.js.ini b/tests/wpt/meta/html/dom/elements/global-attributes/dir-auto-dynamic-changes.window.js.ini
new file mode 100644
index 00000000000..8becf694cfa
--- /dev/null
+++ b/tests/wpt/meta/html/dom/elements/global-attributes/dir-auto-dynamic-changes.window.js.ini
@@ -0,0 +1,24 @@
+[dir-auto-dynamic-changes.window.html]
+  [dynamic insertion of RTL text in a child element]
+    expected: FAIL
+
+  [dir=auto changes for content insertion and removal, in and out of document]
+    expected: FAIL
+
+  [dir=auto changes for slot reassignment]
+    expected: FAIL
+
+  [text changes affecting both slot and ancestor with dir=auto]
+    expected: FAIL
+
+  [dynamic changes to subtrees excluded as a result of the dir attribute]
+    expected: FAIL
+
+  [dynamic changes inside of non-HTML elements]
+    expected: FAIL
+
+  [slotted non-HTML elements]
+    expected: FAIL
+
+  [slotted non-HTML elements after dynamically assigning dir=auto, and dir attribute ignored on non-HTML elements]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/dom/elements/global-attributes/dir-slots-directionality.tentative.html.ini b/tests/wpt/meta/html/dom/elements/global-attributes/dir-slots-directionality.tentative.html.ini
index 9c605ab4702..32cb19c22c3 100644
--- a/tests/wpt/meta/html/dom/elements/global-attributes/dir-slots-directionality.tentative.html.ini
+++ b/tests/wpt/meta/html/dom/elements/global-attributes/dir-slots-directionality.tentative.html.ini
@@ -1,2 +1,18 @@
 [dir-slots-directionality.tentative.html]
-  expected: ERROR
+  [Slots: Directionality: dir=rtl on slot]
+    expected: FAIL
+
+  [Slots: Directionality: dir=rtl on host]
+    expected: FAIL
+
+  [Slots: Directionality: dir=auto on host with Arabic shadow tree content]
+    expected: FAIL
+
+  [Slots: Directionality: dir=auto in shadow tree with Arabic light tree content]
+    expected: FAIL
+
+  [Slots: Directionality: dir=auto in shadow tree with Arabic shadow tree content]
+    expected: FAIL
+
+  [Slots: Directionality: dir=auto on slot with Arabic light tree content]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/dom/idlharness.https.html.ini b/tests/wpt/meta/html/dom/idlharness.https.html.ini
index 9350677d72b..0c973d40304 100644
--- a/tests/wpt/meta/html/dom/idlharness.https.html.ini
+++ b/tests/wpt/meta/html/dom/idlharness.https.html.ini
@@ -1556,6 +1556,258 @@
   [ImageBitmap interface: attribute height]
     expected: FAIL
 
+  [CustomElementRegistry interface: operation getName(CustomElementConstructor)]
+    expected: FAIL
+
+  [Navigation interface: existence and properties of interface object]
+    expected: FAIL
+
+  [Navigation interface object length]
+    expected: FAIL
+
+  [Navigation interface object name]
+    expected: FAIL
+
+  [Navigation interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [Navigation interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [Navigation interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [Navigation interface: operation entries()]
+    expected: FAIL
+
+  [Navigation interface: attribute currentEntry]
+    expected: FAIL
+
+  [Navigation interface: operation updateCurrentEntry(NavigationUpdateCurrentEntryOptions)]
+    expected: FAIL
+
+  [Navigation interface: attribute transition]
+    expected: FAIL
+
+  [Navigation interface: attribute canGoBack]
+    expected: FAIL
+
+  [Navigation interface: attribute canGoForward]
+    expected: FAIL
+
+  [Navigation interface: operation navigate(USVString, optional NavigationNavigateOptions)]
+    expected: FAIL
+
+  [Navigation interface: operation reload(optional NavigationReloadOptions)]
+    expected: FAIL
+
+  [Navigation interface: operation traverseTo(DOMString, optional NavigationOptions)]
+    expected: FAIL
+
+  [Navigation interface: operation back(optional NavigationOptions)]
+    expected: FAIL
+
+  [Navigation interface: operation forward(optional NavigationOptions)]
+    expected: FAIL
+
+  [Navigation interface: attribute onnavigate]
+    expected: FAIL
+
+  [Navigation interface: attribute onnavigatesuccess]
+    expected: FAIL
+
+  [Navigation interface: attribute onnavigateerror]
+    expected: FAIL
+
+  [Navigation interface: attribute oncurrententrychange]
+    expected: FAIL
+
+  [NavigationHistoryEntry interface: existence and properties of interface object]
+    expected: FAIL
+
+  [NavigationHistoryEntry interface object length]
+    expected: FAIL
+
+  [NavigationHistoryEntry interface object name]
+    expected: FAIL
+
+  [NavigationHistoryEntry interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [NavigationHistoryEntry interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [NavigationHistoryEntry interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [NavigationHistoryEntry interface: attribute url]
+    expected: FAIL
+
+  [NavigationHistoryEntry interface: attribute key]
+    expected: FAIL
+
+  [NavigationHistoryEntry interface: attribute id]
+    expected: FAIL
+
+  [NavigationHistoryEntry interface: attribute index]
+    expected: FAIL
+
+  [NavigationHistoryEntry interface: attribute sameDocument]
+    expected: FAIL
+
+  [NavigationHistoryEntry interface: operation getState()]
+    expected: FAIL
+
+  [NavigationHistoryEntry interface: attribute ondispose]
+    expected: FAIL
+
+  [NavigationTransition interface: existence and properties of interface object]
+    expected: FAIL
+
+  [NavigationTransition interface object length]
+    expected: FAIL
+
+  [NavigationTransition interface object name]
+    expected: FAIL
+
+  [NavigationTransition interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [NavigationTransition interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [NavigationTransition interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [NavigationTransition interface: attribute navigationType]
+    expected: FAIL
+
+  [NavigationTransition interface: attribute from]
+    expected: FAIL
+
+  [NavigationTransition interface: attribute finished]
+    expected: FAIL
+
+  [NavigateEvent interface: existence and properties of interface object]
+    expected: FAIL
+
+  [NavigateEvent interface object length]
+    expected: FAIL
+
+  [NavigateEvent interface object name]
+    expected: FAIL
+
+  [NavigateEvent interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [NavigateEvent interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [NavigateEvent interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [NavigateEvent interface: attribute navigationType]
+    expected: FAIL
+
+  [NavigateEvent interface: attribute destination]
+    expected: FAIL
+
+  [NavigateEvent interface: attribute canIntercept]
+    expected: FAIL
+
+  [NavigateEvent interface: attribute userInitiated]
+    expected: FAIL
+
+  [NavigateEvent interface: attribute hashChange]
+    expected: FAIL
+
+  [NavigateEvent interface: attribute signal]
+    expected: FAIL
+
+  [NavigateEvent interface: attribute formData]
+    expected: FAIL
+
+  [NavigateEvent interface: attribute downloadRequest]
+    expected: FAIL
+
+  [NavigateEvent interface: attribute info]
+    expected: FAIL
+
+  [NavigateEvent interface: attribute hasUAVisualTransition]
+    expected: FAIL
+
+  [NavigateEvent interface: operation intercept(optional NavigationInterceptOptions)]
+    expected: FAIL
+
+  [NavigateEvent interface: operation scroll()]
+    expected: FAIL
+
+  [NavigationDestination interface: existence and properties of interface object]
+    expected: FAIL
+
+  [NavigationDestination interface object length]
+    expected: FAIL
+
+  [NavigationDestination interface object name]
+    expected: FAIL
+
+  [NavigationDestination interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [NavigationDestination interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [NavigationDestination interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [NavigationDestination interface: attribute url]
+    expected: FAIL
+
+  [NavigationDestination interface: attribute key]
+    expected: FAIL
+
+  [NavigationDestination interface: attribute id]
+    expected: FAIL
+
+  [NavigationDestination interface: attribute index]
+    expected: FAIL
+
+  [NavigationDestination interface: attribute sameDocument]
+    expected: FAIL
+
+  [NavigationDestination interface: operation getState()]
+    expected: FAIL
+
+  [NavigationCurrentEntryChangeEvent interface: existence and properties of interface object]
+    expected: FAIL
+
+  [NavigationCurrentEntryChangeEvent interface object length]
+    expected: FAIL
+
+  [NavigationCurrentEntryChangeEvent interface object name]
+    expected: FAIL
+
+  [NavigationCurrentEntryChangeEvent interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [NavigationCurrentEntryChangeEvent interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [NavigationCurrentEntryChangeEvent interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [NavigationCurrentEntryChangeEvent interface: attribute navigationType]
+    expected: FAIL
+
+  [NavigationCurrentEntryChangeEvent interface: attribute from]
+    expected: FAIL
+
+  [PopStateEvent interface: attribute hasUAVisualTransition]
+    expected: FAIL
+
+  [PopStateEvent interface: new PopStateEvent("popstate", { data: {} }) must inherit property "hasUAVisualTransition" with the proper type]
+    expected: FAIL
+
 
 [idlharness.https.html?include=(Document|Window)]
   [Document interface: documentWithHandlers must inherit property "queryCommandEnabled(DOMString)" with the proper type]
@@ -2161,6 +2413,12 @@
   [Window interface: window must inherit property "createImageBitmap(ImageBitmapSource, long, long, long, long, optional ImageBitmapOptions)" with the proper type]
     expected: FAIL
 
+  [Window interface: attribute navigation]
+    expected: FAIL
+
+  [Window interface: window must inherit property "navigation" with the proper type]
+    expected: FAIL
+
 
 [idlharness.https.html?include=HTML.*]
   [HTMLTableSectionElement interface: document.createElement("tfoot") must inherit property "align" with the proper type]
diff --git a/tests/wpt/meta/html/interaction/focus/the-autofocus-attribute/document-with-fragment-top.html.ini b/tests/wpt/meta/html/interaction/focus/the-autofocus-attribute/document-with-fragment-top.html.ini
index ab1003579be..6f0fc648f04 100644
--- a/tests/wpt/meta/html/interaction/focus/the-autofocus-attribute/document-with-fragment-top.html.ini
+++ b/tests/wpt/meta/html/interaction/focus/the-autofocus-attribute/document-with-fragment-top.html.ini
@@ -1,7 +1,6 @@
 [document-with-fragment-top.html]
-  expected: TIMEOUT
   [Autofocus elements in iframed documents with "top" fragments should work.]
     expected: FAIL
 
   [Autofocus elements in top-level browsing context's documents with "top" fragments should work.]
-    expected: TIMEOUT
+    expected: FAIL
diff --git a/tests/wpt/meta/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini b/tests/wpt/meta/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
index bc228cfd2a2..ddd65fdcec8 100644
--- a/tests/wpt/meta/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
+++ b/tests/wpt/meta/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
@@ -1,5 +1,4 @@
 [supported-elements.html]
-  expected: TIMEOUT
   [Contenteditable element should support autofocus]
     expected: FAIL
 
@@ -10,7 +9,7 @@
     expected: FAIL
 
   [Area element should support autofocus]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Host element with delegatesFocus should support autofocus]
     expected: FAIL
diff --git a/tests/wpt/meta/html/links/stylesheet/quirk-origin-check-recursive-import.html.ini b/tests/wpt/meta/html/links/stylesheet/quirk-origin-check-recursive-import.html.ini
new file mode 100644
index 00000000000..3f0df9b071f
--- /dev/null
+++ b/tests/wpt/meta/html/links/stylesheet/quirk-origin-check-recursive-import.html.ini
@@ -0,0 +1,3 @@
+[quirk-origin-check-recursive-import.html]
+  [Origin check for stylesheet with non-CSS MIME type quirk: recursive @import]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/rendering/non-replaced-elements/hidden-elements.html.ini b/tests/wpt/meta/html/rendering/non-replaced-elements/hidden-elements.html.ini
index c8168428dfd..1e410b1cee2 100644
--- a/tests/wpt/meta/html/rendering/non-replaced-elements/hidden-elements.html.ini
+++ b/tests/wpt/meta/html/rendering/non-replaced-elements/hidden-elements.html.ini
@@ -4,3 +4,6 @@
 
   [track should not be hidden]
     expected: FAIL
+
+  [embed[hidden='until-found'\] element should be inline 0x0]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/rendering/the-details-element/details-pseudo-elements-002.tentative.html.ini b/tests/wpt/meta/html/rendering/the-details-element/details-pseudo-elements-002.tentative.html.ini
new file mode 100644
index 00000000000..75b4ed86b24
--- /dev/null
+++ b/tests/wpt/meta/html/rendering/the-details-element/details-pseudo-elements-002.tentative.html.ini
@@ -0,0 +1,2 @@
+[details-pseudo-elements-002.tentative.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/html/rendering/widgets/form-sizing-input-number.tentative.html.ini b/tests/wpt/meta/html/rendering/widgets/form-sizing-input-number.tentative.html.ini
new file mode 100644
index 00000000000..f2cce1cc1a8
--- /dev/null
+++ b/tests/wpt/meta/html/rendering/widgets/form-sizing-input-number.tentative.html.ini
@@ -0,0 +1,18 @@
+[form-sizing-input-number.tentative.html]
+  [number: Empty value]
+    expected: FAIL
+
+  [number: Auto width and auto height with a long text]
+    expected: FAIL
+
+  [number: Explicit height and auto width]
+    expected: FAIL
+
+  [number: Text caret is taller than the placeholder]
+    expected: FAIL
+
+  [number: Text caret is shorter than the placeholder]
+    expected: FAIL
+
+  [number: Update form-sizing property dynamically]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/rendering/widgets/form-sizing-input-text.tentative.html.ini b/tests/wpt/meta/html/rendering/widgets/form-sizing-input-text.tentative.html.ini
new file mode 100644
index 00000000000..33eabf960dd
--- /dev/null
+++ b/tests/wpt/meta/html/rendering/widgets/form-sizing-input-text.tentative.html.ini
@@ -0,0 +1,126 @@
+[form-sizing-input-text.tentative.html]
+  [text: Empty value]
+    expected: FAIL
+
+  [text: Empty value with a size atttribute]
+    expected: FAIL
+
+  [text: Auto width and auto height with a long text]
+    expected: FAIL
+
+  [text: Explicit height and auto width]
+    expected: FAIL
+
+  [text: Text caret is taller than the placeholder]
+    expected: FAIL
+
+  [text: Text caret is shorter than the placeholder]
+    expected: FAIL
+
+  [text: Update form-sizing property dynamically]
+    expected: FAIL
+
+  [search: Empty value]
+    expected: FAIL
+
+  [search: Empty value with a size atttribute]
+    expected: FAIL
+
+  [search: Auto width and auto height with a long text]
+    expected: FAIL
+
+  [search: Explicit height and auto width]
+    expected: FAIL
+
+  [search: Text caret is taller than the placeholder]
+    expected: FAIL
+
+  [search: Text caret is shorter than the placeholder]
+    expected: FAIL
+
+  [search: Update form-sizing property dynamically]
+    expected: FAIL
+
+  [tel: Empty value]
+    expected: FAIL
+
+  [tel: Empty value with a size atttribute]
+    expected: FAIL
+
+  [tel: Auto width and auto height with a long text]
+    expected: FAIL
+
+  [tel: Explicit height and auto width]
+    expected: FAIL
+
+  [tel: Text caret is taller than the placeholder]
+    expected: FAIL
+
+  [tel: Text caret is shorter than the placeholder]
+    expected: FAIL
+
+  [tel: Update form-sizing property dynamically]
+    expected: FAIL
+
+  [url: Empty value]
+    expected: FAIL
+
+  [url: Empty value with a size atttribute]
+    expected: FAIL
+
+  [url: Auto width and auto height with a long text]
+    expected: FAIL
+
+  [url: Explicit height and auto width]
+    expected: FAIL
+
+  [url: Text caret is taller than the placeholder]
+    expected: FAIL
+
+  [url: Text caret is shorter than the placeholder]
+    expected: FAIL
+
+  [url: Update form-sizing property dynamically]
+    expected: FAIL
+
+  [email: Empty value]
+    expected: FAIL
+
+  [email: Empty value with a size atttribute]
+    expected: FAIL
+
+  [email: Auto width and auto height with a long text]
+    expected: FAIL
+
+  [email: Explicit height and auto width]
+    expected: FAIL
+
+  [email: Text caret is taller than the placeholder]
+    expected: FAIL
+
+  [email: Text caret is shorter than the placeholder]
+    expected: FAIL
+
+  [email: Update form-sizing property dynamically]
+    expected: FAIL
+
+  [password: Empty value]
+    expected: FAIL
+
+  [password: Empty value with a size atttribute]
+    expected: FAIL
+
+  [password: Auto width and auto height with a long text]
+    expected: FAIL
+
+  [password: Explicit height and auto width]
+    expected: FAIL
+
+  [password: Text caret is taller than the placeholder]
+    expected: FAIL
+
+  [password: Text caret is shorter than the placeholder]
+    expected: FAIL
+
+  [password: Update form-sizing property dynamically]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/rendering/widgets/form-sizing-select.tentative.html.ini b/tests/wpt/meta/html/rendering/widgets/form-sizing-select.tentative.html.ini
new file mode 100644
index 00000000000..bd921cc4895
--- /dev/null
+++ b/tests/wpt/meta/html/rendering/widgets/form-sizing-select.tentative.html.ini
@@ -0,0 +1,15 @@
+[form-sizing-select.tentative.html]
+  [dropdown: The width should depend on the selected OPTION]
+    expected: FAIL
+
+  [dropdown: Change the form-sizing value dynamically]
+    expected: FAIL
+
+  [listbox: The size depend on the content]
+    expected: FAIL
+
+  [listbox: The size attribute value is ignored]
+    expected: FAIL
+
+  [listbox: Change the form-sizing value dynamically]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/rendering/widgets/form-sizing-textarea.tentative.html.ini b/tests/wpt/meta/html/rendering/widgets/form-sizing-textarea.tentative.html.ini
new file mode 100644
index 00000000000..e7397eb411f
--- /dev/null
+++ b/tests/wpt/meta/html/rendering/widgets/form-sizing-textarea.tentative.html.ini
@@ -0,0 +1,24 @@
+[form-sizing-textarea.tentative.html]
+  [Empty value]
+    expected: FAIL
+
+  [Empty value with cols/rows]
+    expected: FAIL
+
+  [Auto width and auto height with a long text]
+    expected: FAIL
+
+  [Explicit width and auto height]
+    expected: FAIL
+
+  [Explicit height and auto width]
+    expected: FAIL
+
+  [Text caret is taller than the placeholder]
+    expected: FAIL
+
+  [Text caret is shorter than the placeholder]
+    expected: FAIL
+
+  [Update form-sizing property dynamically]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/document-metadata/the-base-element/base-data.html.ini b/tests/wpt/meta/html/semantics/document-metadata/the-base-element/base-data.html.ini
new file mode 100644
index 00000000000..859fbc431bf
--- /dev/null
+++ b/tests/wpt/meta/html/semantics/document-metadata/the-base-element/base-data.html.ini
@@ -0,0 +1,6 @@
+[base-data.html]
+  [First <base> has a data: URL so fallback is used]
+    expected: FAIL
+
+  [Dynamically inserted first <base> has a data: URL so fallback is used]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/document-metadata/the-base-element/base-javascript.html.ini b/tests/wpt/meta/html/semantics/document-metadata/the-base-element/base-javascript.html.ini
new file mode 100644
index 00000000000..0cd8cecf4fe
--- /dev/null
+++ b/tests/wpt/meta/html/semantics/document-metadata/the-base-element/base-javascript.html.ini
@@ -0,0 +1,6 @@
+[base-javascript.html]
+  [First <base> has a javascript: URL so fallback is used]
+    expected: FAIL
+
+  [Dynamically inserted first <base> has a javascript: URL so fallback is used]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini b/tests/wpt/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
index 26704422bbe..841bafc6eca 100644
--- a/tests/wpt/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
+++ b/tests/wpt/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
@@ -1,4 +1,3 @@
 [iframe_sandbox_popups_escaping-2.html]
-  expected: TIMEOUT
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
-    expected: TIMEOUT
+    expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini b/tests/wpt/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
index c6f1e5d7d84..4034793cc72 100644
--- a/tests/wpt/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
+++ b/tests/wpt/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
@@ -1,4 +1,3 @@
 [iframe_sandbox_popups_nonescaping-2.html]
-  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
-    expected: NOTRUN
+    expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/embedded-content/the-img-element/sizes/parse-a-sizes-attribute-quirks-mode.html.ini b/tests/wpt/meta/html/semantics/embedded-content/the-img-element/sizes/parse-a-sizes-attribute-quirks-mode.html.ini
new file mode 100644
index 00000000000..4eb09510021
--- /dev/null
+++ b/tests/wpt/meta/html/semantics/embedded-content/the-img-element/sizes/parse-a-sizes-attribute-quirks-mode.html.ini
@@ -0,0 +1,24 @@
+[parse-a-sizes-attribute-quirks-mode.html]
+  [<img srcset="/images/green-1x1.png?e38 50w, /images/green-16x16.png?e38 51w" sizes="(min-width:calc(0)) 1px"> ref sizes="1px" (quirks mode)]
+    expected: FAIL
+
+  [<img srcset="/images/green-1x1.png?e45 50w, /images/green-16x16.png?e45 51w" sizes="(min-width:-1px) 1px, 100vw"> ref sizes="1px" (quirks mode)]
+    expected: FAIL
+
+  [<img srcset="/images/green-1x1.png?e58 50w, /images/green-16x16.png?e58 51w" sizes="(min-width:0) or (unknown-mf-name) 1px"> ref sizes="1px" (quirks mode)]
+    expected: FAIL
+
+  [<img srcset="/images/green-1x1.png?e59 50w, /images/green-16x16.png?e59 51w" sizes="(min-width:0) or (min-width:unknown-mf-value) 1px"> ref sizes="1px" (quirks mode)]
+    expected: FAIL
+
+  [<img srcset="/images/green-1x1.png?e60 50w, /images/green-16x16.png?e60 51w" sizes="(min-width:0) or (min-width:-1px) 1px"> ref sizes="1px" (quirks mode)]
+    expected: FAIL
+
+  [<img srcset="/images/green-1x1.png?e61 50w, /images/green-16x16.png?e61 51w" sizes="(min-width:0) or (unknown &quot;general-enclosed&quot;) 1px"> ref sizes="1px" (quirks mode)]
+    expected: FAIL
+
+  [<img srcset="/images/green-1x1.png?e62 50w, /images/green-16x16.png?e62 51w" sizes="(min-width:0) or unknown-general-enclosed(foo) 1px"> ref sizes="1px" (quirks mode)]
+    expected: FAIL
+
+  [<img srcset="/images/green-1x1.png?e106 50w, /images/green-16x16.png?e106 51w" sizes="(min-width:0) or (unknown-general-enclosed !) 1px"> ref sizes="1px" (quirks mode)]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/forms/constraints/infinite_backtracking.html.ini b/tests/wpt/meta/html/semantics/forms/constraints/infinite_backtracking.html.ini
deleted file mode 100644
index 2863d63707b..00000000000
--- a/tests/wpt/meta/html/semantics/forms/constraints/infinite_backtracking.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[infinite_backtracking.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/meta/html/semantics/forms/constraints/infinite_backtracking.tentative.html.ini b/tests/wpt/meta/html/semantics/forms/constraints/infinite_backtracking.tentative.html.ini
new file mode 100644
index 00000000000..ce52ffb4728
--- /dev/null
+++ b/tests/wpt/meta/html/semantics/forms/constraints/infinite_backtracking.tentative.html.ini
@@ -0,0 +1,2 @@
+[infinite_backtracking.tentative.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/html/semantics/forms/form-submission-0/form-submit-iframe-then-location-navigate.html.ini b/tests/wpt/meta/html/semantics/forms/form-submission-0/form-submit-iframe-then-location-navigate.html.ini
deleted file mode 100644
index d44f3ccff52..00000000000
--- a/tests/wpt/meta/html/semantics/forms/form-submission-0/form-submit-iframe-then-location-navigate.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[form-submit-iframe-then-location-navigate.html]
-  [Verifies that location navigations take precedence when following form submissions.]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/forms/form-submission-0/reparent-form-during-planned-navigation-task.html.ini b/tests/wpt/meta/html/semantics/forms/form-submission-0/reparent-form-during-planned-navigation-task.html.ini
deleted file mode 100644
index 7682a4830bf..00000000000
--- a/tests/wpt/meta/html/semantics/forms/form-submission-0/reparent-form-during-planned-navigation-task.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[reparent-form-during-planned-navigation-task.html]
-  expected: TIMEOUT
-  [reparent-form-during-planned-navigation-task]
-    expected: TIMEOUT
diff --git a/tests/wpt/meta/html/semantics/forms/the-input-element/radio-disconnected-group-owner.html.ini b/tests/wpt/meta/html/semantics/forms/the-input-element/radio-disconnected-group-owner.html.ini
new file mode 100644
index 00000000000..225fb3f96e3
--- /dev/null
+++ b/tests/wpt/meta/html/semantics/forms/the-input-element/radio-disconnected-group-owner.html.ini
@@ -0,0 +1,15 @@
+[radio-disconnected-group-owner.html]
+  [Removed elements are moved into separate radio groups.]
+    expected: FAIL
+
+  [Disconnected radio buttons can serve as radio group containers.]
+    expected: FAIL
+
+  [Shadow roots in disconnected trees can serve as radio group containers.]
+    expected: FAIL
+
+  [Non-HTML elements in disconnected trees can serve as radio group containers.]
+    expected: FAIL
+
+  [Disconnected document fragments can serve as radio group containers.]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/forms/the-select-element/show-picker-cross-origin-iframe.tentative.html.ini b/tests/wpt/meta/html/semantics/forms/the-select-element/show-picker-cross-origin-iframe.tentative.html.ini
new file mode 100644
index 00000000000..12bb3b1110f
--- /dev/null
+++ b/tests/wpt/meta/html/semantics/forms/the-select-element/show-picker-cross-origin-iframe.tentative.html.ini
@@ -0,0 +1,6 @@
+[show-picker-cross-origin-iframe.tentative.html]
+  [Test showPicker() called from cross-origin iframe 1]
+    expected: FAIL
+
+  [Test showPicker() called from cross-origin iframe 3]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/forms/the-selectlist-element/selectlist-default-button-slot.tentative.html.ini b/tests/wpt/meta/html/semantics/forms/the-selectlist-element/selectlist-default-button-slot.tentative.html.ini
new file mode 100644
index 00000000000..54fa9e538d1
--- /dev/null
+++ b/tests/wpt/meta/html/semantics/forms/the-selectlist-element/selectlist-default-button-slot.tentative.html.ini
@@ -0,0 +1,2 @@
+[selectlist-default-button-slot.tentative.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/forms/the-selectlist-element/selectlist-listbox-element.tentative.html.ini b/tests/wpt/meta/html/semantics/forms/the-selectlist-element/selectlist-listbox-element.tentative.html.ini
new file mode 100644
index 00000000000..a20cfc7c4bb
--- /dev/null
+++ b/tests/wpt/meta/html/semantics/forms/the-selectlist-element/selectlist-listbox-element.tentative.html.ini
@@ -0,0 +1,2 @@
+[selectlist-listbox-element.tentative.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/forms/the-selectlist-element/selectlist-selectedoption-element-cloning.tentative.html.ini b/tests/wpt/meta/html/semantics/forms/the-selectlist-element/selectlist-selectedoption-element-cloning.tentative.html.ini
new file mode 100644
index 00000000000..a43e466ba14
--- /dev/null
+++ b/tests/wpt/meta/html/semantics/forms/the-selectlist-element/selectlist-selectedoption-element-cloning.tentative.html.ini
@@ -0,0 +1,2 @@
+[selectlist-selectedoption-element-cloning.tentative.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/forms/the-selectlist-element/selectlist-selectedoption-element.tentative.html.ini b/tests/wpt/meta/html/semantics/forms/the-selectlist-element/selectlist-selectedoption-element.tentative.html.ini
new file mode 100644
index 00000000000..eabdcc0bccc
--- /dev/null
+++ b/tests/wpt/meta/html/semantics/forms/the-selectlist-element/selectlist-selectedoption-element.tentative.html.ini
@@ -0,0 +1,3 @@
+[selectlist-selectedoption-element.tentative.html]
+  [<selectedoption>'s text contents should be replaced with its ancestor <selectlist>'s selected value.]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/forms/the-selectlist-element/selectlist-text-only.tentative.html.ini b/tests/wpt/meta/html/semantics/forms/the-selectlist-element/selectlist-text-only.tentative.html.ini
new file mode 100644
index 00000000000..62dcd3e9e8c
--- /dev/null
+++ b/tests/wpt/meta/html/semantics/forms/the-selectlist-element/selectlist-text-only.tentative.html.ini
@@ -0,0 +1,2 @@
+[selectlist-text-only.tentative.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/interactive-elements/the-details-element/name-attribute.tentative.html.ini b/tests/wpt/meta/html/semantics/interactive-elements/the-details-element/name-attribute.tentative.html.ini
index d1599e1df58..2646908c361 100644
--- a/tests/wpt/meta/html/semantics/interactive-elements/the-details-element/name-attribute.tentative.html.ini
+++ b/tests/wpt/meta/html/semantics/interactive-elements/the-details-element/name-attribute.tentative.html.ini
@@ -34,3 +34,15 @@
 
   [exclusivity enforcement with attachment scenario connected-in-template]
     expected: FAIL
+
+  [mutation event and toggle event order]
+    expected: FAIL
+
+  [handling of name attribute changes]
+    expected: FAIL
+
+  [closing as a result of parsing doesn't depend on attribute order]
+    expected: FAIL
+
+  [handling of insertion of elements into group]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/interactive-elements/the-details-element/toggleEvent.html.ini b/tests/wpt/meta/html/semantics/interactive-elements/the-details-element/toggleEvent.html.ini
new file mode 100644
index 00000000000..d008e71443c
--- /dev/null
+++ b/tests/wpt/meta/html/semantics/interactive-elements/the-details-element/toggleEvent.html.ini
@@ -0,0 +1,24 @@
+[toggleEvent.html]
+  [Adding open to 'details' should fire a toggle event at the 'details' element, with 'oldState: closed' and 'newState: open']
+    expected: FAIL
+
+  [Adding open to 'details' and then removing open from that 'details' should fire only one toggle event at the 'details' element, with 'oldState: closed' and 'newState: closed']
+    expected: FAIL
+
+  [Adding open to 'details' (display:none) should fire a toggle event at the 'details' element, with 'oldState: closed' and 'newState: open']
+    expected: FAIL
+
+  [Adding open to 'details' (no children) should fire a toggle event at the 'details' element, with 'oldState: closed' and 'newState: open']
+    expected: FAIL
+
+  [Adding open to 'details' and then removing open from that 'details' and then again adding open to that 'details' should fire only one toggle event at the 'details' element, with 'oldState: closed' and 'newState: closed']
+    expected: FAIL
+
+  [Adding open to 'details' using setAttribute('open', '') should fire a toggle event at the 'details' element, with 'oldState: closed' and 'newState: open']
+    expected: FAIL
+
+  [Adding open to 'details' and then calling removeAttribute('open') should fire only one toggle event at the 'details' element, with 'oldState: closed' and 'newState: closed']
+    expected: FAIL
+
+  [Adding open to 'details' (not in the document) should fire a toggle event at the 'details' element, with 'oldState: closed' and 'newState: open']
+    expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/interactive-elements/the-dialog-element/backdrop-does-not-inherit.html.ini b/tests/wpt/meta/html/semantics/interactive-elements/the-dialog-element/backdrop-does-not-inherit.html.ini
deleted file mode 100644
index 219b9331fd8..00000000000
--- a/tests/wpt/meta/html/semantics/interactive-elements/the-dialog-element/backdrop-does-not-inherit.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[backdrop-does-not-inherit.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/interactive-elements/the-dialog-element/backdrop-inherits.html.ini b/tests/wpt/meta/html/semantics/interactive-elements/the-dialog-element/backdrop-inherits.html.ini
new file mode 100644
index 00000000000..cf2df3ca49f
--- /dev/null
+++ b/tests/wpt/meta/html/semantics/interactive-elements/the-dialog-element/backdrop-inherits.html.ini
@@ -0,0 +1,2 @@
+[backdrop-inherits.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini b/tests/wpt/meta/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
index 7f099cec1b0..dcd52d2fee8 100644
--- a/tests/wpt/meta/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
+++ b/tests/wpt/meta/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
@@ -7,3 +7,6 @@
 
   [Check that rel=noopener with target=_parent does a normal load]
     expected: FAIL
+
+  [Check that rel=noopener with target=_self does a normal load]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/links/links-created-by-a-and-area-elements/non-parsable-url-getter-setter.window.js.ini b/tests/wpt/meta/html/semantics/links/links-created-by-a-and-area-elements/non-parsable-url-getter-setter.window.js.ini
new file mode 100644
index 00000000000..277c41b3c2f
--- /dev/null
+++ b/tests/wpt/meta/html/semantics/links/links-created-by-a-and-area-elements/non-parsable-url-getter-setter.window.js.ini
@@ -0,0 +1,57 @@
+[non-parsable-url-getter-setter.window.html]
+  [<area href="http://test:test/">.origin getter]
+    expected: FAIL
+
+  [<area href="http://test:test/">.protocol getter]
+    expected: FAIL
+
+  [<area href="http://test:test/">.protocol setter]
+    expected: FAIL
+
+  [<area href="http://test:test/">.username getter]
+    expected: FAIL
+
+  [<area href="http://test:test/">.username setter]
+    expected: FAIL
+
+  [<area href="http://test:test/">.password getter]
+    expected: FAIL
+
+  [<area href="http://test:test/">.password setter]
+    expected: FAIL
+
+  [<area href="http://test:test/">.host getter]
+    expected: FAIL
+
+  [<area href="http://test:test/">.host setter]
+    expected: FAIL
+
+  [<area href="http://test:test/">.hostname getter]
+    expected: FAIL
+
+  [<area href="http://test:test/">.hostname setter]
+    expected: FAIL
+
+  [<area href="http://test:test/">.port getter]
+    expected: FAIL
+
+  [<area href="http://test:test/">.port setter]
+    expected: FAIL
+
+  [<area href="http://test:test/">.pathname getter]
+    expected: FAIL
+
+  [<area href="http://test:test/">.pathname setter]
+    expected: FAIL
+
+  [<area href="http://test:test/">.search getter]
+    expected: FAIL
+
+  [<area href="http://test:test/">.search setter]
+    expected: FAIL
+
+  [<area href="http://test:test/">.hash getter]
+    expected: FAIL
+
+  [<area href="http://test:test/">.hash setter]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/links/links-created-by-a-and-area-elements/non-special-opaque-path-url-getter-setter.window.js.ini b/tests/wpt/meta/html/semantics/links/links-created-by-a-and-area-elements/non-special-opaque-path-url-getter-setter.window.js.ini
new file mode 100644
index 00000000000..ef5a8c229f0
--- /dev/null
+++ b/tests/wpt/meta/html/semantics/links/links-created-by-a-and-area-elements/non-special-opaque-path-url-getter-setter.window.js.ini
@@ -0,0 +1,57 @@
+[non-special-opaque-path-url-getter-setter.window.html]
+  [<area href="non-special:opaque">.origin getter]
+    expected: FAIL
+
+  [<area href="non-special:opaque">.protocol getter]
+    expected: FAIL
+
+  [<area href="non-special:opaque">.protocol setter]
+    expected: FAIL
+
+  [<area href="non-special:opaque">.username getter]
+    expected: FAIL
+
+  [<area href="non-special:opaque">.username setter]
+    expected: FAIL
+
+  [<area href="non-special:opaque">.password getter]
+    expected: FAIL
+
+  [<area href="non-special:opaque">.password setter]
+    expected: FAIL
+
+  [<area href="non-special:opaque">.host getter]
+    expected: FAIL
+
+  [<area href="non-special:opaque">.host setter]
+    expected: FAIL
+
+  [<area href="non-special:opaque">.hostname getter]
+    expected: FAIL
+
+  [<area href="non-special:opaque">.hostname setter]
+    expected: FAIL
+
+  [<area href="non-special:opaque">.port getter]
+    expected: FAIL
+
+  [<area href="non-special:opaque">.port setter]
+    expected: FAIL
+
+  [<area href="non-special:opaque">.pathname getter]
+    expected: FAIL
+
+  [<area href="non-special:opaque">.pathname setter]
+    expected: FAIL
+
+  [<area href="non-special:opaque">.search getter]
+    expected: FAIL
+
+  [<area href="non-special:opaque">.search setter]
+    expected: FAIL
+
+  [<area href="non-special:opaque">.hash getter]
+    expected: FAIL
+
+  [<area href="non-special:opaque">.hash setter]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/links/links-created-by-a-and-area-elements/non-special-url-getter-setter.window.js.ini b/tests/wpt/meta/html/semantics/links/links-created-by-a-and-area-elements/non-special-url-getter-setter.window.js.ini
new file mode 100644
index 00000000000..4e3e534d35c
--- /dev/null
+++ b/tests/wpt/meta/html/semantics/links/links-created-by-a-and-area-elements/non-special-url-getter-setter.window.js.ini
@@ -0,0 +1,45 @@
+[non-special-url-getter-setter.window.html]
+  [<area href="non-special://test:9001/">.origin getter]
+    expected: FAIL
+
+  [<area href="non-special://test:9001/">.protocol getter]
+    expected: FAIL
+
+  [<area href="non-special://test:9001/">.protocol setter]
+    expected: FAIL
+
+  [<area href="non-special://test:9001/">.username getter]
+    expected: FAIL
+
+  [<area href="non-special://test:9001/">.password getter]
+    expected: FAIL
+
+  [<area href="non-special://test:9001/">.host getter]
+    expected: FAIL
+
+  [<area href="non-special://test:9001/">.host setter]
+    expected: FAIL
+
+  [<area href="non-special://test:9001/">.hostname getter]
+    expected: FAIL
+
+  [<area href="non-special://test:9001/">.port getter]
+    expected: FAIL
+
+  [<area href="non-special://test:9001/">.pathname getter]
+    expected: FAIL
+
+  [<area href="non-special://test:9001/">.pathname setter]
+    expected: FAIL
+
+  [<area href="non-special://test:9001/">.search getter]
+    expected: FAIL
+
+  [<area href="non-special://test:9001/">.search setter]
+    expected: FAIL
+
+  [<area href="non-special://test:9001/">.hash getter]
+    expected: FAIL
+
+  [<area href="non-special://test:9001/">.hash setter]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/scripting-1/the-script-element/module/referrer-policy-for-descendants.sub.html.ini b/tests/wpt/meta/html/semantics/scripting-1/the-script-element/module/referrer-policy-for-descendants.sub.html.ini
index f1c62dc9306..4bcd91bc962 100644
--- a/tests/wpt/meta/html/semantics/scripting-1/the-script-element/module/referrer-policy-for-descendants.sub.html.ini
+++ b/tests/wpt/meta/html/semantics/scripting-1/the-script-element/module/referrer-policy-for-descendants.sub.html.ini
@@ -16,3 +16,12 @@
 
   [Parent module delivered with invalid policy importing a same-origin descendant script.]
     expected: FAIL
+
+  [Parent module delivered with `same-origin` policy importing a same-origin descendant script.]
+    expected: FAIL
+
+  [Remote parent module delivered with `same-origin` policy importing a same-origin-to-parent-module descendant script.]
+    expected: FAIL
+
+  [Remote parent module delivered with `same-origin` policy importing a cross-origin-to-parent-module descendant script.]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/selectors/pseudo-classes/readwrite-readonly.html.ini b/tests/wpt/meta/html/semantics/selectors/pseudo-classes/readwrite-readonly.html.ini
index 425ded6efb7..3a219dd898f 100644
--- a/tests/wpt/meta/html/semantics/selectors/pseudo-classes/readwrite-readonly.html.ini
+++ b/tests/wpt/meta/html/semantics/selectors/pseudo-classes/readwrite-readonly.html.ini
@@ -17,3 +17,5 @@
   [The :read-write pseudo-class must match elements that are editable]
     expected: FAIL
 
+  [The :read-write pseudo-class must match elements that are inside editing hosts, but not match inputs and textareas inside that aren't]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini b/tests/wpt/meta/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini
new file mode 100644
index 00000000000..fc0233f5241
--- /dev/null
+++ b/tests/wpt/meta/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini
@@ -0,0 +1,3 @@
+[module-delayed.html]
+  [async document.write in a module]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry-different-function-realm.html.ini b/tests/wpt/meta/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry-different-function-realm.html.ini
index 7237f5792de..dbe1def99e3 100644
--- a/tests/wpt/meta/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry-different-function-realm.html.ini
+++ b/tests/wpt/meta/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry-different-function-realm.html.ini
@@ -1,10 +1,9 @@
 [promise-job-entry-different-function-realm.html]
-  expected: TIMEOUT
   [Fulfillment handler on fulfilled promise]
     expected: FAIL
 
   [Rejection handler on pending-then-rejected promise]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Thenable resolution]
     expected: FAIL
@@ -13,4 +12,4 @@
     expected: FAIL
 
   [Fulfillment handler on pending-then-fulfilled promise]
-    expected: TIMEOUT
+    expected: FAIL
diff --git a/tests/wpt/meta/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry.html.ini b/tests/wpt/meta/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry.html.ini
index 31bfd644df0..8bcf3a07de4 100644
--- a/tests/wpt/meta/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry.html.ini
+++ b/tests/wpt/meta/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry.html.ini
@@ -1,9 +1,10 @@
 [promise-job-entry.html]
+  expected: TIMEOUT
   [Fulfillment handler on fulfilled promise]
     expected: FAIL
 
   [Rejection handler on pending-then-rejected promise]
-    expected: FAIL
+    expected: TIMEOUT
 
   [Sanity check: this all works as expected with no promises involved]
     expected: FAIL
@@ -15,4 +16,4 @@
     expected: FAIL
 
   [Fulfillment handler on pending-then-fulfilled promise]
-    expected: FAIL
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/navigation-timing/idlharness.window.js.ini b/tests/wpt/meta/navigation-timing/idlharness.window.js.ini
index 50c423ba7cb..89e59978de2 100644
--- a/tests/wpt/meta/navigation-timing/idlharness.window.js.ini
+++ b/tests/wpt/meta/navigation-timing/idlharness.window.js.ini
@@ -100,3 +100,9 @@
 
   [PerformanceTiming interface: default toJSON operation on performance.timing]
     expected: FAIL
+
+  [PerformanceNavigationTiming interface: attribute criticalCHRestart]
+    expected: FAIL
+
+  [PerformanceNavigationTiming interface: performance.getEntriesByType("navigation")[0\] must inherit property "criticalCHRestart" with the proper type]
+    expected: FAIL
diff --git a/tests/wpt/meta/navigation-timing/test-timing-attributes-dependent-on-document-load.html.ini b/tests/wpt/meta/navigation-timing/test-timing-attributes-dependent-on-document-load.html.ini
new file mode 100644
index 00000000000..133ac7148f7
--- /dev/null
+++ b/tests/wpt/meta/navigation-timing/test-timing-attributes-dependent-on-document-load.html.ini
@@ -0,0 +1,3 @@
+[test-timing-attributes-dependent-on-document-load.html]
+  [Navigation Timing 2 WPT]
+    expected: FAIL
diff --git a/tests/wpt/meta/performance-timeline/not-restored-reasons/performance-navigation-timing-fetch.tentative.window.js.ini b/tests/wpt/meta/performance-timeline/not-restored-reasons/performance-navigation-timing-fetch.tentative.window.js.ini
new file mode 100644
index 00000000000..876710cd31f
--- /dev/null
+++ b/tests/wpt/meta/performance-timeline/not-restored-reasons/performance-navigation-timing-fetch.tentative.window.js.ini
@@ -0,0 +1,3 @@
+[performance-navigation-timing-fetch.tentative.window.html]
+  [Ensure that ongoing fetch upon entering bfcache blocks bfcache and recorded.]
+    expected: FAIL
diff --git a/tests/wpt/meta/performance-timeline/not-restored-reasons/performance-navigation-timing-lock.https.tentative.window.js.ini b/tests/wpt/meta/performance-timeline/not-restored-reasons/performance-navigation-timing-lock.https.tentative.window.js.ini
new file mode 100644
index 00000000000..3bc9e436aac
--- /dev/null
+++ b/tests/wpt/meta/performance-timeline/not-restored-reasons/performance-navigation-timing-lock.https.tentative.window.js.ini
@@ -0,0 +1,3 @@
+[performance-navigation-timing-lock.https.tentative.window.html]
+  [Ensure that if WebLock is held upon entering bfcache, it cannot enter bfcache and gets reported.]
+    expected: FAIL
diff --git a/tests/wpt/meta/performance-timeline/not-restored-reasons/performance-navigation-timing-navigation-failure.tentative.window.js.ini b/tests/wpt/meta/performance-timeline/not-restored-reasons/performance-navigation-timing-navigation-failure.tentative.window.js.ini
new file mode 100644
index 00000000000..2863298772f
--- /dev/null
+++ b/tests/wpt/meta/performance-timeline/not-restored-reasons/performance-navigation-timing-navigation-failure.tentative.window.js.ini
@@ -0,0 +1,3 @@
+[performance-navigation-timing-navigation-failure.tentative.window.html]
+  [Ensure that navigation failure blocks bfcache and gets recorded.]
+    expected: FAIL
diff --git a/tests/wpt/meta/resource-timing/resource-timing-failed-fetch-web-bundle.tentative.html.ini b/tests/wpt/meta/resource-timing/resource-timing-failed-fetch-web-bundle.tentative.html.ini
new file mode 100644
index 00000000000..f7a11a26db0
--- /dev/null
+++ b/tests/wpt/meta/resource-timing/resource-timing-failed-fetch-web-bundle.tentative.html.ini
@@ -0,0 +1,2 @@
+[resource-timing-failed-fetch-web-bundle.tentative.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/streams/readable-streams/async-iterator.any.js.ini b/tests/wpt/meta/streams/readable-streams/async-iterator.any.js.ini
index 602db58ebe0..840d5e2d798 100644
--- a/tests/wpt/meta/streams/readable-streams/async-iterator.any.js.ini
+++ b/tests/wpt/meta/streams/readable-streams/async-iterator.any.js.ini
@@ -241,3 +241,6 @@
   [close() while next() is pending]
     expected: FAIL
 
+
+[async-iterator.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/streams/readable-streams/bad-strategies.any.js.ini b/tests/wpt/meta/streams/readable-streams/bad-strategies.any.js.ini
index cc833170f61..68d7bbfeb5a 100644
--- a/tests/wpt/meta/streams/readable-streams/bad-strategies.any.js.ini
+++ b/tests/wpt/meta/streams/readable-streams/bad-strategies.any.js.ini
@@ -7,3 +7,6 @@
 
 [bad-strategies.any.serviceworker.html]
   expected: ERROR
+
+[bad-strategies.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/streams/readable-streams/bad-underlying-sources.any.js.ini b/tests/wpt/meta/streams/readable-streams/bad-underlying-sources.any.js.ini
index 4522623853c..352f69f52f2 100644
--- a/tests/wpt/meta/streams/readable-streams/bad-underlying-sources.any.js.ini
+++ b/tests/wpt/meta/streams/readable-streams/bad-underlying-sources.any.js.ini
@@ -7,3 +7,6 @@
   expected: ERROR
 
 [bad-underlying-sources.any.worker.html]
+
+[bad-underlying-sources.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/streams/readable-streams/cancel.any.js.ini b/tests/wpt/meta/streams/readable-streams/cancel.any.js.ini
index 3e9cc9b2a05..4f5ce48851c 100644
--- a/tests/wpt/meta/streams/readable-streams/cancel.any.js.ini
+++ b/tests/wpt/meta/streams/readable-streams/cancel.any.js.ini
@@ -7,3 +7,6 @@
 
 [cancel.any.sharedworker.html]
   expected: ERROR
+
+[cancel.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/streams/readable-streams/constructor.any.js.ini b/tests/wpt/meta/streams/readable-streams/constructor.any.js.ini
index d20001a4d9b..bb53217b504 100644
--- a/tests/wpt/meta/streams/readable-streams/constructor.any.js.ini
+++ b/tests/wpt/meta/streams/readable-streams/constructor.any.js.ini
@@ -7,3 +7,6 @@
 [constructor.any.worker.html]
 
 [constructor.any.html]
+
+[constructor.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/streams/readable-streams/count-queuing-strategy-integration.any.js.ini b/tests/wpt/meta/streams/readable-streams/count-queuing-strategy-integration.any.js.ini
index ac8e23aef12..3f47d0b2d4a 100644
--- a/tests/wpt/meta/streams/readable-streams/count-queuing-strategy-integration.any.js.ini
+++ b/tests/wpt/meta/streams/readable-streams/count-queuing-strategy-integration.any.js.ini
@@ -7,3 +7,6 @@
 [count-queuing-strategy-integration.any.worker.html]
 
 [count-queuing-strategy-integration.any.html]
+
+[count-queuing-strategy-integration.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/streams/readable-streams/crashtests/strategy-worker-terminate.html.ini b/tests/wpt/meta/streams/readable-streams/crashtests/strategy-worker-terminate.html.ini
deleted file mode 100644
index 964697e81e9..00000000000
--- a/tests/wpt/meta/streams/readable-streams/crashtests/strategy-worker-terminate.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[strategy-worker-terminate.html]
-  expected: CRASH
diff --git a/tests/wpt/meta/streams/readable-streams/default-reader.any.js.ini b/tests/wpt/meta/streams/readable-streams/default-reader.any.js.ini
index 7d9f1aa80a3..ab392a349cb 100644
--- a/tests/wpt/meta/streams/readable-streams/default-reader.any.js.ini
+++ b/tests/wpt/meta/streams/readable-streams/default-reader.any.js.ini
@@ -54,3 +54,7 @@
 
   [Second reader can read chunks after first reader was released with pending read requests]
     expected: FAIL
+
+
+[default-reader.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/streams/readable-streams/floating-point-total-queue-size.any.js.ini b/tests/wpt/meta/streams/readable-streams/floating-point-total-queue-size.any.js.ini
index 8c0ea27f0ec..93190332da4 100644
--- a/tests/wpt/meta/streams/readable-streams/floating-point-total-queue-size.any.js.ini
+++ b/tests/wpt/meta/streams/readable-streams/floating-point-total-queue-size.any.js.ini
@@ -7,3 +7,6 @@
 
 [floating-point-total-queue-size.any.sharedworker.html]
   expected: ERROR
+
+[floating-point-total-queue-size.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/streams/readable-streams/from.any.js.ini b/tests/wpt/meta/streams/readable-streams/from.any.js.ini
index dc92c5af9ce..5cd0ec521a9 100644
--- a/tests/wpt/meta/streams/readable-streams/from.any.js.ini
+++ b/tests/wpt/meta/streams/readable-streams/from.any.js.ini
@@ -168,3 +168,7 @@
 
   [ReadableStream.from(array), push() to array while reading]
     expected: FAIL
+
+
+[from.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/streams/readable-streams/garbage-collection.any.js.ini b/tests/wpt/meta/streams/readable-streams/garbage-collection.any.js.ini
index 0c16120d4d8..c4c2c7a3ddc 100644
--- a/tests/wpt/meta/streams/readable-streams/garbage-collection.any.js.ini
+++ b/tests/wpt/meta/streams/readable-streams/garbage-collection.any.js.ini
@@ -7,3 +7,6 @@
 
 [garbage-collection.any.serviceworker.html]
   expected: ERROR
+
+[garbage-collection.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/streams/readable-streams/general.any.js.ini b/tests/wpt/meta/streams/readable-streams/general.any.js.ini
index 8c9554a029a..5d9c24f451b 100644
--- a/tests/wpt/meta/streams/readable-streams/general.any.js.ini
+++ b/tests/wpt/meta/streams/readable-streams/general.any.js.ini
@@ -18,3 +18,7 @@
 
   [ReadableStream: if pull rejects, it should error the stream]
     expected: FAIL
+
+
+[general.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/streams/readable-streams/owning-type-message-port.any.js.ini b/tests/wpt/meta/streams/readable-streams/owning-type-message-port.any.js.ini
index 7c3ac36c84e..c8fd0e2cc57 100644
--- a/tests/wpt/meta/streams/readable-streams/owning-type-message-port.any.js.ini
+++ b/tests/wpt/meta/streams/readable-streams/owning-type-message-port.any.js.ini
@@ -18,3 +18,7 @@
 
   [Second branch of owning ReadableStream tee should end up into errors with transfer only values]
     expected: FAIL
+
+
+[owning-type-message-port.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/streams/readable-streams/owning-type-video-frame.any.js.ini b/tests/wpt/meta/streams/readable-streams/owning-type-video-frame.any.js.ini
index 98f8aaa8c37..4694441ace0 100644
--- a/tests/wpt/meta/streams/readable-streams/owning-type-video-frame.any.js.ini
+++ b/tests/wpt/meta/streams/readable-streams/owning-type-video-frame.any.js.ini
@@ -37,3 +37,6 @@
 
 [owning-type-video-frame.any.sharedworker.html]
   expected: ERROR
+
+[owning-type-video-frame.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/streams/readable-streams/owning-type.any.js.ini b/tests/wpt/meta/streams/readable-streams/owning-type.any.js.ini
index b770693da1b..6d9fb8b9411 100644
--- a/tests/wpt/meta/streams/readable-streams/owning-type.any.js.ini
+++ b/tests/wpt/meta/streams/readable-streams/owning-type.any.js.ini
@@ -36,3 +36,7 @@
 
   [ReadableStream of type owning should transfer enqueued chunks]
     expected: FAIL
+
+
+[owning-type.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/streams/readable-streams/patched-global.any.js.ini b/tests/wpt/meta/streams/readable-streams/patched-global.any.js.ini
index 58836f10e19..9ae14871b98 100644
--- a/tests/wpt/meta/streams/readable-streams/patched-global.any.js.ini
+++ b/tests/wpt/meta/streams/readable-streams/patched-global.any.js.ini
@@ -19,3 +19,6 @@
   [ReadableStream async iterator should use the original values of getReader() and ReadableStreamDefaultReader methods]
     expected: FAIL
 
+
+[patched-global.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/streams/readable-streams/reentrant-strategies.any.js.ini b/tests/wpt/meta/streams/readable-streams/reentrant-strategies.any.js.ini
index 9a611082494..0263c9f8705 100644
--- a/tests/wpt/meta/streams/readable-streams/reentrant-strategies.any.js.ini
+++ b/tests/wpt/meta/streams/readable-streams/reentrant-strategies.any.js.ini
@@ -12,3 +12,7 @@
 [reentrant-strategies.any.worker.html]
   [pipeTo() inside size() should behave as expected]
     expected: FAIL
+
+
+[reentrant-strategies.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/streams/readable-streams/tee.any.js.ini b/tests/wpt/meta/streams/readable-streams/tee.any.js.ini
index d77e48af60a..983ead19dbe 100644
--- a/tests/wpt/meta/streams/readable-streams/tee.any.js.ini
+++ b/tests/wpt/meta/streams/readable-streams/tee.any.js.ini
@@ -7,3 +7,6 @@
   expected: ERROR
 
 [tee.any.html]
+
+[tee.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/streams/readable-streams/templated.any.js.ini b/tests/wpt/meta/streams/readable-streams/templated.any.js.ini
index 3f473b5009e..408f849f24c 100644
--- a/tests/wpt/meta/streams/readable-streams/templated.any.js.ini
+++ b/tests/wpt/meta/streams/readable-streams/templated.any.js.ini
@@ -18,3 +18,7 @@
 
   [ReadableStream (empty) reader: releasing the lock should reject all pending read requests]
     expected: FAIL
+
+
+[templated.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/wasm/jsapi/constructor/compile.any.js.ini b/tests/wpt/meta/wasm/jsapi/constructor/compile.any.js.ini
new file mode 100644
index 00000000000..dfc9bd50cad
--- /dev/null
+++ b/tests/wpt/meta/wasm/jsapi/constructor/compile.any.js.ini
@@ -0,0 +1,6 @@
+[compile.any.shadowrealm.html]
+  expected: ERROR
+
+[compile.any.worker.html]
+
+[compile.any.html]
diff --git a/tests/wpt/meta/wasm/jsapi/constructor/instantiate-bad-imports.any.js.ini b/tests/wpt/meta/wasm/jsapi/constructor/instantiate-bad-imports.any.js.ini
new file mode 100644
index 00000000000..6719f5b796a
--- /dev/null
+++ b/tests/wpt/meta/wasm/jsapi/constructor/instantiate-bad-imports.any.js.ini
@@ -0,0 +1,6 @@
+[instantiate-bad-imports.any.html]
+
+[instantiate-bad-imports.any.shadowrealm.html]
+  expected: ERROR
+
+[instantiate-bad-imports.any.worker.html]
diff --git a/tests/wpt/meta/wasm/jsapi/constructor/instantiate.any.js.ini b/tests/wpt/meta/wasm/jsapi/constructor/instantiate.any.js.ini
new file mode 100644
index 00000000000..691d78b9aea
--- /dev/null
+++ b/tests/wpt/meta/wasm/jsapi/constructor/instantiate.any.js.ini
@@ -0,0 +1,6 @@
+[instantiate.any.html]
+
+[instantiate.any.worker.html]
+
+[instantiate.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/wasm/jsapi/constructor/multi-value.any.js.ini b/tests/wpt/meta/wasm/jsapi/constructor/multi-value.any.js.ini
new file mode 100644
index 00000000000..dbbdb14cb1d
--- /dev/null
+++ b/tests/wpt/meta/wasm/jsapi/constructor/multi-value.any.js.ini
@@ -0,0 +1,6 @@
+[multi-value.any.worker.html]
+
+[multi-value.any.shadowrealm.html]
+  expected: ERROR
+
+[multi-value.any.html]
diff --git a/tests/wpt/meta/wasm/jsapi/constructor/toStringTag.any.js.ini b/tests/wpt/meta/wasm/jsapi/constructor/toStringTag.any.js.ini
new file mode 100644
index 00000000000..204eefd2fe0
--- /dev/null
+++ b/tests/wpt/meta/wasm/jsapi/constructor/toStringTag.any.js.ini
@@ -0,0 +1,6 @@
+[toStringTag.any.shadowrealm.html]
+  expected: ERROR
+
+[toStringTag.any.html]
+
+[toStringTag.any.worker.html]
diff --git a/tests/wpt/meta/wasm/jsapi/constructor/validate.any.js.ini b/tests/wpt/meta/wasm/jsapi/constructor/validate.any.js.ini
new file mode 100644
index 00000000000..8173c108573
--- /dev/null
+++ b/tests/wpt/meta/wasm/jsapi/constructor/validate.any.js.ini
@@ -0,0 +1,6 @@
+[validate.any.html]
+
+[validate.any.shadowrealm.html]
+  expected: ERROR
+
+[validate.any.worker.html]
diff --git a/tests/wpt/meta/wasm/jsapi/exception/basic.tentative.any.js.ini b/tests/wpt/meta/wasm/jsapi/exception/basic.tentative.any.js.ini
index 7d80387c59a..7495957eea9 100644
--- a/tests/wpt/meta/wasm/jsapi/exception/basic.tentative.any.js.ini
+++ b/tests/wpt/meta/wasm/jsapi/exception/basic.tentative.any.js.ini
@@ -7,3 +7,6 @@
 
 [basic.tentative.any.sharedworker.html]
   expected: ERROR
+
+[basic.tentative.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/wasm/jsapi/exception/constructor.tentative.any.js.ini b/tests/wpt/meta/wasm/jsapi/exception/constructor.tentative.any.js.ini
new file mode 100644
index 00000000000..638ca469b7c
--- /dev/null
+++ b/tests/wpt/meta/wasm/jsapi/exception/constructor.tentative.any.js.ini
@@ -0,0 +1,6 @@
+[constructor.tentative.any.shadowrealm.html]
+  expected: ERROR
+
+[constructor.tentative.any.html]
+
+[constructor.tentative.any.worker.html]
diff --git a/tests/wpt/meta/wasm/jsapi/exception/getArg.tentative.any.js.ini b/tests/wpt/meta/wasm/jsapi/exception/getArg.tentative.any.js.ini
index 012fe6c7f8b..6c03a9843e1 100644
--- a/tests/wpt/meta/wasm/jsapi/exception/getArg.tentative.any.js.ini
+++ b/tests/wpt/meta/wasm/jsapi/exception/getArg.tentative.any.js.ini
@@ -6,3 +6,7 @@
 [getArg.tentative.any.html]
   [Getting out-of-range argument]
     expected: FAIL
+
+
+[getArg.tentative.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/wasm/jsapi/exception/identity.tentative.any.js.ini b/tests/wpt/meta/wasm/jsapi/exception/identity.tentative.any.js.ini
new file mode 100644
index 00000000000..efc2282450c
--- /dev/null
+++ b/tests/wpt/meta/wasm/jsapi/exception/identity.tentative.any.js.ini
@@ -0,0 +1,6 @@
+[identity.tentative.any.worker.html]
+
+[identity.tentative.any.shadowrealm.html]
+  expected: ERROR
+
+[identity.tentative.any.html]
diff --git a/tests/wpt/meta/wasm/jsapi/exception/is.tentative.any.js.ini b/tests/wpt/meta/wasm/jsapi/exception/is.tentative.any.js.ini
new file mode 100644
index 00000000000..0384adc9fef
--- /dev/null
+++ b/tests/wpt/meta/wasm/jsapi/exception/is.tentative.any.js.ini
@@ -0,0 +1,6 @@
+[is.tentative.any.shadowrealm.html]
+  expected: ERROR
+
+[is.tentative.any.html]
+
+[is.tentative.any.worker.html]
diff --git a/tests/wpt/meta/wasm/jsapi/exception/toString.tentative.any.js.ini b/tests/wpt/meta/wasm/jsapi/exception/toString.tentative.any.js.ini
new file mode 100644
index 00000000000..0bb6e8890ef
--- /dev/null
+++ b/tests/wpt/meta/wasm/jsapi/exception/toString.tentative.any.js.ini
@@ -0,0 +1,6 @@
+[toString.tentative.any.shadowrealm.html]
+  expected: ERROR
+
+[toString.tentative.any.worker.html]
+
+[toString.tentative.any.html]
diff --git a/tests/wpt/meta/wasm/jsapi/function/call.tentative.any.js.ini b/tests/wpt/meta/wasm/jsapi/function/call.tentative.any.js.ini
index 189c2255703..ea034f8d563 100644
--- a/tests/wpt/meta/wasm/jsapi/function/call.tentative.any.js.ini
+++ b/tests/wpt/meta/wasm/jsapi/function/call.tentative.any.js.ini
@@ -12,3 +12,7 @@
 
   [test constructing function]
     expected: FAIL
+
+
+[call.tentative.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/wasm/jsapi/function/constructor.tentative.any.js.ini b/tests/wpt/meta/wasm/jsapi/function/constructor.tentative.any.js.ini
index a42afd953b6..b56c4edc3b6 100644
--- a/tests/wpt/meta/wasm/jsapi/function/constructor.tentative.any.js.ini
+++ b/tests/wpt/meta/wasm/jsapi/function/constructor.tentative.any.js.ini
@@ -66,3 +66,7 @@
 
   [fail to construct with non-callable object]
     expected: FAIL
+
+
+[constructor.tentative.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/wasm/jsapi/function/table.tentative.any.js.ini b/tests/wpt/meta/wasm/jsapi/function/table.tentative.any.js.ini
index d1c9e23ec99..a5ce570abce 100644
--- a/tests/wpt/meta/wasm/jsapi/function/table.tentative.any.js.ini
+++ b/tests/wpt/meta/wasm/jsapi/function/table.tentative.any.js.ini
@@ -6,3 +6,7 @@
 [table.tentative.any.worker.html]
   [Test insertion into table]
     expected: FAIL
+
+
+[table.tentative.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/wasm/jsapi/function/type.tentative.any.js.ini b/tests/wpt/meta/wasm/jsapi/function/type.tentative.any.js.ini
index 293b3dafc05..849ef4ba6ea 100644
--- a/tests/wpt/meta/wasm/jsapi/function/type.tentative.any.js.ini
+++ b/tests/wpt/meta/wasm/jsapi/function/type.tentative.any.js.ini
@@ -12,3 +12,7 @@
 
   [Check all types]
     expected: FAIL
+
+
+[type.tentative.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/wasm/jsapi/global/constructor.any.js.ini b/tests/wpt/meta/wasm/jsapi/global/constructor.any.js.ini
new file mode 100644
index 00000000000..ad36cd1b314
--- /dev/null
+++ b/tests/wpt/meta/wasm/jsapi/global/constructor.any.js.ini
@@ -0,0 +1,6 @@
+[constructor.any.worker.html]
+
+[constructor.any.shadowrealm.html]
+  expected: ERROR
+
+[constructor.any.html]
diff --git a/tests/wpt/meta/wasm/jsapi/global/toString.any.js.ini b/tests/wpt/meta/wasm/jsapi/global/toString.any.js.ini
new file mode 100644
index 00000000000..a6171f3a687
--- /dev/null
+++ b/tests/wpt/meta/wasm/jsapi/global/toString.any.js.ini
@@ -0,0 +1,6 @@
+[toString.any.shadowrealm.html]
+  expected: ERROR
+
+[toString.any.worker.html]
+
+[toString.any.html]
diff --git a/tests/wpt/meta/wasm/jsapi/global/type.tentative.any.js.ini b/tests/wpt/meta/wasm/jsapi/global/type.tentative.any.js.ini
index 774efeeedb4..93469a74697 100644
--- a/tests/wpt/meta/wasm/jsapi/global/type.tentative.any.js.ini
+++ b/tests/wpt/meta/wasm/jsapi/global/type.tentative.any.js.ini
@@ -102,3 +102,7 @@
 
   [anyfunc, immutable]
     expected: FAIL
+
+
+[type.tentative.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/wasm/jsapi/global/value-get-set.any.js.ini b/tests/wpt/meta/wasm/jsapi/global/value-get-set.any.js.ini
new file mode 100644
index 00000000000..8c9df855fb1
--- /dev/null
+++ b/tests/wpt/meta/wasm/jsapi/global/value-get-set.any.js.ini
@@ -0,0 +1,6 @@
+[value-get-set.any.shadowrealm.html]
+  expected: ERROR
+
+[value-get-set.any.html]
+
+[value-get-set.any.worker.html]
diff --git a/tests/wpt/meta/wasm/jsapi/global/valueOf.any.js.ini b/tests/wpt/meta/wasm/jsapi/global/valueOf.any.js.ini
new file mode 100644
index 00000000000..54293aaccdc
--- /dev/null
+++ b/tests/wpt/meta/wasm/jsapi/global/valueOf.any.js.ini
@@ -0,0 +1,6 @@
+[valueOf.any.shadowrealm.html]
+  expected: ERROR
+
+[valueOf.any.html]
+
+[valueOf.any.worker.html]
diff --git a/tests/wpt/meta/wasm/jsapi/instance/constructor-bad-imports.any.js.ini b/tests/wpt/meta/wasm/jsapi/instance/constructor-bad-imports.any.js.ini
new file mode 100644
index 00000000000..013ca5d2335
--- /dev/null
+++ b/tests/wpt/meta/wasm/jsapi/instance/constructor-bad-imports.any.js.ini
@@ -0,0 +1,6 @@
+[constructor-bad-imports.any.shadowrealm.html]
+  expected: ERROR
+
+[constructor-bad-imports.any.html]
+
+[constructor-bad-imports.any.worker.html]
diff --git a/tests/wpt/meta/wasm/jsapi/instance/constructor-caching.any.js.ini b/tests/wpt/meta/wasm/jsapi/instance/constructor-caching.any.js.ini
new file mode 100644
index 00000000000..882692158fa
--- /dev/null
+++ b/tests/wpt/meta/wasm/jsapi/instance/constructor-caching.any.js.ini
@@ -0,0 +1,6 @@
+[constructor-caching.any.worker.html]
+
+[constructor-caching.any.shadowrealm.html]
+  expected: ERROR
+
+[constructor-caching.any.html]
diff --git a/tests/wpt/meta/wasm/jsapi/instance/constructor.any.js.ini b/tests/wpt/meta/wasm/jsapi/instance/constructor.any.js.ini
new file mode 100644
index 00000000000..c4ffef1c19b
--- /dev/null
+++ b/tests/wpt/meta/wasm/jsapi/instance/constructor.any.js.ini
@@ -0,0 +1,6 @@
+[constructor.any.shadowrealm.html]
+  expected: ERROR
+
+[constructor.any.html]
+
+[constructor.any.worker.html]
diff --git a/tests/wpt/meta/wasm/jsapi/instance/exports.any.js.ini b/tests/wpt/meta/wasm/jsapi/instance/exports.any.js.ini
new file mode 100644
index 00000000000..5e4dabe7a54
--- /dev/null
+++ b/tests/wpt/meta/wasm/jsapi/instance/exports.any.js.ini
@@ -0,0 +1,6 @@
+[exports.any.shadowrealm.html]
+  expected: ERROR
+
+[exports.any.worker.html]
+
+[exports.any.html]
diff --git a/tests/wpt/meta/wasm/jsapi/instance/toString.any.js.ini b/tests/wpt/meta/wasm/jsapi/instance/toString.any.js.ini
new file mode 100644
index 00000000000..6c92721bcda
--- /dev/null
+++ b/tests/wpt/meta/wasm/jsapi/instance/toString.any.js.ini
@@ -0,0 +1,6 @@
+[toString.any.shadowrealm.html]
+  expected: ERROR
+
+[toString.any.html]
+
+[toString.any.worker.html]
diff --git a/tests/wpt/meta/wasm/jsapi/interface.any.js.ini b/tests/wpt/meta/wasm/jsapi/interface.any.js.ini
index 9f98d4464c0..423aa729201 100644
--- a/tests/wpt/meta/wasm/jsapi/interface.any.js.ini
+++ b/tests/wpt/meta/wasm/jsapi/interface.any.js.ini
@@ -6,3 +6,7 @@
 [interface.any.worker.html]
   [WebAssembly.Table.set: length]
     expected: FAIL
+
+
+[interface.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/wasm/jsapi/memory/constructor-shared.tentative.any.js.ini b/tests/wpt/meta/wasm/jsapi/memory/constructor-shared.tentative.any.js.ini
index 70d3eb1e672..747cd00f915 100644
--- a/tests/wpt/meta/wasm/jsapi/memory/constructor-shared.tentative.any.js.ini
+++ b/tests/wpt/meta/wasm/jsapi/memory/constructor-shared.tentative.any.js.ini
@@ -12,3 +12,7 @@
 
   [Order of evaluation for descriptor (with shared)]
     expected: FAIL
+
+
+[constructor-shared.tentative.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/wasm/jsapi/memory/constructor-types.tentative.any.js.ini b/tests/wpt/meta/wasm/jsapi/memory/constructor-types.tentative.any.js.ini
index 383e4828679..04fe71ed3b6 100644
--- a/tests/wpt/meta/wasm/jsapi/memory/constructor-types.tentative.any.js.ini
+++ b/tests/wpt/meta/wasm/jsapi/memory/constructor-types.tentative.any.js.ini
@@ -19,3 +19,6 @@
   [Non-zero minimum]
     expected: FAIL
 
+
+[constructor-types.tentative.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/wasm/jsapi/memory/constructor.any.js.ini b/tests/wpt/meta/wasm/jsapi/memory/constructor.any.js.ini
new file mode 100644
index 00000000000..c4ffef1c19b
--- /dev/null
+++ b/tests/wpt/meta/wasm/jsapi/memory/constructor.any.js.ini
@@ -0,0 +1,6 @@
+[constructor.any.shadowrealm.html]
+  expected: ERROR
+
+[constructor.any.html]
+
+[constructor.any.worker.html]
diff --git a/tests/wpt/meta/wasm/jsapi/memory/grow.any.js.ini b/tests/wpt/meta/wasm/jsapi/memory/grow.any.js.ini
index d1dab31df88..4f10101a8de 100644
--- a/tests/wpt/meta/wasm/jsapi/memory/grow.any.js.ini
+++ b/tests/wpt/meta/wasm/jsapi/memory/grow.any.js.ini
@@ -7,3 +7,6 @@
   [Growing shared memory does not detach old buffer]
     expected: FAIL
 
+
+[grow.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/wasm/jsapi/memory/type.tentative.any.js.ini b/tests/wpt/meta/wasm/jsapi/memory/type.tentative.any.js.ini
index e243a969365..d6d69dcf2dc 100644
--- a/tests/wpt/meta/wasm/jsapi/memory/type.tentative.any.js.ini
+++ b/tests/wpt/meta/wasm/jsapi/memory/type.tentative.any.js.ini
@@ -37,3 +37,6 @@
   [Non-zero initial, no maximum]
     expected: FAIL
 
+
+[type.tentative.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/wasm/jsapi/module/constructor.any.js.ini b/tests/wpt/meta/wasm/jsapi/module/constructor.any.js.ini
new file mode 100644
index 00000000000..ec1e0569cac
--- /dev/null
+++ b/tests/wpt/meta/wasm/jsapi/module/constructor.any.js.ini
@@ -0,0 +1,6 @@
+[constructor.any.worker.html]
+
+[constructor.any.html]
+
+[constructor.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/wasm/jsapi/module/customSections.any.js.ini b/tests/wpt/meta/wasm/jsapi/module/customSections.any.js.ini
index b7a9237976e..b57a0748a2c 100644
--- a/tests/wpt/meta/wasm/jsapi/module/customSections.any.js.ini
+++ b/tests/wpt/meta/wasm/jsapi/module/customSections.any.js.ini
@@ -6,3 +6,7 @@
 [customSections.any.html]
   [Custom sections with U+FFFD]
     expected: FAIL
+
+
+[customSections.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/wasm/jsapi/module/exports.any.js.ini b/tests/wpt/meta/wasm/jsapi/module/exports.any.js.ini
new file mode 100644
index 00000000000..ad9aabe97d9
--- /dev/null
+++ b/tests/wpt/meta/wasm/jsapi/module/exports.any.js.ini
@@ -0,0 +1,6 @@
+[exports.any.html]
+
+[exports.any.shadowrealm.html]
+  expected: ERROR
+
+[exports.any.worker.html]
diff --git a/tests/wpt/meta/wasm/jsapi/module/imports.any.js.ini b/tests/wpt/meta/wasm/jsapi/module/imports.any.js.ini
new file mode 100644
index 00000000000..729e15d14b0
--- /dev/null
+++ b/tests/wpt/meta/wasm/jsapi/module/imports.any.js.ini
@@ -0,0 +1,6 @@
+[imports.any.html]
+
+[imports.any.worker.html]
+
+[imports.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/wasm/jsapi/module/toString.any.js.ini b/tests/wpt/meta/wasm/jsapi/module/toString.any.js.ini
new file mode 100644
index 00000000000..6c92721bcda
--- /dev/null
+++ b/tests/wpt/meta/wasm/jsapi/module/toString.any.js.ini
@@ -0,0 +1,6 @@
+[toString.any.shadowrealm.html]
+  expected: ERROR
+
+[toString.any.html]
+
+[toString.any.worker.html]
diff --git a/tests/wpt/meta/wasm/jsapi/prototypes.any.js.ini b/tests/wpt/meta/wasm/jsapi/prototypes.any.js.ini
new file mode 100644
index 00000000000..ec9782959d6
--- /dev/null
+++ b/tests/wpt/meta/wasm/jsapi/prototypes.any.js.ini
@@ -0,0 +1,6 @@
+[prototypes.any.html]
+
+[prototypes.any.shadowrealm.html]
+  expected: ERROR
+
+[prototypes.any.worker.html]
diff --git a/tests/wpt/meta/wasm/jsapi/table/constructor-types.tentative.any.js.ini b/tests/wpt/meta/wasm/jsapi/table/constructor-types.tentative.any.js.ini
index 383e4828679..04fe71ed3b6 100644
--- a/tests/wpt/meta/wasm/jsapi/table/constructor-types.tentative.any.js.ini
+++ b/tests/wpt/meta/wasm/jsapi/table/constructor-types.tentative.any.js.ini
@@ -19,3 +19,6 @@
   [Non-zero minimum]
     expected: FAIL
 
+
+[constructor-types.tentative.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/wasm/jsapi/table/constructor.any.js.ini b/tests/wpt/meta/wasm/jsapi/table/constructor.any.js.ini
new file mode 100644
index 00000000000..ad36cd1b314
--- /dev/null
+++ b/tests/wpt/meta/wasm/jsapi/table/constructor.any.js.ini
@@ -0,0 +1,6 @@
+[constructor.any.worker.html]
+
+[constructor.any.shadowrealm.html]
+  expected: ERROR
+
+[constructor.any.html]
diff --git a/tests/wpt/meta/wasm/jsapi/table/get-set.any.js.ini b/tests/wpt/meta/wasm/jsapi/table/get-set.any.js.ini
new file mode 100644
index 00000000000..d1cbc776efd
--- /dev/null
+++ b/tests/wpt/meta/wasm/jsapi/table/get-set.any.js.ini
@@ -0,0 +1,6 @@
+[get-set.any.worker.html]
+
+[get-set.any.html]
+
+[get-set.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/wasm/jsapi/table/grow.any.js.ini b/tests/wpt/meta/wasm/jsapi/table/grow.any.js.ini
new file mode 100644
index 00000000000..fe74d16b605
--- /dev/null
+++ b/tests/wpt/meta/wasm/jsapi/table/grow.any.js.ini
@@ -0,0 +1,6 @@
+[grow.any.worker.html]
+
+[grow.any.shadowrealm.html]
+  expected: ERROR
+
+[grow.any.html]
diff --git a/tests/wpt/meta/wasm/jsapi/table/length.any.js.ini b/tests/wpt/meta/wasm/jsapi/table/length.any.js.ini
new file mode 100644
index 00000000000..64545029aac
--- /dev/null
+++ b/tests/wpt/meta/wasm/jsapi/table/length.any.js.ini
@@ -0,0 +1,6 @@
+[length.any.html]
+
+[length.any.worker.html]
+
+[length.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/wasm/jsapi/table/toString.any.js.ini b/tests/wpt/meta/wasm/jsapi/table/toString.any.js.ini
new file mode 100644
index 00000000000..a6171f3a687
--- /dev/null
+++ b/tests/wpt/meta/wasm/jsapi/table/toString.any.js.ini
@@ -0,0 +1,6 @@
+[toString.any.shadowrealm.html]
+  expected: ERROR
+
+[toString.any.worker.html]
+
+[toString.any.html]
diff --git a/tests/wpt/meta/wasm/jsapi/table/type.tentative.any.js.ini b/tests/wpt/meta/wasm/jsapi/table/type.tentative.any.js.ini
index a821c23d4a6..5d1026c296d 100644
--- a/tests/wpt/meta/wasm/jsapi/table/type.tentative.any.js.ini
+++ b/tests/wpt/meta/wasm/jsapi/table/type.tentative.any.js.ini
@@ -30,3 +30,7 @@
 
   [Non-zero maximum]
     expected: FAIL
+
+
+[type.tentative.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/wasm/jsapi/tag/constructor.tentative.any.js.ini b/tests/wpt/meta/wasm/jsapi/tag/constructor.tentative.any.js.ini
new file mode 100644
index 00000000000..28de5e1be57
--- /dev/null
+++ b/tests/wpt/meta/wasm/jsapi/tag/constructor.tentative.any.js.ini
@@ -0,0 +1,6 @@
+[constructor.tentative.any.html]
+
+[constructor.tentative.any.worker.html]
+
+[constructor.tentative.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/wasm/jsapi/tag/toString.tentative.any.js.ini b/tests/wpt/meta/wasm/jsapi/tag/toString.tentative.any.js.ini
new file mode 100644
index 00000000000..5227dbd99ac
--- /dev/null
+++ b/tests/wpt/meta/wasm/jsapi/tag/toString.tentative.any.js.ini
@@ -0,0 +1,6 @@
+[toString.tentative.any.worker.html]
+
+[toString.tentative.any.shadowrealm.html]
+  expected: ERROR
+
+[toString.tentative.any.html]
diff --git a/tests/wpt/meta/wasm/jsapi/tag/type.tentative.any.js.ini b/tests/wpt/meta/wasm/jsapi/tag/type.tentative.any.js.ini
index 9bcd3efd2a2..d3c246a07d2 100644
--- a/tests/wpt/meta/wasm/jsapi/tag/type.tentative.any.js.ini
+++ b/tests/wpt/meta/wasm/jsapi/tag/type.tentative.any.js.ini
@@ -18,3 +18,7 @@
 
   [[i32 i64 f32 f64\]]
     expected: FAIL
+
+
+[type.tentative.any.shadowrealm.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/webaudio/the-audio-api/the-audioparam-interface/setTargetAtTime-after-event-within-block.html.ini b/tests/wpt/meta/webaudio/the-audio-api/the-audioparam-interface/setTargetAtTime-after-event-within-block.html.ini
new file mode 100644
index 00000000000..a72c951f5b0
--- /dev/null
+++ b/tests/wpt/meta/webaudio/the-audio-api/the-audioparam-interface/setTargetAtTime-after-event-within-block.html.ini
@@ -0,0 +1,3 @@
+[setTargetAtTime-after-event-within-block.html]
+  [setTargetAtTime() after setTargetAtTime()]
+    expected: FAIL
diff --git a/tests/wpt/meta/webmessaging/without-ports/018.html.ini b/tests/wpt/meta/webmessaging/without-ports/018.html.ini
new file mode 100644
index 00000000000..b7b36c1d3a4
--- /dev/null
+++ b/tests/wpt/meta/webmessaging/without-ports/018.html.ini
@@ -0,0 +1,4 @@
+[018.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, javascript:]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/workers/constructors/SharedWorker/same-origin.html.ini b/tests/wpt/meta/workers/constructors/SharedWorker/same-origin.html.ini
index f0748be225c..0c8a939632a 100644
--- a/tests/wpt/meta/workers/constructors/SharedWorker/same-origin.html.ini
+++ b/tests/wpt/meta/workers/constructors/SharedWorker/same-origin.html.ini
@@ -25,3 +25,6 @@
 
   [http_port_8012]
     expected: FAIL
+
+  [non-parsable URL]
+    expected: FAIL
diff --git a/tests/wpt/meta/workers/constructors/Worker/Worker-constructor.html.ini b/tests/wpt/meta/workers/constructors/Worker/Worker-constructor.html.ini
new file mode 100644
index 00000000000..80f9a4f15b8
--- /dev/null
+++ b/tests/wpt/meta/workers/constructors/Worker/Worker-constructor.html.ini
@@ -0,0 +1,2 @@
+[Worker-constructor.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/workers/constructors/Worker/same-origin.html.ini b/tests/wpt/meta/workers/constructors/Worker/same-origin.html.ini
deleted file mode 100644
index ee9c252f73d..00000000000
--- a/tests/wpt/meta/workers/constructors/Worker/same-origin.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[same-origin.html]
-  [unsupported_scheme]
-    expected: FAIL
diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json
index 348218ec20a..d5677ec4ba6 100644
--- a/tests/wpt/mozilla/meta/MANIFEST.json
+++ b/tests/wpt/mozilla/meta/MANIFEST.json
@@ -12753,7 +12753,7 @@
      ]
     ],
     "collections.html": [
-     "8e06ffcc0933719b4b79ea6656d6635cc121d900",
+     "24582a791a999636a722cd2e94c8d53672a2b3aa",
      [
       null,
       {}
@@ -13249,7 +13249,7 @@
      ]
     ],
     "htmlcollection.html": [
-     "57114d30a9265be16d521493c1f041a21b82d3b6",
+     "8d0708aa19c033833aec09c7014f79bab2dbaf6d",
      [
       null,
       {}
diff --git a/tests/wpt/mozilla/tests/mozilla/collections.html b/tests/wpt/mozilla/tests/mozilla/collections.html
index 8e06ffcc093..24582a791a9 100644
--- a/tests/wpt/mozilla/tests/mozilla/collections.html
+++ b/tests/wpt/mozilla/tests/mozilla/collections.html
@@ -23,7 +23,7 @@
   </fieldset>
 </form>
 <hr />
-<canvas/>
+<canvas></canvas>
 <p>pppppppppp</p>
 <q>qqqqqqqqqqqqqqqqqqqqqqqqqqq</q>
 <progress max="100" value="80">80%</progress>
diff --git a/tests/wpt/mozilla/tests/mozilla/htmlcollection.html b/tests/wpt/mozilla/tests/mozilla/htmlcollection.html
index 57114d30a92..8d0708aa19c 100644
--- a/tests/wpt/mozilla/tests/mozilla/htmlcollection.html
+++ b/tests/wpt/mozilla/tests/mozilla/htmlcollection.html
@@ -10,9 +10,9 @@
         <div id="bar" class="bar"></div>
         <div id="live" class="live"></div>
         <div id="class-example">
-            <p id="p1" class="aaa bbb"/>
-            <p id="p2" class="aaa ccc"/>
-            <p id="p3" class="bbb ccc"/>
+            <p id="p1" class="aaa bbb"></p>
+            <p id="p2" class="aaa ccc"></p>
+            <p id="p3" class="bbb ccc"></p>
         </div>
         <script>
             var foo1 = document.getElementById("foo-1");
diff --git a/tests/wpt/tests/.azure-pipelines.yml b/tests/wpt/tests/.azure-pipelines.yml
index 75a87df90f0..54b38dbd1c4 100644
--- a/tests/wpt/tests/.azure-pipelines.yml
+++ b/tests/wpt/tests/.azure-pipelines.yml
@@ -100,9 +100,6 @@ jobs:
     inputs:
       versionSpec: '3.11'
   - template: tools/ci/azure/checkout.yml
-  - template: tools/ci/azure/pip_install.yml
-    parameters:
-      packages: virtualenv
   - template: tools/ci/azure/install_fonts.yml
   - template: tools/ci/azure/install_certs.yml
   - template: tools/ci/azure/color_profile.yml
@@ -373,9 +370,6 @@ jobs:
       versionSpec: '3.11'
   - template: tools/ci/azure/system_info.yml
   - template: tools/ci/azure/checkout.yml
-  - template: tools/ci/azure/pip_install.yml
-    parameters:
-      packages: virtualenv
   - template: tools/ci/azure/install_certs.yml
   - template: tools/ci/azure/install_edge.yml
     parameters:
@@ -412,9 +406,6 @@ jobs:
       versionSpec: '3.11'
   - template: tools/ci/azure/system_info.yml
   - template: tools/ci/azure/checkout.yml
-  - template: tools/ci/azure/pip_install.yml
-    parameters:
-      packages: virtualenv
   - template: tools/ci/azure/install_certs.yml
   - template: tools/ci/azure/install_edge.yml
     parameters:
@@ -450,9 +441,6 @@ jobs:
     inputs:
       versionSpec: '3.11'
   - template: tools/ci/azure/checkout.yml
-  - template: tools/ci/azure/pip_install.yml
-    parameters:
-      packages: virtualenv
   - template: tools/ci/azure/install_certs.yml
   - template: tools/ci/azure/install_edge.yml
     parameters:
@@ -488,9 +476,6 @@ jobs:
     inputs:
       versionSpec: '3.11'
   - template: tools/ci/azure/checkout.yml
-  - template: tools/ci/azure/pip_install.yml
-    parameters:
-      packages: virtualenv
   - template: tools/ci/azure/install_certs.yml
   - template: tools/ci/azure/color_profile.yml
   - template: tools/ci/azure/install_safari.yml
@@ -531,9 +516,6 @@ jobs:
     inputs:
       versionSpec: '3.11'
   - template: tools/ci/azure/checkout.yml
-  - template: tools/ci/azure/pip_install.yml
-    parameters:
-      packages: virtualenv
   - template: tools/ci/azure/install_certs.yml
   - template: tools/ci/azure/color_profile.yml
   - template: tools/ci/azure/install_safari.yml
@@ -571,9 +553,6 @@ jobs:
     inputs:
       versionSpec: '3.11'
   - template: tools/ci/azure/checkout.yml
-  - template: tools/ci/azure/pip_install.yml
-    parameters:
-      packages: virtualenv
   - template: tools/ci/azure/install_certs.yml
   - template: tools/ci/azure/color_profile.yml
   - template: tools/ci/azure/update_hosts.yml
diff --git a/tests/wpt/tests/.github/workflows/documentation.yml b/tests/wpt/tests/.github/workflows/documentation.yml
index 0d72edd3e7e..00c7bb22627 100644
--- a/tests/wpt/tests/.github/workflows/documentation.yml
+++ b/tests/wpt/tests/.github/workflows/documentation.yml
@@ -27,7 +27,7 @@ jobs:
       - name: Set up Virtualenv
         run: pip install virtualenv
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 50
       - name: Run website_build.sh
diff --git a/tests/wpt/tests/.github/workflows/epochs.yml b/tests/wpt/tests/.github/workflows/epochs.yml
index a9590cbc870..840d08ffe15 100644
--- a/tests/wpt/tests/.github/workflows/epochs.yml
+++ b/tests/wpt/tests/.github/workflows/epochs.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         fetch-depth: 0
     - name: Run epochs_update.sh
diff --git a/tests/wpt/tests/.github/workflows/interfaces.yml b/tests/wpt/tests/.github/workflows/interfaces.yml
index 2e55ab28e18..04636e0bb3d 100644
--- a/tests/wpt/tests/.github/workflows/interfaces.yml
+++ b/tests/wpt/tests/.github/workflows/interfaces.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: Run interfaces_update.sh
       run: ./tools/ci/interfaces_update.sh
     - name: Create pull request
diff --git a/tests/wpt/tests/.github/workflows/manifest.yml b/tests/wpt/tests/.github/workflows/manifest.yml
index a6e5e43caac..e86ced78f60 100644
--- a/tests/wpt/tests/.github/workflows/manifest.yml
+++ b/tests/wpt/tests/.github/workflows/manifest.yml
@@ -15,7 +15,7 @@ jobs:
       with:
         python-version: '3.11'
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         fetch-depth: 50
     - name: Install dependencies
diff --git a/tests/wpt/tests/.github/workflows/regen_certs.yml b/tests/wpt/tests/.github/workflows/regen_certs.yml
index 4b5549d3aac..4b3565c0d6c 100644
--- a/tests/wpt/tests/.github/workflows/regen_certs.yml
+++ b/tests/wpt/tests/.github/workflows/regen_certs.yml
@@ -14,7 +14,7 @@ jobs:
       with:
         python-version: '3.11'
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: Regenerate certs
       # Use a conditional step instead of a conditional job to work around #20700.
       if: github.repository == 'web-platform-tests/wpt'
diff --git a/tests/wpt/tests/.well-known/aggregation-service/v1/public-keys b/tests/wpt/tests/.well-known/aggregation-service/v1/public-keys
new file mode 100644
index 00000000000..4a9578fdf35
--- /dev/null
+++ b/tests/wpt/tests/.well-known/aggregation-service/v1/public-keys
@@ -0,0 +1,6 @@
+{
+  "keys": [{
+    "id": "example_id",
+    "key": "two07NuSOLRSgJSE4mz3kMrmZ/jqLVYKZ2SW/8LDS3Y="
+  }]
+}
diff --git a/tests/wpt/tests/FileAPI/META.yml b/tests/wpt/tests/FileAPI/META.yml
index 506a59fec1e..66227c8224b 100644
--- a/tests/wpt/tests/FileAPI/META.yml
+++ b/tests/wpt/tests/FileAPI/META.yml
@@ -1,6 +1,6 @@
 spec: https://w3c.github.io/FileAPI/
 suggested_reviewers:
   - inexorabletash
-  - zqzhang
   - jdm
   - mkruisselbrink
+  - annevk
diff --git a/tests/wpt/tests/IndexedDB/META.yml b/tests/wpt/tests/IndexedDB/META.yml
index 89cbe2be26d..7c5448e3f04 100644
--- a/tests/wpt/tests/IndexedDB/META.yml
+++ b/tests/wpt/tests/IndexedDB/META.yml
@@ -2,4 +2,3 @@ spec: https://w3c.github.io/IndexedDB/
 suggested_reviewers:
   - odinho
   - inexorabletash
-  - zqzhang
diff --git a/tests/wpt/tests/IndexedDB/back-forward-cache-open-connection.window.js b/tests/wpt/tests/IndexedDB/back-forward-cache-open-connection.window.js
index 0021857d8b5..cee7287a0bb 100644
--- a/tests/wpt/tests/IndexedDB/back-forward-cache-open-connection.window.js
+++ b/tests/wpt/tests/IndexedDB/back-forward-cache-open-connection.window.js
@@ -29,7 +29,7 @@ promise_test(async t => {
   await rc2.historyBack();
   // The previous page receiving versionchange event should be evicted with the
   // correct reason.
-  // `kIgnoreEventAndEvict` will be reported as "Internal error".
+  // `kIgnoreEventAndEvict` will be reported as "internal-error".
   // See `NotRestoredReasonToReportString()`.
-  await assertNotRestoredFromBFCache(rc1, ['Internal error']);
+  await assertNotRestoredFromBFCache(rc1, ['internal-error']);
 });
diff --git a/tests/wpt/tests/WebCryptoAPI/import_export/ec_importKey.https.any.js b/tests/wpt/tests/WebCryptoAPI/import_export/ec_importKey.https.any.js
index 25defa369c1..31f062e313f 100644
--- a/tests/wpt/tests/WebCryptoAPI/import_export/ec_importKey.https.any.js
+++ b/tests/wpt/tests/WebCryptoAPI/import_export/ec_importKey.https.any.js
@@ -71,7 +71,7 @@
             [true, false].forEach(function(extractable) {
 
                 // Test public keys first
-                [[]].forEach(function(usages) { // Only valid usages argument is empty array
+                allValidUsages(vector.publicUsages, true).forEach(function(usages) {
                     ['spki', 'spki_compressed', 'jwk', 'raw', 'raw_compressed'].forEach(function(format) {
                         var algorithm = {name: vector.name, namedCurve: curve};
                         var data = keyData[curve];
@@ -88,7 +88,7 @@
                 ['pkcs8', 'jwk'].forEach(function(format) {
                     var algorithm = {name: vector.name, namedCurve: curve};
                     var data = keyData[curve];
-                    allValidUsages(vector.privateUsages, []).forEach(function(usages) {
+                    allValidUsages(vector.privateUsages).forEach(function(usages) {
                         testFormat(format, algorithm, data, curve, usages, extractable);
                     });
                     testEmptyUsages(format, algorithm, data, curve, extractable);
@@ -219,46 +219,6 @@
         return base64String.replace(/=/g, "");
     }
 
-    // Want to test every valid combination of usages. Start by creating a list
-    // of all non-empty subsets to possible usages.
-    function allNonemptySubsetsOf(arr) {
-        var results = [];
-        var firstElement;
-        var remainingElements;
-
-        for(var i=0; i<arr.length; i++) {
-            firstElement = arr[i];
-            remainingElements = arr.slice(i+1);
-            results.push([firstElement]);
-
-            if (remainingElements.length > 0) {
-                allNonemptySubsetsOf(remainingElements).forEach(function(combination) {
-                    combination.push(firstElement);
-                    results.push(combination);
-                });
-            }
-        }
-
-        return results;
-    }
-
-    // Return a list of all valid usage combinations, given the possible ones
-    // and the ones that are required for a particular operation.
-    function allValidUsages(possibleUsages, requiredUsages) {
-        var allUsages = [];
-
-        allNonemptySubsetsOf(possibleUsages).forEach(function(usage) {
-            for (var i=0; i<requiredUsages.length; i++) {
-                if (!usage.includes(requiredUsages[i])) {
-                    return;
-                }
-            }
-            allUsages.push(usage);
-        });
-
-        return allUsages;
-    }
-
     // Convert method parameters to a string to uniquely name each test
     function parameterString(format, compressed, data, algorithm, extractable, usages) {
         if ("byteLength" in data) {
@@ -311,4 +271,3 @@
 
         return "{" + keyValuePairs.join(", ") + "}";
     }
-
diff --git a/tests/wpt/tests/WebCryptoAPI/import_export/okp_importKey.https.any.js b/tests/wpt/tests/WebCryptoAPI/import_export/okp_importKey.https.any.js
index 2257a5fa418..a0ec3e81c87 100644
--- a/tests/wpt/tests/WebCryptoAPI/import_export/okp_importKey.https.any.js
+++ b/tests/wpt/tests/WebCryptoAPI/import_export/okp_importKey.https.any.js
@@ -72,7 +72,7 @@
         [true, false].forEach(function(extractable) {
 
             // Test public keys first
-            [[]].forEach(function(usages) { // Only valid usages argument is empty array
+            allValidUsages(vector.publicUsages, true).forEach(function(usages) {
                 ['spki', 'jwk', 'raw'].forEach(function(format) {
                     var algorithm = {name: vector.name};
                     var data = keyData[vector.name];
@@ -86,7 +86,7 @@
             });
 
             // Next, test private keys
-            allValidUsages(vector.privateUsages, []).forEach(function(usages) {
+            allValidUsages(vector.privateUsages).forEach(function(usages) {
                 ['pkcs8', 'jwk'].forEach(function(format) {
                     var algorithm = {name: vector.name};
                     var data = keyData[vector.name];
@@ -194,46 +194,6 @@
         return base64String.replace(/=/g, "");
     }
 
-    // Want to test every valid combination of usages. Start by creating a list
-    // of all non-empty subsets to possible usages.
-    function allNonemptySubsetsOf(arr) {
-        var results = [];
-        var firstElement;
-        var remainingElements;
-
-        for(var i=0; i<arr.length; i++) {
-            firstElement = arr[i];
-            remainingElements = arr.slice(i+1);
-            results.push([firstElement]);
-
-            if (remainingElements.length > 0) {
-                allNonemptySubsetsOf(remainingElements).forEach(function(combination) {
-                    combination.push(firstElement);
-                    results.push(combination);
-                });
-            }
-        }
-
-        return results;
-    }
-
-    // Return a list of all valid usage combinations, given the possible ones
-    // and the ones that are required for a particular operation.
-    function allValidUsages(possibleUsages, requiredUsages) {
-        var allUsages = [];
-
-        allNonemptySubsetsOf(possibleUsages).forEach(function(usage) {
-            for (var i=0; i<requiredUsages.length; i++) {
-                if (!usage.includes(requiredUsages[i])) {
-                    return;
-                }
-            }
-            allUsages.push(usage);
-        });
-
-        return allUsages;
-    }
-
     // Convert method parameters to a string to uniquely name each test
     function parameterString(format, data, algorithm, extractable, usages) {
         if ("byteLength" in data) {
diff --git a/tests/wpt/tests/WebCryptoAPI/import_export/rsa_importKey.https.any.js b/tests/wpt/tests/WebCryptoAPI/import_export/rsa_importKey.https.any.js
index 5582b2f506b..c0917cab683 100644
--- a/tests/wpt/tests/WebCryptoAPI/import_export/rsa_importKey.https.any.js
+++ b/tests/wpt/tests/WebCryptoAPI/import_export/rsa_importKey.https.any.js
@@ -78,7 +78,7 @@
                 [true, false].forEach(function(extractable) {
 
                     // Test public keys first
-                    allValidUsages(vector.publicUsages, []).forEach(function(usages) {
+                    allValidUsages(vector.publicUsages, true).forEach(function(usages) {
                         ['spki', 'jwk'].forEach(function(format) {
                             var algorithm = {name: vector.name, hash: hash};
                             var data = keyData[size];
@@ -95,7 +95,7 @@
                     ['pkcs8', 'jwk'].forEach(function(format) {
                         var algorithm = {name: vector.name, hash: hash};
                         var data = keyData[size];
-                        allValidUsages(vector.privateUsages, []).forEach(function(usages) {
+                        allValidUsages(vector.privateUsages).forEach(function(usages) {
                             testFormat(format, algorithm, data, size, usages, extractable);
                         });
                         testEmptyUsages(format, algorithm, data, size, extractable);
@@ -217,46 +217,6 @@
         return base64String.replace(/=/g, "");
     }
 
-    // Want to test every valid combination of usages. Start by creating a list
-    // of all non-empty subsets to possible usages.
-    function allNonemptySubsetsOf(arr) {
-        var results = [];
-        var firstElement;
-        var remainingElements;
-
-        for(var i=0; i<arr.length; i++) {
-            firstElement = arr[i];
-            remainingElements = arr.slice(i+1);
-            results.push([firstElement]);
-
-            if (remainingElements.length > 0) {
-                allNonemptySubsetsOf(remainingElements).forEach(function(combination) {
-                    combination.push(firstElement);
-                    results.push(combination);
-                });
-            }
-        }
-
-        return results;
-    }
-
-    // Return a list of all valid usage combinations, given the possible ones
-    // and the ones that are required for a particular operation.
-    function allValidUsages(possibleUsages, requiredUsages) {
-        var allUsages = [];
-
-        allNonemptySubsetsOf(possibleUsages).forEach(function(usage) {
-            for (var i=0; i<requiredUsages.length; i++) {
-                if (!usage.includes(requiredUsages[i])) {
-                    return;
-                }
-            }
-            allUsages.push(usage);
-        });
-
-        return allUsages;
-    }
-
     // Convert method parameters to a string to uniquely name each test
     function parameterString(format, data, algorithm, extractable, usages) {
         if ("byteLength" in data) {
diff --git a/tests/wpt/tests/WebCryptoAPI/import_export/symmetric_importKey.https.any.js b/tests/wpt/tests/WebCryptoAPI/import_export/symmetric_importKey.https.any.js
index a9ce9be0a1b..01b3180189d 100644
--- a/tests/wpt/tests/WebCryptoAPI/import_export/symmetric_importKey.https.any.js
+++ b/tests/wpt/tests/WebCryptoAPI/import_export/symmetric_importKey.https.any.js
@@ -49,7 +49,7 @@
                         data = jwkData(keyData, algorithm);
                     }
                     // Generate all combinations of valid usages for testing
-                    allValidUsages(vector.legalUsages, []).forEach(function(usages) {
+                    allValidUsages(vector.legalUsages).forEach(function(usages) {
                         testFormat(format, algorithm, data, keyData.length * 8, usages, extractable);
                     });
                     testEmptyUsages(format, algorithm, data, keyData.length * 8, extractable);
@@ -173,46 +173,6 @@
         return base64String.replace(/=/g, "");
     }
 
-    // Want to test every valid combination of usages. Start by creating a list
-    // of all non-empty subsets to possible usages.
-    function allNonemptySubsetsOf(arr) {
-        var results = [];
-        var firstElement;
-        var remainingElements;
-
-        for(var i=0; i<arr.length; i++) {
-            firstElement = arr[i];
-            remainingElements = arr.slice(i+1);
-            results.push([firstElement]);
-
-            if (remainingElements.length > 0) {
-                allNonemptySubsetsOf(remainingElements).forEach(function(combination) {
-                    combination.push(firstElement);
-                    results.push(combination);
-                });
-            }
-        }
-
-        return results;
-    }
-
-    // Return a list of all valid usage combinations, given the possible ones
-    // and the ones that are required for a particular operation.
-    function allValidUsages(possibleUsages, requiredUsages) {
-        var allUsages = [];
-
-        allNonemptySubsetsOf(possibleUsages).forEach(function(usage) {
-            for (var i=0; i<requiredUsages.length; i++) {
-                if (!usage.includes(requiredUsages[i])) {
-                    return;
-                }
-            }
-            allUsages.push(usage);
-        });
-
-        return allUsages;
-    }
-
     // Convert method parameters to a string to uniquely name each test
     function parameterString(format, data, algorithm, extractable, usages) {
         var result = "(" +
diff --git a/tests/wpt/tests/WebCryptoAPI/util/helpers.js b/tests/wpt/tests/WebCryptoAPI/util/helpers.js
index ce240a1549c..bda97003263 100644
--- a/tests/wpt/tests/WebCryptoAPI/util/helpers.js
+++ b/tests/wpt/tests/WebCryptoAPI/util/helpers.js
@@ -235,7 +235,7 @@ function allValidUsages(validUsages, emptyIsValid, mandatoryUsages) {
         }
     });
 
-    if (emptyIsValid) {
+    if (emptyIsValid && validUsages.length !== 0) {
         okaySubsets.push([]);
     }
 
diff --git a/tests/wpt/tests/accessibility/crashtests/aom-in-destroyed-iframe.html b/tests/wpt/tests/accessibility/crashtests/aom-in-destroyed-iframe.html
index d412892983a..c8f0aca12eb 100644
--- a/tests/wpt/tests/accessibility/crashtests/aom-in-destroyed-iframe.html
+++ b/tests/wpt/tests/accessibility/crashtests/aom-in-destroyed-iframe.html
@@ -1,6 +1,10 @@
 <html class="test-wait">
 <body></body>
 <script>
+
+// Bypass this abandoned syntax in all but the engines that implement it.
+if (typeof getComputedAccessibleNode !== 'undefined') {
+
   const frameElem = document.createElement('iframe');
 
   frameElem.srcdoc = '<html><head><title>X</title></head><body><div>-</div></body></html>';
@@ -21,7 +25,11 @@
       });
     });
   };
-
   document.body.appendChild(frameElem);
+
+} else {
+  // Pass in other engines that have not implemented the abandoned API
+  document.documentElement.className = '';
+}
 </script>
 </html>
diff --git a/tests/wpt/tests/accessibility/crashtests/computed-accessible-child-of-pseudo-element.html b/tests/wpt/tests/accessibility/crashtests/computed-accessible-child-of-pseudo-element.html
index 5bc12499074..b00ee7ba56f 100644
--- a/tests/wpt/tests/accessibility/crashtests/computed-accessible-child-of-pseudo-element.html
+++ b/tests/wpt/tests/accessibility/crashtests/computed-accessible-child-of-pseudo-element.html
@@ -6,17 +6,27 @@
 <h1>Heading</h1>
 
 <script>
-async function trigger1() {
-  let heading = document.querySelector('h1');
-  let computed_accessible_node = await self.getComputedAccessibleNode(heading);
-  let first_child = computed_accessible_node.firstChild;
-  // The first child of the heading is a pseudo element <table>.
-  await first_child.ensureUpToDate();
-  // The next child down has an accessibility object but no node.
-  let grand_child = first_child.firstChild;
-  await grand_child.ensureUpToDate();
+
+// Bypass this abandoned syntax in all but the engines that implement it.
+if (typeof getComputedAccessibleNode !== 'undefined') {
+
+  async function trigger1() {
+    let heading = document.querySelector('h1');
+    let computed_accessible_node = await self.getComputedAccessibleNode(heading);
+    let first_child = computed_accessible_node.firstChild;
+    // The first child of the heading is a pseudo element <table>.
+    await first_child.ensureUpToDate();
+    // The next child down has an accessibility object but no node.
+    let grand_child = first_child.firstChild;
+    await grand_child.ensureUpToDate();
+    document.documentElement.className = '';
+  }
+  trigger1();
+
+} else {
+  // Pass in other engines that have not implemented the abandoned API
   document.documentElement.className = '';
 }
-trigger1();
+
 </script>
 </html>
diff --git a/tests/wpt/tests/accessibility/crashtests/computed-accessible-text-node.html b/tests/wpt/tests/accessibility/crashtests/computed-accessible-text-node.html
index 29b7c2b2fe2..47183ce6ec6 100644
--- a/tests/wpt/tests/accessibility/crashtests/computed-accessible-text-node.html
+++ b/tests/wpt/tests/accessibility/crashtests/computed-accessible-text-node.html
@@ -1,14 +1,24 @@
 <html class="test-wait">
 <img id="img1">text
 <script>
-async function trigger1() {
-  let img = document.getElementById('img1');
-  let computed_accessible_node = await self.getComputedAccessibleNode(img);
-  // The next sibling is a text node.
-  let next_sibling = computed_accessible_node.nextSibling;
-  await next_sibling.ensureUpToDate();
+
+// Bypass this abandoned syntax in all but the engines that implement it.
+if (typeof getComputedAccessibleNode !== 'undefined') {
+
+  async function trigger1() {
+    let img = document.getElementById('img1');
+    let computed_accessible_node = await self.getComputedAccessibleNode(img);
+    // The next sibling is a text node.
+    let next_sibling = computed_accessible_node.nextSibling;
+    await next_sibling.ensureUpToDate();
+    document.documentElement.className = '';
+  }
+  trigger1();
+
+} else {
+  // Pass in other engines that have not implemented the abandoned API
   document.documentElement.className = '';
 }
-trigger1();
+
 </script>
 </html>
diff --git a/tests/wpt/tests/accessibility/crashtests/computed-node-checked.html b/tests/wpt/tests/accessibility/crashtests/computed-node-checked.html
index a413d26a019..47e715b2338 100644
--- a/tests/wpt/tests/accessibility/crashtests/computed-node-checked.html
+++ b/tests/wpt/tests/accessibility/crashtests/computed-node-checked.html
@@ -19,6 +19,10 @@ if (window.chrome && chrome.gpuBenchmarking) {
 </script>
 <script>step_timeout(gc, 50);</script>
 <script>
+
+// Bypass this abandoned syntax in all but the engines that implement it.
+if (typeof getComputedAccessibleNode !== 'undefined') {
+
   const frameElem = document.createElement('iframe');
 
   frameElem.srcdoc = '<div></div>';
@@ -34,5 +38,12 @@ if (window.chrome && chrome.gpuBenchmarking) {
     });
   };
   document.body.appendChild(frameElem);
+
+} else {
+  // Pass in other engines that have not implemented the abandoned API
+  document.documentElement.className = '';
+}
+
+
 </script>
 </html>
diff --git a/tests/wpt/tests/accessibility/crashtests/content-visibility-focusable-scroller-descendant.html b/tests/wpt/tests/accessibility/crashtests/content-visibility-focusable-scroller-descendant.html
new file mode 100644
index 00000000000..e9b027b5c7b
--- /dev/null
+++ b/tests/wpt/tests/accessibility/crashtests/content-visibility-focusable-scroller-descendant.html
@@ -0,0 +1,11 @@
+<!doctype HTML>
+<style>
+html,body {
+     content-visibility: auto;
+}
+</style>
+<div id=target style="height: 1000px; width: 100px; overflow: scroll">
+     <marquee></marquee>
+     <div style="width: 50px; height: 2000px"></div>
+</div>
+
diff --git a/tests/wpt/tests/accessibility/crashtests/display-table-column.html b/tests/wpt/tests/accessibility/crashtests/display-table-column.html
new file mode 100644
index 00000000000..6f34f27fa7e
--- /dev/null
+++ b/tests/wpt/tests/accessibility/crashtests/display-table-column.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html class="test-wait">
+<head>
+<style>
+.foo * {
+  display: table-column;
+}
+</style>
+<script>
+requestAnimationFrame(() => {
+  requestAnimationFrame(() => {
+    const link = document.querySelector('link');
+    // This will queue the creation of an accessibility object for the
+    // link, because it will now have layout.
+    document.documentElement.className = 'foo';
+    // Do something that forces the link's accessibility object to get an
+    // additional update.
+    link.ariaChecked = 'true';
+    requestAnimationFrame(()=> {
+      requestAnimationFrame(()=> {
+        document.documentElement.className = '';
+      });
+    });
+  });
+});
+</script>
+</head>
+<body>
+  <link/>
+</body>
+</html>
diff --git a/tests/wpt/tests/accessibility/crashtests/null-node.html b/tests/wpt/tests/accessibility/crashtests/null-node.html
new file mode 100644
index 00000000000..dc4a81e6bff
--- /dev/null
+++ b/tests/wpt/tests/accessibility/crashtests/null-node.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<style>
+::-webkit-scrollbar-track, ::-webkit-scrollbar {
+  color: red;
+}
+::-webkit-scrollbar-track:horizontal:disabled {
+  content-visibility: hidden;
+}
+</style>
+<main style="height: 100px; width: 100px; overflow: scroll;"></main>
diff --git a/tests/wpt/tests/avif/animated-avif-timeout-ref.html b/tests/wpt/tests/avif/animated-avif-timeout-ref.html
index 0eecb377409..52374220c91 100644
--- a/tests/wpt/tests/avif/animated-avif-timeout-ref.html
+++ b/tests/wpt/tests/avif/animated-avif-timeout-ref.html
@@ -1 +1 @@
-<img src=../images/green.avif>
+<img src=../images/green.avif style="height:500px">
diff --git a/tests/wpt/tests/avif/animated-avif-timeout.html b/tests/wpt/tests/avif/animated-avif-timeout.html
index 13a5722051e..0970c994d34 100644
--- a/tests/wpt/tests/avif/animated-avif-timeout.html
+++ b/tests/wpt/tests/avif/animated-avif-timeout.html
@@ -1,7 +1,7 @@
 <html class="reftest-wait">
 <title>Animated AVIF: Second frame displays quickly, replacing red with green.</title>
 <link rel="match" href="animated-avif-timeout-ref.html"/>
-<img src=../images/animated-avif.avif onload="loaded()"/>
+<img src=../images/animated-avif.avif onload="loaded()" style="height:500px"/>
 <script>
   function loaded() {
     setTimeout(function() {
diff --git a/tests/wpt/tests/clear-site-data/support/test_utils.sub.js b/tests/wpt/tests/clear-site-data/support/test_utils.sub.js
index 712c57cbb7e..71fc79c420a 100644
--- a/tests/wpt/tests/clear-site-data/support/test_utils.sub.js
+++ b/tests/wpt/tests/clear-site-data/support/test_utils.sub.js
@@ -145,35 +145,6 @@ var TestUtils = (function() {
         });
       }
     },
-    {
-      "name": "WebSQL",
-      "supported": function() { return !!window.openDatabase; },
-      "add": function() {
-        return new Promise(function(resolve, reject) {
-          var database = window.openDatabase(
-              "database", "1.0", "database", 1024 /* 1 kB */);
-          database.transaction(function(context) {
-            context.executeSql("CREATE TABLE IF NOT EXISTS data (column)");
-            context.executeSql(
-                "INSERT INTO data (column) VALUES (1)", [], resolve);
-          });
-        });
-      },
-      "isEmpty": function() {
-        return new Promise(function(resolve, reject) {
-          var database = window.openDatabase(
-              "database", "1.0", "database", 1024 /* 1 kB */);
-          database.transaction(function(context) {
-            context.executeSql("CREATE TABLE IF NOT EXISTS data (column)");
-            context.executeSql(
-                "SELECT * FROM data", [],
-                function(transaction, result) {
-                  resolve(!result.rows.length);
-                });
-          });
-        });
-      }
-    }
   ].filter(function(backend) { return backend.supported(); });
 
   /**
diff --git a/tests/wpt/tests/client-hints/accept-ch/__dir__.headers b/tests/wpt/tests/client-hints/accept-ch/__dir__.headers
index f233c2e9d64..4d4739028d3 100644
--- a/tests/wpt/tests/client-hints/accept-ch/__dir__.headers
+++ b/tests/wpt/tests/client-hints/accept-ch/__dir__.headers
@@ -1 +1 @@
-Accept-CH: device-memory, dpr, width, viewport-width, rtt, downlink, ect, sec-ch-ua, sec-ch-ua-arch, sec-ch-ua-platform, sec-ch-ua-model, sec-ch-ua-mobile, sec-ch-ua-full-version, sec-ch-ua-platform-version, sec-ch-prefers-color-scheme, sec-ch-prefers-reduced-motion, sec-ch-ua-bitness, sec-ch-viewport-height, sec-ch-device-memory, sec-ch-dpr, sec-ch-width, sec-ch-viewport-width, sec-ch-ua-full-version-list, sec-ch-ua-wow64
+Accept-CH: device-memory, dpr, width, viewport-width, rtt, downlink, ect, sec-ch-ua, sec-ch-ua-arch, sec-ch-ua-platform, sec-ch-ua-model, sec-ch-ua-mobile, sec-ch-ua-full-version, sec-ch-ua-platform-version, sec-ch-prefers-color-scheme, sec-ch-prefers-reduced-motion, sec-ch-ua-bitness, sec-ch-viewport-height, sec-ch-device-memory, sec-ch-dpr, sec-ch-width, sec-ch-viewport-width, sec-ch-ua-full-version-list, sec-ch-ua-wow64, sec-ch-prefers-reduced-transparency
diff --git a/tests/wpt/tests/client-hints/accept-ch/feature-policy-navigation/__dir__.headers b/tests/wpt/tests/client-hints/accept-ch/feature-policy-navigation/__dir__.headers
index f233c2e9d64..4d4739028d3 100644
--- a/tests/wpt/tests/client-hints/accept-ch/feature-policy-navigation/__dir__.headers
+++ b/tests/wpt/tests/client-hints/accept-ch/feature-policy-navigation/__dir__.headers
@@ -1 +1 @@
-Accept-CH: device-memory, dpr, width, viewport-width, rtt, downlink, ect, sec-ch-ua, sec-ch-ua-arch, sec-ch-ua-platform, sec-ch-ua-model, sec-ch-ua-mobile, sec-ch-ua-full-version, sec-ch-ua-platform-version, sec-ch-prefers-color-scheme, sec-ch-prefers-reduced-motion, sec-ch-ua-bitness, sec-ch-viewport-height, sec-ch-device-memory, sec-ch-dpr, sec-ch-width, sec-ch-viewport-width, sec-ch-ua-full-version-list, sec-ch-ua-wow64
+Accept-CH: device-memory, dpr, width, viewport-width, rtt, downlink, ect, sec-ch-ua, sec-ch-ua-arch, sec-ch-ua-platform, sec-ch-ua-model, sec-ch-ua-mobile, sec-ch-ua-full-version, sec-ch-ua-platform-version, sec-ch-prefers-color-scheme, sec-ch-prefers-reduced-motion, sec-ch-ua-bitness, sec-ch-viewport-height, sec-ch-device-memory, sec-ch-dpr, sec-ch-width, sec-ch-viewport-width, sec-ch-ua-full-version-list, sec-ch-ua-wow64, sec-ch-prefers-reduced-transparency
diff --git a/tests/wpt/tests/client-hints/accept-ch/feature-policy.sub.https.html b/tests/wpt/tests/client-hints/accept-ch/feature-policy.sub.https.html
index e1aa3ad68f8..8f9be9fde43 100644
--- a/tests/wpt/tests/client-hints/accept-ch/feature-policy.sub.https.html
+++ b/tests/wpt/tests/client-hints/accept-ch/feature-policy.sub.https.html
@@ -45,6 +45,7 @@ promise_test(t => {
     assert_in_array(r.headers.get("mobile-received"), ["?0", "?1"], 'mobile is unexpected');
     assert_false(r.headers.has("prefers-color-scheme-received"), "prefers-color-scheme-received");
     assert_false(r.headers.has("prefers-reduced-motion-received"), "prefers-reduced-motion-received");
+    assert_false(r.headers.has("prefers-reduced-transparency-received"), "prefers-reduced-transparency-received");
     assert_false(r.headers.has("viewport-height-received"), "viewport-height-received");
   });
 }, "Accept-CH header test");
@@ -65,6 +66,7 @@ promise_test(t => {
     assert_false(r.headers.has("ect-received"), "ect-received");
     assert_false(r.headers.has("prefers-color-scheme-received"), "prefers-color-scheme-received");
     assert_false(r.headers.has("prefers-reduced-motion-received"), "prefers-reduced-motion-received");
+    assert_false(r.headers.has("prefers-reduced-transparency-received"), "prefers-reduced-transparency-received");
     assert_false(r.headers.has("viewport-height-received"), "viewport-height-received");
   });
 }, "Cross-Origin Accept-CH header test");
diff --git a/tests/wpt/tests/client-hints/accept-ch/feature-policy.sub.https.html.headers b/tests/wpt/tests/client-hints/accept-ch/feature-policy.sub.https.html.headers
index d968517a3ad..6e6b89e9230 100644
--- a/tests/wpt/tests/client-hints/accept-ch/feature-policy.sub.https.html.headers
+++ b/tests/wpt/tests/client-hints/accept-ch/feature-policy.sub.https.html.headers
@@ -1 +1 @@
-Permissions-Policy: ch-device-memory=*, ch-dpr=(), ch-viewport-width=(self), ch-mobile, ch-prefers-color-scheme=(), ch-prefers-reduced-motion=(), ch-viewport-height=()
+Permissions-Policy: ch-device-memory=*, ch-dpr=(), ch-viewport-width=(self), ch-mobile, ch-prefers-color-scheme=(), ch-prefers-reduced-motion=(), ch-viewport-height=(), ch-prefers-reduced-transparency=()
diff --git a/tests/wpt/tests/client-hints/http-equiv-accept-ch-merge.https.html b/tests/wpt/tests/client-hints/http-equiv-accept-ch-merge.https.html
index 832c0578874..bc578afb1e1 100644
--- a/tests/wpt/tests/client-hints/http-equiv-accept-ch-merge.https.html
+++ b/tests/wpt/tests/client-hints/http-equiv-accept-ch-merge.https.html
@@ -2,7 +2,7 @@
 <head>
 <meta http-equiv="Accept-CH" content="sec-ch-viewport-width, viewport-width, rtt">
 <meta http-equiv="Accept-CH" content="downlink, ect, sec-ch-prefers-color-scheme">
-<meta http-equiv="Accept-CH" content="sec-ch-prefers-reduced-motion">
+<meta http-equiv="Accept-CH" content="sec-ch-prefers-reduced-motion, sec-ch-prefers-reduced-transparency">
 <body>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
@@ -40,6 +40,7 @@ promise_test(t => {
           "3g", "4g"], 'ect-received is unexpected');
     assert_true(r.headers.has("prefers-color-scheme-received"), "prefers-color-scheme-received");
     assert_true(r.headers.has("prefers-reduced-motion-received"), "prefers-reduced-motion-received");
+    assert_true(r.headers.has("prefers-reduced-transparency-received"), "prefers-reduced-transparency-received");
   });
 }, "Accept-CH header test");
 
diff --git a/tests/wpt/tests/client-hints/meta-equiv-delegate-ch-injection.https.html b/tests/wpt/tests/client-hints/meta-equiv-delegate-ch-injection.https.html
index b9e4a334fca..79221efe954 100644
--- a/tests/wpt/tests/client-hints/meta-equiv-delegate-ch-injection.https.html
+++ b/tests/wpt/tests/client-hints/meta-equiv-delegate-ch-injection.https.html
@@ -15,7 +15,7 @@
 document.getElementsByTagName('meta')[0].setAttribute("content", "dpr;sec-ch-dpr;device-memory;sec-ch-device-memory;viewport-width;sec-ch-viewport-width;rtt;downlink;ect");
 document.head.outerHTML += '<meta http-equiv="Delegate-CH" content="sec-ch-ua-arch;sec-ch-ua-platform;sec-ch-ua-model">';
 document.head.innerHTML += '<meta http-equiv="Delegate-CH" content="sec-ch-ua-full-version;sec-ch-ua-bitness;sec-ch-ua-full-version-list">';
-document.write('<meta http-equiv="Delegate-CH" content="sec-ch-ua-platform-version;sec-ch-prefers-color-scheme;sec-ch-prefers-reduced-motion;sec-ch-viewport-height">');
+document.write('<meta http-equiv="Delegate-CH" content="sec-ch-ua-platform-version;sec-ch-prefers-color-scheme;sec-ch-prefers-reduced-motion;sec-ch-viewport-height;sec-ch-prefers-reduced-transparency">');
 
 // resources/echo-client-hints-received.py sets the response headers depending on the set
 // of client hints it receives in the request headers.
@@ -34,6 +34,7 @@ promise_test(t => {
     assert_false(r.headers.has("downlink-received"), "downlink-received");
     assert_false(r.headers.has("ect-received"), "ect-received");
     assert_false(r.headers.has("prefers-color-scheme-received"), "prefers-color-scheme-received");
+    assert_false(r.headers.has("prefers-reduced-transparency-received"), "prefers-reduced-transparency-received");
   });
 }, "Delegate-CH meta-equiv injection test");
 
diff --git a/tests/wpt/tests/client-hints/meta-equiv-delegate-ch-merge.https.html b/tests/wpt/tests/client-hints/meta-equiv-delegate-ch-merge.https.html
index d8dbc9f96c4..1039be4dbe4 100644
--- a/tests/wpt/tests/client-hints/meta-equiv-delegate-ch-merge.https.html
+++ b/tests/wpt/tests/client-hints/meta-equiv-delegate-ch-merge.https.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="Delegate-CH" content="sec-ch-viewport-width; viewport-width; rtt">
 <meta http-equiv="Delegate-CH" content="downlink; ect; sec-ch-prefers-color-scheme">
-<meta http-equiv="Delegate-CH" content="sec-ch-prefers-reduced-motion">
+<meta http-equiv="Delegate-CH" content="sec-ch-prefers-reduced-motion; sec-ch-prefers-reduced-transparency">
 <body>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
@@ -41,6 +41,7 @@ promise_test(t => {
           "3g", "4g"], 'ect-received is unexpected');
     assert_true(r.headers.has("prefers-color-scheme-received"), "prefers-color-scheme-received");
     assert_true(r.headers.has("prefers-reduced-motion-received"), "prefers-reduced-motion-received");
+    assert_true(r.headers.has("prefers-reduced-transparency-received"), "prefers-reduced-transparency-received");
   });
 }, "Delegate-CH header test");
 
diff --git a/tests/wpt/tests/client-hints/resources/clienthintslist.py b/tests/wpt/tests/client-hints/resources/clienthintslist.py
index 3d1f7caf468..badf716c024 100644
--- a/tests/wpt/tests/client-hints/resources/clienthintslist.py
+++ b/tests/wpt/tests/client-hints/resources/clienthintslist.py
@@ -23,6 +23,7 @@ def client_hints_list():
           b"sec-ch-viewport-width",
           b"sec-ch-ua-full-version-list",
           b"sec-ch-ua-wow64",
+          b"sec-ch-prefers-reduced-transparency",
   ]
 
 def client_hints_full_list():
diff --git a/tests/wpt/tests/client-hints/resources/echo-client-hints-received.py b/tests/wpt/tests/client-hints/resources/echo-client-hints-received.py
index 190cd862892..0aa5bfb25c8 100644
--- a/tests/wpt/tests/client-hints/resources/echo-client-hints-received.py
+++ b/tests/wpt/tests/client-hints/resources/echo-client-hints-received.py
@@ -34,3 +34,5 @@ def main(request, response):
         response.headers.set(b"prefers-color-scheme-received", request.headers.get(b"sec-ch-prefers-color-scheme"))
     if b"sec-ch-prefers-reduced-motion" in request.headers:
         response.headers.set(b"prefers-reduced-motion-received", request.headers.get(b"sec-ch-prefers-reduced-motion"))
+    if b"sec-ch-prefers-reduced-transparency" in request.headers:
+        response.headers.set(b"prefers-reduced-transparency-received", request.headers.get(b"sec-ch-prefers-reduced-transparency"))
diff --git a/tests/wpt/tests/client-hints/resources/export.js b/tests/wpt/tests/client-hints/resources/export.js
index 57caba1c5f4..e2596e1c6f7 100644
--- a/tests/wpt/tests/client-hints/resources/export.js
+++ b/tests/wpt/tests/client-hints/resources/export.js
@@ -23,6 +23,7 @@ const client_hints_list = [
   "sec-ch-viewport-width",
   "sec-ch-ua-full-version-list",
   "sec-ch-ua-wow64",
+  "sec-ch-prefers-reduced-transparency",
 ];
 
 const client_hints_full_list = client_hints_list.concat(["width", "sec-ch-width"])
diff --git a/tests/wpt/tests/client-hints/sandbox/__dir__.headers b/tests/wpt/tests/client-hints/sandbox/__dir__.headers
index f233c2e9d64..4d4739028d3 100644
--- a/tests/wpt/tests/client-hints/sandbox/__dir__.headers
+++ b/tests/wpt/tests/client-hints/sandbox/__dir__.headers
@@ -1 +1 @@
-Accept-CH: device-memory, dpr, width, viewport-width, rtt, downlink, ect, sec-ch-ua, sec-ch-ua-arch, sec-ch-ua-platform, sec-ch-ua-model, sec-ch-ua-mobile, sec-ch-ua-full-version, sec-ch-ua-platform-version, sec-ch-prefers-color-scheme, sec-ch-prefers-reduced-motion, sec-ch-ua-bitness, sec-ch-viewport-height, sec-ch-device-memory, sec-ch-dpr, sec-ch-width, sec-ch-viewport-width, sec-ch-ua-full-version-list, sec-ch-ua-wow64
+Accept-CH: device-memory, dpr, width, viewport-width, rtt, downlink, ect, sec-ch-ua, sec-ch-ua-arch, sec-ch-ua-platform, sec-ch-ua-model, sec-ch-ua-mobile, sec-ch-ua-full-version, sec-ch-ua-platform-version, sec-ch-prefers-color-scheme, sec-ch-prefers-reduced-motion, sec-ch-ua-bitness, sec-ch-viewport-height, sec-ch-device-memory, sec-ch-dpr, sec-ch-width, sec-ch-viewport-width, sec-ch-ua-full-version-list, sec-ch-ua-wow64, sec-ch-prefers-reduced-transparency
diff --git a/tests/wpt/tests/client-hints/sec-ch-quotes.https.html b/tests/wpt/tests/client-hints/sec-ch-quotes.https.html
index 31dc945510d..08f7c51af0f 100644
--- a/tests/wpt/tests/client-hints/sec-ch-quotes.https.html
+++ b/tests/wpt/tests/client-hints/sec-ch-quotes.https.html
@@ -29,6 +29,7 @@ promise_test(async (test) => {
     "sec-ch-prefers-reduced-motion",
     "sec-ch-ua-full-version-list",
     "sec-ch-ua-wow64",
+    "sec-ch-prefers-reduced-transparency",
   ];
   const boolean_client_hint_headers = [
     "sec-ch-mobile",
diff --git a/tests/wpt/tests/client-hints/sec-ch-quotes.https.html.headers b/tests/wpt/tests/client-hints/sec-ch-quotes.https.html.headers
index 60ab0f2024c..1d6f8f26fb8 100644
--- a/tests/wpt/tests/client-hints/sec-ch-quotes.https.html.headers
+++ b/tests/wpt/tests/client-hints/sec-ch-quotes.https.html.headers
@@ -1 +1 @@
-Accept-CH: sec-ch-ua,sec-ch-ua-arch,sec-ch-ua-platform,sec-ch-ua-platform-version,sec-ch-ua-model,sec-ch-prefers-color-scheme,sec-ch-prefers-reduced-motion
+Accept-CH: sec-ch-ua,sec-ch-ua-arch,sec-ch-ua-platform,sec-ch-ua-platform-version,sec-ch-ua-model,sec-ch-prefers-color-scheme,sec-ch-prefers-reduced-motion,sec-ch-prefers-reduced-transparency
diff --git a/tests/wpt/tests/clipboard-apis/async-unsanitized-standard-html-formats-write-read.tentative.https.html b/tests/wpt/tests/clipboard-apis/async-unsanitized-standard-html-formats-write-read.tentative.https.html
index f6313c1b901..0eb97926bc0 100644
--- a/tests/wpt/tests/clipboard-apis/async-unsanitized-standard-html-formats-write-read.tentative.https.html
+++ b/tests/wpt/tests/clipboard-apis/async-unsanitized-standard-html-formats-write-read.tentative.https.html
@@ -20,7 +20,7 @@ function reformatHtml(html) {
   const parser = new DOMParser();
   const htmlString =
         parser.parseFromString(html, 'text/html').documentElement.innerHTML;
-  const reformattedString = htmlString.replace(/\>\s*\</g, '> <');
+  const reformattedString = htmlString.replace(/\>\s*\</g, '> <').replace(/<!--[a-zA-Z]*?-->/g, '');
   return reformattedString;
 }
 
diff --git a/tests/wpt/tests/common/META.yml b/tests/wpt/tests/common/META.yml
index ca4d2e523c0..963dff9d1f1 100644
--- a/tests/wpt/tests/common/META.yml
+++ b/tests/wpt/tests/common/META.yml
@@ -1,3 +1,2 @@
 suggested_reviewers:
-  - zqzhang
   - deniak
diff --git a/tests/wpt/tests/compression/compression-bad-chunks.tentative.any.js b/tests/wpt/tests/compression/compression-bad-chunks.tentative.any.js
index cbd4805a4da..2d0b5684733 100644
--- a/tests/wpt/tests/compression/compression-bad-chunks.tentative.any.js
+++ b/tests/wpt/tests/compression/compression-bad-chunks.tentative.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 
 'use strict';
 
diff --git a/tests/wpt/tests/compression/compression-constructor-error.tentative.any.js b/tests/wpt/tests/compression/compression-constructor-error.tentative.any.js
index 2d5271c11d3..b39ab93bd02 100644
--- a/tests/wpt/tests/compression/compression-constructor-error.tentative.any.js
+++ b/tests/wpt/tests/compression/compression-constructor-error.tentative.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 
 'use strict';
 
diff --git a/tests/wpt/tests/compression/compression-including-empty-chunk.tentative.any.js b/tests/wpt/tests/compression/compression-including-empty-chunk.tentative.any.js
index 0948029c4bd..a7fd1ceb24f 100644
--- a/tests/wpt/tests/compression/compression-including-empty-chunk.tentative.any.js
+++ b/tests/wpt/tests/compression/compression-including-empty-chunk.tentative.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 // META: script=third_party/pako/pako_inflate.min.js
 // META: timeout=long
 
diff --git a/tests/wpt/tests/compression/compression-large-flush-output.any.js b/tests/wpt/tests/compression/compression-large-flush-output.any.js
index c7455807fb2..6afcb4d5287 100644
--- a/tests/wpt/tests/compression/compression-large-flush-output.any.js
+++ b/tests/wpt/tests/compression/compression-large-flush-output.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 // META: script=third_party/pako/pako_inflate.min.js
 // META: script=resources/concatenate-stream.js
 // META: timeout=long
diff --git a/tests/wpt/tests/compression/compression-multiple-chunks.tentative.any.js b/tests/wpt/tests/compression/compression-multiple-chunks.tentative.any.js
index f43f13b5411..28a90e5ca53 100644
--- a/tests/wpt/tests/compression/compression-multiple-chunks.tentative.any.js
+++ b/tests/wpt/tests/compression/compression-multiple-chunks.tentative.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 // META: script=third_party/pako/pako_inflate.min.js
 // META: timeout=long
 
diff --git a/tests/wpt/tests/compression/compression-output-length.tentative.any.js b/tests/wpt/tests/compression/compression-output-length.tentative.any.js
index 07efe92a826..7aa13734500 100644
--- a/tests/wpt/tests/compression/compression-output-length.tentative.any.js
+++ b/tests/wpt/tests/compression/compression-output-length.tentative.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 
 'use strict';
 
diff --git a/tests/wpt/tests/compression/compression-stream.tentative.any.js b/tests/wpt/tests/compression/compression-stream.tentative.any.js
index 8c02a6d699a..a7ea0cb9084 100644
--- a/tests/wpt/tests/compression/compression-stream.tentative.any.js
+++ b/tests/wpt/tests/compression/compression-stream.tentative.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 // META: script=third_party/pako/pako_inflate.min.js
 // META: timeout=long
 
diff --git a/tests/wpt/tests/compression/compression-with-detach.tentative.window.js b/tests/wpt/tests/compression/compression-with-detach.tentative.window.js
index 786bba21c80..465feaa47d4 100644
--- a/tests/wpt/tests/compression/compression-with-detach.tentative.window.js
+++ b/tests/wpt/tests/compression/compression-with-detach.tentative.window.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 // META: script=resources/concatenate-stream.js
 
 'use strict';
diff --git a/tests/wpt/tests/compression/decompression-bad-chunks.tentative.any.js b/tests/wpt/tests/compression/decompression-bad-chunks.tentative.any.js
index 0a1312a5a11..f450b0c4cb2 100644
--- a/tests/wpt/tests/compression/decompression-bad-chunks.tentative.any.js
+++ b/tests/wpt/tests/compression/decompression-bad-chunks.tentative.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 
 'use strict';
 
diff --git a/tests/wpt/tests/compression/decompression-buffersource.tentative.any.js b/tests/wpt/tests/compression/decompression-buffersource.tentative.any.js
index 5f8638b1351..e81fc566779 100644
--- a/tests/wpt/tests/compression/decompression-buffersource.tentative.any.js
+++ b/tests/wpt/tests/compression/decompression-buffersource.tentative.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 
 'use strict';
 
diff --git a/tests/wpt/tests/compression/decompression-constructor-error.tentative.any.js b/tests/wpt/tests/compression/decompression-constructor-error.tentative.any.js
index 1bd86ff5b59..0270ba73531 100644
--- a/tests/wpt/tests/compression/decompression-constructor-error.tentative.any.js
+++ b/tests/wpt/tests/compression/decompression-constructor-error.tentative.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 
 'use strict';
 
diff --git a/tests/wpt/tests/compression/decompression-correct-input.tentative.any.js b/tests/wpt/tests/compression/decompression-correct-input.tentative.any.js
index e5f56c0f0a5..90519445e36 100644
--- a/tests/wpt/tests/compression/decompression-correct-input.tentative.any.js
+++ b/tests/wpt/tests/compression/decompression-correct-input.tentative.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 
 'use strict';
 
diff --git a/tests/wpt/tests/compression/decompression-corrupt-input.tentative.any.js b/tests/wpt/tests/compression/decompression-corrupt-input.tentative.any.js
index edf6dedaee0..fc18197dfbd 100644
--- a/tests/wpt/tests/compression/decompression-corrupt-input.tentative.any.js
+++ b/tests/wpt/tests/compression/decompression-corrupt-input.tentative.any.js
@@ -1,4 +1,4 @@
-// META global=window,worker
+// META global=window,worker,shadowrealm
 
 // This test checks that DecompressionStream behaves according to the standard
 // when the input is corrupted. To avoid a combinatorial explosion in the
diff --git a/tests/wpt/tests/compression/decompression-empty-input.tentative.any.js b/tests/wpt/tests/compression/decompression-empty-input.tentative.any.js
index 62759757720..201db8ec0b0 100644
--- a/tests/wpt/tests/compression/decompression-empty-input.tentative.any.js
+++ b/tests/wpt/tests/compression/decompression-empty-input.tentative.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 
 'use strict';
 
@@ -40,4 +40,4 @@ promise_test(async t => {
   assert_true(done, "read() should set done");
   assert_equals(value, undefined, "value should be undefined");
   await writePromise;
-}, 'decompressing deflate-raw empty input should work');
\ No newline at end of file
+}, 'decompressing deflate-raw empty input should work');
diff --git a/tests/wpt/tests/compression/decompression-split-chunk.tentative.any.js b/tests/wpt/tests/compression/decompression-split-chunk.tentative.any.js
index 96c26f004c8..eb12c2a2360 100644
--- a/tests/wpt/tests/compression/decompression-split-chunk.tentative.any.js
+++ b/tests/wpt/tests/compression/decompression-split-chunk.tentative.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 
 'use strict';
 
diff --git a/tests/wpt/tests/compression/decompression-uint8array-output.tentative.any.js b/tests/wpt/tests/compression/decompression-uint8array-output.tentative.any.js
index ff0f8d62254..0c45a0aaa72 100644
--- a/tests/wpt/tests/compression/decompression-uint8array-output.tentative.any.js
+++ b/tests/wpt/tests/compression/decompression-uint8array-output.tentative.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 // META: timeout=long
 //
 // This test isn't actually slow usually, but sometimes it takes >10 seconds on
diff --git a/tests/wpt/tests/compression/decompression-with-detach.tentative.window.js b/tests/wpt/tests/compression/decompression-with-detach.tentative.window.js
index a2f8bda0914..1ff9c269837 100644
--- a/tests/wpt/tests/compression/decompression-with-detach.tentative.window.js
+++ b/tests/wpt/tests/compression/decompression-with-detach.tentative.window.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 // META: script=resources/concatenate-stream.js
 
 'use strict';
diff --git a/tests/wpt/tests/content-security-policy/connect-src/connect-src-syncxmlhttprequest-allowed.sub.html b/tests/wpt/tests/content-security-policy/connect-src/connect-src-syncxmlhttprequest-allowed.sub.html
new file mode 100644
index 00000000000..5da8890de95
--- /dev/null
+++ b/tests/wpt/tests/content-security-policy/connect-src/connect-src-syncxmlhttprequest-allowed.sub.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="connect-src 'self' http://{{host}}:{{ports[http][0]}}; script-src 'self' 'unsafe-inline';">
+    <title>connect-src-syncxmlhttprequest-allowed</title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src='../support/logTest.sub.js?logs=["Pass"]'></script>
+    <script src="../support/alertAssert.sub.js?alerts=[]"></script>
+</head>
+
+<body>
+    <script>
+        window.addEventListener('securitypolicyviolation', function(e) {
+            log("Fail");
+        });
+
+        try {
+            var xhr = new XMLHttpRequest;
+            xhr.open("GET", "http://{{host}}:{{ports[http][0]}}/xmlhttprequest/resources/get.txt", false);
+            log("Pass");
+        } catch (e) {
+            log("Fail");
+        }
+
+    </script>
+    <div id="log"></div>
+</body>
+
+</html>
diff --git a/tests/wpt/tests/content-security-policy/connect-src/connect-src-syncxmlhttprequest-blocked.sub.html b/tests/wpt/tests/content-security-policy/connect-src/connect-src-syncxmlhttprequest-blocked.sub.html
new file mode 100644
index 00000000000..0dfa642e091
--- /dev/null
+++ b/tests/wpt/tests/content-security-policy/connect-src/connect-src-syncxmlhttprequest-blocked.sub.html
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="connect-src 'self'; script-src 'self' 'unsafe-inline';">
+    <title>connect-src-syncxmlhttprequest-blocked</title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src='../support/logTest.sub.js?logs=["Pass","violated-directive=connect-src"]'></script>
+    <script src="../support/alertAssert.sub.js?alerts=[]"></script>
+</head>
+
+<body>
+    <script>
+        window.addEventListener('securitypolicyviolation', function(e) {
+            log("violated-directive=" + e.violatedDirective);
+        });
+
+        try {
+            var xhr = new XMLHttpRequest;
+            xhr.open("GET", "http://www1.{{host}}:{{ports[http][0]}}/content-security-policy/support/fail.png", false);
+            xhr.send();
+            xhr.onload = function() {
+                log("Fail");
+            }
+            xhr.onerror = function() {
+                log("Pass");
+            }
+        } catch (e) {
+            log("Pass");
+        }
+
+    </script>
+    <div id="log"></div>
+</body>
+
+</html>
diff --git a/tests/wpt/tests/content-security-policy/connect-src/connect-src-syncxmlhttprequest-redirect-to-blocked.sub.html b/tests/wpt/tests/content-security-policy/connect-src/connect-src-syncxmlhttprequest-redirect-to-blocked.sub.html
new file mode 100644
index 00000000000..00025084266
--- /dev/null
+++ b/tests/wpt/tests/content-security-policy/connect-src/connect-src-syncxmlhttprequest-redirect-to-blocked.sub.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <!-- Programmatically converted from a WebKit Reftest, please forgive resulting idiosyncracies.-->
+    <meta http-equiv="Content-Security-Policy" content="connect-src 'self'; script-src 'self' 'unsafe-inline';">
+    <title>connect-src-syncxmlhttprequest-redirect-to-blocked</title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src='../support/logTest.sub.js?logs=["PASS Sync XMLHttpRequest.send() did not follow the disallowed redirect.","TEST COMPLETE","violated-directive=connect-src"]'></script>
+    <script src="../support/alertAssert.sub.js?alerts=[]"></script>
+    <script id="inject_here"></script>
+</head>
+
+<body>
+    <script>
+        window.addEventListener('securitypolicyviolation', function(e) {
+            log("violated-directive=" + e.violatedDirective);
+        });
+
+        var xhr = new XMLHttpRequest;
+        try {
+            xhr.open("GET", "/common/redirect.py?location=http://www1.{{host}}:{{ports[http][0]}}/content-security-policy/support/fail.asis", false);
+        } catch (e) {
+            log("FAIL " + "Sync XMLHttpRequest.open() should not throw an exception.");
+        }
+        xhr.onload = function() {
+            log("FAIL " + "Sync XMLHttpRequest.send() should fail to follow the disallowed redirect.");
+            log("TEST COMPLETE");
+        };
+        try {
+            xhr.send();
+        } catch (e) {
+            log("PASS " + "Sync XMLHttpRequest.send() did not follow the disallowed redirect.");
+            log("TEST COMPLETE");
+        }
+
+    </script>
+    <div id="log"></div>
+</body>
+
+</html>
diff --git a/tests/wpt/tests/content-security-policy/connect-src/connect-src-xmlhttprequest-redirect-to-blocked.sub.html b/tests/wpt/tests/content-security-policy/connect-src/connect-src-xmlhttprequest-redirect-to-blocked.sub.html
index 429e463c531..61f58f00c19 100644
--- a/tests/wpt/tests/content-security-policy/connect-src/connect-src-xmlhttprequest-redirect-to-blocked.sub.html
+++ b/tests/wpt/tests/content-security-policy/connect-src/connect-src-xmlhttprequest-redirect-to-blocked.sub.html
@@ -25,7 +25,6 @@
             log("FAIL " + "XMLHttpRequest.open() should not throw an exception.");
         }
         xhr.onload = function() {
-            //cons/**/ole.log(xhr.responseText);
             if(xhr.responseText == "FAIL") {
                 log("FAIL " + "XMLHttpRequest.send() should fail to follow the disallowed redirect.");
             } else {
diff --git a/tests/wpt/tests/content-security-policy/media-src/media-src-7_2_2.sub.html b/tests/wpt/tests/content-security-policy/media-src/media-src-7_2_2.sub.html
index e1626eec5aa..ce6b8add3c8 100644
--- a/tests/wpt/tests/content-security-policy/media-src/media-src-7_2_2.sub.html
+++ b/tests/wpt/tests/content-security-policy/media-src/media-src-7_2_2.sub.html
@@ -40,16 +40,17 @@
 
     <audio id="audioObject" width="320" height="240" controls
            onloadeddata="media_loaded(source_test)">
-        <source id="audioSourceObject"
-                type="audio/ogg"
-                onerror="media_error_handler(source_test)">
     </audio>
     <audio id="audioObject2" width="320" height="240" controls
            onerror="media_error_handler(src_test)"
            onloadeddata="media_loaded(src_test)">
-
+    </audio>
     <script>
-        document.getElementById("audioSourceObject").src = mediaURL;
+        let source = document.createElement("source");
+        source.src = mediaURL;
+        source.type = "audio/ogg";
+        source.onerror = _ => { media_error_handler(source_test); }
+        document.getElementById("audioObject").appendChild(source);
         document.getElementById("audioObject2").src = mediaURL;
     </script>
 
diff --git a/tests/wpt/tests/cookie-deprecation-label/cookie-deprecation-label-detached-iframe.https.html b/tests/wpt/tests/cookie-deprecation-label/cookie-deprecation-label-detached-iframe.https.html
new file mode 100644
index 00000000000..9573dd2a4a1
--- /dev/null
+++ b/tests/wpt/tests/cookie-deprecation-label/cookie-deprecation-label-detached-iframe.https.html
@@ -0,0 +1,23 @@
+<!doctype html>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<iframe id="iframe"></iframe>
+<script>
+  promise_test(async t => {
+    let label = await navigator.cookieDeprecationLabel.getValue();
+    assert_equals(label, 'label_test');
+
+    const iframe = document.getElementById('iframe');
+    const iframeNavigator = iframe.contentWindow.navigator;
+    let iframeLabel = await iframeNavigator.cookieDeprecationLabel.getValue();
+    assert_equals(iframeLabel, 'label_test');
+
+    iframe.parentNode.removeChild(iframe);
+
+    label = await navigator.cookieDeprecationLabel.getValue();
+    assert_equals(label, 'label_test');
+
+    iframeLabel = await iframeNavigator.cookieDeprecationLabel.getValue();
+    assert_equals(iframeLabel, undefined);
+  }, 'Test navigator.cookieDeprecationLabel behavior in detached iframes');
+</script>
\ No newline at end of file
diff --git a/tests/wpt/tests/cookie-deprecation-label/cookie-deprecation-label-insecure-context.http.html b/tests/wpt/tests/cookie-deprecation-label/cookie-deprecation-label-insecure-context.http.html
new file mode 100644
index 00000000000..bf415e97fa8
--- /dev/null
+++ b/tests/wpt/tests/cookie-deprecation-label/cookie-deprecation-label-insecure-context.http.html
@@ -0,0 +1,8 @@
+<!doctype html>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script>
+  test(() => {
+    assert_equals(navigator.cookieDeprecationLabel, undefined);
+  }, 'Test navigator.cookieDeprecationLabel in insecure context');
+</script>
diff --git a/tests/wpt/tests/cookie-deprecation-label/cookie-deprecation-label.https.html b/tests/wpt/tests/cookie-deprecation-label/cookie-deprecation-label.https.html
new file mode 100644
index 00000000000..c1ad72c30bf
--- /dev/null
+++ b/tests/wpt/tests/cookie-deprecation-label/cookie-deprecation-label.https.html
@@ -0,0 +1,9 @@
+<!doctype html>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script>
+  promise_test(async t => {
+    let label = await navigator.cookieDeprecationLabel.getValue();
+    assert_equals(label, 'label_test');
+  }, 'Test navigator.cookieDeprecationLabel.getValue()');
+</script>
diff --git a/tests/wpt/tests/cookies/third-party-cookies/resources/test-helpers.js b/tests/wpt/tests/cookies/third-party-cookies/resources/test-helpers.js
new file mode 100644
index 00000000000..2ae2c46a371
--- /dev/null
+++ b/tests/wpt/tests/cookies/third-party-cookies/resources/test-helpers.js
@@ -0,0 +1,63 @@
+function testHttpCookies({desc, origin, cookieNames, expectsCookie}) {
+  promise_test(async () => {
+    await assertOriginCanAccessCookies({origin, cookieNames, expectsCookie});
+  }, getCookieTestName(expectsCookie, desc, "HTTP"));
+}
+
+async function assertOriginCanAccessCookies({
+  origin,
+  cookieNames,
+  expectsCookie,
+}) {
+  const resp = await credFetch(`${origin}/cookies/resources/list.py`);
+  const cookies = await resp.json();
+  for (const cookieName of cookieNames) {
+    assert_equals(
+      cookies.hasOwnProperty(cookieName), expectsCookie,
+      getCookieAssertDesc(expectsCookie, cookieName));
+  }
+}
+
+function testDomCookies({desc, cookieNames, expectsCookie}) {
+  test(() => {
+    assertDomCanAccessCookie(cookieNames, expectsCookie);
+  }, getCookieTestName(expectsCookie, desc, "DOM"));
+}
+
+function assertDomCanAccessCookie(cookieNames, expectsCookie) {
+  for (const cookieName of cookieNames) {
+    assert_equals(
+      document.cookie.includes(cookieName + "="), expectsCookie,
+      getCookieAssertDesc(expectsCookie, cookieName));
+  }
+}
+
+function testCookieStoreCookies({desc, cookieNames, expectsCookie}) {
+  if (!window.cookieStore) return;
+  promise_test(async () => {
+    await assertCookieStoreCanAccessCookies(cookieNames, expectsCookie);
+  }, getCookieTestName(expectsCookie, desc, "CookieStore"));
+}
+
+async function assertCookieStoreCanAccessCookies(cookieNames, expectsCookie) {
+  const cookies = await cookieStore.getAll({sameSite: 'none'});
+  for (const cookieName of cookieNames) {
+    assert_equals(
+      !!cookies.find(c => c.name === cookieName), expectsCookie,
+      getCookieAssertDesc(expectsCookie, cookieName));
+  }
+}
+
+function getCookieTestName(expectsCookie, desc, cookieType) {
+  if (expectsCookie) {
+      return `${desc}: Cookies are accessible via ${cookieType}`;
+  }
+  return `${desc}: Cookies are not accessible via ${cookieType}`;
+}
+
+function getCookieAssertDesc(expectsCookie, cookieName) {
+  if (expectsCookie) {
+    return `Expected cookie ${cookieName} to be available`;
+  }
+  return `Expected cookie ${cookieName} to not be available`;
+}
diff --git a/tests/wpt/tests/cookies/third-party-cookies/resources/third-party-cookies-cross-site-embed.html b/tests/wpt/tests/cookies/third-party-cookies/resources/third-party-cookies-cross-site-embed.html
new file mode 100644
index 00000000000..2d579c91bed
--- /dev/null
+++ b/tests/wpt/tests/cookies/third-party-cookies/resources/third-party-cookies-cross-site-embed.html
@@ -0,0 +1,57 @@
+<!DOCTYPE html>
+<meta charset="utf-8"/>
+<meta name="timeout" content="long">
+<title>Test site embedded in a cross-site context</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
+<script src="/cookies/resources/cookie-helper.sub.js"></script>
+<script src="/cookies/third-party-cookies/resources/test-helpers.js"></script>
+<body>
+<script>
+
+// Cookies set by the parent window in a 1P context.
+const cookieNames = ["1P_http", "1P_dom"];
+if (window.cookieStore) {
+  cookieNames.push("1P_cs");
+}
+
+testDomCookies({
+  desc: "3P embed",
+  cookieNames,
+  expectsCookie: false,
+});
+
+testCookieStoreCookies({
+  desc: "3P embed",
+  cookieNames,
+  expectsCookie: false,
+});
+
+test(() => {
+  const thirdPartyDomCookieName = "3P_dom";
+  document.cookie =
+      `${thirdPartyDomCookieName}=foobar;Secure;Path=/;SameSite=None`;
+
+  assertDomCanAccessCookie([thirdPartyDomCookieName], false);
+}, "Cross site embed setting DOM cookies");
+
+if (window.cookieStore) {
+  promise_test(async () => {
+    const thirdPartyCsCookieName = "3P_cs";
+    await cookieStore.set({
+      name: thirdPartyCsCookieName,
+      value: "foobar",
+      path: "/",
+      sameSite: "none",
+    }).then(
+        // The promise should reject.
+        () => { assert_unreached(); },
+        () => {});
+
+    await assertCookieStoreCanAccessCookies([thirdPartyCsCookieName], false);
+  }, "Cross site embed setting CookieStore cookies");
+}
+
+</script>
+</body>
diff --git a/tests/wpt/tests/cookies/third-party-cookies/resources/third-party-cookies-cross-site-window.html b/tests/wpt/tests/cookies/third-party-cookies/resources/third-party-cookies-cross-site-window.html
new file mode 100644
index 00000000000..99418a67491
--- /dev/null
+++ b/tests/wpt/tests/cookies/third-party-cookies/resources/third-party-cookies-cross-site-window.html
@@ -0,0 +1,62 @@
+<!DOCTYPE html>
+<meta charset="utf-8"/>
+<meta name="timeout" content="long">
+<title>Cross-site window</title>
+<script src="/resources/testharness.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
+<script src="/cookies/resources/cookie-helper.sub.js"></script>
+<script src="/cookies/third-party-cookies/resources/test-helpers.js"></script>
+
+<body>
+<script>
+
+let origin;
+
+// Test that parent window passed its origin in the URL parameters correctly.
+test(() => {
+  assert_true(window.location.search.startsWith("?origin="));
+  origin = decodeURIComponent(window.location.search.slice(
+      window.location.search.indexOf("?origin=") + 8));
+}, "Cross-site window opened correctly");
+
+// Cookies set by the parent window in a 1P context.
+const cookieNames = ["1P_http", "1P_dom"];
+if (window.cookieStore) {
+  cookieNames.push("1P_cs");
+}
+
+// Test theses cookies are not available on cross-site subresource requests
+// to the origin that set them.
+testHttpCookies({
+  desc: "3P fetch",
+  origin,
+  cookieNames,
+  expectsCookie: false,
+});
+
+promise_test(async () => {
+  const thirdPartyHttpCookie = "3P_http"
+  await credFetch(
+    `${origin}/cookies/resources/set.py?${thirdPartyHttpCookie}=foobar;` +
+    "Secure;Path=/;SameSite=None");
+  await assertOriginCanAccessCookies({
+    origin,
+    cookieNames: ["3P_http"],
+    expectsCookie: false,
+  });
+}, "Cross site window setting HTTP cookies");
+
+// Create a cross-site <iframe> which embeds the cookies' origin into this
+// page.
+const iframe = document.createElement("iframe");
+const url = new URL(
+    "/cookies/third-party-cookies/resources/" +
+        "third-party-cookies-cross-site-embed.html",
+    origin);
+iframe.src = String(url);
+document.body.appendChild(iframe);
+
+fetch_tests_from_window(iframe.contentWindow);
+
+</script>
+</body>
diff --git a/tests/wpt/tests/cookies/third-party-cookies/third-party-cookies.tentative.https.html b/tests/wpt/tests/cookies/third-party-cookies/third-party-cookies.tentative.https.html
new file mode 100644
index 00000000000..184649ff5bc
--- /dev/null
+++ b/tests/wpt/tests/cookies/third-party-cookies/third-party-cookies.tentative.https.html
@@ -0,0 +1,72 @@
+<!DOCTYPE html>
+<meta charset="utf-8"/>
+<meta name="timeout" content="long">
+<title>Test third-party cookies</title>
+<title>Test partitioned cookies</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
+<script src="/cookies/resources/cookie-helper.sub.js"></script>
+<script src="/cookies/third-party-cookies/resources/test-helpers.js"></script>
+
+<body>
+<script>
+
+document.body.onload = async () => {
+  // Set SameSite=None cookie in a 1P context using HTTP.
+  const attributes = "Secure;Path=/;SameSite=None";
+  const httpCookieName = "1P_http";
+  await credFetch(
+      `${self.origin}/cookies/resources/set.py?${httpCookieName}=foobar;${
+          attributes}`);
+
+  // Set another cookie using document.cookie.
+  const domCookieName = "1P_dom";
+  document.cookie = `${domCookieName}=foobar;${attributes}`;
+
+  const cookieNames = [httpCookieName, domCookieName];
+
+  // Set another cookie using the CookieStore API, if supported.
+  if (window.cookieStore) {
+    const cookieStoreCookieName = "1P_cs";
+    await cookieStore.set({
+      name: cookieStoreCookieName,
+      value: "foobar",
+      path: "/",
+      sameSite: "none",
+    });
+    cookieNames.push(cookieStoreCookieName);
+  }
+
+  // Test that the cookie is available in a first-party context via HTTP.
+  testHttpCookies({
+    desc: "1P window",
+    origin: self.origin,
+    cookieNames,
+    expectsCookie: true,
+  });
+
+  // // Verify that the cookies are available to the DOM as well.
+  testDomCookies({
+    desc: "1P window",
+    cookieNames,
+    expectsCookie: true,
+  });
+  testCookieStoreCookies({
+    desc: "1P window",
+    cookieNames,
+    expectsCookie: true,
+  });
+
+  // Open a cross-site window which will embed the current origin in a
+  // third-party context.
+  const crossSiteUrl = new URL(
+      `./resources/third-party-cookies-cross-site-window.html?origin=${
+          encodeURIComponent(self.origin)}`,
+      get_host_info().HTTPS_NOTSAMESITE_ORIGIN + self.location.pathname);
+  const popup = window.open(crossSiteUrl);
+  fetch_tests_from_window(popup);
+};
+
+</script>
+</body>
diff --git a/tests/wpt/tests/core-aam/aria-haspopup_dialog-manual.html b/tests/wpt/tests/core-aam/aria-haspopup_dialog-manual.html
index 659b9bf3767..bf893a1c4bd 100644
--- a/tests/wpt/tests/core-aam/aria-haspopup_dialog-manual.html
+++ b/tests/wpt/tests/core-aam/aria-haspopup_dialog-manual.html
@@ -42,6 +42,12 @@
                   "actions",
                   "doesNotContain",
                   "AXPress"
+               ],
+               [
+                  "property",
+                  "AXPopupValue",
+                  "is",
+                  "dialog"
                ]
             ],
             "IAccessible2" : [
diff --git a/tests/wpt/tests/core-aam/aria-haspopup_listbox-manual.html b/tests/wpt/tests/core-aam/aria-haspopup_listbox-manual.html
index 0ebc1bbb268..b940195a04c 100644
--- a/tests/wpt/tests/core-aam/aria-haspopup_listbox-manual.html
+++ b/tests/wpt/tests/core-aam/aria-haspopup_listbox-manual.html
@@ -42,6 +42,12 @@
                   "actions",
                   "doesNotContain",
                   "AXPress"
+               ],
+               [
+                  "property",
+                  "AXPopupValue",
+                  "is",
+                  "listbox"
                ]
             ],
             "IAccessible2" : [
diff --git a/tests/wpt/tests/core-aam/aria-haspopup_menu-manual.html b/tests/wpt/tests/core-aam/aria-haspopup_menu-manual.html
index d9a203a8775..f149aaabcc7 100644
--- a/tests/wpt/tests/core-aam/aria-haspopup_menu-manual.html
+++ b/tests/wpt/tests/core-aam/aria-haspopup_menu-manual.html
@@ -42,6 +42,12 @@
                   "actions",
                   "doesNotContain",
                   "AXPress"
+               ],
+               [
+                  "property",
+                  "AXPopupValue",
+                  "is",
+                  "menu"
                ]
             ],
             "IAccessible2" : [
diff --git a/tests/wpt/tests/core-aam/aria-haspopup_tree-manual.html b/tests/wpt/tests/core-aam/aria-haspopup_tree-manual.html
index 41de64f47a3..db1608659cd 100644
--- a/tests/wpt/tests/core-aam/aria-haspopup_tree-manual.html
+++ b/tests/wpt/tests/core-aam/aria-haspopup_tree-manual.html
@@ -42,6 +42,12 @@
                   "actions",
                   "doesNotContain",
                   "AXPress"
+               ],
+               [
+                  "property",
+                  "AXPopupValue",
+                  "is",
+                  "tree"
                ]
             ],
             "IAccessible2" : [
diff --git a/tests/wpt/tests/core-aam/aria-haspopup_true-manual.html b/tests/wpt/tests/core-aam/aria-haspopup_true-manual.html
index b9e046cdd7f..659e77cc984 100644
--- a/tests/wpt/tests/core-aam/aria-haspopup_true-manual.html
+++ b/tests/wpt/tests/core-aam/aria-haspopup_true-manual.html
@@ -42,6 +42,12 @@
                   "actions",
                   "doesNotContain",
                   "AXPress"
+               ],
+               [
+                  "property",
+                  "AXPopupValue",
+                  "is",
+                  "menu"
                ]
             ],
             "IAccessible2" : [
diff --git a/tests/wpt/tests/cors/META.yml b/tests/wpt/tests/cors/META.yml
index 08dc73704f9..3187818d44d 100644
--- a/tests/wpt/tests/cors/META.yml
+++ b/tests/wpt/tests/cors/META.yml
@@ -1,6 +1,5 @@
 spec: https://fetch.spec.whatwg.org/#http-cors-protocol
 suggested_reviewers:
-  - zqzhang
   - odinho
   - hillbrad
   - jdm
diff --git a/tests/wpt/tests/credential-management/fedcm-account-auto-selected-flag.https.html b/tests/wpt/tests/credential-management/fedcm-account-auto-selected-flag.https.html
new file mode 100644
index 00000000000..ac3515596ae
--- /dev/null
+++ b/tests/wpt/tests/credential-management/fedcm-account-auto-selected-flag.https.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<title>Federated Credential Management API account auto selected flag tests.</title>
+<link rel="help" href="https://fedidcg.github.io/FedCM">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+
+<script type="module">
+import {request_options_with_mediation_optional,
+        fedcm_test,
+        select_manifest,
+        fedcm_get_and_select_first_account} from './support/fedcm-helper.sub.js';
+
+fedcm_test(async t => {
+  let test_options = request_options_with_mediation_optional("manifest_with_account_auto_selected_flag.json");
+  await select_manifest(t, test_options);
+
+  let cred = await fedcm_get_and_select_first_account(t, test_options);
+  assert_equals(cred.token, "is_account_auto_selected=false");
+
+  test_options = request_options_with_mediation_optional("manifest_with_account_auto_selected_flag.json");
+  await select_manifest(t, test_options);
+
+  cred = await navigator.credentials.get(test_options);
+  assert_equals(cred.token, "is_account_auto_selected=true");
+  assert_equals(cred.isAccountAutoSelected, true);
+}, "Test that the is_account_auto_selected bit is properly sent.");
+</script>
diff --git a/tests/wpt/tests/credential-management/fedcm-basic.https.html b/tests/wpt/tests/credential-management/fedcm-basic.https.html
index d5804f796e9..d07c0de9577 100644
--- a/tests/wpt/tests/credential-management/fedcm-basic.https.html
+++ b/tests/wpt/tests/credential-management/fedcm-basic.https.html
@@ -16,7 +16,7 @@ import {fedcm_test,
 fedcm_test(async t => {
   const cred = await fedcm_get_and_select_first_account(t, request_options_with_mediation_required());
   assert_equals(cred.token, "token");
-  assert_equals(cred.isAutoReauthn, false);
+  assert_equals(cred.isAccountAutoSelected, false);
 }, "Successfully obtaining token should resolve the promise.");
 
 </script>
diff --git a/tests/wpt/tests/credential-management/fedcm-iframe.https.html b/tests/wpt/tests/credential-management/fedcm-iframe.https.html
index 964ebf4c44d..dc0c17dea69 100644
--- a/tests/wpt/tests/credential-management/fedcm-iframe.https.html
+++ b/tests/wpt/tests/credential-management/fedcm-iframe.https.html
@@ -16,13 +16,16 @@ const basePath = window.location.pathname.replace(/\/[^\/]*$/, '/');
 const remoteBaseURL = host.HTTPS_REMOTE_ORIGIN + basePath;
 const localhostBaseURL = "http://localhost:" + host.HTTP_PORT + basePath;
 
-async function createIframeAndWaitForMessage(test, iframeUrl, setPermissionPolicy) {
+async function createIframeAndWaitForMessage(test, iframeUrl, setPermissionPolicy, style = "") {
     const messageWatcher = new EventWatcher(test, window, "message");
     var iframe = document.createElement("iframe");
     iframe.src = iframeUrl;
     if (setPermissionPolicy) {
       iframe.allow = "identity-credentials-get";
     }
+    if (style !== "") {
+      iframe.style = style;
+    }
     document.body.appendChild(iframe);
     const message = await messageWatcher.wait_for("message");
     return message.data;
@@ -44,6 +47,14 @@ fedcm_test(async t => {
   assert_equals(message.token, "token");
 }, "FedCM enabled in 2 level deep nested iframe. FedCM should be enabled regardless of iframe nesting depth");
 
+fedcm_test(async t => {
+  const message = await createIframeAndWaitForMessage(
+      t, remoteBaseURL + "support/fedcm-iframe.html",
+      /*setPermissionPolicy=*/true, /*style=*/"display:none;");
+  assert_equals(message.result, "Pass");
+  assert_equals(message.token, "token");
+}, "FedCM enabled in invisible iframe. FedCM should be enabled as long as the top frame is visible");
+
 fedcm_test(async t => {
   const message = await createIframeAndWaitForMessage(
       t, remoteBaseURL + "support/fedcm-iframe-level2.html",
diff --git a/tests/wpt/tests/credential-management/fedcm-returning-account-auto-reauthn.https.html b/tests/wpt/tests/credential-management/fedcm-returning-account-auto-reauthn.https.html
index bec836f25f0..38c07f0a60a 100644
--- a/tests/wpt/tests/credential-management/fedcm-returning-account-auto-reauthn.https.html
+++ b/tests/wpt/tests/credential-management/fedcm-returning-account-auto-reauthn.https.html
@@ -29,6 +29,6 @@ fedcm_test(async t => {
   // "Jane" is a new user, the second account "John" will be selected.
   cred = await navigator.credentials.get(test_options);
   assert_equals(cred.token, "account_id=john_doe");
-  assert_equals(cred.isAutoReauthn, true);
+  assert_equals(cred.isAccountAutoSelected, true);
 }, "Test that the returning account from the two accounts will be auto re-authenticated.");
 </script>
diff --git a/tests/wpt/tests/credential-management/support/fedcm/accounts.py b/tests/wpt/tests/credential-management/support/fedcm/accounts.py
index dabc2c6f9f9..3989de7f17c 100644
--- a/tests/wpt/tests/credential-management/support/fedcm/accounts.py
+++ b/tests/wpt/tests/credential-management/support/fedcm/accounts.py
@@ -1,18 +1,10 @@
+import importlib
+error_checker = importlib.import_module("credential-management.support.fedcm.request-params-check")
+
 def main(request, response):
-  if request.cookies.get(b"cookie") != b"1":
-    return (530, [], "Missing cookie")
-  if request.headers.get(b"Accept") != b"application/json":
-    return (531, [], "Wrong Accept")
-  if request.headers.get(b"Sec-Fetch-Dest") != b"webidentity":
-    return (532, [], "Wrong Sec-Fetch-Dest header")
-  if request.headers.get(b"Referer"):
-    return (533, [], "Should not have Referer")
-  if request.headers.get(b"Origin"):
-    return (534, [], "Should not have Origin")
-  if request.headers.get(b"Sec-Fetch-Mode") != b"no-cors":
-    return (535, [], "Wrong Sec-Fetch-Mode header")
-  if request.headers.get(b"Sec-Fetch-Site") != b"none":
-    return (536, [], "Wrong Sec-Fetch-Site header")
+  request_error = error_checker.accountsCheck(request)
+  if (request_error):
+    return request_error
 
   response.headers.set(b"Content-Type", b"application/json")
 
diff --git a/tests/wpt/tests/credential-management/support/fedcm/client_metadata.py b/tests/wpt/tests/credential-management/support/fedcm/client_metadata.py
index 61d8aaf2367..72ddcc5cd62 100644
--- a/tests/wpt/tests/credential-management/support/fedcm/client_metadata.py
+++ b/tests/wpt/tests/credential-management/support/fedcm/client_metadata.py
@@ -1,23 +1,12 @@
 # 'import credential-management.support.fedcm.keys' does not work.
 import importlib
 keys = importlib.import_module("credential-management.support.fedcm.keys")
+error_checker = importlib.import_module("credential-management.support.fedcm.request-params-check")
 
 def main(request, response):
-  if (request.GET.get(b'skip_checks', b'0') != b'1'):
-    if len(request.cookies) > 0:
-      return (530, [], "Cookie should not be sent to this endpoint")
-    if request.headers.get(b"Accept") != b"application/json":
-      return (531, [], "Wrong Accept")
-    if request.headers.get(b"Sec-Fetch-Dest") != b"webidentity":
-      return (532, [], "Wrong Sec-Fetch-Dest header")
-    if request.headers.get(b"Referer"):
-      return (533, [], "Should not have Referer")
-    if not request.headers.get(b"Origin"):
-      return (534, [], "Missing Origin")
-    if request.headers.get(b"Sec-Fetch-Mode") != b"no-cors":
-      return (535, [], "Wrong Sec-Fetch-Mode header")
-    if request.headers.get(b"Sec-Fetch-Site") != b"cross-site":
-      return (536, [], "Wrong Sec-Fetch-Site header")
+  request_error = error_checker.clientMetadataCheck(request)
+  if (request_error):
+    return request_error
 
   counter = request.server.stash.take(keys.CLIENT_METADATA_COUNTER_KEY)
   try:
diff --git a/tests/wpt/tests/credential-management/support/fedcm/manifest-not-in-list.json b/tests/wpt/tests/credential-management/support/fedcm/manifest-not-in-list.json
index c66903cfd22..e6f5a1bbf32 100644
--- a/tests/wpt/tests/credential-management/support/fedcm/manifest-not-in-list.json
+++ b/tests/wpt/tests/credential-management/support/fedcm/manifest-not-in-list.json
@@ -1,5 +1,6 @@
 {
   "accounts_endpoint": "accounts.py",
   "client_metadata_endpoint": "client_metadata.py",
-  "id_assertion_endpoint": "token.py"
+  "id_assertion_endpoint": "token.py",
+  "login_url": "signin.html"
 }
diff --git a/tests/wpt/tests/credential-management/support/fedcm/manifest.py b/tests/wpt/tests/credential-management/support/fedcm/manifest.py
index 8a8fff74bc9..f8dced8f561 100644
--- a/tests/wpt/tests/credential-management/support/fedcm/manifest.py
+++ b/tests/wpt/tests/credential-management/support/fedcm/manifest.py
@@ -1,18 +1,10 @@
+import importlib
+error_checker = importlib.import_module("credential-management.support.fedcm.request-params-check")
+
 def main(request, response):
-  if len(request.cookies) > 0:
-    return (530, [], "Cookie should not be sent to manifest endpoint")
-  if request.headers.get(b"Accept") != b"application/json":
-    return (531, [], "Wrong Accept")
-  if request.headers.get(b"Sec-Fetch-Dest") != b"webidentity":
-    return (532, [], "Wrong Sec-Fetch-Dest header")
-  if request.headers.get(b"Referer"):
-    return (533, [], "Should not have Referer")
-  if request.headers.get(b"Origin"):
-    return (534, [], "Should not have Origin")
-  if request.headers.get(b"Sec-Fetch-Mode") != b"no-cors":
-    return (535, [], "Wrong Sec-Fetch-Mode header")
-  if request.headers.get(b"Sec-Fetch-Site") != b"cross-site":
-    return (536, [], "Wrong Sec-Fetch-Site header")
+  request_error = error_checker.manifestCheck(request)
+  if (request_error):
+    return request_error
 
   response.headers.set(b"Content-Type", b"application/json")
 
@@ -21,6 +13,7 @@ def main(request, response):
   "accounts_endpoint": "accounts.py",
   "client_metadata_endpoint": "client_metadata.py",
   "id_assertion_endpoint": "token.py",
-  "revocation_endpoint": "revoke.py"
+  "revocation_endpoint": "revoke.py",
+  "login_url": "signin.html"
 }
 """
diff --git a/tests/wpt/tests/credential-management/support/fedcm/manifest_redirect_accounts.json b/tests/wpt/tests/credential-management/support/fedcm/manifest_redirect_accounts.json
index 590704cfeb1..4a8a5469fa9 100644
--- a/tests/wpt/tests/credential-management/support/fedcm/manifest_redirect_accounts.json
+++ b/tests/wpt/tests/credential-management/support/fedcm/manifest_redirect_accounts.json
@@ -1,5 +1,6 @@
 {
   "accounts_endpoint": "/common/redirect.py?location=/credential-management/support/fedcm/accounts.py",
   "client_metadata_endpoint": "client_metadata.py",
-  "id_assertion_endpoint": "token.py"
+  "id_assertion_endpoint": "token.py",
+  "login_url": "signin.html"
 }
diff --git a/tests/wpt/tests/credential-management/support/fedcm/manifest_redirect_token.json b/tests/wpt/tests/credential-management/support/fedcm/manifest_redirect_token.json
index 190420736df..35e75d10c22 100644
--- a/tests/wpt/tests/credential-management/support/fedcm/manifest_redirect_token.json
+++ b/tests/wpt/tests/credential-management/support/fedcm/manifest_redirect_token.json
@@ -2,5 +2,6 @@
   "accounts_endpoint": "accounts.py",
   "client_metadata_endpoint": "client_metadata.py",
   "id_assertion_endpoint": "/common/redirect.py?location=/credential-management/support/fedcm/token.py&status=308",
-  "revocation_endpoint": "revoke.py"
+  "revocation_endpoint": "revoke.py",
+  "login_url": "signin.html"
 }
diff --git a/tests/wpt/tests/credential-management/support/fedcm/manifest_with_account_auto_selected_flag.json b/tests/wpt/tests/credential-management/support/fedcm/manifest_with_account_auto_selected_flag.json
new file mode 100644
index 00000000000..e3f38b7983f
--- /dev/null
+++ b/tests/wpt/tests/credential-management/support/fedcm/manifest_with_account_auto_selected_flag.json
@@ -0,0 +1,6 @@
+{
+  "accounts_endpoint": "two_accounts.py",
+  "client_metadata_endpoint": "client_metadata.py",
+  "id_assertion_endpoint": "token_with_account_auto_selected_flag.py",
+  "login_url": "signin.html"
+}
diff --git a/tests/wpt/tests/credential-management/support/fedcm/manifest_with_no_accounts.json b/tests/wpt/tests/credential-management/support/fedcm/manifest_with_no_accounts.json
index ad3f295ea85..761a38b4377 100644
--- a/tests/wpt/tests/credential-management/support/fedcm/manifest_with_no_accounts.json
+++ b/tests/wpt/tests/credential-management/support/fedcm/manifest_with_no_accounts.json
@@ -1,5 +1,6 @@
 {
   "accounts_endpoint": "no_accounts.py",
   "client_metadata_endpoint": "client_metadata.py",
-  "id_assertion_endpoint": "token_with_account_id.py"
+  "id_assertion_endpoint": "token_with_account_id.py",
+  "login_url": "signin.html"
 }
diff --git a/tests/wpt/tests/credential-management/support/fedcm/manifest_with_single_account.json b/tests/wpt/tests/credential-management/support/fedcm/manifest_with_single_account.json
index 15a657c679d..72b0d6bcb7e 100644
--- a/tests/wpt/tests/credential-management/support/fedcm/manifest_with_single_account.json
+++ b/tests/wpt/tests/credential-management/support/fedcm/manifest_with_single_account.json
@@ -1,5 +1,6 @@
 {
   "accounts_endpoint": "single_account.py",
   "client_metadata_endpoint": "client_metadata.py",
-  "id_assertion_endpoint": "token_with_account_id.py"
+  "id_assertion_endpoint": "token_with_account_id.py",
+  "login_url": "signin.html"
 }
diff --git a/tests/wpt/tests/credential-management/support/fedcm/manifest_with_two_accounts.json b/tests/wpt/tests/credential-management/support/fedcm/manifest_with_two_accounts.json
index 932fb85dac3..00ae4cbe62c 100644
--- a/tests/wpt/tests/credential-management/support/fedcm/manifest_with_two_accounts.json
+++ b/tests/wpt/tests/credential-management/support/fedcm/manifest_with_two_accounts.json
@@ -1,5 +1,6 @@
 {
   "accounts_endpoint": "two_accounts.py",
   "client_metadata_endpoint": "client_metadata.py",
-  "id_assertion_endpoint": "token_with_account_id.py"
+  "id_assertion_endpoint": "token_with_account_id.py",
+  "login_url": "signin.html"
 }
diff --git a/tests/wpt/tests/credential-management/support/fedcm/no_accounts.py b/tests/wpt/tests/credential-management/support/fedcm/no_accounts.py
index e3948084df1..8767c50afb4 100644
--- a/tests/wpt/tests/credential-management/support/fedcm/no_accounts.py
+++ b/tests/wpt/tests/credential-management/support/fedcm/no_accounts.py
@@ -1,18 +1,10 @@
+import importlib
+error_checker = importlib.import_module("credential-management.support.fedcm.request-params-check")
+
 def main(request, response):
-  if request.cookies.get(b"cookie") != b"1":
-    return (530, [], "Missing cookie")
-  if request.headers.get(b"Accept") != b"application/json":
-    return (531, [], "Wrong Accept")
-  if request.headers.get(b"Sec-Fetch-Dest") != b"webidentity":
-    return (532, [], "Wrong Sec-Fetch-Dest header")
-  if request.headers.get(b"Referer"):
-    return (533, [], "Should not have Referer")
-  if request.headers.get(b"Origin"):
-    return (534, [], "Should not have Origin")
-  if request.headers.get(b"Sec-Fetch-Mode") != b"no-cors":
-    return (535, [], "Wrong Sec-Fetch-Mode header")
-  if request.headers.get(b"Sec-Fetch-Site") != b"none":
-    return (536, [], "Wrong Sec-Fetch-Site header")
+  request_error = error_checker.accountsCheck(request)
+  if (request_error):
+    return request_error
 
   response.headers.set(b"Content-Type", b"application/json")
 
diff --git a/tests/wpt/tests/credential-management/support/fedcm/request-params-check.py b/tests/wpt/tests/credential-management/support/fedcm/request-params-check.py
new file mode 100644
index 00000000000..b5fdac00bf4
--- /dev/null
+++ b/tests/wpt/tests/credential-management/support/fedcm/request-params-check.py
@@ -0,0 +1,76 @@
+def commonCheck(request):
+  if request.headers.get(b"Accept") != b"application/json":
+    return (531, [], "Wrong Accept")
+  if request.headers.get(b"Sec-Fetch-Dest") != b"webidentity":
+    return (532, [], "Wrong Sec-Fetch-Dest header")
+  if request.headers.get(b"Referer"):
+    return (533, [], "Should not have Referer")
+  if request.headers.get(b"Sec-Fetch-Mode") != b"no-cors":
+    return (534, [], "Wrong Sec-Fetch-Mode header")
+
+def commonUncredentialedRequestCheck(request):
+  if len(request.cookies) > 0:
+    return (535, [], "Cookie should not be sent to this endpoint")
+  if request.headers.get(b"Sec-Fetch-Site") != b"cross-site":
+    return (536, [], "Wrong Sec-Fetch-Site header")
+
+def commonCredentialedRequestCheck(request):
+  if request.cookies.get(b"cookie") != b"1":
+    return (537, [], "Missing cookie")
+  if request.headers.get(b"Sec-Fetch-Site") != b"none":
+    return (538, [], "Wrong Sec-Fetch-Site header")
+
+def manifestCheck(request):
+  common_error = commonCheck(request)
+  if (common_error):
+    return common_error
+  common_uncredentialed_error = commonUncredentialedRequestCheck(request)
+  if (common_uncredentialed_error):
+    return common_uncredentialed_error
+
+  if request.headers.get(b"Origin"):
+    return (539, [], "Should not have Origin")
+
+def clientMetadataCheck(request):
+  if (request.GET.get(b'skip_checks', b'0') != b'1'):
+    common_error = commonCheck(request)
+    if (common_error):
+      return common_error
+    common_uncredentialed_error = commonUncredentialedRequestCheck(request)
+    if (common_uncredentialed_error):
+      return common_uncredentialed_error
+
+    if not request.headers.get(b"Origin"):
+      return (540, [], "Missing Origin")
+
+def accountsCheck(request):
+  common_error = commonCheck(request)
+  if (common_error):
+    return common_error
+  common_credentialed_error = commonCredentialedRequestCheck(request)
+  if (common_credentialed_error):
+    return common_credentialed_error
+
+  if request.headers.get(b"Origin"):
+    return (539, [], "Should not have Origin")
+
+def tokenCheck(request):
+  common_error = commonCheck(request)
+  if (common_error):
+    return common_error
+  common_credentialed_error = commonCredentialedRequestCheck(request)
+  if (common_credentialed_error):
+    return common_credentialed_error
+
+  if not request.headers.get(b"Origin"):
+    return (540, [], "Missing Origin")
+  if request.method != "POST":
+    return (541, [], "Method is not POST")
+  if request.headers.get(b"Content-Type") != b"application/x-www-form-urlencoded":
+    return (542, [], "Wrong Content-Type")
+  if not request.POST.get(b"client_id"):
+    return (543, [], "Missing 'client_id' POST parameter")
+  if not request.POST.get(b"account_id"):
+    return (544, [], "Missing 'account_id' POST parameter")
+  if not request.POST.get(b"disclosure_text_shown"):
+    return (545, [], "Missing 'disclosure_text_shown' POST parameter")
diff --git a/tests/wpt/tests/credential-management/support/fedcm/single_account.py b/tests/wpt/tests/credential-management/support/fedcm/single_account.py
index 5f05dc4be50..7c8906ae7b9 100644
--- a/tests/wpt/tests/credential-management/support/fedcm/single_account.py
+++ b/tests/wpt/tests/credential-management/support/fedcm/single_account.py
@@ -1,18 +1,10 @@
+import importlib
+error_checker = importlib.import_module("credential-management.support.fedcm.request-params-check")
+
 def main(request, response):
-  if request.cookies.get(b"cookie") != b"1":
-    return (530, [], "Missing cookie")
-  if request.headers.get(b"Accept") != b"application/json":
-    return (531, [], "Wrong Accept")
-  if request.headers.get(b"Sec-Fetch-Dest") != b"webidentity":
-    return (532, [], "Wrong Sec-Fetch-Dest header")
-  if request.headers.get(b"Referer"):
-    return (533, [], "Should not have Referer")
-  if request.headers.get(b"Origin"):
-    return (534, [], "Should not have Origin")
-  if request.headers.get(b"Sec-Fetch-Mode") != b"no-cors":
-    return (535, [], "Wrong Sec-Fetch-Mode header")
-  if request.headers.get(b"Sec-Fetch-Site") != b"none":
-    return (536, [], "Wrong Sec-Fetch-Site header")
+  request_error = error_checker.accountsCheck(request)
+  if (request_error):
+    return request_error
 
   response.headers.set(b"Content-Type", b"application/json")
 
diff --git a/tests/wpt/tests/credential-management/support/fedcm/token.py b/tests/wpt/tests/credential-management/support/fedcm/token.py
index 54150325524..b914eb2d965 100644
--- a/tests/wpt/tests/credential-management/support/fedcm/token.py
+++ b/tests/wpt/tests/credential-management/support/fedcm/token.py
@@ -1,29 +1,10 @@
-def main(request, response):
-  if request.cookies.get(b"cookie") != b"1":
-    return (530, [], "Missing cookie")
-  if request.method != "POST":
-    return (531, [], "Method is not POST")
-  if request.headers.get(b"Content-Type") != b"application/x-www-form-urlencoded":
-    return (532, [], "Wrong Content-Type")
-  if request.headers.get(b"Accept") != b"application/json":
-    return (533, [], "Wrong Accept")
-  if request.headers.get(b"Sec-Fetch-Dest") != b"webidentity":
-    return (500, [], "Wrong Sec-Fetch-Dest header")
-  if request.headers.get(b"Referer"):
-    return (534, [], "Should not have Referer")
-  if not request.headers.get(b"Origin"):
-    return (535, [], "Missing Origin")
-  if request.headers.get(b"Sec-Fetch-Mode") != b"no-cors":
-    return (539, [], "Wrong Sec-Fetch-Mode header")
-  if request.headers.get(b"Sec-Fetch-Site") != b"none":
-    return (540, [], "Wrong Sec-Fetch-Site header")
+import importlib
+error_checker = importlib.import_module("credential-management.support.fedcm.request-params-check")
 
-  if not request.POST.get(b"client_id"):
-    return (536, [], "Missing 'client_id' POST parameter")
-  if not request.POST.get(b"account_id"):
-    return (537, [], "Missing 'account_id' POST parameter")
-  if not request.POST.get(b"disclosure_text_shown"):
-    return (538, [], "Missing 'disclosure_text_shown' POST parameter")
+def main(request, response):
+  request_error = error_checker.tokenCheck(request)
+  if (request_error):
+    return request_error
 
   response.headers.set(b"Content-Type", b"application/json")
 
diff --git a/tests/wpt/tests/credential-management/support/fedcm/token_with_account_auto_selected_flag.py b/tests/wpt/tests/credential-management/support/fedcm/token_with_account_auto_selected_flag.py
new file mode 100644
index 00000000000..6de26fe5aab
--- /dev/null
+++ b/tests/wpt/tests/credential-management/support/fedcm/token_with_account_auto_selected_flag.py
@@ -0,0 +1,12 @@
+import importlib
+error_checker = importlib.import_module("credential-management.support.fedcm.request-params-check")
+
+def main(request, response):
+  request_error = error_checker.tokenCheck(request)
+  if (request_error):
+    return request_error
+
+  response.headers.set(b"Content-Type", b"application/json")
+
+  is_account_auto_selected = request.POST.get(b"is_account_auto_selected")
+  return "{\"token\": \"is_account_auto_selected=" + is_account_auto_selected.decode("utf-8") + "\"}"
diff --git a/tests/wpt/tests/credential-management/support/fedcm/token_with_account_id.py b/tests/wpt/tests/credential-management/support/fedcm/token_with_account_id.py
index 4b8ae9a5651..52fb20184bc 100644
--- a/tests/wpt/tests/credential-management/support/fedcm/token_with_account_id.py
+++ b/tests/wpt/tests/credential-management/support/fedcm/token_with_account_id.py
@@ -1,29 +1,10 @@
-def main(request, response):
-  if request.cookies.get(b"cookie") != b"1":
-    return (530, [], "Missing cookie")
-  if request.method != "POST":
-    return (531, [], "Method is not POST")
-  if request.headers.get(b"Content-Type") != b"application/x-www-form-urlencoded":
-    return (532, [], "Wrong Content-Type")
-  if request.headers.get(b"Accept") != b"application/json":
-    return (533, [], "Wrong Accept")
-  if request.headers.get(b"Sec-Fetch-Dest") != b"webidentity":
-    return (500, [], "Wrong Sec-Fetch-Dest header")
-  if request.headers.get(b"Referer"):
-    return (534, [], "Should not have Referer")
-  if not request.headers.get(b"Origin"):
-    return (535, [], "Missing Origin")
-  if request.headers.get(b"Sec-Fetch-Mode") != b"no-cors":
-    return (539, [], "Wrong Sec-Fetch-Mode header")
-  if request.headers.get(b"Sec-Fetch-Site") != b"none":
-    return (540, [], "Wrong Sec-Fetch-Site header")
+import importlib
+error_checker = importlib.import_module("credential-management.support.fedcm.request-params-check")
 
-  if not request.POST.get(b"client_id"):
-    return (536, [], "Missing 'client_id' POST parameter")
-  if not request.POST.get(b"account_id"):
-    return (537, [], "Missing 'account_id' POST parameter")
-  if not request.POST.get(b"disclosure_text_shown"):
-    return (538, [], "Missing 'disclosure_text_shown' POST parameter")
+def main(request, response):
+  request_error = error_checker.tokenCheck(request)
+  if (request_error):
+    return request_error
 
   response.headers.set(b"Content-Type", b"application/json")
 
diff --git a/tests/wpt/tests/credential-management/support/fedcm/two_accounts.py b/tests/wpt/tests/credential-management/support/fedcm/two_accounts.py
index 75ebf51056c..4ea6d76a7eb 100644
--- a/tests/wpt/tests/credential-management/support/fedcm/two_accounts.py
+++ b/tests/wpt/tests/credential-management/support/fedcm/two_accounts.py
@@ -1,18 +1,10 @@
+import importlib
+error_checker = importlib.import_module("credential-management.support.fedcm.request-params-check")
+
 def main(request, response):
-  if request.cookies.get(b"cookie") != b"1":
-    return (530, [], "Missing cookie")
-  if request.headers.get(b"Accept") != b"application/json":
-    return (531, [], "Wrong Accept")
-  if request.headers.get(b"Sec-Fetch-Dest") != b"webidentity":
-    return (532, [], "Wrong Sec-Fetch-Dest header")
-  if request.headers.get(b"Referer"):
-    return (533, [], "Should not have Referer")
-  if request.headers.get(b"Origin"):
-    return (534, [], "Should not have Origin")
-  if request.headers.get(b"Sec-Fetch-Mode") != b"no-cors":
-    return (535, [], "Wrong Sec-Fetch-Mode header")
-  if request.headers.get(b"Sec-Fetch-Site") != b"none":
-    return (536, [], "Wrong Sec-Fetch-Site header")
+  request_error = error_checker.accountsCheck(request)
+  if (request_error):
+    return request_error
 
   response.headers.set(b"Content-Type", b"application/json")
 
diff --git a/tests/wpt/tests/css/compositing/canvas-composite-modes.html b/tests/wpt/tests/css/compositing/canvas-composite-modes.html
new file mode 100644
index 00000000000..c1aae52ce6f
--- /dev/null
+++ b/tests/wpt/tests/css/compositing/canvas-composite-modes.html
@@ -0,0 +1,157 @@
+<!DOCTYPE HTML>
+<meta charset="utf-8">
+<title>Test of &lt;composite-mode&gt; values in canvas globalCompositeOperation</title>
+<link rel="help" href="https://html.spec.whatwg.org/multipage/C#compositing">
+<link rel="help" href="https://drafts.fxtf.org/compositing/#canvascompositingandblending">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<canvas id="canvas" width="2" height="2"></canvas>
+
+<script>
+
+// Test a small set of sRGB color and alpha values in the 0-255 range.
+const VALUES = [ 0, 47, 193, 255 ];
+
+const COMPOSITE_OPERATORS = {
+  // Define a "color" function accepting source and destination colors
+  // and alphas, and an "alpha" function accepting source and
+  // destination alphas.
+  "clear": {
+    "color": (sa, sc, da, dc) => 0,
+    "alpha": (sa, da) => 0
+  },
+  "copy": {
+    "color": (sa, sc, da, dc) => sa * sc,
+    "alpha": (sa, da) => sa
+  },
+  "destination": {
+    // TODO(dbaron): The spec says this should work, but none of
+    // Chromium, Gecko, or WebKit appear to implement it.
+    "color": (sa, sc, da, dc) => da * dc,
+    "alpha": (sa, da) => da
+  },
+  "source-over": {
+    "color": (sa, sc, da, dc) => sa * sc + da * dc * (1 - sa),
+    "alpha": (sa, da) => sa + da * (1 - sa)
+  },
+  "destination-over": {
+    "color": (sa, sc, da, dc) => sa * sc * (1 - da) + da * dc,
+    "alpha": (sa, da) => sa * (1 - da) + da
+  },
+  "source-in": {
+    "color": (sa, sc, da, dc) => sa * sc * da,
+    "alpha": (sa, da) => sa * da
+  },
+  "destination-in": {
+    "color": (sa, sc, da, dc) => da * dc * sa,
+    "alpha": (sa, da) => da * sa
+  },
+  "source-out": {
+    "color": (sa, sc, da, dc) => sa * sc * (1 - da),
+    "alpha": (sa, da) => sa * (1 - da)
+  },
+  "destination-out": {
+    "color": (sa, sc, da, dc) => da * dc * (1 - sa),
+    "alpha": (sa, da) => da * (1 - sa)
+  },
+  "source-atop": {
+    "color": (sa, sc, da, dc) => sa * sc * da + da * dc * (1 - sa),
+    "alpha": (sa, da) => sa * da + da * (1 - sa)
+  },
+  "destination-atop": {
+    "color": (sa, sc, da, dc) => sa * sc * (1 - da) + da * dc * sa,
+    "alpha": (sa, da) => sa * (1 - da) + da * sa
+  },
+  "xor": {
+    "color": (sa, sc, da, dc) => sa * sc * (1 - da) + da * dc * (1 - sa),
+    "alpha": (sa, da) => sa * (1 - da) + da * (1 - sa)
+  },
+  "lighter": {
+    // TODO(https://github.com/w3c/fxtf-drafts/issues/446): All engines
+    // actually implement 'lighter' using the formula for 'plus-lighter'
+    // given below; we should update the spec to match!
+    "color": (sa, sc, da, dc) => sa * sc + da * dc,
+    "alpha": (sa, da) => sa + da
+  },
+  "plus-darker": {
+    // TODO(https://github.com/w3c/fxtf-drafts/issues/447): This formula
+    // is almost certainly wrong.  It doesn't make sense, and the one
+    // engine that implements this value (WebKit) does something very
+    // different.
+    "color": (sa, sc, da, dc) => Math.max(0, 1 - sa * sc + 1 - da * dc),
+    "alpha": (sa, da) => Math.max(0, 1 - sa + 1 - da)
+  },
+  "plus-lighter": {
+    "color": (sa, sc, da, dc) => Math.min(1, sa * sc + da * dc),
+    "alpha": (sa, da) => Math.min(1, sa + da)
+  }
+};
+
+let canvas = document.getElementById("canvas");
+let cx = canvas.getContext("2d", { willReadFrequently: true });
+
+function roundup_255th(n) {
+  return Math.ceil(n * 255) / 255;
+}
+
+function rounddown_255th(n) {
+  return Math.floor(n * 255) / 255;
+}
+
+for (let op in COMPOSITE_OPERATORS) {
+  test(function() {
+    cx.save();
+    this.add_cleanup(() => { cx.restore(); });
+    for (let sc of VALUES) {
+      for (let sa of VALUES) {
+        for (let dc of VALUES) {
+          for (let da of VALUES) {
+            let desc = `g=${sc} a=${sa} ${op} g=${dc} a=${da}`;
+            cx.restore();
+            cx.save();
+            cx.clearRect(0, 0, 2, 2);
+            cx.fillStyle = `rgb(0, ${dc}, 0)`;
+            cx.globalAlpha = da / 255;
+            cx.fillRect(0, 0, 2, 2);
+            cx.globalCompositeOperation = op;
+            assert_equals(cx.globalCompositeOperation, op, "composite operation");
+            cx.fillStyle = `rgb(0, ${sc}, 0)`;
+            cx.globalAlpha = sa / 255;
+            cx.fillRect(0, 0, 2, 2);
+            let imageData = cx.getImageData(0, 0, 1, 1);
+            assert_equals(imageData.data.length, 4, "length of ImageData");
+            assert_equals(imageData.data[0], 0, `red: ${desc}`);
+            assert_equals(imageData.data[2], 0, `blue: ${desc}`);
+            let expected_color = COMPOSITE_OPERATORS[op].color(sa/255, sc/255, da/255, dc/255);
+            let expected_alpha = COMPOSITE_OPERATORS[op].alpha(sa/255, da/255);
+            let allowed_color_error;
+            // undo the premultiplication:
+            if (expected_alpha == 0) {
+              assert_equals(expected_color, 0, `premultiplication zero check: ${desc}`);
+              allowed_color_error = 0;
+            } else {
+              // We want to allow for the error in the color expectation
+              // to increase when the expected alpha is small, because
+              // we want to allow for roughly the same amount of error
+              // in the (smaller) *premultiplied* value.
+              let expected_min_color = rounddown_255th(expected_color) / roundup_255th(expected_alpha);
+              let expected_max_color = roundup_255th(expected_color) / rounddown_255th(expected_alpha);
+              // Set the expectation to the midpoint of the error range
+              // rather than the actual accurate expectation.
+              expected_color = (expected_max_color + expected_min_color) / 2;
+              allowed_color_error = (expected_max_color - expected_min_color) / 2;
+            }
+            expected_color *= 255;
+            expected_alpha *= 255;
+            allowed_color_error *= 255;
+            allowed_color_error += 3.5;
+            assert_approx_equals(imageData.data[1], expected_color, allowed_color_error, `green: ${desc}`);
+            assert_approx_equals(imageData.data[3], expected_alpha, 1.01, `alpha: ${desc}`);
+          }
+        }
+      }
+    }
+  }, `globalCompositeOperation ${op}`);
+}
+</script>
diff --git a/tests/wpt/tests/css/compositing/compositing_simple_div-ref.html b/tests/wpt/tests/css/compositing/compositing_simple_div-ref.html
deleted file mode 100644
index 2f462178120..00000000000
--- a/tests/wpt/tests/css/compositing/compositing_simple_div-ref.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<head>
-<title>[simple<div>] blending reference</title>
-
-<link rel="author" title="Aili Wang"  href="mailto:augur521@hotmail.com">
-<link rel="help" href="http://www.w3.org/TR/compositing-1/">
-
-
-
-<style>
-  #b{background-color:rgb(0,255,0); width:100px;height:100px
-	  }
-
-</style>
-</head>
-<body>
-
-<div id="b"></div>
-</body>
-</html>
diff --git a/tests/wpt/tests/css/compositing/compositing_simple_div.html b/tests/wpt/tests/css/compositing/compositing_simple_div.html
deleted file mode 100644
index 44f138b5a6e..00000000000
--- a/tests/wpt/tests/css/compositing/compositing_simple_div.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<head>
-<title>[simple<div>] blending</title>
-
-<link rel="author" title="Aili Wang"  href="mailto:augur521@hotmail.com">
-<link rel="help" href="http://www.w3.org/TR/compositing-1/#mix-blend-mode">
-<link rel="match" href="compositing_simple_div-ref.html">
-
-
-<style>
-  #b{background-color:rgb(255,0,255); mix-blend-mode:difference; width:100px;height:100px
-	  }
-
-</style>
-</head>
-<body>
-
-<div id="b"></div>
-</body>
-</html>
diff --git a/tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-root-element-group-ref.html b/tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-root-element-group-ref.html
new file mode 100644
index 00000000000..a661c4663a3
--- /dev/null
+++ b/tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-root-element-group-ref.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>CSS Reftest Reference</title>
+        <link rel="author" title="Matt Woodrow" href="mailto:mattwoodrow@apple.com">
+        <link rel="help" href="https://drafts.fxtf.org/compositing-1/#mix-blend-mode">
+        <style type="text/css">
+            div {
+                width: 200px;
+                height: 200px;
+            }
+            .green {
+                background: rgba(0,160,0,0.5);
+                mix-blend-mode: soft-light;
+            }
+            .blue {
+                position: absolute;
+                top: 75px;
+                left: 75px;
+                background: rgba(0,0,160,0.5)
+            }
+            .wrapper {
+                isolation: isolate;
+            }
+        </style>
+    </head>
+    <body>
+        <div class="wrapper">
+            <div class="blue"></div>
+            <div class="green"></div>
+        </div>
+    </body>
+</html>
diff --git a/tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-root-element-group.html b/tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-root-element-group.html
new file mode 100644
index 00000000000..8a190b92817
--- /dev/null
+++ b/tests/wpt/tests/css/compositing/mix-blend-mode/mix-blend-mode-root-element-group.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>CSS Test: mix-blend-mode in the Root Element Group should have a transparent backdrop</title>
+        <link rel="author" title="Matt Woodrow" href="mailto:mattwoodrow@apple.com">
+        <link rel="help" href="https://drafts.fxtf.org/compositing-1/#mix-blend-mode">
+        <meta name="assert" content="Test checks that the Root Element Group has a transparent backdrop">
+        <link rel="match" href="mix-blend-mode-root-element-group-ref.html">
+        <style type="text/css">
+            div {
+                width: 200px;
+                height: 200px;
+            }
+            .green {
+                background: rgba(0,160,0,0.5);
+                mix-blend-mode: soft-light;
+            }
+            .blue {
+                position: absolute;
+                top: 75px;
+                left: 75px;
+                background: rgba(0,0,160,0.5)
+            }
+        </style>
+    </head>
+    <body>
+        <div class="blue"></div>
+        <div class="green"></div>
+    </body>
+</html>
diff --git a/tests/wpt/tests/css/compositing/root-element-background-image-transparency-001-ref.html b/tests/wpt/tests/css/compositing/root-element-background-image-transparency-001-ref.html
new file mode 100644
index 00000000000..b07685d9517
--- /dev/null
+++ b/tests/wpt/tests/css/compositing/root-element-background-image-transparency-001-ref.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>CSS Reftest Reference</title>
+    <link rel="author" title="Matt Woodrow" href="mailto:mattwoodrow@apple.com">
+    <style>
+      html {
+        background-color: white;
+      }
+      body {
+        /* The default 8px margin makes the background not line up exactly */
+        margin: 0;
+        background: url(support/transform-triangle-left.svg) top left;
+        opacity: 0.5;
+        height: 100vh;
+      }
+    </style>
+  </head>
+  <body>
+  </body>
+</html>
diff --git a/tests/wpt/tests/css/compositing/root-element-background-image-transparency-001.html b/tests/wpt/tests/css/compositing/root-element-background-image-transparency-001.html
new file mode 100644
index 00000000000..1f07d60375e
--- /dev/null
+++ b/tests/wpt/tests/css/compositing/root-element-background-image-transparency-001.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>Opacity on Root Element With background image</title>
+    <link rel="author" title="Matt Woodrow" href="mailto:mattwoodrow@apple.com">
+    <link rel="help" href="https://drafts.fxtf.org/compositing/#pagebackdrop">
+    <meta name="assert" content="The background image should have opacity applied to
+    it as part of the Root Element Group">
+    <link rel="match" href="root-element-background-image-transparency-001-ref.html">
+    <meta name="fuzzy" content="maxDifference=0-1; totalPixels=0-9600" />
+    <style>
+      html {
+        background: url(support/transform-triangle-left.svg);
+        opacity: 0.5;
+      }
+      body {
+        /* The default 8px margin makes the background not line up exactly */
+        margin: 0;
+      }
+    </style>
+  </head>
+  <body>
+  </body>
+</html>
diff --git a/tests/wpt/tests/css/compositing/root-element-background-image-transparency-002.html b/tests/wpt/tests/css/compositing/root-element-background-image-transparency-002.html
new file mode 100644
index 00000000000..0da51986f1c
--- /dev/null
+++ b/tests/wpt/tests/css/compositing/root-element-background-image-transparency-002.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>Opacity on Root Element With background image</title>
+    <link rel="author" title="Matt Woodrow" href="mailto:mattwoodrow@apple.com">
+    <link rel="help" href="https://drafts.fxtf.org/compositing/#pagebackdrop">
+    <meta name="assert" content="The background image should have opacity applied to
+    it as part of the Root Element Group">
+    <link rel="match" href="root-element-background-image-transparency-001-ref.html">
+    <meta name="fuzzy" content="maxDifference=0-1; totalPixels=0-9600" />
+    <style>
+      html {
+        background: url(support/transform-triangle-left.svg) fixed;
+        opacity: 0.5;
+      }
+      body {
+        /* The default 8px margin makes the background not line up exactly */
+        margin: 0;
+      }
+    </style>
+  </head>
+  <body>
+  </body>
+</html>
diff --git a/tests/wpt/tests/css/compositing/root-element-background-image-transparency-003.html b/tests/wpt/tests/css/compositing/root-element-background-image-transparency-003.html
new file mode 100644
index 00000000000..0aded929d87
--- /dev/null
+++ b/tests/wpt/tests/css/compositing/root-element-background-image-transparency-003.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>Opacity on Root Element With background image</title>
+    <link rel="author" title="Matt Woodrow" href="mailto:mattwoodrow@apple.com">
+    <link rel="help" href="https://drafts.fxtf.org/compositing/#pagebackdrop">
+    <meta name="assert" content="The background image should have opacity applied to
+    it as part of the Root Element Group">
+    <link rel="match" href="root-element-background-image-transparency-001-ref.html">
+    <meta name="fuzzy" content="maxDifference=0-1; totalPixels=0-237600" />
+    <style>
+      html {
+        background: url(support/transform-triangle-left.svg);
+        opacity: 0.5;
+        will-change: opacity;
+      }
+      body {
+        /* The default 8px margin makes the background not line up exactly */
+        margin: 0;
+      }
+    </style>
+  </head>
+  <body>
+  </body>
+</html>
diff --git a/tests/wpt/tests/css/compositing/root-element-background-image-transparency-004.html b/tests/wpt/tests/css/compositing/root-element-background-image-transparency-004.html
new file mode 100644
index 00000000000..1bc4b446149
--- /dev/null
+++ b/tests/wpt/tests/css/compositing/root-element-background-image-transparency-004.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>Opacity on Root Element With background image</title>
+    <link rel="author" title="Matt Woodrow" href="mailto:mattwoodrow@apple.com">
+    <link rel="help" href="https://drafts.fxtf.org/compositing/#pagebackdrop">
+    <meta name="assert" content="The background image should have opacity applied to
+    it as part of the Root Element Group">
+    <link rel="match" href="root-element-background-image-transparency-001-ref.html">
+    <meta name="fuzzy" content="maxDifference=0-1; totalPixels=0-237600" />
+    <style>
+      html {
+        background: url(support/transform-triangle-left.svg) fixed;
+        opacity: 0.5;
+        will-change: opacity;
+      }
+      body {
+        /* The default 8px margin makes the background not line up exactly */
+        margin: 0;
+      }
+    </style>
+  </head>
+  <body>
+  </body>
+</html>
diff --git a/tests/wpt/tests/css/compositing/support/transform-triangle-left.svg b/tests/wpt/tests/css/compositing/support/transform-triangle-left.svg
new file mode 100644
index 00000000000..e0bf2665687
--- /dev/null
+++ b/tests/wpt/tests/css/compositing/support/transform-triangle-left.svg
@@ -0,0 +1,4 @@
+<svg height="100px" width="100px" viewBox="0 0 100 100"
+xmlns="http://www.w3.org/2000/svg">
+<polygon fill="blue" points="0,50 100,100 100,0" />
+</svg>
diff --git a/tests/wpt/tests/css/css-align/blocks/align-content-block-001-ref.html b/tests/wpt/tests/css/css-align/blocks/align-content-block-001-ref.html
new file mode 100644
index 00000000000..6a454d60d76
--- /dev/null
+++ b/tests/wpt/tests/css/css-align/blocks/align-content-block-001-ref.html
@@ -0,0 +1,66 @@
+<!DOCTYPE html>
+<title>CSS Box Alignment: non-normal align-content establishes block formatting context root on blocks</title>
+<link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact">
+
+<style>
+  html, body { margin: 0; font-size: 10px; line-height: 1; color: transparent; }
+  /* show bounds of test box without interfering with margin-collapsing */
+    .test { background: black; padding-right: 2px; margin: 0.5em; }
+  /* ensure float cannot penetrate */
+    .outer-float { float: left; height: 600px; /* reftest limit = 600px */
+                   margin: 0 1em; background: gray; }
+  /* ensure float is contained */
+    .float { float: left; background: orange; height: 2em }
+  /* ensure margin is contained */
+    .in-flow { margin-top: 1em; background: orange }
+
+  /* reference code */
+    .test { overflow: hidden; display: flow-root; }
+</style>
+
+<div class="outer-float">FLT</div>
+<div class="test">
+  <div class="in-flow"><div class="float">FLT</div>BLOCK</div>
+</div>
+<div class="test">
+  <div class="in-flow"><div class="float">FLT</div>BLOCK</div>
+</div>
+<div class="test">
+  <div class="in-flow"><div class="float">FLT</div>BLOCK</div>
+</div>
+<div class="test">
+  <div class="in-flow"><div class="float">FLT</div>BLOCK</div>
+</div>
+<div class="test">
+  <div class="in-flow"><div class="float">FLT</div>BLOCK</div>
+</div>
+<div class="test">
+  <div class="in-flow"><div class="float">FLT</div>BLOCK</div>
+</div>
+<div class="test">
+  <div class="in-flow"><div class="float">FLT</div>BLOCK</div>
+</div>
+<div class="test">
+  <div class="in-flow"><div class="float">FLT</div>BLOCK</div>
+</div>
+<div class="test">
+  <div class="in-flow"><div class="float">FLT</div>BLOCK</div>
+</div>
+<div class="test">
+  <div class="in-flow"><div class="float">FLT</div>BLOCK</div>
+</div>
+<div class="test">
+  <div class="in-flow"><div class="float">FLT</div>BLOCK</div>
+</div>
+<div class="test">
+  <div class="in-flow"><div class="float">FLT</div>BLOCK</div>
+</div>
+<div class="test">
+  <div class="in-flow"><div class="float">FLT</div>BLOCK</div>
+</div>
+<div class="test">
+  <div class="in-flow"><div class="float">FLT</div>BLOCK</div>
+</div>
+<div class="test" style="overflow: visible; display: block">
+  <div class="in-flow"><div class="float">FLT</div>BLOCK</div>
+</div>
diff --git a/tests/wpt/tests/css/css-align/blocks/align-content-block-001.html b/tests/wpt/tests/css/css-align/blocks/align-content-block-001.html
new file mode 100644
index 00000000000..472ecae5765
--- /dev/null
+++ b/tests/wpt/tests/css/css-align/blocks/align-content-block-001.html
@@ -0,0 +1,65 @@
+<!DOCTYPE html>
+<title>CSS Box Alignment: non-normal align-content establishes block formatting context root on blocks</title>
+<link rel="help" href="https://www.w3.org/TR/css-align-3/#align-block">
+<link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact">
+<link rel="match" href="align-content-block-001-ref.html">
+
+<style>
+  html, body { margin: 0; font-size: 10px; line-height: 1; color: transparent; }
+  /* show bounds of test box without interfering with margin-collapsing */
+    .test { background: black; padding-right: 2px; margin: 0.5em; }
+  /* ensure float cannot penetrate */
+    .outer-float { float: left; height: 600px; /* reftest limit = 600px */
+                   margin: 0 1em; background: gray; }
+  /* ensure float is contained */
+    .float { float: left; background: orange; height: 2em }
+  /* ensure margin is contained */
+    .in-flow { margin-top: 1em; background: orange }
+</style>
+
+<div class="outer-float">FLT</div>
+<div class="test" style="align-content: start">
+  <div class="in-flow"><div class="float">FLT</div>BLOCK</div>
+</div>
+<div class="test" style="align-content: center">
+  <div class="in-flow"><div class="float">FLT</div>BLOCK</div>
+</div>
+<div class="test" style="align-content: end">
+  <div class="in-flow"><div class="float">FLT</div>BLOCK</div>
+</div>
+<div class="test" style="align-content: baseline">
+  <div class="in-flow"><div class="float">FLT</div>BLOCK</div>
+</div>
+<div class="test" style="align-content: flex-start">
+  <div class="in-flow"><div class="float">FLT</div>BLOCK</div>
+</div>
+<div class="test" style="align-content: flex-end">
+  <div class="in-flow"><div class="float">FLT</div>BLOCK</div>
+</div>
+<div class="test" style="align-content: unsafe start">
+  <div class="in-flow"><div class="float">FLT</div>BLOCK</div>
+</div>
+<div class="test" style="align-content: unsafe center">
+  <div class="in-flow"><div class="float">FLT</div>BLOCK</div>
+</div>
+<div class="test" style="align-content: unsafe end">
+  <div class="in-flow"><div class="float">FLT</div>BLOCK</div>
+</div>
+<div class="test" style="align-content: safe start">
+  <div class="in-flow"><div class="float">FLT</div>BLOCK</div>
+</div>
+<div class="test" style="align-content: safe center">
+  <div class="in-flow"><div class="float">FLT</div>BLOCK</div>
+</div>
+<div class="test" style="align-content: safe end">
+  <div class="in-flow"><div class="float">FLT</div>BLOCK</div>
+</div>
+<div class="test" style="align-content: space-between">
+  <div class="in-flow"><div class="float">FLT</div>BLOCK</div>
+</div>
+<div class="test" style="align-content: space-around">
+  <div class="in-flow"><div class="float">FLT</div>BLOCK</div>
+</div>
+<div class="test" style="align-content: start; align-content: normal">
+  <div class="in-flow"><div class="float">FLT</div>BLOCK</div>
+</div>
diff --git a/tests/wpt/tests/css/css-align/blocks/align-content-block-002-ref.html b/tests/wpt/tests/css/css-align/blocks/align-content-block-002-ref.html
new file mode 100644
index 00000000000..d7bde74e9eb
--- /dev/null
+++ b/tests/wpt/tests/css/css-align/blocks/align-content-block-002-ref.html
@@ -0,0 +1,231 @@
+<!DOCTYPE html>
+<title>CSS Box Alignment: align-content on large block container</title>
+<link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact">
+
+<style title="Needed for automation; delete to review/debug">
+  @import "/fonts/ahem.css";
+  html { font: 10px/1 Ahem; max-width: 800px; }
+  .label { display: none; }
+</style>
+
+<style>
+  html, body { margin: 0; padding: 0; }
+
+  .test { height: 5em; margin: 0.5em 2em;
+          /* show bounds of test box without interfering with margin-collapsing */
+          background: black; padding-right: 2px;
+          /* ensure bullet follows first line */
+          display: list-item; }
+  /* ensure margin is contained */
+    .in-flow { margin: 1em 0 0.4em; background: orange }
+  /* ensure relpos is ignored */
+    .relpos { position: relative; top: -1.5em; }
+  /* ensure abspos static position follows alignment */
+    .wrapper { position: relative; }
+    .abspos { position: absolute; right: 0; margin-top: -1.5em; }
+  /* ensure overflow is not counted */
+    .overflow { height: 0; }
+
+  /* cram into 800x600 */
+  html { max-height: 600px; columns: 3 }
+  .wrapper { break-inside: avoid; border: solid 2px gray; }
+
+  /* readability */
+  .test > * { color: #8888; }
+  .label { color: black; font-weight: bold; }
+
+  /* reference code */
+  .test { box-sizing: border-box; }
+  .in-flow { margin: 0; }
+</style>
+
+<div class="wrapper">
+  <div class="test" style="padding-top: 1em">
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <span class="label">START</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="padding-top: 2.3em">
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <span class="label">CENTER</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="padding-top: 3.6em">
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <span class="label">END</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="padding-top: 1em">
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <span class="label">BASELINE</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="padding-top: 3.6em">
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <span class="label">LAST BASELINE</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="padding-top: 1em">
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <span class="label">FLEX-START</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="padding-top: 3.6em">
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <span class="label">FLEX-END</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="padding-top: 1em">
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <span class="label">UNSAFE START</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="padding-top: 2.3em">
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <span class="label">UNSAFE CENTER</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="padding-top: 3.6em">
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <span class="label">UNSAFE END</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="padding-top: 1em">
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <span class="label">SAFE START</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="padding-top: 2.3em">
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <span class="label">SAFE CENTER</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="padding-top: 3.6em">
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <span class="label">SAFE END</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="padding-top: 2.3em">
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <span class="label">SPACE-EVENLY</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="padding-top: 1em">
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <span class="label">SPACE-BETWEEN</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="padding-top: 2.3em">
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <span class="label">SPACE-AROUND</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="margin-top: 1em">
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <span class="label">NORMAL</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+
+<p>
+  <button onclick="document.querySelector('style[title]').textContent = 'html { font-size: 12px; }'">Show Text</button>
diff --git a/tests/wpt/tests/css/css-align/blocks/align-content-block-002.html b/tests/wpt/tests/css/css-align/blocks/align-content-block-002.html
new file mode 100644
index 00000000000..bad174d86f7
--- /dev/null
+++ b/tests/wpt/tests/css/css-align/blocks/align-content-block-002.html
@@ -0,0 +1,229 @@
+<!DOCTYPE html>
+<title>CSS Box Alignment: align-content on large block container</title>
+<link rel="help" href="https://www.w3.org/TR/css-align-3/#align-block">
+<link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact">
+<link rel="match" href="align-content-block-002-ref.html">
+
+<style title="Needed for automation; delete to review/debug">
+  @import "/fonts/ahem.css";
+  html { font: 10px/1 Ahem; max-width: 800px;  }
+  .label { display: none; }
+</style>
+
+<style>
+  html, body { margin: 0; padding: 0; }
+
+  .test { height: 5em; margin: 0.5em 2em;
+          /* show bounds of test box without interfering with margin-collapsing */
+          background: black; padding-right: 2px;
+          /* ensure bullet follows first line */
+          display: list-item; }
+  /* ensure margin is contained */
+    .in-flow { margin: 1em 0 0.4em; background: orange }
+  /* ensure relpos is ignored */
+    .relpos { position: relative; top: -1.5em; }
+  /* ensure abspos static position follows alignment */
+    .wrapper { position: relative; }
+    .abspos { position: absolute; right: 0; margin-top: -1.5em; }
+  /* ensure overflow is not counted */
+    .overflow { height: 0; }
+
+  /* cram into 800x600 */
+  html { max-height: 600px; columns: 3 }
+  .wrapper { break-inside: avoid; border: solid 2px gray; }
+
+  /* readability */
+  .test > * { color: #8888; }
+  .label { color: black; font-weight: bold; }
+</style>
+
+<div class="wrapper">
+  <div class="test" style="align-content: start">
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <span class="label">START</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: center">
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <span class="label">CENTER</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: end">
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <span class="label">END</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: baseline">
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <span class="label">BASELINE</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: last baseline">
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <span class="label">LAST BASELINE</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: flex-start">
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <span class="label">FLEX-START</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: flex-end">
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <span class="label">FLEX-END</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: unsafe start">
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <span class="label">UNSAFE START</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: unsafe center">
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <span class="label">UNSAFE CENTER</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: unsafe end">
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <span class="label">UNSAFE END</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: safe start">
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <span class="label">SAFE START</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: safe center">
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <span class="label">SAFE CENTER</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: safe end">
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <span class="label">SAFE END</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: space-evenly">
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <span class="label">SPACE-EVENLY</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: space-between">
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <span class="label">SPACE-BETWEEN</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: space-around">
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <span class="label">SPACE-AROUND</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: normal">
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <span class="label">NORMAL</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+
+<p>
+  <button onclick="document.querySelector('style[title]').textContent = 'html { font-size: 12px; }'">Show Text</button>
diff --git a/tests/wpt/tests/css/css-align/blocks/align-content-block-003-ref.html b/tests/wpt/tests/css/css-align/blocks/align-content-block-003-ref.html
new file mode 100644
index 00000000000..34414804bfa
--- /dev/null
+++ b/tests/wpt/tests/css/css-align/blocks/align-content-block-003-ref.html
@@ -0,0 +1,230 @@
+<!DOCTYPE html>
+<title>CSS Box Alignment: align-content on small block container</title>
+<link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact">
+
+<style title="Needed for automation; delete to review/debug">
+  @import "/fonts/ahem.css";
+  html { font: 10px/1 Ahem; max-width: 800px; }
+  .label { display: none; }
+</style>
+
+<style>
+  html, body { margin: 0; padding: 0; }
+
+  .test { height: 0.5em; margin: 0.5em 2em;
+          /* show bounds of test box without interfering with margin-collapsing */
+          background: black; padding-right: 2px;
+          /* ensure bullet follows first line */
+          display: list-item; }
+  /* ensure margin is contained */
+    .in-flow { margin: 1em 0 0.5em; background: orange }
+  /* ensure relpos is ignored */
+    .relpos { position: relative; top: -1.5em; }
+  /* ensure abspos static position follows alignment */
+    .wrapper { position: relative; }
+    .abspos { position: absolute; right: 0; margin-top: -1.5em; }
+  /* ensure overflow is not counted */
+    .overflow { height: 0; }
+
+  /* cram into 800x600 */
+  html { max-height: 600px; columns: 3 }
+  .wrapper { break-inside: avoid; border: solid 2px gray; padding: 2em 0; }
+
+  /* readability */
+  .test > * { color: #8888; }
+  .label { color: black; font-weight: bold; }
+
+  /* reference code */
+  .in-flow { margin: 0; }
+</style>
+
+<div class="wrapper">
+  <div class="test">
+    <div style="padding-top: 1em"></div>
+    <div class="in-flow">
+      <span class="label">START</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test">
+    <div style="padding-top: 1em"></div>
+    <div class="in-flow">
+      <span class="label">CENTER</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test">
+    <div style="padding-top: 1em"></div>
+    <div class="in-flow">
+      <span class="label">END</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test">
+    <div style="padding-top: 1em"></div>
+    <div class="in-flow">
+      <span class="label">BASELINE</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test">
+    <div style="padding-top: 1em"></div>
+    <div class="in-flow">
+      <span class="label">LAST BASELINE</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test">
+    <div style="padding-top: 1em"></div>
+    <div class="in-flow">
+      <span class="label">FLEX-START</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test">
+    <div style="padding-top: 1em"></div>
+    <div class="in-flow">
+      <span class="label">FLEX-END</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test">
+    <div style="padding-top: 1em"></div>
+    <div class="in-flow">
+      <span class="label">UNSAFE START</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test">
+    <div style="padding-top: 1em; margin-bottom: -1em"></div>
+    <div class="in-flow">
+      <span class="label">UNSAFE CENTER</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test">
+    <div style="padding-top: 1em; margin-bottom: -2em"></div>
+    <div class="in-flow">
+      <span class="label">UNSAFE END</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test">
+    <div style="padding-top: 1em"></div>
+    <div class="in-flow">
+      <span class="label">SAFE START</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test">
+    <div style="padding-top: 1em"></div>
+    <div class="in-flow">
+      <span class="label">SAFE CENTER</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test">
+    <div style="padding-top: 1em"></div>
+    <div class="in-flow">
+      <span class="label">SAFE END</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test">
+    <div style="padding-top: 1em"></div>
+    <div class="in-flow">
+      <span class="label">SPACE-EVENLY</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test">
+    <div style="padding-top: 1em"></div>
+    <div class="in-flow">
+      <span class="label">SPACE-BETWEEN</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test">
+    <div style="padding-top: 1em"></div>
+    <div class="in-flow">
+      <span class="label">SPACE-AROUND</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test">
+    <div style="margin-top: 1em"></div>
+    <div class="in-flow">
+      <span class="label">NORMAL</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+
+<p>
+  <button onclick="document.querySelector('style[title]').textContent = 'html { font-size: 12px; }'">Show Text</button>
diff --git a/tests/wpt/tests/css/css-align/blocks/align-content-block-003.html b/tests/wpt/tests/css/css-align/blocks/align-content-block-003.html
new file mode 100644
index 00000000000..9356d2a3ff5
--- /dev/null
+++ b/tests/wpt/tests/css/css-align/blocks/align-content-block-003.html
@@ -0,0 +1,229 @@
+<!DOCTYPE html>
+<title>CSS Box Alignment: align-content on small block container</title>
+<link rel="help" href="https://www.w3.org/TR/css-align-3/#align-block">
+<link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact">
+<link rel="match" href="align-content-block-003-ref.html">
+
+<style title="Needed for automation; delete to review/debug">
+  @import "/fonts/ahem.css";
+  html { font: 10px/1 Ahem; max-width: 800px; }
+  .label { display: none; }
+</style>
+
+<style>
+  html, body { margin: 0; padding: 0; }
+
+  .test { height: 0.5em; margin: 0.5em 2em;
+          /* show bounds of test box without interfering with margin-collapsing */
+          background: black; padding-right: 2px;
+          /* ensure bullet follows first line */
+          display: list-item; }
+  /* ensure margin is contained */
+    .in-flow { margin: 1em 0 0.5em; background: orange }
+  /* ensure relpos is ignored */
+    .relpos { position: relative; top: -1.5em; }
+  /* ensure abspos static position follows alignment */
+    .wrapper { position: relative; }
+    .abspos { position: absolute; right: 0; margin-top: -1.5em; }
+  /* ensure overflow is not counted */
+    .overflow { height: 0; }
+
+  /* cram into 800x600 */
+  html { max-height: 600px; columns: 3 }
+  .wrapper { break-inside: avoid; border: solid 2px gray; padding: 2em 0; }
+
+  /* readability */
+  .test > * { color: #8888; }
+  .label { color: black; font-weight: bold; }
+</style>
+
+<div class="wrapper">
+  <div class="test" style="align-content: start">
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <span class="label">START</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: center">
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <span class="label">CENTER</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: end">
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <span class="label">END</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: baseline">
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <span class="label">BASELINE</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: last baseline">
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <span class="label">LAST BASELINE</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: flex-start">
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <span class="label">FLEX-START</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: flex-end">
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <span class="label">FLEX-END</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: unsafe start">
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <span class="label">UNSAFE START</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: unsafe center">
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <span class="label">UNSAFE CENTER</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: unsafe end">
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <span class="label">UNSAFE END</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: safe start">
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <span class="label">SAFE START</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: safe center">
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <span class="label">SAFE CENTER</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: safe end">
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <span class="label">SAFE END</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: space-evenly">
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <span class="label">SPACE-EVENLY</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: space-between">
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <span class="label">SPACE-BETWEEN</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: space-around">
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <span class="label">SPACE-AROUND</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: normal">
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <span class="label">NORMAL</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+
+<p>
+  <button onclick="document.querySelector('style[title]').textContent = 'html { font-size: 12px; }'">Show Text</button>
diff --git a/tests/wpt/tests/css/css-align/blocks/align-content-block-004-ref.html b/tests/wpt/tests/css/css-align/blocks/align-content-block-004-ref.html
new file mode 100644
index 00000000000..ba1182b643d
--- /dev/null
+++ b/tests/wpt/tests/css/css-align/blocks/align-content-block-004-ref.html
@@ -0,0 +1,264 @@
+<!DOCTYPE html>
+<title>CSS Box Alignment: align-content on large block container with floats</title>
+<link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact">
+
+<style title="Needed for automation; delete to review/debug">
+  @import "/fonts/ahem.css";
+  html { font: 10px/1 Ahem; max-width: 800px; }
+  .label { display: none; }
+</style>
+
+<style>
+  html, body { margin: 0; padding: 0; }
+
+  .test { height: 5em; margin: 0.5em 1em;
+          /* show bounds of test box without interfering with margin-collapsing */
+          background: black; padding-right: 2px; }
+  /* ensure float is contained */
+    .float { float: right; background: orange; height: 2em }
+  /* ensure margin is contained */
+    .in-flow { margin-top: 1em; background: orange }
+  /* ensure relpos is ignored */
+    .relpos { position: relative; top: -1.5em; }
+  /* ensure abspos static position follows alignment */
+    .wrapper { position: relative; }
+    .abspos { position: absolute; right: 0; margin-top: -1.5em; }
+  /* ensure overflow is not counted */
+    .overflow { height: 0; }
+
+  /* cram into 800x600 */
+  html { max-height: 600px; columns: 3 }
+  .wrapper { break-inside: avoid; border: solid 2px gray; }
+
+  /* readability */
+  .test > * { color: #8888; }
+  .label { color: black; font-weight: bold; }
+
+  /* reference code */
+  .test { display: flow-root; box-sizing: border-box; }
+</style>
+
+<div class="wrapper">
+  <div class="test" style="padding-top: 0">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">START</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="padding-top: 1em">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">CENTER</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="padding-top: 2em">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">END</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="padding-top: 0">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">BASELINE</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="padding-top: 2em">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">LAST BASELINE</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="padding-top: 0">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">FLEX-START</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="padding-top: 2em">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">FLEX-END</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="padding-top: 0">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">UNSAFE START</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="padding-top: 1em">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">UNSAFE CENTER</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="padding-top: 2em">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">UNSAFE END</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="padding-top: 0">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">SAFE START</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="padding-top: 1em">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">SAFE CENTER</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="padding-top: 2em">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">SAFE END</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="padding-top: 1em">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">SPACE-EVENLY</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="padding-top: 0">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">SPACE-BETWEEN</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="padding-top: 1em">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">SPACE-AROUND</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="display: block">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">NORMAL</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+
+<p>
+  <button onclick="document.querySelector('style[title]').textContent = 'html { font-size: 12px; }'">Show Text</button>
diff --git a/tests/wpt/tests/css/css-align/blocks/align-content-block-004.html b/tests/wpt/tests/css/css-align/blocks/align-content-block-004.html
new file mode 100644
index 00000000000..38a330909d4
--- /dev/null
+++ b/tests/wpt/tests/css/css-align/blocks/align-content-block-004.html
@@ -0,0 +1,263 @@
+<!DOCTYPE html>
+<title>CSS Box Alignment: align-content on large block container with floats</title>
+<link rel="help" href="https://www.w3.org/TR/css-align-3/#align-block">
+<link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact">
+<link rel="match" href="align-content-block-004-ref.html">
+
+<style title="Needed for automation; delete to review/debug">
+  @import "/fonts/ahem.css";
+  html { font: 10px/1 Ahem; max-width: 800px; }
+  .label { display: none; }
+</style>
+
+<style>
+  html, body { margin: 0; padding: 0; }
+
+  .test { height: 5em; margin: 0.5em 1em;
+          /* show bounds of test box without interfering with margin-collapsing */
+          background: black; padding-right: 2px; }
+  /* ensure float is contained */
+    .float { float: right; background: orange; height: 2em }
+  /* ensure margin is contained */
+    .in-flow { margin-top: 1em; background: orange }
+  /* ensure relpos is ignored */
+    .relpos { position: relative; top: -1.5em; }
+  /* ensure abspos static position follows alignment */
+    .wrapper { position: relative; }
+    .abspos { position: absolute; right: 0; margin-top: -1.5em; }
+  /* ensure overflow is not counted */
+    .overflow { height: 0; }
+
+  /* cram into 800x600 */
+  html { max-height: 600px; columns: 3 }
+  .wrapper { break-inside: avoid; border: solid 2px gray; }
+
+  /* readability */
+  .test > * { color: #8888; }
+  .label { color: black; font-weight: bold; }
+</style>
+
+<div class="wrapper">
+  <div class="test" style="align-content: start">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">START</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: center">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">CENTER</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: end">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">END</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: baseline">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">BASELINE</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: last baseline">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">LAST BASELINE</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: flex-start">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">FLEX-START</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: flex-end">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">FLEX-END</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: unsafe start">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">UNSAFE START</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: unsafe center">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">UNSAFE CENTER</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: unsafe end">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">UNSAFE END</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: safe start">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">SAFE START</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: safe center">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">SAFE CENTER</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: safe end">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">SAFE END</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: space-evenly">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">SPACE-EVENLY</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: space-between">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">SPACE-BETWEEN</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: space-around">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">SPACE-AROUND</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: normal">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">NORMAL</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+
+<p>
+  <button onclick="document.querySelector('style[title]').textContent = 'html { font-size: 12px; }'">Show Text</button>
diff --git a/tests/wpt/tests/css/css-align/blocks/align-content-block-005-ref.html b/tests/wpt/tests/css/css-align/blocks/align-content-block-005-ref.html
new file mode 100644
index 00000000000..c3712610dcd
--- /dev/null
+++ b/tests/wpt/tests/css/css-align/blocks/align-content-block-005-ref.html
@@ -0,0 +1,261 @@
+<!DOCTYPE html>
+<title>CSS Box Alignment: align-content on small block container with floats</title>
+<link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact">
+
+<style title="Needed for automation; delete to review/debug">
+  @import "/fonts/ahem.css";
+  html { font: 10px/1 Ahem; max-width: 800px; }
+  .label { display: none; }
+</style>
+
+<style>
+  html, body { margin: 0; padding: 0; }
+
+  .test { height: 1em; margin: 0.5em 2em;
+          /* show bounds of test box without interfering with margin-collapsing */
+          background: black; padding-right: 2px; }
+  /* ensure float is contained */
+    .float { float: right; background: orange; height: 2em }
+  /* ensure margin is contained */
+    .in-flow { margin-top: 1em; background: orange }
+  /* ensure relpos is ignored */
+    .relpos { position: relative; top: -1.5em; }
+  /* ensure abspos static position follows alignment */
+    .wrapper { position: relative; }
+    .abspos { position: absolute; right: 0; margin-top: -1.5em; }
+  /* ensure overflow is not counted */
+    .overflow { height: 0; }
+
+  /* cram into 800x600 */
+  html { max-height: 600px; columns: 3 }
+  .wrapper { break-inside: avoid; border: solid 2px gray; padding: 3em 0; }
+
+  /* readability */
+  .test > * { color: #8888; }
+  .label { color: black; font-weight: bold; }
+</style>
+
+<div class="wrapper">
+  <div class="test">
+    <div class="float">FLT</div>
+    <div style="padding-top: 0.5em; margin-bottom: -0.5em"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">START</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test">
+    <div class="float">FLT</div>
+    <div style="padding-top: 0.5em; margin-bottom: -0.5em"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">CENTER</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test">
+    <div class="float">FLT</div>
+    <div style="padding-top: 0.5em; margin-bottom: -0.5em"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">END</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test">
+    <div class="float">FLT</div>
+    <div style="padding-top: 0.5em; margin-bottom: -0.5em"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">BASELINE</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test">
+    <div class="float">FLT</div>
+    <div style="padding-top: 0.5em; margin-bottom: -0.5em"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">LAST BASELINE</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test">
+    <div class="float">FLT</div>
+    <div style="padding-top: 0.5em; margin-bottom: -0.5em"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">FLEX-START</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test">
+    <div class="float">FLT</div>
+    <div style="padding-top: 0.5em; margin-bottom: -0.5em"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">FLEX-END</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test">
+    <div class="float">FLT</div>
+    <div style="padding-top: 0.5em; margin-bottom: -0.5em"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">UNSAFE START</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test">
+    <div class="float" style="margin-top: -1em">FLT</div>
+    <div style="padding-top: 0.5em; margin-bottom: -1.5em"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">UNSAFE CENTER</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test">
+    <div style="padding-top: 0.5em; margin-bottom: -2.5em"></div>
+    <div class="in-flow">
+      <div class="float" style="margin-top: -1em">FLT</div>
+      <div class="float">FLT</div>
+      <span class="label">UNSAFE END</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test">
+    <div class="float">FLT</div>
+    <div style="padding-top: 0.5em; margin-bottom: -0.5em"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">SAFE START</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test">
+    <div class="float">FLT</div>
+    <div style="padding-top: 0.5em; margin-bottom: -0.5em"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">SAFE CENTER</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test">
+    <div class="float">FLT</div>
+    <div style="padding-top: 0.5em; margin-bottom: -0.5em"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">SAFE END</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test">
+    <div class="float">FLT</div>
+    <div style="padding-top: 0.5em; margin-bottom: -0.5em"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">SPACE-EVENLY</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test">
+    <div class="float">FLT</div>
+    <div style="padding-top: 0.5em; margin-bottom: -0.5em"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">SPACE-BETWEEN</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test">
+    <div class="float">FLT</div>
+    <div style="padding-top: 0.5em; margin-bottom: -0.5em"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">SPACE-AROUND</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test">
+    <div class="float">FLT</div>
+    <div></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">NORMAL</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+
+<p>
+  <button onclick="document.querySelector('style[title]').textContent = 'html { font-size: 12px; }'">Show Text</button>
diff --git a/tests/wpt/tests/css/css-align/blocks/align-content-block-005.html b/tests/wpt/tests/css/css-align/blocks/align-content-block-005.html
new file mode 100644
index 00000000000..97fe6c97fe9
--- /dev/null
+++ b/tests/wpt/tests/css/css-align/blocks/align-content-block-005.html
@@ -0,0 +1,264 @@
+<!DOCTYPE html>
+<title>CSS Box Alignment: align-content on small block container with floats</title>
+<link rel="help" href="https://www.w3.org/TR/css-align-3/#align-block">
+<link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact">
+<link rel="match" href="align-content-block-003-ref.html">
+
+<style title="Needed for automation; delete to review/debug">
+  @import "/fonts/ahem.css";
+  html { font: 10px/1 Ahem; max-width: 800px; }
+  .label { display: none; }
+</style>
+
+<style>
+  html, body { margin: 0; padding: 0; }
+
+  .test { height: 1em; margin: 0.5em 2em;
+          /* show bounds of test box without interfering with margin-collapsing */
+          background: black; padding-right: 2px; }
+  /* ensure float is contained */
+    .float { float: right; background: orange; height: 2em }
+  /* ensure margin is contained */
+    .in-flow { margin-top: 1em; background: orange }
+  /* ensure relpos is ignored */
+    .relpos { position: relative; top: -1.5em; }
+  /* ensure abspos static position follows alignment */
+    .wrapper { position: relative; }
+    .abspos { position: absolute; right: 0; margin-top: -1.5em; }
+  /* ensure overflow is not counted */
+    .overflow { height: 0; }
+
+  /* cram into 800x600 */
+  html { max-height: 600px; columns: 3 }
+  .wrapper { break-inside: avoid; border: solid 2px gray; padding: 3em 0; }
+
+  /* readability */
+  .test > * { color: #8888; }
+  .label { color: black; font-weight: bold; }
+</style>
+
+<div class="wrapper">
+  <div class="test" style="align-content: start">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">START</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: center">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">CENTER</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: end">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">END</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: baseline">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">BASELINE</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: last baseline">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">LAST BASELINE</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: flex-start">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">FLEX-START</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: flex-end">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">FLEX-END</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: unsafe start">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">UNSAFE START</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: unsafe center">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">UNSAFE CENTER</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: unsafe end">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">UNSAFE END</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: safe start">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">SAFE START</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: safe center">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">SAFE CENTER</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: safe end">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">SAFE END</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: space-evenly">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">SPACE-EVENLY</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+
+<div class="wrapper">
+  <div class="test" style="align-content: space-between">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">SPACE-BETWEEN</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: space-around">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">SPACE-AROUND</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: normal">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">NORMAL</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+
+<p>
+  <button onclick="document.querySelector('style[title]').textContent = 'html { font-size: 12px; }'">Show Text</button>
diff --git a/tests/wpt/tests/css/css-align/blocks/align-content-block-006.html b/tests/wpt/tests/css/css-align/blocks/align-content-block-006.html
new file mode 100644
index 00000000000..be62e78a706
--- /dev/null
+++ b/tests/wpt/tests/css/css-align/blocks/align-content-block-006.html
@@ -0,0 +1,282 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<title>CSS Box Alignment: align-content container change to large block container with floats</title>
+<link rel="help" href="https://www.w3.org/TR/css-align-3/#align-block">
+<link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact">
+<link rel="match" href="align-content-block-004-ref.html">
+
+<style title="Needed for automation; delete to review/debug">
+  @import "/fonts/ahem.css";
+  html { font: 10px/1 Ahem; max-width: 800px; }
+  .label { display: none; }
+  #manual { display: none; }
+</style>
+
+<style id="initial">
+  .test { height: 1em !important; }
+</style>
+<script>
+  function test()
+  {
+    document.body.offsetHeight; // trigger layout
+    document.getElementById('initial').type = 'text/plain'; // invalidate stylesheet
+    document.documentElement.removeAttribute("class");
+  };
+  document.addEventListener("TestRendered", test);
+  window.addEventListener("click", () => { document.getElementById('manual').style.display = "inline"; });
+</script>
+
+<style>
+  html, body { margin: 0; padding: 0; }
+
+  .test { height: 5em; margin: 0.5em 1em;
+          /* show bounds of test box without interfering with margin-collapsing */
+          background: black; padding-right: 2px; }
+  /* ensure float is contained */
+    .float { float: right; background: orange; height: 2em }
+  /* ensure margin is contained */
+    .in-flow { margin-top: 1em; background: orange }
+  /* ensure relpos is ignored */
+    .relpos { position: relative; top: -1.5em; }
+  /* ensure abspos static position follows alignment */
+    .wrapper { position: relative; }
+    .abspos { position: absolute; right: 0; margin-top: -1.5em; }
+  /* ensure overflow is not counted */
+    .overflow { height: 0; }
+
+  /* cram into 800x600 */
+  html { max-height: 600px; columns: 3 }
+  .wrapper { break-inside: avoid; border: solid 2px gray; }
+
+  /* readability */
+  .test > * { color: #8888; }
+  .label { color: black; font-weight: bold; }
+</style>
+
+<body>
+
+<div class="wrapper">
+  <div class="test" style="align-content: start">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">START</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: center">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">CENTER</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: end">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">END</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: baseline">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">BASELINE</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: last baseline">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">LAST BASELINE</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: flex-start">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">FLEX-START</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: flex-end">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">FLEX-END</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: unsafe start">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">UNSAFE START</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: unsafe center">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">UNSAFE CENTER</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: unsafe end">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">UNSAFE END</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: safe start">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">SAFE START</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: safe center">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">SAFE CENTER</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: safe end">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">SAFE END</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: space-evenly">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">SPACE-EVENLY</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: space-between">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">SPACE-BETWEEN</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: space-around">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">SPACE-AROUND</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: normal">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">NORMAL</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+
+<p>
+  <button onclick="document.querySelector('style[title]').textContent = 'html { font-size: 12px; }'">Show Text</button>
+  <button onclick="test()" id="manual">Run Test (Manual Trigger)</button>
diff --git a/tests/wpt/tests/css/css-align/blocks/align-content-block-007.html b/tests/wpt/tests/css/css-align/blocks/align-content-block-007.html
new file mode 100644
index 00000000000..61c4c684cd8
--- /dev/null
+++ b/tests/wpt/tests/css/css-align/blocks/align-content-block-007.html
@@ -0,0 +1,280 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<title>CSS Box Alignment: align-content container change to small block container with floats</title>
+<link rel="help" href="https://www.w3.org/TR/css-align-3/#align-block">
+<link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact">
+<link rel="match" href="align-content-block-005-ref.html">
+
+<style title="Needed for automation; delete to review/debug">
+  @import "/fonts/ahem.css";
+  html { font: 10px/1 Ahem; max-width: 800px; }
+  .label { display: none; }
+  #manual { display: none; }
+</style>
+
+<style id="initial">
+  .test { height: 5em !important; }
+</style>
+<script>
+  function test()
+  {
+    document.body.offsetHeight; // trigger layout
+    document.getElementById('initial').type = 'text/plain'; // invalidate stylesheet
+    document.documentElement.removeAttribute("class");
+  };
+  document.addEventListener("TestRendered", test);
+  window.addEventListener("click", () => { document.getElementById('manual').style.display = "inline"; });
+</script>
+
+<style>
+  html, body { margin: 0; padding: 0; }
+
+  .test { height: 1em; margin: 0.5em 2em;
+          /* show bounds of test box without interfering with margin-collapsing */
+          background: black; padding-right: 2px; }
+  /* ensure float is contained */
+    .float { float: right; background: orange; height: 2em }
+  /* ensure margin is contained */
+    .in-flow { margin-top: 1em; background: orange }
+  /* ensure relpos is ignored */
+    .relpos { position: relative; top: -1.5em; }
+  /* ensure abspos static position follows alignment */
+    .wrapper { position: relative; }
+    .abspos { position: absolute; right: 0; margin-top: -1.5em; }
+  /* ensure overflow is not counted */
+    .overflow { height: 0; }
+
+  /* cram into 800x600 */
+  html { max-height: 600px; columns: 3 }
+  .wrapper { break-inside: avoid; border: solid 2px gray; padding: 3em 0; }
+
+  /* readability */
+  .test > * { color: #8888; }
+  .label { color: black; font-weight: bold; }
+</style>
+
+<div class="wrapper">
+  <div class="test" style="align-content: start">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">START</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: center">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">CENTER</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: end">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">END</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: baseline">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">BASELINE</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: last baseline">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">LAST BASELINE</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: flex-start">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">FLEX-START</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: flex-end">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">FLEX-END</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: unsafe start">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">UNSAFE START</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: unsafe center">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">UNSAFE CENTER</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: unsafe end">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">UNSAFE END</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: safe start">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">SAFE START</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: safe center">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">SAFE CENTER</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: safe end">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">SAFE END</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: space-evenly">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">SPACE-EVENLY</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: space-between">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">SPACE-BETWEEN</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: space-around">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">SPACE-AROUND</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: normal">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">NORMAL</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+
+<p>
+  <button onclick="document.querySelector('style[title]').textContent = 'html { font-size: 12px; }'">Show Text</button>
+  <button onclick="test()" id="manual">Run Test (Manual Trigger)</button>
diff --git a/tests/wpt/tests/css/css-align/blocks/align-content-block-008.html b/tests/wpt/tests/css/css-align/blocks/align-content-block-008.html
new file mode 100644
index 00000000000..e9a861c7148
--- /dev/null
+++ b/tests/wpt/tests/css/css-align/blocks/align-content-block-008.html
@@ -0,0 +1,299 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<title>CSS Box Alignment: align-content style change on large block container with floats</title>
+<link rel="help" href="https://www.w3.org/TR/css-align-3/#align-block">
+<link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact">
+<link rel="match" href="align-content-block-004-ref.html">
+
+<style title="Needed for automation; delete to review/debug">
+  @import "/fonts/ahem.css";
+  html { font: 10px/1 Ahem; max-width: 800px; }
+  .label { display: none; }
+  #manual { display: none; }
+</style>
+
+<style id="initial">
+  /* scramble test styles */
+  [style$="start"        ] { align-content: end           !important; }
+  [style$="center"       ] { align-content: unsafe end    !important; }
+  [style$="end"          ] { align-content: start         !important; }
+  [style$="baseline"     ] { align-content: unsafe end    !important; }
+  [style$="last baseline"] { align-content: start         !important; }
+  [style$="flex-start"   ] { align-content: normal        !important; }
+  [style$="flex-end"     ] { align-content: start         !important; }
+  [style$="unsafe start" ] { align-content: center        !important; }
+  [style$="unsafe center"] { align-content: baseline      !important; }
+  [style$="unsafe end"   ] { align-content: unsafe center !important; }
+  [style$="safe start"   ] { align-content: unsafe end    !important; }
+  [style$="safe center"  ] { align-content: normal        !important; }
+  [style$="safe end"     ] { align-content: unsafe end    !important; }
+  [style$="space-evenly" ] { align-content: end           !important; }
+  [style$="space-between"] { align-content: unsafe center !important; }
+  [style$="space-around" ] { align-content: start         !important; }
+  [style$="normal"       ] { align-content: unsafe end    !important; }
+</style>
+<script>
+  function test()
+  {
+    document.body.offsetHeight; // trigger layout
+    document.getElementById('initial').type = 'text/plain'; // invalidate stylesheet
+    document.documentElement.removeAttribute("class");
+  };
+  document.addEventListener("TestRendered", test);
+  window.addEventListener("click", () => { document.getElementById('manual').style.display = "inline"; });
+</script>
+
+<style>
+  html, body { margin: 0; padding: 0; }
+
+  .test { height: 5em; margin: 0.5em 1em;
+          /* show bounds of test box without interfering with margin-collapsing */
+          background: black; padding-right: 2px; }
+  /* ensure float is contained */
+    .float { float: right; background: orange; height: 2em }
+  /* ensure margin is contained */
+    .in-flow { margin-top: 1em; background: orange }
+  /* ensure relpos is ignored */
+    .relpos { position: relative; top: -1.5em; }
+  /* ensure abspos static position follows alignment */
+    .wrapper { position: relative; }
+    .abspos { position: absolute; right: 0; margin-top: -1.5em; }
+  /* ensure overflow is not counted */
+    .overflow { height: 0; }
+
+  /* cram into 800x600 */
+  html { max-height: 600px; columns: 3 }
+  .wrapper { break-inside: avoid; border: solid 2px gray; }
+
+  /* readability */
+  .test > * { color: #8888; }
+  .label { color: black; font-weight: bold; }
+</style>
+
+<body>
+
+<div class="wrapper">
+  <div class="test" style="align-content: start">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">START</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: center">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">CENTER</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: end">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">END</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: baseline">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">BASELINE</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: last baseline">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">LAST BASELINE</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: flex-start">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">FLEX-START</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: flex-end">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">FLEX-END</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: unsafe start">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">UNSAFE START</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: unsafe center">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">UNSAFE CENTER</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: unsafe end">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">UNSAFE END</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: safe start">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">SAFE START</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: safe center">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">SAFE CENTER</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: safe end">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">SAFE END</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: space-evenly">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">SPACE-EVENLY</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: space-between">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">SPACE-BETWEEN</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: space-around">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">SPACE-AROUND</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: normal">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">NORMAL</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+
+<p>
+  <button onclick="document.querySelector('style[title]').textContent = 'html { font-size: 12px; }'">Show Text</button>
+  <button onclick="test()" id="manual">Run Test (Manual Trigger)</button>
diff --git a/tests/wpt/tests/css/css-align/blocks/align-content-block-009.html b/tests/wpt/tests/css/css-align/blocks/align-content-block-009.html
new file mode 100644
index 00000000000..0b2e8ec9fc4
--- /dev/null
+++ b/tests/wpt/tests/css/css-align/blocks/align-content-block-009.html
@@ -0,0 +1,297 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<title>CSS Box Alignment: align-content style change on small block container with floats</title>
+<link rel="help" href="https://www.w3.org/TR/css-align-3/#align-block">
+<link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact">
+<link rel="match" href="align-content-block-005-ref.html">
+
+<style title="Needed for automation; delete to review/debug">
+  @import "/fonts/ahem.css";
+  html { font: 10px/1 Ahem; max-width: 800px; }
+  .label { display: none; }
+  #manual { display: none; }
+</style>
+
+<style id="initial">
+  /* scramble test styles */
+  [style$="start"        ] { align-content: end           !important; }
+  [style$="center"       ] { align-content: unsafe end    !important; }
+  [style$="end"          ] { align-content: start         !important; }
+  [style$="baseline"     ] { align-content: unsafe end    !important; }
+  [style$="last baseline"] { align-content: start         !important; }
+  [style$="flex-start"   ] { align-content: normal        !important; }
+  [style$="flex-end"     ] { align-content: start         !important; }
+  [style$="unsafe start" ] { align-content: center        !important; }
+  [style$="unsafe center"] { align-content: baseline      !important; }
+  [style$="unsafe end"   ] { align-content: unsafe center !important; }
+  [style$="safe start"   ] { align-content: unsafe end    !important; }
+  [style$="safe center"  ] { align-content: normal        !important; }
+  [style$="safe end"     ] { align-content: unsafe end    !important; }
+  [style$="space-evenly" ] { align-content: end           !important; }
+  [style$="space-between"] { align-content: unsafe center !important; }
+  [style$="space-around" ] { align-content: start         !important; }
+  [style$="normal"       ] { align-content: unsafe end    !important; }
+</style>
+<script>
+  function test()
+  {
+    document.body.offsetHeight; // trigger layout
+    document.getElementById('initial').type = 'text/plain'; // invalidate stylesheet
+    document.documentElement.removeAttribute("class");
+  };
+  document.addEventListener("TestRendered", test);
+  window.addEventListener("click", () => { document.getElementById('manual').style.display = "inline"; });
+</script>
+
+<style>
+  html, body { margin: 0; padding: 0; }
+
+  .test { height: 1em; margin: 0.5em 2em;
+          /* show bounds of test box without interfering with margin-collapsing */
+          background: black; padding-right: 2px; }
+  /* ensure float is contained */
+    .float { float: right; background: orange; height: 2em }
+  /* ensure margin is contained */
+    .in-flow { margin-top: 1em; background: orange }
+  /* ensure relpos is ignored */
+    .relpos { position: relative; top: -1.5em; }
+  /* ensure abspos static position follows alignment */
+    .wrapper { position: relative; }
+    .abspos { position: absolute; right: 0; margin-top: -1.5em; }
+  /* ensure overflow is not counted */
+    .overflow { height: 0; }
+
+  /* cram into 800x600 */
+  html { max-height: 600px; columns: 3 }
+  .wrapper { break-inside: avoid; border: solid 2px gray; padding: 3em 0; }
+
+  /* readability */
+  .test > * { color: #8888; }
+  .label { color: black; font-weight: bold; }
+</style>
+
+<div class="wrapper">
+  <div class="test" style="align-content: start">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">START</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: center">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">CENTER</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: end">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">END</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: baseline">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">BASELINE</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: last baseline">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">LAST BASELINE</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: flex-start">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">FLEX-START</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: flex-end">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">FLEX-END</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: unsafe start">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">UNSAFE START</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: unsafe center">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">UNSAFE CENTER</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: unsafe end">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">UNSAFE END</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: safe start">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">SAFE START</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: safe center">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">SAFE CENTER</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: safe end">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">SAFE END</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: space-evenly">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">SPACE-EVENLY</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: space-between">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">SPACE-BETWEEN</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: space-around">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">SPACE-AROUND</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: normal">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">NORMAL</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+
+<p>
+  <button onclick="document.querySelector('style[title]').textContent = 'html { font-size: 12px; }'">Show Text</button>
+  <button onclick="test()" id="manual">Run Test (Manual Trigger)</button>
diff --git a/tests/wpt/tests/css/css-align/blocks/align-content-block-010.html b/tests/wpt/tests/css/css-align/blocks/align-content-block-010.html
new file mode 100644
index 00000000000..ffb0e9cc4db
--- /dev/null
+++ b/tests/wpt/tests/css/css-align/blocks/align-content-block-010.html
@@ -0,0 +1,282 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<title>CSS Box Alignment: align-content content change in large block container with floats</title>
+<link rel="help" href="https://www.w3.org/TR/css-align-3/#align-block">
+<link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact">
+<link rel="match" href="align-content-block-004-ref.html">
+
+<style title="Needed for automation; delete to review/debug">
+  @import "/fonts/ahem.css";
+  html { font: 10px/1 Ahem; max-width: 800px; }
+  .label { display: none; }
+  #manual { display: none; }
+</style>
+
+<style id="initial">
+  .in-flow .float { height: 0; !important }
+</style>
+<script>
+  function test()
+  {
+    document.body.offsetHeight; // trigger layout
+    document.getElementById('initial').type = 'text/plain'; // invalidate stylesheet
+    document.documentElement.removeAttribute("class");
+  };
+  document.addEventListener("TestRendered", test);
+  window.addEventListener("click", () => { document.getElementById('manual').style.display = "inline"; });
+</script>
+
+<style>
+  html, body { margin: 0; padding: 0; }
+
+  .test { height: 5em; margin: 0.5em 1em;
+          /* show bounds of test box without interfering with margin-collapsing */
+          background: black; padding-right: 2px; }
+  /* ensure float is contained */
+    .float { float: right; background: orange; height: 2em }
+  /* ensure margin is contained */
+    .in-flow { margin-top: 1em; background: orange }
+  /* ensure relpos is ignored */
+    .relpos { position: relative; top: -1.5em; }
+  /* ensure abspos static position follows alignment */
+    .wrapper { position: relative; }
+    .abspos { position: absolute; right: 0; margin-top: -1.5em; }
+  /* ensure overflow is not counted */
+    .overflow { height: 0; }
+
+  /* cram into 800x600 */
+  html { max-height: 600px; columns: 3 }
+  .wrapper { break-inside: avoid; border: solid 2px gray; }
+
+  /* readability */
+  .test > * { color: #8888; }
+  .label { color: black; font-weight: bold; }
+</style>
+
+<body>
+
+<div class="wrapper">
+  <div class="test" style="align-content: start">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">START</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: center">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">CENTER</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: end">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">END</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: baseline">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">BASELINE</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: last baseline">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">LAST BASELINE</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: flex-start">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">FLEX-START</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: flex-end">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">FLEX-END</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: unsafe start">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">UNSAFE START</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: unsafe center">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">UNSAFE CENTER</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: unsafe end">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">UNSAFE END</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: safe start">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">SAFE START</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: safe center">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">SAFE CENTER</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: safe end">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">SAFE END</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: space-evenly">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">SPACE-EVENLY</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: space-between">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">SPACE-BETWEEN</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: space-around">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">SPACE-AROUND</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: normal">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">NORMAL</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+
+<p>
+  <button onclick="document.querySelector('style[title]').textContent = 'html { font-size: 12px; }'">Show Text</button>
+  <button onclick="test()" id="manual">Run Test (Manual Trigger)</button>
diff --git a/tests/wpt/tests/css/css-align/blocks/align-content-block-011.html b/tests/wpt/tests/css/css-align/blocks/align-content-block-011.html
new file mode 100644
index 00000000000..44b8d898729
--- /dev/null
+++ b/tests/wpt/tests/css/css-align/blocks/align-content-block-011.html
@@ -0,0 +1,280 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<title>CSS Box Alignment: align-content content change on small block container with floats</title>
+<link rel="help" href="https://www.w3.org/TR/css-align-3/#align-block">
+<link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact">
+<link rel="match" href="align-content-block-005-ref.html">
+
+<style title="Needed for automation; delete to review/debug">
+  @import "/fonts/ahem.css";
+  html { font: 10px/1 Ahem; max-width: 800px; }
+  .label { display: none; }
+  #manual { display: none; }
+</style>
+
+<style id="initial">
+  .in-flow .float { height: 0; !important }
+</style>
+<script>
+  function test()
+  {
+    document.body.offsetHeight; // trigger layout
+    document.getElementById('initial').type = 'text/plain'; // invalidate stylesheet
+    document.documentElement.removeAttribute("class");
+  };
+  document.addEventListener("TestRendered", test);
+  window.addEventListener("click", () => { document.getElementById('manual').style.display = "inline"; });
+</script>
+
+<style>
+  html, body { margin: 0; padding: 0; }
+
+  .test { height: 1em; margin: 0.5em 2em;
+          /* show bounds of test box without interfering with margin-collapsing */
+          background: black; padding-right: 2px; }
+  /* ensure float is contained */
+    .float { float: right; background: orange; height: 2em }
+  /* ensure margin is contained */
+    .in-flow { margin-top: 1em; background: orange }
+  /* ensure relpos is ignored */
+    .relpos { position: relative; top: -1.5em; }
+  /* ensure abspos static position follows alignment */
+    .wrapper { position: relative; }
+    .abspos { position: absolute; right: 0; margin-top: -1.5em; }
+  /* ensure overflow is not counted */
+    .overflow { height: 0; }
+
+  /* cram into 800x600 */
+  html { max-height: 600px; columns: 3 }
+  .wrapper { break-inside: avoid; border: solid 2px gray; padding: 3em 0; }
+
+  /* readability */
+  .test > * { color: #8888; }
+  .label { color: black; font-weight: bold; }
+</style>
+
+<div class="wrapper">
+  <div class="test" style="align-content: start">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">START</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: center">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">CENTER</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: end">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">END</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: baseline">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">BASELINE</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: last baseline">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">LAST BASELINE</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: flex-start">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">FLEX-START</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: flex-end">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">FLEX-END</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: unsafe start">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">UNSAFE START</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: unsafe center">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">UNSAFE CENTER</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: unsafe end">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">UNSAFE END</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: safe start">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">SAFE START</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: safe center">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">SAFE CENTER</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: safe end">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">SAFE END</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: space-evenly">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">SPACE-EVENLY</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: space-between">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">SPACE-BETWEEN</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: space-around">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">SPACE-AROUND</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: normal">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">NORMAL</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+
+<p>
+  <button onclick="document.querySelector('style[title]').textContent = 'html { font-size: 12px; }'">Show Text</button>
+  <button onclick="test()" id="manual">Run Test (Manual Trigger)</button>
diff --git a/tests/wpt/tests/css/css-align/blocks/align-content-block-break-content-010-aligned-ref.html b/tests/wpt/tests/css/css-align/blocks/align-content-block-break-content-010-aligned-ref.html
new file mode 100644
index 00000000000..4c92cc9b45f
--- /dev/null
+++ b/tests/wpt/tests/css/css-align/blocks/align-content-block-break-content-010-aligned-ref.html
@@ -0,0 +1,186 @@
+<!DOCTYPE html>
+<title>CSS Box Alignment: align-content block fragmentation: simple content</title>
+<link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact">
+<link rel="help" href="https://www.w3.org/TR/css-align-3/#align-block">
+
+<style title="Needed for automation; delete to review/debug">
+  @import "/fonts/ahem.css";
+  html { font: 10px/1 Ahem; max-width: 780px; }
+</style>
+
+<style>
+  .pager {
+    column-fill: auto;
+    column-width: 15em;
+    height: 5em;
+  }
+  .test {
+    height: 5em; break-inside: avoid;
+    /* show bounds of test box without interfering with margin-collapsing */
+    border-inline: solid black 1em;
+  }
+  .test:last-child {
+    height: 4em;
+  }
+  .large, .float {
+    height: 2.5em;
+    break-inside: avoid;
+    padding: 2px; /* using padding because of margin handling bugs
+    margin: 2px;
+switch back once fixed */
+    background: orange;
+  }
+  .float {
+    float: right;
+  }
+  .nobr {
+    break-inside: avoid;
+  }
+
+  /* readability */
+  .pager { border: solid 2px gray; margin: 0.5em 0; }
+  .test  { color: #8888; text-align: center; }
+  .label { color: black; font-weight: bold; }
+
+  /* reference */
+  .center .test { align-content: center; }
+  .end    .test { align-content: end; }
+  /* margins are truncated by unforced breaks, so mimic that */
+  .test .large:first-child { margin-top: 0; }
+  .test .large:last-child  { margin-bottom: 0; }
+</style>
+
+<!--
+   This test creates breaks:
+     * after some directly-contained text
+     * after a fixed-height block
+     * through some nested text
+     * after a block containing text
+-->
+
+<div class="pager center">
+  <div class="test">
+      <span class="label">CENTER</span><br>LINE 2<br>LINE 3
+  </div>
+  <div class="test">
+      <div class="large"></div>
+  </div>
+  <div class="test">
+      <div class="large"></div>
+      <div>
+        LINE 4
+      </div>
+  </div>
+  <div class="test">
+      <div>
+        <div class="nobr">LINE 5<br>LINE 6</div>
+      </div>
+    </div>
+  </div>
+</div>
+
+
+<div class="pager end">
+  <div class="test">
+      <span class="label">END</span><br>LINE 2<br>LINE 3
+  </div>
+  <div class="test">
+      <div class="large"></div>
+  </div>
+  <div class="test">
+      <div class="large"></div>
+      <div>
+        LINE 4
+      </div>
+  </div>
+  <div class="test">
+      <div>
+        <div class="nobr">LINE 5<br>LINE 6</div>
+      </div>
+    </div>
+  </div>
+</div>
+
+<div class="pager">
+  <div class="test">
+      <span class="label">BASELINE</span><br>LINE 2<br>LINE 3
+  </div>
+  <div class="test">
+      <div class="large"></div>
+  </div>
+  <div class="test">
+      <div class="large"></div>
+      <div>
+        LINE 4
+      </div>
+  </div>
+  <div class="test">
+      <div>
+        <div class="nobr">LINE 5<br>LINE 6</div>
+      </div>
+    </div>
+  </div>
+</div>
+
+<div class="pager">
+  <div class="test">
+      <span class="label">LAST BASELINE</span><br>LINE 2<br>LINE 3
+  </div>
+  <div class="test">
+      <div class="large"></div>
+  </div>
+  <div class="test">
+      <div class="large"></div>
+      <div>
+        LINE 4
+      </div>
+  </div>
+  <div class="test">
+      <div>
+        <div class="nobr">LINE 5<br>LINE 6</div>
+      </div>
+    </div>
+  </div>
+</div>
+
+<div class="pager center">
+  <div class="test">
+      <span class="label">UNSAFE CENTER</span><br>LINE 2<br>LINE 3
+  </div>
+  <div class="test">
+      <div class="large"></div>
+  </div>
+  <div class="test">
+      <div class="large"></div>
+      <div>
+        LINE 4
+      </div>
+  </div>
+  <div class="test">
+      <div>
+        <div class="nobr">LINE 5<br>LINE 6</div>
+      </div>
+    </div>
+  </div>
+</div>
+
+<div class="pager end">
+  <div class="test">
+      <span class="label">UNSAFE END</span><br>LINE 2<br>LINE 3
+  </div>
+  <div class="test">
+      <div class="large"></div>
+  </div>
+  <div class="test">
+      <div class="large"></div>
+      <div>
+        LINE 4
+      </div>
+  </div>
+  <div class="test">
+      <div>
+        <div class="nobr">LINE 5<br>LINE 6</div>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/tests/wpt/tests/css/css-align/blocks/align-content-block-break-content-010-unaligned-ref.html b/tests/wpt/tests/css/css-align/blocks/align-content-block-break-content-010-unaligned-ref.html
new file mode 100644
index 00000000000..458fcf28937
--- /dev/null
+++ b/tests/wpt/tests/css/css-align/blocks/align-content-block-break-content-010-unaligned-ref.html
@@ -0,0 +1,130 @@
+<!DOCTYPE html>
+<title>CSS Box Alignment: align-content block fragmentation: simple content</title>
+<link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact">
+<link rel="help" href="https://www.w3.org/TR/css-align-3/#align-block">
+
+<style title="Needed for automation; delete to review/debug">
+  @import "/fonts/ahem.css";
+  html { font: 10px/1 Ahem; max-width: 780px; }
+</style>
+
+<style>
+  .pager {
+    column-fill: auto;
+    column-width: 15em;
+    height: 5em;
+  }
+  .test {
+    height: 19em;
+    /* show bounds of test box without interfering with margin-collapsing */
+    border-inline: solid black 1em;
+  }
+  .large, .float {
+    height: 2.5em;
+    break-inside: avoid;
+    padding: 2px; /* using padding because of margin handling bugs
+    margin: 2px;
+switch back once fixed */
+    background: orange;
+  }
+  .float {
+    float: right;
+  }
+  .nobr {
+    break-inside: avoid;
+  }
+
+  /* readability */
+  .pager { border: solid 2px gray; margin: 0.5em 0; }
+  .test  { color: #8888; text-align: center; }
+  .label { color: black; font-weight: bold; }
+  .test .large { margin-top: 0; } /* margins truncated by unforced breaks */
+</style>
+
+<!--
+   This test creates breaks:
+     * after some directly-contained text
+     * after a fixed-height block
+     * through some nested text
+     * after a block containing text
+-->
+
+<div class="pager">
+  <div class="test">
+      <span class="label">CENTER</span><br>LINE 2<br>LINE 3
+      <div class="large"></div>
+      <div class="large"></div>
+      <div>
+        LINE 4
+        <div class="nobr">LINE 5<br>LINE 6</div>
+      </div>
+    </div>
+  </div>
+</div>
+
+
+<div class="pager">
+  <div class="test">
+      <span class="label">END</span><br>LINE 2<br>LINE 3
+      <div class="large"></div>
+      <div class="large"></div>
+      <div>
+        LINE 4
+        <div class="nobr">LINE 5<br>LINE 6</div>
+      </div>
+    </div>
+  </div>
+</div>
+
+<div class="pager">
+  <div class="test">
+      <span class="label">BASELINE</span><br>LINE 2<br>LINE 3
+      <div class="large"></div>
+      <div class="large"></div>
+      <div>
+        LINE 4
+        <div class="nobr">LINE 5<br>LINE 6</div>
+      </div>
+    </div>
+  </div>
+</div>
+
+<div class="pager">
+  <div class="test">
+      <span class="label">LAST BASELINE</span><br>LINE 2<br>LINE 3
+      <div class="large"></div>
+      <div class="large"></div>
+      <div>
+        LINE 4
+        <div class="nobr">LINE 5<br>LINE 6</div>
+      </div>
+    </div>
+  </div>
+</div>
+
+<div class="pager">
+  <div class="test">
+      <span class="label">UNSAFE CENTER</span><br>LINE 2<br>LINE 3
+      <div class="large"></div>
+      <div class="large"></div>
+      <div>
+        LINE 4
+        <div class="nobr">LINE 5<br>LINE 6</div>
+      </div>
+    </div>
+  </div>
+</div>
+
+
+<div class="pager">
+  <div class="test">
+      <span class="label">UNSAFE END</span><br>LINE 2<br>LINE 3
+      <div class="large"></div>
+      <div class="large"></div>
+      <div>
+        LINE 4
+        <div class="nobr">LINE 5<br>LINE 6</div>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/tests/wpt/tests/css/css-align/blocks/align-content-block-break-content-010.html b/tests/wpt/tests/css/css-align/blocks/align-content-block-break-content-010.html
new file mode 100644
index 00000000000..27a56a608f4
--- /dev/null
+++ b/tests/wpt/tests/css/css-align/blocks/align-content-block-break-content-010.html
@@ -0,0 +1,133 @@
+<!DOCTYPE html>
+<title>CSS Box Alignment: align-content block fragmentation: simple content</title>
+<link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact">
+<link rel="help" href="https://www.w3.org/TR/css-align-3/#align-block">
+<meta name="flags" content="may">
+<!-- fragmented alignment is underdefined; these are two possibilities -->
+<link rel="match" href="align-content-block-break-content-010-aligned-ref.html">
+<link rel="match" href="align-content-block-break-content-010-unaligned-ref.html">
+
+<style title="Needed for automation; delete to review/debug">
+  @import "/fonts/ahem.css";
+  html { font: 10px/1 Ahem; max-width: 780px; }
+</style>
+
+<style>
+  .pager {
+    column-fill: auto;
+    column-width: 15em;
+    height: 5em;
+  }
+  .test {
+    height: 19em;
+    /* show bounds of test box without interfering with margin-collapsing */
+    border-inline: solid black 1em;
+  }
+  .large, .float {
+    height: 2.5em;
+    break-inside: avoid;
+    padding: 2px; /* using padding because of margin handling bugs
+    margin: 2px;
+switch back once fixed */
+    background: orange;
+  }
+  .float {
+    float: right;
+  }
+  .nobr {
+    break-inside: avoid;
+  }
+
+  /* readability */
+  .pager { border: solid 2px gray; margin: 0.5em 0; }
+  .test  { color: #8888; text-align: center; }
+  .label { color: black; font-weight: bold; }
+</style>
+
+<!--
+   This test creates breaks:
+     * after some directly-contained text
+     * after a fixed-height block
+     * through some nested text
+     * after a block containing text
+-->
+
+<div class="pager">
+  <div class="test" style="align-content: center">
+      <span class="label">CENTER</span><br>LINE 2<br>LINE 3
+      <div class="large"></div>
+      <div class="large"></div>
+      <div>
+        LINE 4
+        <div class="nobr">LINE 5<br>LINE 6</div>
+      </div>
+    </div>
+  </div>
+</div>
+
+
+<div class="pager">
+  <div class="test" style="align-content: end">
+      <span class="label">END</span><br>LINE 2<br>LINE 3
+      <div class="large"></div>
+      <div class="large"></div>
+      <div>
+        LINE 4
+        <div class="nobr">LINE 5<br>LINE 6</div>
+      </div>
+    </div>
+  </div>
+</div>
+
+<div class="pager">
+  <div class="test" style="align-content: baseline">
+      <span class="label">BASELINE</span><br>LINE 2<br>LINE 3
+      <div class="large"></div>
+      <div class="large"></div>
+      <div>
+        LINE 4
+        <div class="nobr">LINE 5<br>LINE 6</div>
+      </div>
+    </div>
+  </div>
+</div>
+
+<div class="pager">
+  <div class="test" style="align-content: last baseline">
+      <span class="label">LAST BASELINE</span><br>LINE 2<br>LINE 3
+      <div class="large"></div>
+      <div class="large"></div>
+      <div>
+        LINE 4
+        <div class="nobr">LINE 5<br>LINE 6</div>
+      </div>
+    </div>
+  </div>
+</div>
+
+<div class="pager">
+  <div class="test" style="align-content: unsafe center">
+      <span class="label">UNSAFE CENTER</span><br>LINE 2<br>LINE 3
+      <div class="large"></div>
+      <div class="large"></div>
+      <div>
+        LINE 4
+        <div class="nobr">LINE 5<br>LINE 6</div>
+      </div>
+    </div>
+  </div>
+</div>
+
+
+<div class="pager">
+  <div class="test" style="align-content: unsafe end">
+      <span class="label">UNSAFE END</span><br>LINE 2<br>LINE 3
+      <div class="large"></div>
+      <div class="large"></div>
+      <div>
+        LINE 4
+        <div class="nobr">LINE 5<br>LINE 6</div>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/tests/wpt/tests/css/css-align/blocks/align-content-block-break-content-020-aligned-ref.html b/tests/wpt/tests/css/css-align/blocks/align-content-block-break-content-020-aligned-ref.html
new file mode 100644
index 00000000000..6a0e3871496
--- /dev/null
+++ b/tests/wpt/tests/css/css-align/blocks/align-content-block-break-content-020-aligned-ref.html
@@ -0,0 +1,244 @@
+<!DOCTYPE html>
+<title>CSS Box Alignment: align-content block fragmentation: complex block content</title>
+<link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact">
+<link rel="help" href="https://www.w3.org/TR/css-align-3/#align-block">
+
+<style title="Needed for automation; delete to review/debug">
+  @import "/fonts/ahem.css";
+  html { font: 10px/1 Ahem; max-width: 800px; }
+</style>
+
+<style>
+  .pager {
+    column-fill: auto;
+    column-width: 15em;
+    height: 5em;
+  }
+  .test {
+    height: 5em; break-inside: avoid;
+    /* show bounds of test box without interfering with margin-collapsing */
+    border-inline: solid black 1em;
+  }
+  .test:last-child {
+    height: 4.5em;
+  }
+  .large, .float {
+    height: 2.5em;
+    break-inside: avoid;
+    background: orange;
+  }
+  .float {
+    float: right;
+  }
+  .margin {
+    padding: 0.2em; /* using padding because of margin handling bugs
+    margin-block: 0.5em;
+  }
+  .margin > * {
+    margin-block: -0.3em;
+switch back once fixed */
+  }
+  hr {
+    border: solid 1px; margin: 0.5em;
+  }
+
+  /* readability */
+  .pager { border: solid 2px gray; margin: 0.5em 0; }
+  .test { color: #8888; text-align: center; }
+  .label { color: black; font-weight: bold; }
+
+  /* reference */
+  .center .test { align-content: center; }
+  .end    .test { align-content: end; }
+  /* margins are truncated by unforced breaks, so mimic that */
+  .test .large:first-child { margin-top: 0; }
+  .test .large:last-child  { margin-bottom: 0; }
+</style>
+
+<!--
+   This test creates breaks:
+     * between two blocks with collapsing negative margins
+     * through the middle of a float
+     * through some nested text
+     * after a nested float
+-->
+
+<div class="pager center">
+  <div class="test">
+    <span class="label">CENTER</span>
+    <div class="margin">
+      <div class="large"></div>
+    </div>
+  </div>
+  <div class="test">
+    <div class="margin">
+      <div class="large"></div>
+    </div>
+    LINE 1<br>LINE 2
+  </div>
+  <div class="test">
+    <div class="float">FLT</div>
+    LINE 3
+    <hr>
+    <div>
+      LINE 4<br>LINE 5
+    </div>
+  </div>
+  <div class="test">
+    <div>
+      LINE 6
+      <div class="float">FLT</div>
+    </div>
+    LINE 7
+  </div>
+</div>
+
+<div class="pager end">
+  <div class="test">
+    <span class="label">END</span>
+    <div class="margin">
+      <div class="large"></div>
+    </div>
+  </div>
+  <div class="test">
+    <div class="margin">
+      <div class="large"></div>
+    </div>
+    LINE 1<br>LINE 2
+  </div>
+  <div class="test">
+    <div class="float">FLT</div>
+    LINE 3
+    <hr>
+    <div>
+      LINE 4<br>LINE 5
+    </div>
+  </div>
+  <div class="test">
+    <div>
+      LINE 6
+      <div class="float">FLT</div>
+    </div>
+    LINE 7
+  </div>
+</div>
+
+<div class="pager">
+  <div class="test">
+    <span class="label">BASELINE</span>
+    <div class="margin">
+      <div class="large"></div>
+    </div>
+  </div>
+  <div class="test">
+    <div class="margin">
+      <div class="large"></div>
+    </div>
+    LINE 1<br>LINE 2
+  </div>
+  <div class="test">
+    <div class="float">FLT</div>
+    LINE 3
+    <hr>
+    <div>
+      LINE 4<br>LINE 5
+    </div>
+  </div>
+  <div class="test">
+    <div>
+      LINE 6
+      <div class="float">FLT</div>
+    </div>
+    LINE 7
+  </div>
+</div>
+
+<div class="pager">
+  <div class="test">
+    <span class="label">LAST BASELINE</span>
+    <div class="margin">
+      <div class="large"></div>
+    </div>
+  </div>
+  <div class="test">
+    <div class="margin">
+      <div class="large"></div>
+    </div>
+    LINE 1<br>LINE 2
+  </div>
+  <div class="test">
+    <div class="float">FLT</div>
+    LINE 3
+    <hr>
+    <div>
+      LINE 4<br>LINE 5
+    </div>
+  </div>
+  <div class="test">
+    <div>
+      LINE 6
+      <div class="float">FLT</div>
+    </div>
+    LINE 7
+  </div>
+</div>
+
+<div class="pager center">
+  <div class="test">
+    <span class="label">UNSAFE CENTER</span>
+    <div class="margin">
+      <div class="large"></div>
+    </div>
+  </div>
+  <div class="test">
+    <div class="margin">
+      <div class="large"></div>
+    </div>
+    LINE 1<br>LINE 2
+  </div>
+  <div class="test">
+    <div class="float">FLT</div>
+    LINE 3
+    <hr>
+    <div>
+      LINE 4<br>LINE 5
+    </div>
+  </div>
+  <div class="test">
+    <div>
+      LINE 6
+      <div class="float">FLT</div>
+    </div>
+    LINE 7
+  </div>
+</div>
+
+<div class="pager end">
+  <div class="test">
+    <span class="label">UNSAFE END</span>
+    <div class="margin">
+      <div class="large"></div>
+    </div>
+  </div>
+  <div class="test">
+    <div class="margin">
+      <div class="large"></div>
+    </div>
+    LINE 1<br>LINE 2
+  </div>
+  <div class="test">
+    <div class="float">FLT</div>
+    LINE 3
+    <hr>
+    <div>
+      LINE 4<br>LINE 5
+    </div>
+  </div>
+  <div class="test">
+    <div>
+      LINE 6
+      <div class="float">FLT</div>
+    </div>
+    LINE 7
+  </div>
+</div>
diff --git a/tests/wpt/tests/css/css-align/blocks/align-content-block-break-content-020-unaligned-ref.html b/tests/wpt/tests/css/css-align/blocks/align-content-block-break-content-020-unaligned-ref.html
new file mode 100644
index 00000000000..730c8741d70
--- /dev/null
+++ b/tests/wpt/tests/css/css-align/blocks/align-content-block-break-content-020-unaligned-ref.html
@@ -0,0 +1,174 @@
+<!DOCTYPE html>
+<title>CSS Box Alignment: align-content block fragmentation: complex block content</title>
+<link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact">
+<link rel="help" href="https://www.w3.org/TR/css-align-3/#align-block">
+
+<style title="Needed for automation; delete to review/debug">
+  @import "/fonts/ahem.css";
+  html { font: 10px/1 Ahem; max-width: 800px; }
+</style>
+
+<style>
+  .pager {
+    column-fill: auto;
+    column-width: 15em;
+    height: 5em;
+  }
+  .test {
+    height: 19.5em;
+    /* show bounds of test box without interfering with margin-collapsing */
+    border-inline: solid black 1em;
+  }
+  .large, .float {
+    height: 2.5em;
+    break-inside: avoid;
+    background: orange;
+  }
+  .float {
+    float: right;
+  }
+  .margin {
+    padding: 0.2em; /* using padding because of margin handling bugs
+    margin-block: 0.5em;
+  }
+  .margin > * {
+    margin-block: -0.3em;
+switch back once fixed */
+  }
+  hr {
+    border: solid 1px; margin: 0.5em;
+  }
+
+  /* readability */
+  .pager { border: solid 2px gray; margin: 0.5em 0; }
+  .test  { color: #8888; text-align: center; }
+  .label { color: black; font-weight: bold; }
+</style>
+
+<!--
+   This test creates breaks:
+     * between two blocks with collapsing negative margins
+     * through the middle of a float
+     * through some nested text
+     * after a nested float
+-->
+
+<div class="pager">
+  <div class="test">
+      <span class="label">CENTER</span>
+      <div class="margin">
+        <div class="large"></div>
+        <div class="large"></div>
+      </div>
+      LINE 1<br>
+      <div class="float">FLT</div>
+      LINE 2<br>LINE 3
+      <hr>
+      <div>
+        LINE 4<br>LINE 5<br>LINE 6
+        <div class="float">FLT</div>
+      </div>
+      LINE 7
+    </div>
+  </div>
+</div>
+
+<div class="pager">
+  <div class="test">
+      <span class="label">END</span>
+      <div class="margin">
+        <div class="large"></div>
+        <div class="large"></div>
+      </div>
+      LINE 1<br>
+      <div class="float">FLT</div>
+      LINE 2<br>LINE 3
+      <hr>
+      <div>
+        LINE 4<br>LINE 5<br>LINE 6
+        <div class="float">FLT</div>
+      </div>
+      LINE 7
+    </div>
+  </div>
+</div>
+
+<div class="pager">
+  <div class="test">
+      <span class="label">BASELINE</span>
+      <div class="margin">
+        <div class="large"></div>
+        <div class="large"></div>
+      </div>
+      LINE 1<br>
+      <div class="float">FLT</div>
+      LINE 2<br>LINE 3
+      <hr>
+      <div>
+        LINE 4<br>LINE 5<br>LINE 6
+        <div class="float">FLT</div>
+      </div>
+      LINE 7
+    </div>
+  </div>
+</div>
+
+<div class="pager">
+  <div class="test">
+      <span class="label">LAST BASELINE</span>
+      <div class="margin">
+        <div class="large"></div>
+        <div class="large"></div>
+      </div>
+      LINE 1<br>
+      <div class="float">FLT</div>
+      LINE 2<br>LINE 3
+      <hr>
+      <div>
+        LINE 4<br>LINE 5<br>LINE 6
+        <div class="float">FLT</div>
+      </div>
+      LINE 7
+    </div>
+  </div>
+</div>
+
+<div class="pager">
+  <div class="test">
+      <span class="label">UNSAFE CENTER</span>
+      <div class="margin">
+        <div class="large"></div>
+        <div class="large"></div>
+      </div>
+      LINE 1<br>
+      <div class="float">FLT</div>
+      LINE 2<br>LINE 3
+      <hr>
+      <div>
+        LINE 4<br>LINE 5<br>LINE 6
+        <div class="float">FLT</div>
+      </div>
+      LINE 7
+    </div>
+  </div>
+</div>
+
+<div class="pager">
+  <div class="test">
+      <span class="label">UNSAFE END</span>
+      <div class="margin">
+        <div class="large"></div>
+        <div class="large"></div>
+      </div>
+      LINE 1<br>
+      <div class="float">FLT</div>
+      LINE 2<br>LINE 3
+      <hr>
+      <div>
+        LINE 4<br>LINE 5<br>LINE 6
+        <div class="float">FLT</div>
+      </div>
+      LINE 7
+    </div>
+  </div>
+</div>
diff --git a/tests/wpt/tests/css/css-align/blocks/align-content-block-break-content-020.html b/tests/wpt/tests/css/css-align/blocks/align-content-block-break-content-020.html
new file mode 100644
index 00000000000..83267301b4c
--- /dev/null
+++ b/tests/wpt/tests/css/css-align/blocks/align-content-block-break-content-020.html
@@ -0,0 +1,177 @@
+<!DOCTYPE html>
+<title>CSS Box Alignment: align-content block fragmentation: complex block content</title>
+<link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact">
+<link rel="help" href="https://www.w3.org/TR/css-align-3/#align-block">
+<meta name="flags" content="may">
+<!-- fragmented alignment is underdefined; these are two possibilities -->
+<link rel="match" href="align-content-block-break-content-010-aligned-ref.html">
+<link rel="match" href="align-content-block-break-content-010-unaligned-ref.html">
+
+<style title="Needed for automation; delete to review/debug">
+  @import "/fonts/ahem.css";
+  html { font: 10px/1 Ahem; max-width: 800px; }
+</style>
+
+<style>
+  .pager {
+    column-fill: auto;
+    column-width: 15em;
+    height: 5em;
+  }
+  .test {
+    height: 19.5em;
+    /* show bounds of test box without interfering with margin-collapsing */
+    border-inline: solid black 1em;
+  }
+  .large, .float {
+    height: 2.5em;
+    break-inside: avoid;
+    background: orange;
+  }
+  .float {
+    float: right;
+  }
+  .margin {
+    padding: 0.2em; /* using padding because of margin handling bugs
+    margin-block: 0.5em;
+  }
+  .margin > * {
+    margin-block: -0.3em;
+switch back once fixed */
+  }
+  hr {
+    border: solid 1px; margin: 0.5em; }
+
+  /* readability */
+  .pager { border: solid 2px gray; margin: 0.5em 0; }
+  .test { color: #8888; text-align: center; }
+  .label { color: black; font-weight: bold; }
+</style>
+
+<!--
+   This test creates breaks:
+     * between two blocks with collapsing negative margins
+     * through the middle of a float
+     * through some nested text
+     * after a nested float
+-->
+
+<div class="pager">
+  <div class="test" style="align-content: center">
+      <span class="label">CENTER</span>
+      <div class="margin">
+        <div class="large"></div>
+        <div class="large"></div>
+      </div>
+      LINE 1<br>
+      <div class="float">FLT</div>
+      LINE 2<br>LINE 3
+      <hr>
+      <div>
+        LINE 4<br>LINE 5<br>LINE 6
+        <div class="float">FLT</div>
+      </div>
+      LINE 7
+    </div>
+  </div>
+</div>
+
+<div class="pager">
+  <div class="test" style="align-content: end">
+      <span class="label">END</span>
+      <div class="margin">
+        <div class="large"></div>
+        <div class="large"></div>
+      </div>
+      LINE 1<br>
+      <div class="float">FLT</div>
+      LINE 2<br>LINE 3
+      <hr>
+      <div>
+        LINE 4<br>LINE 5<br>LINE 6
+        <div class="float">FLT</div>
+      </div>
+      LINE 7
+    </div>
+  </div>
+</div>
+
+<div class="pager">
+  <div class="test" style="align-content: baseline">
+      <span class="label">BASELINE</span>
+      <div class="margin">
+        <div class="large"></div>
+        <div class="large"></div>
+      </div>
+      LINE 1<br>
+      <div class="float">FLT</div>
+      LINE 2<br>LINE 3
+      <hr>
+      <div>
+        LINE 4<br>LINE 5<br>LINE 6
+        <div class="float">FLT</div>
+      </div>
+      LINE 7
+    </div>
+  </div>
+</div>
+
+<div class="pager">
+  <div class="test" style="align-content: last baseline">
+      <span class="label">LAST BASELINE</span>
+      <div class="margin">
+        <div class="large"></div>
+        <div class="large"></div>
+      </div>
+      LINE 1<br>
+      <div class="float">FLT</div>
+      LINE 2<br>LINE 3
+      <hr>
+      <div>
+        LINE 4<br>LINE 5<br>LINE 6
+        <div class="float">FLT</div>
+      </div>
+      LINE 7
+    </div>
+  </div>
+</div>
+
+<div class="pager">
+  <div class="test" style="align-content: unsafe center">
+      <span class="label">UNSAFE CENTER</span>
+      <div class="margin">
+        <div class="large"></div>
+        <div class="large"></div>
+      </div>
+      LINE 1<br>
+      <div class="float">FLT</div>
+      LINE 2<br>LINE 3
+      <hr>
+      <div>
+        LINE 4<br>LINE 5<br>LINE 6
+        <div class="float">FLT</div>
+      </div>
+      LINE 7
+    </div>
+  </div>
+</div>
+
+<div class="pager">
+  <div class="test" style="align-content: unsafe end">
+      <span class="label">UNSAFE END</span>
+      <div class="margin">
+        <div class="large"></div>
+        <div class="large"></div>
+      </div>
+      LINE 1<br>
+      <div class="float">FLT</div>
+      LINE 2<br>LINE 3
+      <hr>
+      <div>
+        LINE 4<br>LINE 5<br>LINE 6
+        <div class="float">FLT</div>
+      </div>
+      LINE 7
+    </div>
+  </div>
+</div>
diff --git a/tests/wpt/tests/css/css-align/blocks/align-content-block-break-overflow-010-ref.html b/tests/wpt/tests/css/css-align/blocks/align-content-block-break-overflow-010-ref.html
new file mode 100644
index 00000000000..68af3244e53
--- /dev/null
+++ b/tests/wpt/tests/css/css-align/blocks/align-content-block-break-overflow-010-ref.html
@@ -0,0 +1,162 @@
+<!DOCTYPE html>
+<title>CSS Box Alignment: align-content fragmentation: simple block content</title>
+<link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact">
+<link rel="help" href="https://www.w3.org/TR/css-align-3/#align-block">
+
+<style title="Needed for automation; delete to review/debug">
+  @import "/fonts/ahem.css";
+  html { font: 10px/1 Ahem; max-width: 780px; }
+</style>
+
+<style>
+  .pager {
+    column-fill: auto;
+    column-width: 15em;
+    height: 5em;
+  }
+  .test {
+    height: 5em;
+    break-inside: avoid;
+    /* show bounds of test box without interfering with margin-collapsing */
+    border-inline: solid black 1em;
+  }
+  .test:last-child {
+    height: 4em;
+  }
+  .large, .float {
+    height: 2.5em;
+    break-inside: avoid;
+    padding: 2px; /* using padding because of margin handling bugs
+    margin: 2px;
+switch back once fixed */
+    background: orange;
+  }
+  .float {
+    float: right;
+  }
+  .nobr {
+    break-inside: avoid;
+  }
+
+  /* readability */
+  .pager { border: solid 2px gray; margin: 0.5em 0; }
+  .test  { color: #8888; text-align: center; }
+  .label { color: black; font-weight: bold; }
+</style>
+
+<!--
+   This test creates breaks in overflow:
+     * after some directly-contained text
+     * after a fixed-height block
+     * through some nested text
+     * after a block containing text
+-->
+
+<div class="pager">
+  <div class="test">
+      <span class="label">CENTER</span>
+      <br>LINE 2<br>LINE 3
+  </div>
+  <div class="test">
+      <div class="large"></div>
+  </div>
+  <div class="test">
+      <div class="large"></div>
+      LINE 4
+  </div>
+  <div class="test">
+      <div class="nobr">LINE 5<br>LINE 6</div>
+    </div>
+  </div>
+</div>
+
+
+<div class="pager">
+  <div class="test">
+      <span class="label">END</span>
+      <br>LINE 2<br>LINE 3
+  </div>
+  <div class="test">
+      <div class="large"></div>
+  </div>
+  <div class="test">
+      <div class="large"></div>
+      LINE 4
+  </div>
+  <div class="test">
+      <div class="nobr">LINE 5<br>LINE 6</div>
+    </div>
+  </div>
+</div>
+
+<div class="pager">
+  <div class="test">
+      <span class="label">BASELINE</span>
+      <br>LINE 2<br>LINE 3
+  </div>
+  <div class="test">
+      <div class="large"></div>
+  </div>
+  <div class="test">
+      <div class="large"></div>
+      LINE 4
+  </div>
+  <div class="test">
+      <div class="nobr">LINE 5<br>LINE 6</div>
+    </div>
+  </div>
+</div>
+
+<div class="pager">
+  <div class="test">
+      <span class="label">LAST BASELINE</span>
+      <br>LINE 2<br>LINE 3
+  </div>
+  <div class="test">
+      <div class="large"></div>
+  </div>
+  <div class="test">
+      <div class="large"></div>
+      LINE 4
+  </div>
+  <div class="test">
+      <div class="nobr">LINE 5<br>LINE 6</div>
+    </div>
+  </div>
+</div>
+
+<div class="pager">
+  <div class="test">
+      <span class="label">UNSAFE CENTER</span>
+      <br>LINE 2<br>LINE 3
+  </div>
+  <div class="test">
+      <div class="large"></div>
+  </div>
+  <div class="test">
+      <div class="large"></div>
+      LINE 4
+  </div>
+  <div class="test">
+      <div class="nobr">LINE 5<br>LINE 6</div>
+    </div>
+  </div>
+</div>
+
+<div class="pager">
+  <div class="test">
+      <span class="label">UNSAFE END</span>
+      <br>LINE 2<br>LINE 3
+  </div>
+  <div class="test">
+      <div class="large"></div>
+  </div>
+  <div class="test">
+      <div class="large"></div>
+      LINE 4
+  </div>
+  <div class="test">
+      <div class="nobr">LINE 5<br>LINE 6</div>
+    </div>
+  </div>
+</div>
diff --git a/tests/wpt/tests/css/css-align/blocks/align-content-block-break-overflow-010.html b/tests/wpt/tests/css/css-align/blocks/align-content-block-break-overflow-010.html
new file mode 100644
index 00000000000..cde57ad7a32
--- /dev/null
+++ b/tests/wpt/tests/css/css-align/blocks/align-content-block-break-overflow-010.html
@@ -0,0 +1,154 @@
+<!DOCTYPE html>
+<title>CSS Box Alignment: align-content fragmentation: simple block content</title>
+<link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact">
+<link rel="help" href="https://www.w3.org/TR/css-align-3/#align-block">
+<meta name="flags" content="may">
+<!-- fragmented alignment is underdefined; this is one possibility -->
+<link rel="match" href="align-content-block-break-overflow-010-ref.html">
+
+<style title="Needed for automation; delete to review/debug">
+  @import "/fonts/ahem.css";
+  html { font: 10px/1 Ahem; max-width: 780px; }
+</style>
+
+<style>
+  .pager {
+    column-fill: auto;
+    column-width: 15em;
+    height: 5em;
+  }
+  .test {
+    height: 19em;
+    /* show bounds of test box without interfering with margin-collapsing */
+    border-inline: solid black 1em;
+  }
+  .overflow {
+    height: 0;
+    /* show bounds of overflow box without interfering with margin-collapsing */
+    background: red;
+  }
+  .large, .float {
+    height: 2.5em;
+    break-inside: avoid;
+    padding: 2px; /* using padding because of margin handling bugs
+    margin: 2px;
+switch back once fixed */
+    background: orange;
+  }
+  .float {
+    float: right;
+  }
+  .nobr {
+    break-inside: avoid;
+  }
+
+  /* readability */
+  .pager { border: solid 2px gray; margin: 0.5em 0; }
+  .test  { color: #8888; text-align: center; }
+  .label { color: black; font-weight: bold; }
+</style>
+
+<!--
+   This test creates breaks in overflow:
+     * after some directly-contained text
+     * after a fixed-height block
+     * through some nested text
+     * after a block containing text
+-->
+
+<div class="pager">
+  <div class="test" style="align-content: center">
+      <span class="label">CENTER</span>
+      <div class="overflow">
+        LINE 2<br>LINE 3
+        <div class="large"></div>
+        <div class="large"></div>
+        <div>
+          LINE 4
+          <div class="nobr">LINE 5<br>LINE 6</div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+
+
+<div class="pager">
+  <div class="test" style="align-content: end">
+      <span class="label">END</span>
+      <div class="overflow">
+        LINE 2<br>LINE 3
+        <div class="large"></div>
+        <div class="large"></div>
+        <div>
+          LINE 4
+          <div class="nobr">LINE 5<br>LINE 6</div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+
+<div class="pager">
+  <div class="test" style="align-content: baseline">
+      <span class="label">BASELINE</span>
+      <div class="overflow">
+        LINE 2<br>LINE 3
+        <div class="large"></div>
+        <div class="large"></div>
+        <div>
+          LINE 4
+          <div class="nobr">LINE 5<br>LINE 6</div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+
+<div class="pager">
+  <div class="test" style="align-content: last baseline">
+      <span class="label">LAST BASELINE</span>
+      <div class="overflow">
+        LINE 2<br>LINE 3
+        <div class="large"></div>
+        <div class="large"></div>
+        <div>
+          LINE 4
+          <div class="nobr">LINE 5<br>LINE 6</div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+
+<div class="pager">
+  <div class="test" style="align-content: unsafe center">
+      <span class="label">UNSAFE CENTER</span>
+      <div class="overflow">
+        LINE 2<br>LINE 3
+        <div class="large"></div>
+        <div class="large"></div>
+        <div>
+          LINE 4
+          <div class="nobr">LINE 5<br>LINE 6</div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+
+<div class="pager">
+  <div class="test" style="align-content: unsafe end">
+      <span class="label">UNSAFE END</span>
+      <div class="overflow">
+        LINE 2<br>LINE 3
+        <div class="large"></div>
+        <div class="large"></div>
+        <div>
+          LINE 4
+          <div class="nobr">LINE 5<br>LINE 6</div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/tests/wpt/tests/css/css-align/blocks/align-content-block-break-overflow-020-ref.html b/tests/wpt/tests/css/css-align/blocks/align-content-block-break-overflow-020-ref.html
new file mode 100644
index 00000000000..7b27284cdf4
--- /dev/null
+++ b/tests/wpt/tests/css/css-align/blocks/align-content-block-break-overflow-020-ref.html
@@ -0,0 +1,215 @@
+<!DOCTYPE html>
+<title>CSS Box Alignment: align-content block fragmentation: complex block content</title>
+<link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact">
+<link rel="help" href="https://www.w3.org/TR/css-align-3/#align-block">
+
+<style title="Needed for automation; delete to review/debug">
+  @import "/fonts/ahem.css";
+  html { font: 10px/1 Ahem; max-width: 800px; }
+</style>
+
+<style>
+  .pager {
+    column-fill: auto;
+    column-width: 15em;
+    height: 5em;
+  }
+  .test {
+    height: 5em;
+    break-inside: avoid;
+    /* show bounds of test box without interfering with margin-collapsing */
+    border-left: solid black 1em;
+  }
+  .test:last-child {
+    height: 4.5em;
+  }
+  .large, .float {
+    height: 2.5em;
+    break-inside: avoid;
+    background: orange;
+  }
+  .float {
+    float: right;
+  }
+  .margin {
+    padding: 0.2em; /* using padding because of margin handling bugs
+    margin-block: 0.5em;
+  }
+  .margin > * {
+    margin-block: -0.3em;
+switch back once fixed */
+  }
+  hr {
+    border: solid 1px;
+    margin: 0.5em;
+  }
+
+  /* readability */
+  .pager { border: solid 2px gray; margin: 0.5em 0; }
+  .test  { color: #8888; text-align: center; }
+  .label { color: black; font-weight: bold; }
+
+  /* reference */
+  /* margins are truncated by unforced breaks, so mimic that */
+  .margin:first-child { margin-top: 0; padding-top: 0; }
+  .margin:last-child  { margin-bottom: 0; padding-bottom: 0; }
+
+</style>
+
+<!--
+   This test creates breaks in overflow:
+     * between two blocks with collapsing negative margins
+     * through the middle of a float
+     * through some nested text
+     * after a nested float
+-->
+
+<div class="pager">
+  <div class="test">
+    <span class="label">CENTER</span>
+    <div class="margin">
+      <div class="large"></div>
+    </div>
+  </div>
+  <div class="test">
+    <div class="margin">
+      <div class="large"></div>
+    </div>
+    LINE 1<br>LINE 2
+  </div>
+  <div class="test">
+    <div class="float">FLT</div>
+    LINE 3
+    <hr>
+    LINE 4<br>LINE 5
+  </div>
+  <div class="test">
+    <div class="float">FLT</div>
+    LINE 6<br>LINE 7
+  </div>
+</div>
+
+<div class="pager">
+  <div class="test">
+    <span class="label">END</span>
+    <div class="margin">
+      <div class="large"></div>
+    </div>
+  </div>
+  <div class="test">
+    <div class="margin">
+      <div class="large"></div>
+    </div>
+    LINE 1<br>LINE 2
+  </div>
+  <div class="test">
+    <div class="float">FLT</div>
+    LINE 3
+    <hr>
+    LINE 4<br>LINE 5
+  </div>
+  <div class="test">
+    <div class="float">FLT</div>
+    LINE 6<br>LINE 7
+  </div>
+</div>
+
+<div class="pager">
+  <div class="test">
+      <span class="label">BASELINE</span>
+    <div class="margin">
+      <div class="large"></div>
+    </div>
+  </div>
+  <div class="test">
+    <div class="margin">
+      <div class="large"></div>
+    </div>
+    LINE 1<br>LINE 2
+  </div>
+  <div class="test">
+    <div class="float">FLT</div>
+    LINE 3
+    <hr>
+    LINE 4<br>LINE 5
+  </div>
+  <div class="test">
+    <div class="float">FLT</div>
+    LINE 6<br>LINE 7
+  </div>
+</div>
+
+<div class="pager">
+  <div class="test">
+      <span class="label">LAST BASELINE</span>
+    <div class="margin">
+      <div class="large"></div>
+    </div>
+  </div>
+  <div class="test">
+    <div class="margin">
+      <div class="large"></div>
+    </div>
+    LINE 1<br>LINE 2
+  </div>
+  <div class="test">
+    <div class="float">FLT</div>
+    LINE 3
+    <hr>
+    LINE 4<br>LINE 5
+  </div>
+  <div class="test">
+    <div class="float">FLT</div>
+    LINE 6<br>LINE 7
+  </div>
+</div>
+
+<div class="pager">
+  <div class="test">
+      <span class="label">UNSAFE CENTER</span>
+    <div class="margin">
+      <div class="large"></div>
+    </div>
+  </div>
+  <div class="test">
+    <div class="margin">
+      <div class="large"></div>
+    </div>
+    LINE 1<br>LINE 2
+  </div>
+  <div class="test">
+    <div class="float">FLT</div>
+    LINE 3
+    <hr>
+    LINE 4<br>LINE 5
+  </div>
+  <div class="test">
+    <div class="float">FLT</div>
+    LINE 6<br>LINE 7
+  </div>
+</div>
+
+<div class="pager">
+  <div class="test">
+      <span class="label">UNSAFE END</span>
+    <div class="margin">
+      <div class="large"></div>
+    </div>
+  </div>
+  <div class="test">
+    <div class="margin">
+      <div class="large"></div>
+    </div>
+    LINE 1<br>LINE 2
+  </div>
+  <div class="test">
+    <div class="float">FLT</div>
+    LINE 3
+    <hr>
+    LINE 4<br>LINE 5
+  </div>
+  <div class="test">
+    <div class="float">FLT</div>
+    LINE 6<br>LINE 7
+  </div>
+</div>
diff --git a/tests/wpt/tests/css/css-align/blocks/align-content-block-break-overflow-020.html b/tests/wpt/tests/css/css-align/blocks/align-content-block-break-overflow-020.html
new file mode 100644
index 00000000000..5f4b3d9555a
--- /dev/null
+++ b/tests/wpt/tests/css/css-align/blocks/align-content-block-break-overflow-020.html
@@ -0,0 +1,195 @@
+<!DOCTYPE html>
+<title>CSS Box Alignment: align-content block fragmentation: complex block content</title>
+<link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact">
+<link rel="help" href="https://www.w3.org/TR/css-align-3/#align-block">
+<meta name="flags" content="may">
+<!-- fragmented alignment is underdefined; this is one possibility -->
+<link rel="match" href="align-content-block-break-overflow-010-ref.html">
+
+<style title="Needed for automation; delete to review/debug">
+  @import "/fonts/ahem.css";
+  html { font: 10px/1 Ahem; max-width: 800px; }
+</style>
+
+<style>
+  .pager {
+    column-fill: auto;
+    column-width: 15em;
+    height: 5em;
+  }
+  .test {
+    height: 19.5em;
+    /* show bounds of test box without interfering with margin-collapsing */
+    border-left: solid black 1em;
+  }
+  .overflow {
+    height: 0;
+    /* show bounds of overflow box without interfering with margin-collapsing */
+    background: red;
+  }
+  .large, .float {
+    height: 2.5em;
+    break-inside: avoid;
+    background: orange;
+  }
+  .float {
+    float: right;
+  }
+  .margin {
+    padding: 0.2em; /* using padding because of margin handling bugs
+    margin-block: 0.5em;
+  }
+  .margin > * {
+    margin-block: -0.3em;
+switch back once fixed */
+  }
+  hr {
+    border: solid 1px;
+    margin: 0.5em;
+  }
+
+  /* readability */
+  .pager { border: solid 2px gray; margin: 0.5em 0; }
+  .test  { color: #8888; text-align: center; }
+  .label { color: black; font-weight: bold; }
+</style>
+
+<!--
+   This test creates breaks in overflow:
+     * between two blocks with collapsing negative margins
+     * through the middle of a float
+     * through some nested text
+     * after a nested float
+-->
+
+<div class="pager">
+  <div class="test" style="align-content: center">
+      <span class="label">CENTER</span>
+      <div class="overflow">
+        <div class="margin">
+          <div class="large"></div>
+          <div class="large"></div>
+        </div>
+        LINE 1<br>
+        <div class="float">FLT</div>
+        LINE 2<br>LINE 3
+        <hr>
+        <div>
+          LINE 4<br>LINE 5<br>LINE 6
+          <div class="float">FLT</div>
+        </div>
+        LINE 7
+      </div>
+    </div>
+  </div>
+</div>
+
+<div class="pager">
+  <div class="test" style="align-content: end">
+      <span class="label">END</span>
+      <div class="overflow">
+        <div class="margin">
+          <div class="large"></div>
+          <div class="large"></div>
+        </div>
+        LINE 1<br>
+        <div class="float">FLT</div>
+        LINE 2<br>LINE 3
+        <hr>
+        <div>
+          LINE 4<br>LINE 5<br>LINE 6
+          <div class="float">FLT</div>
+        </div>
+        LINE 7
+      </div>
+    </div>
+  </div>
+</div>
+
+<div class="pager">
+  <div class="test" style="align-content: baseline">
+      <span class="label">BASELINE</span>
+      <div class="overflow">
+        <div class="margin">
+          <div class="large"></div>
+          <div class="large"></div>
+        </div>
+        LINE 1<br>
+        <div class="float">FLT</div>
+        LINE 2<br>LINE 3
+        <hr>
+        <div>
+          LINE 4<br>LINE 5<br>LINE 6
+          <div class="float">FLT</div>
+        </div>
+        LINE 7
+      </div>
+    </div>
+  </div>
+</div>
+
+<div class="pager">
+  <div class="test" style="align-content: last baseline">
+      <span class="label">LAST BASELINE</span>
+      <div class="overflow">
+        <div class="margin">
+          <div class="large"></div>
+          <div class="large"></div>
+        </div>
+        LINE 1<br>
+        <div class="float">FLT</div>
+        LINE 2<br>LINE 3
+        <hr>
+        <div>
+          LINE 4<br>LINE 5<br>LINE 6
+          <div class="float">FLT</div>
+        </div>
+        LINE 7
+      </div>
+    </div>
+  </div>
+</div>
+
+<div class="pager">
+  <div class="test" style="align-content: unsafe center">
+      <span class="label">UNSAFE CENTER</span>
+      <div class="overflow">
+        <div class="margin">
+          <div class="large"></div>
+          <div class="large"></div>
+        </div>
+        LINE 1<br>
+        <div class="float">FLT</div>
+        LINE 2<br>LINE 3
+        <hr>
+        <div>
+          LINE 4<br>LINE 5<br>LINE 6
+          <div class="float">FLT</div>
+        </div>
+        LINE 7
+      </div>
+    </div>
+  </div>
+</div>
+
+<div class="pager">
+  <div class="test" style="align-content: unsafe end">
+      <span class="label">UNSAFE END</span>
+      <div class="overflow">
+        <div class="margin">
+          <div class="large"></div>
+          <div class="large"></div>
+        </div>
+        LINE 1<br>
+        <div class="float">FLT</div>
+        LINE 2<br>LINE 3
+        <hr>
+        <div>
+          LINE 4<br>LINE 5<br>LINE 6
+          <div class="float">FLT</div>
+        </div>
+        LINE 7
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/tests/wpt/tests/css/css-align/blocks/align-content-block-overflow-000-ref.html b/tests/wpt/tests/css/css-align/blocks/align-content-block-overflow-000-ref.html
new file mode 100644
index 00000000000..8ca5407e4ca
--- /dev/null
+++ b/tests/wpt/tests/css/css-align/blocks/align-content-block-overflow-000-ref.html
@@ -0,0 +1,261 @@
+<!DOCTYPE html>
+<title>CSS Box Alignment: align-content on small block container with floats</title>
+<link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact">
+
+<style title="Needed for automation; delete to review/debug">
+  @import "/fonts/ahem.css";
+  html { font: 10px/1 Ahem; max-width: 800px; }
+  .label { display: none; }
+</style>
+
+<style>
+  html, body { margin: 0; padding: 0; }
+
+  .test { height: 1.8em; margin: 0.5em 2em; overflow: hidden;
+          /* show bounds of test box without interfering with margin-collapsing */
+          background: black; padding-right: 2px; }
+  /* ensure float is contained */
+    .float { float: right; background: orange; height: 2em }
+  /* ensure margin is contained */
+    .in-flow { margin-top: 1em; background: orange }
+  /* ensure relpos is ignored */
+    .relpos { position: relative; top: -1.5em; }
+  /* ensure abspos static position follows alignment */
+    .wrapper { position: relative; }
+    .abspos { position: absolute; right: 0; margin-top: -1.5em; }
+  /* ensure overflow is not counted */
+    .overflow { height: 0; }
+
+  /* cram into 800x600 */
+  html { max-height: 600px; columns: 3 }
+  .wrapper { break-inside: avoid; border: solid 2px gray; padding: 3em 0; }
+
+  /* readability */
+  .test > * { color: #8888; }
+  .label { color: black; font-weight: bold; }
+</style>
+
+<div class="wrapper">
+  <div class="test">
+    <div class="float">FLT</div>
+    <div style="padding-top: 0.5em; margin-bottom: -0.5em"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">START</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test">
+    <div class="float">FLT</div>
+    <div style="padding-top: 0.5em; margin-bottom: -0.5em"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">CENTER</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test">
+    <div class="float">FLT</div>
+    <div style="padding-top: 0.5em; margin-bottom: -0.5em"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">END</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test">
+    <div class="float">FLT</div>
+    <div style="padding-top: 0.5em; margin-bottom: -0.5em"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">BASELINE</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test">
+    <div class="float">FLT</div>
+    <div style="padding-top: 0.5em; margin-bottom: -0.5em"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">LAST BASELINE</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test">
+    <div class="float">FLT</div>
+    <div style="padding-top: 0.5em; margin-bottom: -0.5em"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">FLEX-START</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test">
+    <div class="float">FLT</div>
+    <div style="padding-top: 0.5em; margin-bottom: -0.5em"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">FLEX-END</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test">
+    <div class="float">FLT</div>
+    <div style="padding-top: 0.5em; margin-bottom: -0.5em"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">UNSAFE START</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test">
+    <div class="float" style="margin-top: -0.6em">FLT</div>
+    <div style="margin-bottom: -0.6em"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">UNSAFE CENTER</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test">
+    <div style="margin-bottom: -1.2em"></div>
+    <div class="in-flow">
+      <div class="float" style="margin-top: -1em">FLT</div>
+      <div class="float">FLT</div>
+      <span class="label">UNSAFE END</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test">
+    <div class="float">FLT</div>
+    <div style="padding-top: 0.5em; margin-bottom: -0.5em"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">SAFE START</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test">
+    <div class="float">FLT</div>
+    <div style="padding-top: 0.5em; margin-bottom: -0.5em"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">SAFE CENTER</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test">
+    <div class="float">FLT</div>
+    <div style="padding-top: 0.5em; margin-bottom: -0.5em"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">SAFE END</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test">
+    <div class="float">FLT</div>
+    <div style="padding-top: 0.5em; margin-bottom: -0.5em"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">SPACE-EVENLY</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test">
+    <div class="float">FLT</div>
+    <div style="padding-top: 0.5em; margin-bottom: -0.5em"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">SPACE-BETWEEN</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test">
+    <div class="float">FLT</div>
+    <div style="padding-top: 0.5em; margin-bottom: -0.5em"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">SPACE-AROUND</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test">
+    <div class="float">FLT</div>
+    <div></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">NORMAL</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+
+<p>
+  <button onclick="document.querySelector('style[title]').textContent = 'html { font: 10px/1 sans-serif; }'">Show Text</button>
diff --git a/tests/wpt/tests/css/css-align/blocks/align-content-block-overflow-000.html b/tests/wpt/tests/css/css-align/blocks/align-content-block-overflow-000.html
new file mode 100644
index 00000000000..c53606a0589
--- /dev/null
+++ b/tests/wpt/tests/css/css-align/blocks/align-content-block-overflow-000.html
@@ -0,0 +1,264 @@
+<!DOCTYPE html>
+<html>
+<title>CSS Box Alignment: align-content + overflow:hidden on small block container with floats</title>
+<link rel="help" href="https://www.w3.org/TR/css-align-3/#align-block">
+<link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact">
+<link rel="match" href="align-content-block-overflow-000-ref.html">
+
+<style title="Needed for automation; delete to review/debug">
+  @import "/fonts/ahem.css";
+  html { font: 10px/1 Ahem; max-width: 800px; }
+  .label { display: none; }
+</style>
+
+<style>
+  html, body { margin: 0; padding: 0; }
+
+  .test { height: 1.8em; margin: 0.5em 2em; overflow: hidden;
+          /* show bounds of test box without interfering with margin-collapsing */
+          background: black; padding-right: 2px; }
+  /* ensure float is contained */
+    .float { float: right; background: orange; height: 2em }
+  /* ensure margin is contained */
+    .in-flow { margin-top: 1em; background: orange }
+  /* ensure relpos is ignored */
+    .relpos { position: relative; top: -1.5em; }
+  /* ensure abspos static position follows alignment */
+    .wrapper { position: relative; }
+    .abspos { position: absolute; right: 0; margin-top: -1.5em; }
+  /* ensure overflow is not counted */
+    .overflow { height: 0; }
+
+  /* cram into 800x600 */
+  html { max-height: 600px; columns: 3 }
+  .wrapper { break-inside: avoid; border: solid 2px gray; padding: 3em 0; }
+
+  /* readability */
+  .test > * { color: #8888; }
+  .label { color: black; font-weight: bold; }
+</style>
+
+<div class="wrapper">
+  <div class="test" style="align-content: start">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">START</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: center">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">CENTER</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: end">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">END</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: baseline">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">BASELINE</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: last baseline">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">LAST BASELINE</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: flex-start">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">FLEX-START</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: flex-end">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">FLEX-END</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: unsafe start">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">UNSAFE START</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: unsafe center">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">UNSAFE CENTER</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: unsafe end">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">UNSAFE END</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: safe start">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">SAFE START</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: safe center">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">SAFE CENTER</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: safe end">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">SAFE END</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: space-evenly">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">SPACE-EVENLY</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: space-between">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">SPACE-BETWEEN</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: space-around">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">SPACE-AROUND</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+<div class="wrapper">
+  <div class="test" style="align-content: normal">
+    <div class="float">FLT</div>
+    <div class="in-flow"></div>
+    <div class="in-flow">
+      <div class="float">FLT</div>
+      <span class="label">NORMAL</span>
+      <span class="abspos">ABS</span>
+      <span class="relpos">REL</span>
+      <div class="overflow">OVERFLOW</div>
+    </div>
+  </div>
+</div>
+
+<p>
+  <button onclick="document.querySelector('style[title]').textContent = 'html { font: 10px/1 sans-serif; }'">Show Text</button>
diff --git a/tests/wpt/tests/css/css-anchor-position/anchor-name-004.html b/tests/wpt/tests/css/css-anchor-position/anchor-name-004.html
new file mode 100644
index 00000000000..ebe96df7401
--- /dev/null
+++ b/tests/wpt/tests/css/css-anchor-position/anchor-name-004.html
@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-anchor-position-1/#determining">
+<link rel="author" href="mailto:xiaochengh@chromium.org">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/check-layout-th.js"></script>
+<script src="support/test-common.js"></script>
+<style>
+.relpos {
+  position: relative;
+}
+.anchor1 {
+  anchor-name: --a1, --a2;
+  width: 30px;
+  height: 10px;
+  background: orange;
+}
+.target {
+  position: absolute;
+  height: 10px;
+  background: lime;
+}
+#target1 {
+  width: anchor-size(--a1 width);
+}
+#target2 {
+  width: anchor-size(--a2 width);
+}
+#target3 {
+  width: anchor-size(--a3 width, 11px);
+}
+</style>
+<body onload="checkLayoutForAnchorPos('.target')">
+  <!--
+    First two targets should find the same anchor via different names.
+    Third target shouldn't find the anchor, as the name is invalid.
+  -->
+  <div class="relpos">
+    <div class="anchor1" style="width: 30px"></div>
+    <div class="target" id="target1" data-expected-width=30></div>
+    <div class="target" id="target2" data-expected-width=30></div>
+    <div class="target" id="target3" data-expected-width=11></div>
+  </div>
+</body>
diff --git a/tests/wpt/tests/css/css-anchor-position/anchor-name-basics.html b/tests/wpt/tests/css/css-anchor-position/anchor-name-basics.html
index 1d88b941377..9523ee87725 100644
--- a/tests/wpt/tests/css/css-anchor-position/anchor-name-basics.html
+++ b/tests/wpt/tests/css/css-anchor-position/anchor-name-basics.html
@@ -14,18 +14,19 @@
 </div>
 
 <script>
-// anchor-name: none | <dashed-ident>
+// anchor-name: none | <dashed-ident>#
 test_valid_value('anchor-name', 'none');
 test_valid_value('anchor-name', '--foo');
+test_valid_value('anchor-name', '--foo, --bar')
 test_invalid_value('anchor-name', 'foo-bar');
 test_invalid_value('anchor-name', '--foo --bar')
-test_invalid_value('anchor-name', '--foo, --bar')
 test_invalid_value('anchor-name', '100px');
 test_invalid_value('anchor-name', '100%');
 
 // Computed value: as specified
 test_computed_value('anchor-name', 'none');
 test_computed_value('anchor-name', '--foo');
+test_computed_value('anchor-name', '--foo, --bar');
 
 // Initial: none
 // Inherited: no
diff --git a/tests/wpt/tests/css/css-anchor-position/anchor-position-auto-004.html b/tests/wpt/tests/css/css-anchor-position/anchor-position-auto-004.html
new file mode 100644
index 00000000000..befd5fcff06
--- /dev/null
+++ b/tests/wpt/tests/css/css-anchor-position/anchor-position-auto-004.html
@@ -0,0 +1,60 @@
+<!DOCTYPE html>
+<title>Tests auto fallbacks with scrolling</title>
+<link rel="author" href="mailto:xiaochengh@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-anchor-1/#scroll">
+<link rel="help" href="https://drafts.csswg.org/css-anchor-1/#fallback-automatic">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="support/test-common.js"></script>
+
+<style>
+#container {
+  position: relative;
+  width: 200px;
+  height: 300px;
+}
+
+#scroller {
+  height: 300px;
+  overflow-y: scroll;
+}
+
+#anchor {
+  width: 100px;
+  height: 100px;
+  margin-top: 200px;
+  margin-bottom: 200px;
+  background: orange;
+  anchor-name: --a;
+}
+
+#target {
+  position: absolute;
+  width: 100px;
+  height: 100px;
+  anchor-default: --a;
+  left: anchor(left);
+  top: anchor(auto);
+  background: lime;
+}
+</style>
+
+<div id="container">
+  <div id="scroller">
+    <div id="anchor"></div>
+  </div>
+  <div id="target"></div>
+</div>
+
+<script>
+promise_test(async () => {
+  await waitUntilNextAnimationFrame();
+  assert_fallback_position(target, anchor, 'top');
+}, 'Should be above the anchor when at initial scroll position');
+
+promise_test(async () => {
+  scroller.scrollTop = 100;
+  await waitUntilNextAnimationFrame();
+  assert_fallback_position(target, anchor, 'bottom');
+}, 'Scroll down to allow enough space below the anchor, should move target below');
+</script>
diff --git a/tests/wpt/tests/css/css-anchor-position/at-fallback-position-allowed-declarations.html b/tests/wpt/tests/css/css-anchor-position/at-fallback-position-allowed-declarations.html
index 873fa131400..25f6a14577f 100644
--- a/tests/wpt/tests/css/css-anchor-position/at-fallback-position-allowed-declarations.html
+++ b/tests/wpt/tests/css/css-anchor-position/at-fallback-position-allowed-declarations.html
@@ -45,6 +45,19 @@ test_allowed_declaration('inset-block');
 test_allowed_declaration('inset-inline');
 test_allowed_declaration('inset');
 
+// Margin properties are allowed
+test_allowed_declaration('margin-top');
+test_allowed_declaration('margin-bottom');
+test_allowed_declaration('margin-left');
+test_allowed_declaration('margin-right');
+test_allowed_declaration('margin-block-start');
+test_allowed_declaration('margin-block-end');
+test_allowed_declaration('margin-inline-start');
+test_allowed_declaration('margin-inline-end');
+test_allowed_declaration('margin-block');
+test_allowed_declaration('margin-inline');
+test_allowed_declaration('margin');
+
 // Sizing properties are allowed
 test_allowed_declaration('width');
 test_allowed_declaration('height');
@@ -70,13 +83,6 @@ test_allowed_declaration('align-self', 'normal');
 // Custom properties are disallowed
 test_disallowed_declaration('--custom');
 
-// Margin properties are disallowed
-test_disallowed_declaration('margin-left');
-test_disallowed_declaration('margin-right');
-test_disallowed_declaration('margin-top');
-test_disallowed_declaration('margin-bottom');
-test_disallowed_declaration('margin');
-
 // Test some other disallowed properties
 test_disallowed_declaration('font-size');
 test_disallowed_declaration('border-width');
diff --git a/tests/wpt/tests/css/css-anchor-position/position-fallback-004.html b/tests/wpt/tests/css/css-anchor-position/position-fallback-004.html
new file mode 100644
index 00000000000..e4dbd718664
--- /dev/null
+++ b/tests/wpt/tests/css/css-anchor-position/position-fallback-004.html
@@ -0,0 +1,74 @@
+<!DOCTYPE html>
+<title>Tests margin properties in position fallback</title>
+<link rel="help" href="https://drafts.csswg.org/css-anchor-position-1/#accepted-try-properties">
+<link rel="author" href="mailto:xiaochengh@chromium.org">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/check-layout-th.js"></script>
+<script src="support/test-common.js"></script>
+
+<style>
+body {
+  margin: 0;
+}
+
+.cb {
+  width: 300px;
+  height: 150px;
+  position: relative;
+  background: lightgray;
+}
+
+.anchor {
+  position: absolute;
+  width: 100px;
+  height: 100px;
+  top: 25px;
+  background: orange;
+  anchor-name: --a;
+}
+
+.target {
+  position: absolute;
+  width: 100px;
+  height: 100px;
+  background: lime;
+  position-fallback: --fallbacks;
+}
+
+@position-fallback --fallbacks {
+  @try {
+    top: anchor(--a top);
+    right: anchor(--a left);
+    margin-top: 10px;
+    margin-right: 10px;
+  }
+
+  @try {
+    bottom: anchor(--a bottom);
+    left: anchor(--a right);
+    margin-bottom: 10px;
+    margin-left: 10px;
+  }
+}
+</style>
+
+<body onload="checkLayoutForAnchorPos('.target')">
+
+<div class=cb>
+  <div class=anchor style="left: 110px"></div>
+  <!-- Chooses 1st @try block. -->
+  <div class=target data-offset-x=0
+       data-expected-margin-left=0 data-expected-margin-right=10
+       data-expected-margin-top=10 data-expected-margin-bottom=0></div>
+</div>
+
+<div class=cb>
+  <div class=anchor style="right: 110px"></div>
+  <!-- Chooses 2nd @try block. -->
+  <div class=target data-offset-x=200
+       data-expected-margin-left=10 data-expected-margin-right=0
+       data-expected-margin-top=0 data-expected-margin-bottom=10></div>
+</div>
+
+</body>
diff --git a/tests/wpt/tests/css/css-backgrounds/animations/box-shadow-interpolation.html b/tests/wpt/tests/css/css-backgrounds/animations/box-shadow-interpolation.html
index 4ed55abc9e6..f0b7ec083ed 100644
--- a/tests/wpt/tests/css/css-backgrounds/animations/box-shadow-interpolation.html
+++ b/tests/wpt/tests/css/css-backgrounds/animations/box-shadow-interpolation.html
@@ -194,5 +194,45 @@ test_no_interpolation({
   from: '10px 20px yellow, 5px 10px green',
   to: 'inset 5px 10px green, 15px 20px blue'
 });
+
+// Test CSS color 4 color types
+test_interpolation({
+  property: 'box-shadow',
+  from: '10px 10px 10px 10px rgb(0 0 0)',
+  to: '10px 10px 10px 10px color(srgb 1 1 1)',
+}, [
+{at: -0.3, expect: '10px 10px 10px 10px oklab(0 0 0)'},
+  {at: 0, expect: '10px 10px 10px 10px oklab(0 0 0)'},
+  {at: 0.3, expect: '10px 10px 10px 10px oklab(0.3 0 0)'},
+  {at: 0.6, expect: '10px 10px 10px 10px oklab(0.6 0 0)'},
+  {at: 1, expect: '10px 10px 10px 10px oklab(1 0 0)'},
+  {at: 1.5, expect: '10px 10px 10px 10px oklab(1 0 0)'},
+]);
+
+test_interpolation({
+  property: 'box-shadow',
+  from: '10px 10px 10px 10px color(srgb 0, 0, 0)',
+  to: '10px 10px 10px 10px rgb(255 255 255)',
+}, [
+{at: -0.3, expect: '10px 10px 10px 10px oklab(0 0 0)'},
+  {at: 0, expect: '10px 10px 10px 10px oklab(0 0 0)'},
+  {at: 0.3, expect: '10px 10px 10px 10px oklab(0.3 0 0)'},
+  {at: 0.6, expect: '10px 10px 10px 10px oklab(0.6 0 0)'},
+  {at: 1, expect: '10px 10px 10px 10px oklab(1 0 0)'},
+  {at: 1.5, expect: '10px 10px 10px 10px oklab(1 0 0)'},
+]);
+
+test_interpolation({
+  property: 'box-shadow',
+  from: '10px 10px 10px 10px color(srgb 0, 0, 0)',
+  to: '10px 10px 10px 10px color(srgb 1 1 1)',
+}, [
+{at: -0.3, expect: '10px 10px 10px 10px oklab(0 0 0)'},
+  {at: 0, expect: '10px 10px 10px 10px oklab(0 0 0)'},
+  {at: 0.3, expect: '10px 10px 10px 10px oklab(0.3 0 0)'},
+  {at: 0.6, expect: '10px 10px 10px 10px oklab(0.6 0 0)'},
+  {at: 1, expect: '10px 10px 10px 10px oklab(1 0 0)'},
+  {at: 1.5, expect: '10px 10px 10px 10px oklab(1 0 0)'},
+]);
 </script>
 </body>
diff --git a/tests/wpt/tests/css/css-backgrounds/border-image-repeat-round-003.html b/tests/wpt/tests/css/css-backgrounds/border-image-repeat-round-003.html
index c2cb2372bc7..034a5ed98a0 100644
--- a/tests/wpt/tests/css/css-backgrounds/border-image-repeat-round-003.html
+++ b/tests/wpt/tests/css/css-backgrounds/border-image-repeat-round-003.html
@@ -8,7 +8,7 @@
 
   Created: June 21st 2023
 
-  Last modified: June 25th 2023
+  Last modified: August 23rd 2023
 
   -->
 
@@ -44,6 +44,7 @@
       border-image-slice: 64 fill; /* the center will be black */
       border-image-source: url("support/4bicolor-squares.png");
       display: inline-block;
+      image-rendering: pixelated; /* attempt to overcome antialias fuzziness */
       margin-right: 1em;
       vertical-align: bottom;
    }
diff --git a/tests/wpt/tests/css/css-backgrounds/border-image-repeat-round-stretch-001.html b/tests/wpt/tests/css/css-backgrounds/border-image-repeat-round-stretch-001.html
index 2a23e789f90..fa681b22ed3 100644
--- a/tests/wpt/tests/css/css-backgrounds/border-image-repeat-round-stretch-001.html
+++ b/tests/wpt/tests/css/css-backgrounds/border-image-repeat-round-stretch-001.html
@@ -8,7 +8,7 @@
 
   Created: June 23rd 2023
 
-  Last modified: June 23rd 2023
+  Last modified: August 23rd 2023
 
   -->
 
@@ -53,6 +53,7 @@
       border-image-slice: 64 fill; /* the center will be black */
       border-image-source: url("support/4bicolor-squares.png");
       display: inline-block;
+      image-rendering: pixelated; /* attempt to overcome antialias fuzziness */
       margin-right: 1em;
    }
 
diff --git a/tests/wpt/tests/css/css-backgrounds/border-image-repeat-stretch-round-001.html b/tests/wpt/tests/css/css-backgrounds/border-image-repeat-stretch-round-001.html
index 2ac51fecf23..8c2963a5aec 100644
--- a/tests/wpt/tests/css/css-backgrounds/border-image-repeat-stretch-round-001.html
+++ b/tests/wpt/tests/css/css-backgrounds/border-image-repeat-stretch-round-001.html
@@ -8,7 +8,7 @@
 
   Created: June 23rd 2023
 
-  Last modified: June 23rd 2023
+  Last modified: August 23rd 2023
 
   -->
 
@@ -53,6 +53,7 @@
       border-image-slice: 64 fill; /* the center will be black */
       border-image-source: url("support/4bicolor-squares.png");
       display: inline-block;
+      image-rendering: pixelated; /* attempt to overcome antialias fuzziness */
       margin-right: 1em;
    }
 
diff --git a/tests/wpt/tests/css/css-backgrounds/box-shadow/slice-block-fragmentation-001-ref.html b/tests/wpt/tests/css/css-backgrounds/box-shadow/slice-block-fragmentation-001-ref.html
index 7e64fa9f63b..66951d44b75 100644
--- a/tests/wpt/tests/css/css-backgrounds/box-shadow/slice-block-fragmentation-001-ref.html
+++ b/tests/wpt/tests/css/css-backgrounds/box-shadow/slice-block-fragmentation-001-ref.html
@@ -4,14 +4,18 @@
   .piece {
     position: absolute;
     left: 5px;
-    top: 5px;
+    top: 0;
     width: 95px;
-    height: 95px;
+    height: 100px;
     border: solid;
   }
+  .start {
+    top: 5px;
+    height: 95px;
+  }
 </style>
 <div style="position:relative; margin:50px;">
-  <div class="piece" style="border-width:0 5px 0 0;"></div>
+  <div class="piece start" style="border-width:0 5px 0 0"></div>
   <div class="piece" style="margin-left:120px; border-width:0 5px 0 0;"></div>
   <div class="piece" style="margin-left:240px; border-width:0 5px 5px 0;"></div>
 </div>
diff --git a/tests/wpt/tests/css/css-backgrounds/box-shadow/slice-block-fragmentation-002-ref.html b/tests/wpt/tests/css/css-backgrounds/box-shadow/slice-block-fragmentation-002-ref.html
index 2c148d8a52c..1453d544c23 100644
--- a/tests/wpt/tests/css/css-backgrounds/box-shadow/slice-block-fragmentation-002-ref.html
+++ b/tests/wpt/tests/css/css-backgrounds/box-shadow/slice-block-fragmentation-002-ref.html
@@ -6,12 +6,15 @@
     left: -5px;
     top: 0;
     width: 95px;
-    height: 95px;
+    height: 100px;
     border: solid;
   }
+  .end {
+    height: 95px;
+  }
 </style>
 <div style="position:relative; margin:50px;">
   <div class="piece" style="top:-5px; border-width:5px 0 0 5px;"></div>
   <div class="piece" style="margin-left:120px; border-width:0 0 0 5px;"></div>
-  <div class="piece" style="margin-left:240px; border-width:0 0 0 5px;"></div>
+  <div class="piece end" style="margin-left:240px; border-width:0 0 0 5px;"></div>
 </div>
diff --git a/tests/wpt/tests/css/css-backgrounds/box-shadow/slice-inline-fragmentation-001-ref.html b/tests/wpt/tests/css/css-backgrounds/box-shadow/slice-inline-fragmentation-001-ref.html
index 171e4935edd..e116d81691c 100644
--- a/tests/wpt/tests/css/css-backgrounds/box-shadow/slice-inline-fragmentation-001-ref.html
+++ b/tests/wpt/tests/css/css-backgrounds/box-shadow/slice-inline-fragmentation-001-ref.html
@@ -9,11 +9,11 @@
   <br>
   <span style="position:relative;">
     &nbsp;ppp&#xc9;&#xc9;&#xc9;&nbsp;
-    <div style="position:absolute; inset:5px 0 -5px 5px; border:solid black; border-width:0 0 5px 0;"></div>
+    <div style="position:absolute; inset:5px 0 -5px 0; border:solid black; border-width:0 0 5px 0;"></div>
   </span>
   <br>
   <span style="position:relative;">
     &nbsp;ppp&#xc9;&#xc9;&#xc9;&nbsp;
-    <div style="position:absolute; inset:5px -5px -5px 5px; border:solid black; border-width:0 5px 5px 0;"></div>
+    <div style="position:absolute; inset:5px -5px -5px 0; border:solid black; border-width:0 5px 5px 0;"></div>
   </span>
 </div>
diff --git a/tests/wpt/tests/css/css-backgrounds/box-shadow/slice-inline-fragmentation-002-ref.html b/tests/wpt/tests/css/css-backgrounds/box-shadow/slice-inline-fragmentation-002-ref.html
index baf297fe2c6..01bbf542125 100644
--- a/tests/wpt/tests/css/css-backgrounds/box-shadow/slice-inline-fragmentation-002-ref.html
+++ b/tests/wpt/tests/css/css-backgrounds/box-shadow/slice-inline-fragmentation-002-ref.html
@@ -4,12 +4,12 @@
 <div style="font:16px/40px Ahem; color:cyan;">
   <span style="position:relative;">
     &nbsp;ppp&#xc9;&#xc9;&#xc9;&nbsp;
-    <div style="position:absolute; inset:-5px 5px 5px -5px; border:solid black; border-width:5px 0 0 5px;"></div>
+    <div style="position:absolute; inset:-5px 0 5px -5px; border:solid black; border-width:5px 0 0 5px;"></div>
   </span>
   <br>
   <span style="position:relative;">
     &nbsp;ppp&#xc9;&#xc9;&#xc9;&nbsp;
-    <div style="position:absolute; inset:-5px 5px 5px 0; border:solid black; border-width:5px 0 0 0;"></div>
+    <div style="position:absolute; inset:-5px 0 5px 0; border:solid black; border-width:5px 0 0 0;"></div>
   </span>
   <br>
   <span style="position:relative;">
diff --git a/tests/wpt/tests/css/css-break/border-image-000.html b/tests/wpt/tests/css/css-break/border-image-000.html
new file mode 100644
index 00000000000..a588830310d
--- /dev/null
+++ b/tests/wpt/tests/css/css-break/border-image-000.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<title>'box-decoration-break: clone' and 'border-image'</title>
+<meta name="flags" content="ahem">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
+<link rel="help" href="https://www.w3.org/TR/css-break-3/#break-decoration">
+<link rel="match" href="reference/border-image-000-ref.html">
+<style>
+  .border-image {
+    font: 81px/1 Ahem;
+    color: transparent;
+    border-image: radial-gradient(green 50%, transparent 50%) 27 fill / 27px;
+    -webkit-box-decoration-break: clone;
+    box-decoration-break: clone;
+  }
+</style>
+<p>There should be two green circles below.</p>
+<div style="width: 81px">
+  <span class="border-image">A A</span>
+</div>
diff --git a/tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-049.html b/tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-049.html
index 0ede74a118c..ae683e938c2 100644
--- a/tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-049.html
+++ b/tests/wpt/tests/css/css-break/flexbox/multi-line-column-flex-fragmentation-049.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <title>
   Tests that a flex-item with an indefinite flex-basis expands if the
-  container hieght is auto.
+  container height is auto.
 </title>
 <link rel="help" href="https://drafts.csswg.org/css-flexbox-1/#pagination">
 <link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
diff --git a/tests/wpt/tests/css/css-break/float-in-inline-widows-orphans-crash.html b/tests/wpt/tests/css/css-break/float-in-inline-widows-orphans-crash.html
new file mode 100644
index 00000000000..be8645ddfa1
--- /dev/null
+++ b/tests/wpt/tests/css/css-break/float-in-inline-widows-orphans-crash.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1486252">
+<div style="columns:10em; orphans:2; widows:2; height:20px; column-fill:auto; line-height:20px; background:yellow;">
+  <div style="float:left; width:100%; height:30px; background:cyan;"></div>
+  <br>
+  <div style="float:left; contain:size; width:1px; height:10px; background:hotpink;"></div>
+  <div style="float:left; width:10px; height:10px; background:blue;"></div>
+  allworkandnoplaymakesjackadullstableboy
+</div>
diff --git a/tests/wpt/tests/css/css-break/inline-with-float-001.html b/tests/wpt/tests/css/css-break/inline-with-float-001.html
new file mode 100644
index 00000000000..b6a6e1958ff
--- /dev/null
+++ b/tests/wpt/tests/css/css-break/inline-with-float-001.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1113185">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<style>
+  .ib {
+    display: inline-block;
+    width: 100%;
+    vertical-align: top;
+    background: green;
+  }
+</style>
+<div style="columns:4; gap:0; column-fill:auto; width:100px; height:100px; orphans:1; widows:1; background:red;">
+  <div style="height:70px; background:green;"></div>
+  <span style="position:relative;">
+    <div class="ib" style="height:30px;"></div>
+    <div class="ib" style="height:20px;"></div>
+    <div style="position:relative; float:left; width:100%; height:200px; background:green;"></div>
+    <div class="ib" style="height:80px;"></div>
+  </span>
+</div>
diff --git a/tests/wpt/tests/css/css-break/inline-with-float-002.html b/tests/wpt/tests/css/css-break/inline-with-float-002.html
new file mode 100644
index 00000000000..d9235b421a1
--- /dev/null
+++ b/tests/wpt/tests/css/css-break/inline-with-float-002.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1113185">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<style>
+  .ib {
+    display: inline-block;
+    width: 100%;
+    vertical-align: top;
+    background: green;
+  }
+</style>
+<div style="columns:5; gap:0; column-fill:auto; width:100px; height:100px; orphans:1; widows:1; background:red;">
+  <div style="height:170px; background:green;"></div>
+  <span style="position:relative;">
+    <div class="ib" style="height:30px;"></div>
+    <div class="ib" style="height:20px;"></div>
+    <div style="position:relative; float:left; width:100%; height:200px; background:green;"></div>
+    <div class="ib" style="height:80px;"></div>
+  </span>
+</div>
diff --git a/tests/wpt/tests/css/css-break/inline-with-float-003.html b/tests/wpt/tests/css/css-break/inline-with-float-003.html
new file mode 100644
index 00000000000..377548768a1
--- /dev/null
+++ b/tests/wpt/tests/css/css-break/inline-with-float-003.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1113185">
+<style>
+  .ib {
+    display: inline-block;
+    width: 100%;
+    vertical-align: top;
+  }
+  body { margin: 0; }
+</style>
+<div style="columns:5; gap:0; column-fill:auto; width:100px; height:100px; orphans:1; widows:1;">
+  <div style="height:170px;"></div>
+  <span style="position:relative;">
+    <div id="ib1" class="ib" style="height:30px;"></div>
+    <div id="ib2" class="ib" style="height:20px;"></div>
+    <div id="floater" style="position:relative; float:left; width:100%; height:200px;"></div>
+    <div id="ib3" class="ib" style="height:80px;"></div>
+  </span>
+</div>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+  test(()=> {
+    assert_equals(document.elementFromPoint(20, 70), ib1);
+  }, "Hit first inline-block");
+  test(()=> {
+    assert_equals(document.elementFromPoint(40, 0), ib2);
+  }, "Hit second inline-block");
+  test(()=> {
+    assert_equals(document.elementFromPoint(40, 20), floater);
+  }, "Hit first float fragment");
+  test(()=> {
+    assert_equals(document.elementFromPoint(60, 0), floater);
+  }, "Hit second float fragment");
+  test(()=> {
+    assert_equals(document.elementFromPoint(80, 0), floater);
+  }, "Hit third float fragment");
+  test(()=> {
+    assert_equals(document.elementFromPoint(80, 20), ib3);
+  }, "Hit third inline-block");
+</script>
diff --git a/tests/wpt/tests/css/css-break/inline-with-float-004.html b/tests/wpt/tests/css/css-break/inline-with-float-004.html
new file mode 100644
index 00000000000..6b404d95700
--- /dev/null
+++ b/tests/wpt/tests/css/css-break/inline-with-float-004.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1113185">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<style>
+  .ib {
+    display: inline-block;
+    vertical-align: top;
+    width: 100%;
+    height: 25px;
+    background: green;
+  }
+</style>
+<div style="display:flow-root; width:100px; height:100px; background:red;">
+  <div style="columns:5; column-fill:auto; gap:0; margin-top:100px; height:100px; orphans:1; widows:1;">
+    <div style="position:relative; top:-100px; height:150px; background:green;"></div>
+    <span style="position:relative; top:-100px; ">
+      <div style="float:left; break-inside:avoid; width:100%; height:125px; background:green;"></div>
+      <div class="ib"></div><br>
+      <div class="ib"></div><br>
+      <div class="ib"></div><br>
+      <div class="ib"></div><br>
+      <div class="ib"></div><br>
+      <div class="ib"></div><br>
+      <div class="ib"></div><br>
+      <div class="ib"></div><br>
+      <div class="ib"></div><br>
+    </span>
+  </div>
+</div>
diff --git a/tests/wpt/tests/css/css-break/out-of-order-float-in-inline-crash.html b/tests/wpt/tests/css/css-break/out-of-order-float-in-inline-crash.html
new file mode 100644
index 00000000000..0a348cf2665
--- /dev/null
+++ b/tests/wpt/tests/css/css-break/out-of-order-float-in-inline-crash.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1486411">
+<div style="columns:2; column-fill:auto; height:100px; orphans:1; widows:1;">
+  <br>
+  <span>
+    <div style="float:left; break-inside:avoid; width:100%; height:200px;"></div>
+    x
+  </span>
+</div>
diff --git a/tests/wpt/tests/css/css-break/reference/border-image-000-ref.html b/tests/wpt/tests/css/css-break/reference/border-image-000-ref.html
new file mode 100644
index 00000000000..70af9921ca5
--- /dev/null
+++ b/tests/wpt/tests/css/css-break/reference/border-image-000-ref.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<title>'box-decoration-break: clone' and 'border-image' (reference)</title>
+<meta name="flags" content="ahem">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
+<style>
+  .border-image {
+    font: 81px/1 Ahem;
+    color: transparent;
+    border-image: radial-gradient(green 50%, transparent 50%) 27 fill / 27px;
+  }
+</style>
+<p>There should be two green circles below.</p>
+<div style="width: 81px">
+  <span class="border-image">A</span>
+  <span class="border-image">A</span>
+</div>
diff --git a/tests/wpt/tests/css/css-break/soft-break-before-margin-001.html b/tests/wpt/tests/css/css-break/soft-break-before-margin-001.html
new file mode 100644
index 00000000000..6907c33586a
--- /dev/null
+++ b/tests/wpt/tests/css/css-break/soft-break-before-margin-001.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1457515">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div style="width:100px; columns:2; gap:0; column-fill:auto; line-height:20px; height:100px; orphans:1; widows:1; background:red;">
+  <div style="height:80px; background:green;"></div>
+  <div style="display:grid;">
+    <div>
+      <span>
+        <div style="display:inline-block; vertical-align:top; width:100%; height:20px; background:green;"></div>
+        <div style="margin-top:33px; break-inside:avoid; height:100px; background:green;"></div>
+      </span>
+    </div>
+  </div>
+</div>
diff --git a/tests/wpt/tests/css/css-break/table/caption-margin-005.html b/tests/wpt/tests/css/css-break/table/caption-margin-005.html
new file mode 100644
index 00000000000..a77e2d83b8c
--- /dev/null
+++ b/tests/wpt/tests/css/css-break/table/caption-margin-005.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://www.w3.org/TR/css-break-3/#box-splitting">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div style="width:100px; height:100px; background:red;">
+  <div style="columns:2; gap:0; column-fill:auto; height:150px;">
+    <div style="height:100px; background:green;"></div>
+    <div style="background:red;">
+      <div style="display:table;">
+        <div style="display:table-caption;"></div>
+        <div style="display:table-caption; margin-top:200px; contain:size; width:50px; height:100px; background:green;"></div>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/tests/wpt/tests/css/css-break/widows-orphans-019.html b/tests/wpt/tests/css/css-break/widows-orphans-019.html
new file mode 100644
index 00000000000..cf5ff7572c8
--- /dev/null
+++ b/tests/wpt/tests/css/css-break/widows-orphans-019.html
@@ -0,0 +1,51 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://www.w3.org/TR/css-break-3/#widows-orphans">
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1486252">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<style>
+  .multicol {
+    width: 100px;
+    columns: 4;
+    column-fill: auto;
+    gap: 0;
+    height: 100px;
+    line-height:25px;
+    orphans: 4;
+    widows: 4;
+    background: red;
+  }
+  .float {
+    float: left;
+    width: 20%;
+    height: 400px;
+    background: green;
+  }
+  .ib {
+    display: inline-block;
+    vertical-align: top;
+    width: 40%;
+    height: 25px;
+    background: green;
+  }
+</style>
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div class="multicol">
+  <div class="float"></div>
+  <div class="float"></div>
+  <div class="float"></div>
+  <div class="ib"></div><br>
+  <div class="ib"></div><br>
+  <div class="ib"></div><br>
+  <div class="ib"></div><br>
+  <div class="ib"></div><br>
+  <div class="ib"></div><br>
+  <div class="ib"></div><br>
+  <div class="ib"></div><br>
+  <div class="ib"></div><br>
+  <div class="ib"></div><br>
+  <div class="ib"></div><br>
+  <div class="ib"></div><br>
+  <div class="ib" style="height:100px;"></div><br>
+</div>
+
diff --git a/tests/wpt/tests/css/css-cascade/all-prop-revert-layer.html b/tests/wpt/tests/css/css-cascade/all-prop-revert-layer.html
index fa29b5106a7..420a3a61cac 100644
--- a/tests/wpt/tests/css/css-cascade/all-prop-revert-layer.html
+++ b/tests/wpt/tests/css/css-cascade/all-prop-revert-layer.html
@@ -24,6 +24,7 @@
   animation-iteration-count: 123;
   animation-name: \.;
   animation-play-state: paused;
+  animation-range: 10% 20%;
   animation-timeline: none;
   animation-timing-function: linear;
   app-region: drag;
@@ -41,6 +42,7 @@
   background-repeat: round;
   background-size: 123px;
   baseline-shift: 123px;
+  baseline-source: first;
   block-size: 123px;
   border-block-end: 123px dashed #123;
   border-block-start: 123px dashed #123;
@@ -96,6 +98,7 @@
   container-name: foo;
   container-type: size;
   content: "b";
+  content-visibility: auto;
   counter-increment: add 123;
   counter-reset: add 123;
   counter-set: add 123;
@@ -133,11 +136,13 @@
   font-variant-alternates: historical-forms;
   font-variant-caps: small-caps;
   font-variant-east-asian: full-width;
+  font-variant-emoji: emoji;
   font-variant-ligatures: none;
   font-variant-numeric: tabular-nums;
   font-variant-position: super;
   font-variation-settings: "smcp" 1;
   font-weight: 123;
+  forced-color-adjust: none;
   glyph-orientation-horizontal: 123deg;
   glyph-orientation-vertical: 123deg;
   grid-auto-columns: 123px;
@@ -153,6 +158,7 @@
   hanging-punctuation: first;
   height: 123px;
   hyphenate-character: "e";
+  hyphenate-limit-chars: 5;
   hyphens: auto;
   image-orientation: none;
   image-rendering: pixelated;
@@ -187,6 +193,7 @@
   margin-left: 123px;
   margin-right: 123px;
   margin-top: 123px;
+  margin-trim: block;
   marker-end: url("#ref");
   marker-mid: url("#ref");
   marker-start: url("#ref");
@@ -248,6 +255,7 @@
   padding-left: 123px;
   padding-right: 123px;
   padding-top: 123px;
+  page: page;
   paint-order: fill;
   perspective: 123px;
   perspective-origin: 123px 123%;
@@ -285,6 +293,7 @@
   scroll-snap-align: center;
   scroll-snap-stop: always;
   scroll-snap-type: both;
+  scroll-timeline: --foo inline;
   scrollbar-color: #123 #123;
   scrollbar-gutter: stable;
   scrollbar-width: none;
@@ -329,13 +338,14 @@
   text-transform: lowercase;
   text-underline-offset: 123px;
   text-underline-position: under;
-  text-wrap: nowrap;
+  timeline-scope: --foo;
   top: 123px;
   touch-action: none;
   transform: scale(-1);
   transform-box: fill-box;
   transform-origin: 123px 123px 123px;
   transform-style: preserve-3d;
+  transition-behavior: allow-discrete;
   transition-delay: 123s;
   transition-duration: 123s;
   transition-property: add;
@@ -345,8 +355,10 @@
   user-select: all;
   vector-effect: non-scaling-stroke;
   vertical-align: 123px;
+  view-timeline: --foo inline 10px;
+  view-transition-name: --foo;
   visibility: collapse;
-  white-space-collapse: preserve;
+  white-space: pre;
   white-space-trim: discard-inner;
   widows: 123;
   width: 123px;
diff --git a/tests/wpt/tests/css/css-color/color-mix-currentcolor-visited-getcomputedstyle.html b/tests/wpt/tests/css/css-color/color-mix-currentcolor-visited-getcomputedstyle.html
new file mode 100644
index 00000000000..754fe56a96f
--- /dev/null
+++ b/tests/wpt/tests/css/css-color/color-mix-currentcolor-visited-getcomputedstyle.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>color-mix and currentcolor with :visited don't leak information via getComputedStyle</title>
+<link rel="help" href="https://drafts.csswg.org/css-color-5/#color-mix">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/computed-testcommon.js"></script>
+
+<style>
+a:link { color: red; }
+a:visited { color: green; }
+</style>
+
+<a href=""><span id="target">This background should be green and not red</span></a>
+
+<script>
+test_computed_value("background-color", "color-mix(in srgb, currentcolor, white)", "color(srgb 1 0.5 0.5)", "should not leak :visited for computed style");
+</script>
diff --git a/tests/wpt/tests/css/css-color/color-mix-currentcolor-visited-ref.html b/tests/wpt/tests/css/css-color/color-mix-currentcolor-visited-ref.html
new file mode 100644
index 00000000000..35376a2ccf6
--- /dev/null
+++ b/tests/wpt/tests/css/css-color/color-mix-currentcolor-visited-ref.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+<meta charset="utf-8">
+<title>currentcolor is taken from :visited pseudo-class correctly in color-mix()</title>
+<style>
+a { color: green; background-color: color-mix(in srgb, green, white 75%); }
+</style>
+
+<a href="unvisited">This background should be green and not red</a>
+</html>
diff --git a/tests/wpt/tests/css/css-color/color-mix-currentcolor-visited.html b/tests/wpt/tests/css/css-color/color-mix-currentcolor-visited.html
new file mode 100644
index 00000000000..28db2d6736f
--- /dev/null
+++ b/tests/wpt/tests/css/css-color/color-mix-currentcolor-visited.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<link rel="match" href="color-mix-currentcolor-visited-ref.html">
+<title>currentcolor is taken from :visited pseudo-class correctly in color-mix()</title>
+<link rel="help" href="https://drafts.csswg.org/css-color-5/#color-mix">
+<link rel="author" title="Matthieu Dubet" href="https://github.com/mdubet">
+<style>
+a:link { color: red; }
+a:visited { color: green; }
+span {
+    background-color: color-mix(in srgb, currentcolor, white 75%);
+}
+</style>
+<a href=""><span>This background should be green and not red</span></a>
diff --git a/tests/wpt/tests/css/css-color/currentcolor-004-ref.html b/tests/wpt/tests/css/css-color/currentcolor-004-ref.html
new file mode 100644
index 00000000000..835e4b81e62
--- /dev/null
+++ b/tests/wpt/tests/css/css-color/currentcolor-004-ref.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<style>
+* {
+    color: green;
+}
+</style>
+<div>
+    <a href=""><div>This should be green and not red.</div></a>
+</div>
diff --git a/tests/wpt/tests/css/css-color/currentcolor-004.html b/tests/wpt/tests/css/css-color/currentcolor-004.html
new file mode 100644
index 00000000000..06a429071ab
--- /dev/null
+++ b/tests/wpt/tests/css/css-color/currentcolor-004.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<link rel="match" href="currentcolor-004-ref.html">
+<title>currentcolor and visited inherited parent color</title>
+<link rel="help" href="https://drafts.csswg.org/css-color-4/#resolving-other-colors">
+<link rel="author" title="Matthieu Dubet" href="https://github.com/mdubet">
+<style>
+a { color: red; }
+a:visited { color: green; }
+div {
+    color: currentcolor;
+}
+</style>
+<div>
+    <a href=""><div>This should be green and not red.</div></a>
+</div>
diff --git a/tests/wpt/tests/css/css-color/lch-005-ref.html b/tests/wpt/tests/css/css-color/lch-005-ref.html
index 3636541afde..d2164159fe4 100644
--- a/tests/wpt/tests/css/css-color/lch-005-ref.html
+++ b/tests/wpt/tests/css/css-color/lch-005-ref.html
@@ -2,7 +2,7 @@
 <meta charset="utf-8">
 <title>CSS Color 4: Specifying Lab and LCH</title>
 <style>
-    .test { background-color: rgb(10.7906% 75.5567% 66.3982%); width: 12em; height: 12em; } /* lch(70% 45 180) converted to sRGB */
+    .test { background-color: rgb(10.7506% 75.5575% 66.3981%); width: 12em; height: 12em; } /* lch(70% 45 180) converted to sRGB */
 </style>
 <body>
     <p>Test passes if you see a single square, and not two rectangles of different colors.</p>
diff --git a/tests/wpt/tests/css/css-color/lch-005.html b/tests/wpt/tests/css/css-color/lch-005.html
index ed32cb92cb4..3986ddc11be 100644
--- a/tests/wpt/tests/css/css-color/lch-005.html
+++ b/tests/wpt/tests/css/css-color/lch-005.html
@@ -7,7 +7,7 @@
 <meta name="assert" content="lch() with no alpha, negative a axis (when converted to Lab)">
 <style>
     .test { background-color: red; width: 12em; height: 6em; margin-top: 0; }
-    .ref { background-color: rgb(10.7906% 75.5567% 66.3982%); width: 12em; height: 6em; margin-bottom: 0; } /* lch(70% 45 180) converted to sRGB */
+    .ref { background-color: rgb(10.7506% 75.5575% 66.3981%); width: 12em; height: 6em; margin-bottom: 0; } /* lch(70% 45 180) converted to sRGB */
     .test { background-color: lch(70% 45 -180); }
 </style>
 <body>
diff --git a/tests/wpt/tests/css/css-color/out-of-gamut-legacy-rgb-ref.html b/tests/wpt/tests/css/css-color/out-of-gamut-legacy-rgb-ref.html
new file mode 100644
index 00000000000..4b1079569f1
--- /dev/null
+++ b/tests/wpt/tests/css/css-color/out-of-gamut-legacy-rgb-ref.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Test Reference</title>
+<style>
+  body {
+    background-color: black;
+  }
+  div {
+    height: 100px;
+    background-color: rgba(255, 255, 255, 0.5);
+  }
+</style>
+<body>
+  <div></div>
+</body>
+
diff --git a/tests/wpt/tests/css/css-color/out-of-gamut-legacy-rgb.html b/tests/wpt/tests/css/css-color/out-of-gamut-legacy-rgb.html
new file mode 100644
index 00000000000..e872dec314c
--- /dev/null
+++ b/tests/wpt/tests/css/css-color/out-of-gamut-legacy-rgb.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Color 4: Out Of Gamut Legacy SRGB Color with Transparency</title>
+<link rel="author" title="Aaron Krajeski" href="mailto:aaronhk@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-color-4/#rgb-functions">
+<link rel="match" href="out-of-gamut-legacy-rgb-ref.html">
+<style>
+  /*  See crbug.com/1483736.
+      Values above 255 were being stored for legacy colors which was causing
+      them to be rendered a if their alphas were greater.
+  */
+  body {
+    background-color: black;
+  }
+  div {
+    height: 100px;
+    background-color: rgba(500, 500, 500, 0.5);
+  }
+</style>
+<body>
+  <div></div>
+</body>
diff --git a/tests/wpt/tests/css/css-color/parsing/color-computed-color-mix-function.html b/tests/wpt/tests/css/css-color/parsing/color-computed-color-mix-function.html
index c1ca47491ff..a48d6b20bcd 100644
--- a/tests/wpt/tests/css/css-color/parsing/color-computed-color-mix-function.html
+++ b/tests/wpt/tests/css/css-color/parsing/color-computed-color-mix-function.html
@@ -11,420 +11,410 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/css/support/computed-testcommon.js"></script>
+<script src="/css/support/color-testcommon.js"></script>
 </head>
 <body>
 <div id="target"></div>
 <script>
-    function canonicalize(value)
-    {
-        const property = 'color';
-        var div = document.createElement("div");
-        document.body.appendChild(div);
-        div.style.setProperty(property, value);
-        var computedValue = getComputedStyle(div).getPropertyValue(property);
-        document.body.removeChild(div);
-        return computedValue;
-    }
-
     // hsl()
-    test_computed_value(`color`, `color-mix(in hsl, hsl(120deg 10% 20%), hsl(30deg 30% 40%))`, `color(srgb 0.33 0.36 0.24)`);
-    test_computed_value(`color`, `color-mix(in hsl, hsl(120deg 10% 20%) 25%, hsl(30deg 30% 40%))`, `color(srgb 0.4375 0.415625 0.2625)`);
-    test_computed_value(`color`, `color-mix(in hsl, 25% hsl(120deg 10% 20%), hsl(30deg 30% 40%))`, `color(srgb 0.4375 0.415625 0.2625)`);
-    test_computed_value(`color`, `color-mix(in hsl, hsl(120deg 10% 20%), 25% hsl(30deg 30% 40%))`, `color(srgb 0.240625 0.2875 0.2125)`);
-    test_computed_value(`color`, `color-mix(in hsl, hsl(120deg 10% 20%), hsl(30deg 30% 40%) 25%)`, `color(srgb 0.240625 0.2875 0.2125)`);
-    test_computed_value(`color`, `color-mix(in hsl, hsl(120deg 10% 20%) 25%, hsl(30deg 30% 40%) 75%)`, `color(srgb 0.4375 0.415625 0.2625)`);
-    test_computed_value(`color`, `color-mix(in hsl, hsl(120deg 10% 20%) 30%, hsl(30deg 30% 40%) 90%)`, `color(srgb 0.4375 0.415625 0.2625)`);
-    test_computed_value(`color`, `color-mix(in hsl, hsl(120deg 10% 20%) 12.5%, hsl(30deg 30% 40%) 37.5%)`, `color(srgb 0.4375 0.415625 0.2625 / 0.5)`);
-    test_computed_value(`color`, `color-mix(in hsl, hsl(120deg 10% 20%) 0%, hsl(30deg 30% 40%))`, `color(srgb 0.52 0.4 0.28)`);
+    fuzzy_test_computed_color(`color-mix(in hsl, hsl(120deg 10% 20%), hsl(30deg 30% 40%))`, `color(srgb 0.33 0.36 0.24)`);
+    fuzzy_test_computed_color(`color-mix(in hsl, hsl(120deg 10% 20%) 25%, hsl(30deg 30% 40%))`, `color(srgb 0.4375 0.415625 0.2625)`);
+    fuzzy_test_computed_color(`color-mix(in hsl, 25% hsl(120deg 10% 20%), hsl(30deg 30% 40%))`, `color(srgb 0.4375 0.415625 0.2625)`);
+    fuzzy_test_computed_color(`color-mix(in hsl, hsl(120deg 10% 20%), 25% hsl(30deg 30% 40%))`, `color(srgb 0.240625 0.2875 0.2125)`);
+    fuzzy_test_computed_color(`color-mix(in hsl, hsl(120deg 10% 20%), hsl(30deg 30% 40%) 25%)`, `color(srgb 0.240625 0.2875 0.2125)`);
+    fuzzy_test_computed_color(`color-mix(in hsl, hsl(120deg 10% 20%) 25%, hsl(30deg 30% 40%) 75%)`, `color(srgb 0.4375 0.415625 0.2625)`);
+    fuzzy_test_computed_color(`color-mix(in hsl, hsl(120deg 10% 20%) 30%, hsl(30deg 30% 40%) 90%)`, `color(srgb 0.4375 0.415625 0.2625)`);
+    fuzzy_test_computed_color(`color-mix(in hsl, hsl(120deg 10% 20%) 12.5%, hsl(30deg 30% 40%) 37.5%)`, `color(srgb 0.4375 0.415625 0.2625 / 0.5)`);
+    fuzzy_test_computed_color(`color-mix(in hsl, hsl(120deg 10% 20%) 0%, hsl(30deg 30% 40%))`, `color(srgb 0.52 0.4 0.28)`);
 
-    test_computed_value(`color`, `color-mix(in hsl, hsl(120deg 10% 20% / .4), hsl(30deg 30% 40% / .8))`, `color(srgb 0.372222 0.411111 0.255556 / 0.6)`);
-    test_computed_value(`color`, `color-mix(in hsl, hsl(120deg 10% 20%) 25%, hsl(30deg 30% 40% / .8))`, `color(srgb 0.42346 0.402889 0.258893 / 0.85)`);
-    test_computed_value(`color`, `color-mix(in hsl, 25% hsl(120deg 10% 20% / .4), hsl(30deg 30% 40% / .8))`, `color(srgb 0.472245 0.447041 0.270612 / 0.7)`);
-    test_computed_value(`color`, `color-mix(in hsl, hsl(120deg 10% 20% / .4), 25% hsl(30deg 30% 40% / .8))`, `color(srgb 0.2674 0.3304 0.2296 / 0.5)`);
-    test_computed_value(`color`, `color-mix(in hsl, hsl(120deg 10% 20% / .4), hsl(30deg 30% 40% / .8) 25%)`, `color(srgb 0.2674 0.3304 0.2296 / 0.5)`);
-    test_computed_value(`color`, `color-mix(in hsl, hsl(120deg 10% 20% / .4) 25%, hsl(30deg 30% 40% / .8) 75%)`, `color(srgb 0.472245 0.447041 0.270612 / 0.7)`);
-    test_computed_value(`color`, `color-mix(in hsl, hsl(120deg 10% 20% / .4) 30%, hsl(30deg 30% 40% / .8) 90%)`, `color(srgb 0.472245 0.447041 0.270612 / 0.7)`);
-    test_computed_value(`color`, `color-mix(in hsl, hsl(120deg 10% 20% / .4) 12.5%, hsl(30deg 30% 40% / .8) 37.5%)`, `color(srgb 0.472245 0.447041 0.270612 / 0.35)`);
-    test_computed_value(`color`, `color-mix(in hsl, hsl(120deg 10% 20% / .4) 0%, hsl(30deg 30% 40% / .8))`, `color(srgb 0.52 0.4 0.28 / 0.8)`);
+    fuzzy_test_computed_color(`color-mix(in hsl, hsl(120deg 10% 20% / .4), hsl(30deg 30% 40% / .8))`, `color(srgb 0.372222 0.411111 0.255556 / 0.6)`);
+    fuzzy_test_computed_color(`color-mix(in hsl, hsl(120deg 10% 20%) 25%, hsl(30deg 30% 40% / .8))`, `color(srgb 0.42346 0.402889 0.258893 / 0.85)`);
+    fuzzy_test_computed_color(`color-mix(in hsl, 25% hsl(120deg 10% 20% / .4), hsl(30deg 30% 40% / .8))`, `color(srgb 0.472245 0.447041 0.270612 / 0.7)`);
+    fuzzy_test_computed_color(`color-mix(in hsl, hsl(120deg 10% 20% / .4), 25% hsl(30deg 30% 40% / .8))`, `color(srgb 0.2674 0.3304 0.2296 / 0.5)`);
+    fuzzy_test_computed_color(`color-mix(in hsl, hsl(120deg 10% 20% / .4), hsl(30deg 30% 40% / .8) 25%)`, `color(srgb 0.2674 0.3304 0.2296 / 0.5)`);
+    fuzzy_test_computed_color(`color-mix(in hsl, hsl(120deg 10% 20% / .4) 25%, hsl(30deg 30% 40% / .8) 75%)`, `color(srgb 0.472245 0.447041 0.270612 / 0.7)`);
+    fuzzy_test_computed_color(`color-mix(in hsl, hsl(120deg 10% 20% / .4) 30%, hsl(30deg 30% 40% / .8) 90%)`, `color(srgb 0.472245 0.447041 0.270612 / 0.7)`);
+    fuzzy_test_computed_color(`color-mix(in hsl, hsl(120deg 10% 20% / .4) 12.5%, hsl(30deg 30% 40% / .8) 37.5%)`, `color(srgb 0.472245 0.447041 0.270612 / 0.35)`);
+    fuzzy_test_computed_color(`color-mix(in hsl, hsl(120deg 10% 20% / .4) 0%, hsl(30deg 30% 40% / .8))`, `color(srgb 0.52 0.4 0.28 / 0.8)`);
 
-    test_computed_value(`color`, `color-mix(in hsl, transparent, hsl(30deg 30% 40%))`, `color(srgb 0.52 0.4 0.28 / 0.5)`);
-    test_computed_value(`color`, `color-mix(in hsl, transparent 10%, hsl(30deg 30% 40%))`, `color(srgb 0.52 0.4 0.28 / 0.9)`);
-    test_computed_value(`color`, `color-mix(in hsl, hsl(120deg 10% 20% / 0), hsl(30deg 30% 40%))`, `color(srgb 0.46 0.52 0.28 / 0.5)`);
-    test_computed_value(`color`, `color-mix(in hsl, hsl(120deg 10% 20% / 0) 10%, hsl(30deg 30% 40%))`, `color(srgb 0.52 0.436 0.28 / 0.9)`);
+    fuzzy_test_computed_color(`color-mix(in hsl, transparent, hsl(30deg 30% 40%))`, `color(srgb 0.52 0.4 0.28 / 0.5)`);
+    fuzzy_test_computed_color(`color-mix(in hsl, transparent 10%, hsl(30deg 30% 40%))`, `color(srgb 0.52 0.4 0.28 / 0.9)`);
+    fuzzy_test_computed_color(`color-mix(in hsl, hsl(120deg 10% 20% / 0), hsl(30deg 30% 40%))`, `color(srgb 0.46 0.52 0.28 / 0.5)`);
+    fuzzy_test_computed_color(`color-mix(in hsl, hsl(120deg 10% 20% / 0) 10%, hsl(30deg 30% 40%))`, `color(srgb 0.52 0.436 0.28 / 0.9)`);
 
-    test_computed_value(`color`, `color-mix(in hsl, hsl(40deg 50% 50%), hsl(60deg 50% 50%))`, `color(srgb 0.75 0.666667 0.25)`);
-    test_computed_value(`color`, `color-mix(in hsl, hsl(60deg 50% 50%), hsl(40deg 50% 50%))`, `color(srgb 0.75 0.666667 0.25)`);
-    test_computed_value(`color`, `color-mix(in hsl, hsl(50deg 50% 50%), hsl(330deg 50% 50%))`, `color(srgb 0.75 0.333333 0.25)`);
-    test_computed_value(`color`, `color-mix(in hsl, hsl(330deg 50% 50%), hsl(50deg 50% 50%))`, `color(srgb 0.75 0.333333 0.25)`);
-    test_computed_value(`color`, `color-mix(in hsl, hsl(20deg 50% 50%), hsl(320deg 50% 50%))`, `color(srgb 0.75 0.25 0.333333)`);
-    test_computed_value(`color`, `color-mix(in hsl, hsl(320deg 50% 50%), hsl(20deg 50% 50%))`, `color(srgb 0.75 0.25 0.333333)`);
+    fuzzy_test_computed_color(`color-mix(in hsl, hsl(40deg 50% 50%), hsl(60deg 50% 50%))`, `color(srgb 0.75 0.666667 0.25)`);
+    fuzzy_test_computed_color(`color-mix(in hsl, hsl(60deg 50% 50%), hsl(40deg 50% 50%))`, `color(srgb 0.75 0.666667 0.25)`);
+    fuzzy_test_computed_color(`color-mix(in hsl, hsl(50deg 50% 50%), hsl(330deg 50% 50%))`, `color(srgb 0.75 0.333333 0.25)`);
+    fuzzy_test_computed_color(`color-mix(in hsl, hsl(330deg 50% 50%), hsl(50deg 50% 50%))`, `color(srgb 0.75 0.333333 0.25)`);
+    fuzzy_test_computed_color(`color-mix(in hsl, hsl(20deg 50% 50%), hsl(320deg 50% 50%))`, `color(srgb 0.75 0.25 0.333333)`);
+    fuzzy_test_computed_color(`color-mix(in hsl, hsl(320deg 50% 50%), hsl(20deg 50% 50%))`, `color(srgb 0.75 0.25 0.333333)`);
 
-    test_computed_value(`color`, `color-mix(in hsl shorter hue, hsl(40deg 50% 50%), hsl(60deg 50% 50%))`, `color(srgb 0.75 0.666667 0.25)`);
-    test_computed_value(`color`, `color-mix(in hsl shorter hue, hsl(60deg 50% 50%), hsl(40deg 50% 50%))`, `color(srgb 0.75 0.666667 0.25)`);
-    test_computed_value(`color`, `color-mix(in hsl shorter hue, hsl(50deg 50% 50%), hsl(330deg 50% 50%))`, `color(srgb 0.75 0.333333 0.25)`);
-    test_computed_value(`color`, `color-mix(in hsl shorter hue, hsl(330deg 50% 50%), hsl(50deg 50% 50%))`, `color(srgb 0.75 0.333333 0.25)`);
-    test_computed_value(`color`, `color-mix(in hsl shorter hue, hsl(20deg 50% 50%), hsl(320deg 50% 50%))`, `color(srgb 0.75 0.25 0.333333)`);
-    test_computed_value(`color`, `color-mix(in hsl shorter hue, hsl(320deg 50% 50%), hsl(20deg 50% 50%))`, `color(srgb 0.75 0.25 0.333333)`);
+    fuzzy_test_computed_color(`color-mix(in hsl shorter hue, hsl(40deg 50% 50%), hsl(60deg 50% 50%))`, `color(srgb 0.75 0.666667 0.25)`);
+    fuzzy_test_computed_color(`color-mix(in hsl shorter hue, hsl(60deg 50% 50%), hsl(40deg 50% 50%))`, `color(srgb 0.75 0.666667 0.25)`);
+    fuzzy_test_computed_color(`color-mix(in hsl shorter hue, hsl(50deg 50% 50%), hsl(330deg 50% 50%))`, `color(srgb 0.75 0.333333 0.25)`);
+    fuzzy_test_computed_color(`color-mix(in hsl shorter hue, hsl(330deg 50% 50%), hsl(50deg 50% 50%))`, `color(srgb 0.75 0.333333 0.25)`);
+    fuzzy_test_computed_color(`color-mix(in hsl shorter hue, hsl(20deg 50% 50%), hsl(320deg 50% 50%))`, `color(srgb 0.75 0.25 0.333333)`);
+    fuzzy_test_computed_color(`color-mix(in hsl shorter hue, hsl(320deg 50% 50%), hsl(20deg 50% 50%))`, `color(srgb 0.75 0.25 0.333333)`);
 
-    test_computed_value(`color`, `color-mix(in hsl longer hue, hsl(40deg 50% 50%), hsl(60deg 50% 50%))`, `color(srgb 0.25 0.333333 0.75)`);
-    test_computed_value(`color`, `color-mix(in hsl longer hue, hsl(60deg 50% 50%), hsl(40deg 50% 50%))`, `color(srgb 0.25 0.333333 0.75)`);
-    test_computed_value(`color`, `color-mix(in hsl longer hue, hsl(50deg 50% 50%), hsl(330deg 50% 50%))`, `color(srgb 0.25 0.666667 0.75)`);
-    test_computed_value(`color`, `color-mix(in hsl longer hue, hsl(330deg 50% 50%), hsl(50deg 50% 50%))`, `color(srgb 0.25 0.666667 0.75)`);
-    test_computed_value(`color`, `color-mix(in hsl longer hue, hsl(20deg 50% 50%), hsl(320deg 50% 50%))`, `color(srgb 0.25 0.75 0.666667)`);
-    test_computed_value(`color`, `color-mix(in hsl longer hue, hsl(320deg 50% 50%), hsl(20deg 50% 50%))`, `color(srgb 0.25 0.75 0.666667)`);
+    fuzzy_test_computed_color(`color-mix(in hsl longer hue, hsl(40deg 50% 50%), hsl(60deg 50% 50%))`, `color(srgb 0.25 0.333333 0.75)`);
+    fuzzy_test_computed_color(`color-mix(in hsl longer hue, hsl(60deg 50% 50%), hsl(40deg 50% 50%))`, `color(srgb 0.25 0.333333 0.75)`);
+    fuzzy_test_computed_color(`color-mix(in hsl longer hue, hsl(50deg 50% 50%), hsl(330deg 50% 50%))`, `color(srgb 0.25 0.666667 0.75)`);
+    fuzzy_test_computed_color(`color-mix(in hsl longer hue, hsl(330deg 50% 50%), hsl(50deg 50% 50%))`, `color(srgb 0.25 0.666667 0.75)`);
+    fuzzy_test_computed_color(`color-mix(in hsl longer hue, hsl(20deg 50% 50%), hsl(320deg 50% 50%))`, `color(srgb 0.25 0.75 0.666667)`);
+    fuzzy_test_computed_color(`color-mix(in hsl longer hue, hsl(320deg 50% 50%), hsl(20deg 50% 50%))`, `color(srgb 0.25 0.75 0.666667)`);
 
-    test_computed_value(`color`, `color-mix(in hsl increasing hue, hsl(40deg 50% 50%), hsl(60deg 50% 50%))`, `color(srgb 0.75 0.666667 0.25)`);
-    test_computed_value(`color`, `color-mix(in hsl increasing hue, hsl(60deg 50% 50%), hsl(40deg 50% 50%))`, `color(srgb 0.25 0.333333 0.75)`);
-    test_computed_value(`color`, `color-mix(in hsl increasing hue, hsl(50deg 50% 50%), hsl(330deg 50% 50%))`, `color(srgb 0.25 0.666667 0.75)`);
-    test_computed_value(`color`, `color-mix(in hsl increasing hue, hsl(330deg 50% 50%), hsl(50deg 50% 50%))`, `color(srgb 0.75 0.333333 0.25)`);
-    test_computed_value(`color`, `color-mix(in hsl increasing hue, hsl(20deg 50% 50%), hsl(320deg 50% 50%))`, `color(srgb 0.25 0.75 0.666667)`);
-    test_computed_value(`color`, `color-mix(in hsl increasing hue, hsl(320deg 50% 50%), hsl(20deg 50% 50%))`, `color(srgb 0.75 0.25 0.333333)`);
+    fuzzy_test_computed_color(`color-mix(in hsl increasing hue, hsl(40deg 50% 50%), hsl(60deg 50% 50%))`, `color(srgb 0.75 0.666667 0.25)`);
+    fuzzy_test_computed_color(`color-mix(in hsl increasing hue, hsl(60deg 50% 50%), hsl(40deg 50% 50%))`, `color(srgb 0.25 0.333333 0.75)`);
+    fuzzy_test_computed_color(`color-mix(in hsl increasing hue, hsl(50deg 50% 50%), hsl(330deg 50% 50%))`, `color(srgb 0.25 0.666667 0.75)`);
+    fuzzy_test_computed_color(`color-mix(in hsl increasing hue, hsl(330deg 50% 50%), hsl(50deg 50% 50%))`, `color(srgb 0.75 0.333333 0.25)`);
+    fuzzy_test_computed_color(`color-mix(in hsl increasing hue, hsl(20deg 50% 50%), hsl(320deg 50% 50%))`, `color(srgb 0.25 0.75 0.666667)`);
+    fuzzy_test_computed_color(`color-mix(in hsl increasing hue, hsl(320deg 50% 50%), hsl(20deg 50% 50%))`, `color(srgb 0.75 0.25 0.333333)`);
 
-    test_computed_value(`color`, `color-mix(in hsl decreasing hue, hsl(40deg 50% 50%), hsl(60deg 50% 50%))`, `color(srgb 0.25 0.333333 0.75)`);
-    test_computed_value(`color`, `color-mix(in hsl decreasing hue, hsl(60deg 50% 50%), hsl(40deg 50% 50%))`, `color(srgb 0.75 0.666667 0.25)`);
-    test_computed_value(`color`, `color-mix(in hsl decreasing hue, hsl(50deg 50% 50%), hsl(330deg 50% 50%))`, `color(srgb 0.75 0.333333 0.25)`);
-    test_computed_value(`color`, `color-mix(in hsl decreasing hue, hsl(330deg 50% 50%), hsl(50deg 50% 50%))`, `color(srgb 0.25 0.666667 0.75)`);
-    test_computed_value(`color`, `color-mix(in hsl decreasing hue, hsl(20deg 50% 50%), hsl(320deg 50% 50%))`, `color(srgb 0.75 0.25 0.333333)`);
-    test_computed_value(`color`, `color-mix(in hsl decreasing hue, hsl(320deg 50% 50%), hsl(20deg 50% 50%))`, `color(srgb 0.25 0.75 0.666667)`);
+    fuzzy_test_computed_color(`color-mix(in hsl decreasing hue, hsl(40deg 50% 50%), hsl(60deg 50% 50%))`, `color(srgb 0.25 0.333333 0.75)`);
+    fuzzy_test_computed_color(`color-mix(in hsl decreasing hue, hsl(60deg 50% 50%), hsl(40deg 50% 50%))`, `color(srgb 0.75 0.666667 0.25)`);
+    fuzzy_test_computed_color(`color-mix(in hsl decreasing hue, hsl(50deg 50% 50%), hsl(330deg 50% 50%))`, `color(srgb 0.75 0.333333 0.25)`);
+    fuzzy_test_computed_color(`color-mix(in hsl decreasing hue, hsl(330deg 50% 50%), hsl(50deg 50% 50%))`, `color(srgb 0.25 0.666667 0.75)`);
+    fuzzy_test_computed_color(`color-mix(in hsl decreasing hue, hsl(20deg 50% 50%), hsl(320deg 50% 50%))`, `color(srgb 0.75 0.25 0.333333)`);
+    fuzzy_test_computed_color(`color-mix(in hsl decreasing hue, hsl(320deg 50% 50%), hsl(20deg 50% 50%))`, `color(srgb 0.25 0.75 0.666667)`);
 
-    test_computed_value(`color`, `color-mix(in hsl, hsl(none none none), hsl(none none none))`, `color(srgb none none none)`);
-    test_computed_value(`color`, `color-mix(in hsl, hsl(none none none), hsl(30deg 40% 80%))`, `color(srgb 0.88 0.8 0.72)`);
-    test_computed_value(`color`, `color-mix(in hsl, hsl(120deg 20% 40%), hsl(none none none))`, `color(srgb 0.32 0.48 0.32)`);
-    test_computed_value(`color`, `color-mix(in hsl, hsl(120deg 20% none), hsl(30deg 40% 60%))`, `color(srgb 0.66 0.72 0.48)`);
-    test_computed_value(`color`, `color-mix(in hsl, hsl(120deg 20% 40%), hsl(30deg 20% none))`, `color(srgb 0.44 0.48 0.32)`);
-    test_computed_value(`color`, `color-mix(in hsl, hsl(none 20% 40%), hsl(30deg none 80%))`, `color(srgb 0.68 0.6 0.52)`);
+    fuzzy_test_computed_color(`color-mix(in hsl, hsl(none none none), hsl(none none none))`, `color(srgb none none none)`);
+    fuzzy_test_computed_color(`color-mix(in hsl, hsl(none none none), hsl(30deg 40% 80%))`, `color(srgb 0.88 0.8 0.72)`);
+    fuzzy_test_computed_color(`color-mix(in hsl, hsl(120deg 20% 40%), hsl(none none none))`, `color(srgb 0.32 0.48 0.32)`);
+    fuzzy_test_computed_color(`color-mix(in hsl, hsl(120deg 20% none), hsl(30deg 40% 60%))`, `color(srgb 0.66 0.72 0.48)`);
+    fuzzy_test_computed_color(`color-mix(in hsl, hsl(120deg 20% 40%), hsl(30deg 20% none))`, `color(srgb 0.44 0.48 0.32)`);
+    fuzzy_test_computed_color(`color-mix(in hsl, hsl(none 20% 40%), hsl(30deg none 80%))`, `color(srgb 0.68 0.6 0.52)`);
 
-    test_computed_value(`color`, `color-mix(in hsl, hsl(120deg 40% 40% / none), hsl(0deg 40% 40%))`, `color(srgb 0.56 0.56 0.24)`);
-    test_computed_value(`color`, `color-mix(in hsl, hsl(120deg 40% 40% / none), hsl(0deg 40% 40% / 0.5))`, `color(srgb 0.56 0.56 0.24 / 0.5)`);
-    test_computed_value(`color`, `color-mix(in hsl, hsl(120deg 40% 40% / none), hsl(0deg 40% 40% / none))`, `color(srgb 0.56 0.56 0.24 / none)`);
+    fuzzy_test_computed_color(`color-mix(in hsl, hsl(120deg 40% 40% / none), hsl(0deg 40% 40%))`, `color(srgb 0.56 0.56 0.24)`);
+    fuzzy_test_computed_color(`color-mix(in hsl, hsl(120deg 40% 40% / none), hsl(0deg 40% 40% / 0.5))`, `color(srgb 0.56 0.56 0.24 / 0.5)`);
+    fuzzy_test_computed_color(`color-mix(in hsl, hsl(120deg 40% 40% / none), hsl(0deg 40% 40% / none))`, `color(srgb 0.56 0.56 0.24 / none)`);
 
     // hwb()
-    test_computed_value(`color`, `color-mix(in hwb, hwb(120deg 10% 20%), hwb(30deg 30% 40%))`, `color(srgb 0.575 0.7 0.2)`);
-    test_computed_value(`color`, `color-mix(in hwb, hwb(120deg 10% 20%) 25%, hwb(30deg 30% 40%))`, `color(srgb 0.65 0.6 0.25)`);
-    test_computed_value(`color`, `color-mix(in hwb, 25% hwb(120deg 10% 20%), hwb(30deg 30% 40%))`, `color(srgb 0.65 0.6 0.25)`);
-    test_computed_value(`color`, `color-mix(in hwb, hwb(120deg 10% 20%), 25% hwb(30deg 30% 40%))`, `color(srgb 0.375 0.75 0.15)`);
-    test_computed_value(`color`, `color-mix(in hwb, hwb(120deg 10% 20%), hwb(30deg 30% 40%) 25%)`, `color(srgb 0.375 0.75 0.15)`);
-    test_computed_value(`color`, `color-mix(in hwb, hwb(120deg 10% 20%) 25%, hwb(30deg 30% 40%) 75%)`, `color(srgb 0.65 0.6 0.25)`);
-    test_computed_value(`color`, `color-mix(in hwb, hwb(120deg 10% 20%) 30%, hwb(30deg 30% 40%) 90%)`, `color(srgb 0.65 0.6 0.25)`);
-    test_computed_value(`color`, `color-mix(in hwb, hwb(120deg 10% 20%) 12.5%, hwb(30deg 30% 40%) 37.5%)`, `color(srgb 0.65 0.6 0.25 / 0.5)`);
-    test_computed_value(`color`, `color-mix(in hwb, hwb(120deg 10% 20%) 0%, hwb(30deg 30% 40%))`, `color(srgb 0.6 0.45 0.3)`);
+    fuzzy_test_computed_color(`color-mix(in hwb, hwb(120deg 10% 20%), hwb(30deg 30% 40%))`, `color(srgb 0.575 0.7 0.2)`);
+    fuzzy_test_computed_color(`color-mix(in hwb, hwb(120deg 10% 20%) 25%, hwb(30deg 30% 40%))`, `color(srgb 0.65 0.6 0.25)`);
+    fuzzy_test_computed_color(`color-mix(in hwb, 25% hwb(120deg 10% 20%), hwb(30deg 30% 40%))`, `color(srgb 0.65 0.6 0.25)`);
+    fuzzy_test_computed_color(`color-mix(in hwb, hwb(120deg 10% 20%), 25% hwb(30deg 30% 40%))`, `color(srgb 0.375 0.75 0.15)`);
+    fuzzy_test_computed_color(`color-mix(in hwb, hwb(120deg 10% 20%), hwb(30deg 30% 40%) 25%)`, `color(srgb 0.375 0.75 0.15)`);
+    fuzzy_test_computed_color(`color-mix(in hwb, hwb(120deg 10% 20%) 25%, hwb(30deg 30% 40%) 75%)`, `color(srgb 0.65 0.6 0.25)`);
+    fuzzy_test_computed_color(`color-mix(in hwb, hwb(120deg 10% 20%) 30%, hwb(30deg 30% 40%) 90%)`, `color(srgb 0.65 0.6 0.25)`);
+    fuzzy_test_computed_color(`color-mix(in hwb, hwb(120deg 10% 20%) 12.5%, hwb(30deg 30% 40%) 37.5%)`, `color(srgb 0.65 0.6 0.25 / 0.5)`);
+    fuzzy_test_computed_color(`color-mix(in hwb, hwb(120deg 10% 20%) 0%, hwb(30deg 30% 40%))`, `color(srgb 0.6 0.45 0.3)`);
 
-    test_computed_value(`color`, `color-mix(in hwb, hwb(120deg 10% 20% / .4), hwb(30deg 30% 40% / .8))`, `color(srgb 0.558333 0.666667 0.233333 / 0.6)`);
-    test_computed_value(`color`, `color-mix(in hwb, hwb(120deg 10% 20% / .4) 25%, hwb(30deg 30% 40% / .8))`, `color(srgb 0.628571 0.583929 0.271429 / 0.7)`);
-    test_computed_value(`color`, `color-mix(in hwb, 25% hwb(120deg 10% 20% / .4), hwb(30deg 30% 40% / .8))`, `color(srgb 0.628571 0.583929 0.271429 / 0.7)`);
-    test_computed_value(`color`, `color-mix(in hwb, hwb(120deg 10% 20%), 25% hwb(30deg 30% 40% / .8))`, `color(srgb 0.373026 0.757895 0.142105 / 0.95)`);
-    test_computed_value(`color`, `color-mix(in hwb, hwb(120deg 10% 20% / .4), hwb(30deg 30% 40% / .8) 25%)`, `color(srgb 0.3825 0.72 0.18 / 0.5)`);
-    test_computed_value(`color`, `color-mix(in hwb, hwb(120deg 10% 20% / .4) 25%, hwb(30deg 30% 40% / .8) 75%)`, `color(srgb 0.628571 0.583929 0.271429 / 0.7)`);
-    test_computed_value(`color`, `color-mix(in hwb, hwb(120deg 10% 20% / .4) 30%, hwb(30deg 30% 40% / .8) 90%)`, `color(srgb 0.628571 0.583929 0.271429 / 0.7)`);
-    test_computed_value(`color`, `color-mix(in hwb, hwb(120deg 10% 20% / .4) 12.5%, hwb(30deg 30% 40% / .8) 37.5%)`, `color(srgb 0.628571 0.583929 0.271429 / 0.35)`);
-    test_computed_value(`color`, `color-mix(in hwb, hwb(120deg 10% 20% / .4) 0%, hwb(30deg 30% 40% / .8))`, `color(srgb 0.6 0.45 0.3 / 0.8)`);
+    fuzzy_test_computed_color(`color-mix(in hwb, hwb(120deg 10% 20% / .4), hwb(30deg 30% 40% / .8))`, `color(srgb 0.558333 0.666667 0.233333 / 0.6)`);
+    fuzzy_test_computed_color(`color-mix(in hwb, hwb(120deg 10% 20% / .4) 25%, hwb(30deg 30% 40% / .8))`, `color(srgb 0.628571 0.583929 0.271429 / 0.7)`);
+    fuzzy_test_computed_color(`color-mix(in hwb, 25% hwb(120deg 10% 20% / .4), hwb(30deg 30% 40% / .8))`, `color(srgb 0.628571 0.583929 0.271429 / 0.7)`);
+    fuzzy_test_computed_color(`color-mix(in hwb, hwb(120deg 10% 20%), 25% hwb(30deg 30% 40% / .8))`, `color(srgb 0.373026 0.757895 0.142105 / 0.95)`);
+    fuzzy_test_computed_color(`color-mix(in hwb, hwb(120deg 10% 20% / .4), hwb(30deg 30% 40% / .8) 25%)`, `color(srgb 0.3825 0.72 0.18 / 0.5)`);
+    fuzzy_test_computed_color(`color-mix(in hwb, hwb(120deg 10% 20% / .4) 25%, hwb(30deg 30% 40% / .8) 75%)`, `color(srgb 0.628571 0.583929 0.271429 / 0.7)`);
+    fuzzy_test_computed_color(`color-mix(in hwb, hwb(120deg 10% 20% / .4) 30%, hwb(30deg 30% 40% / .8) 90%)`, `color(srgb 0.628571 0.583929 0.271429 / 0.7)`);
+    fuzzy_test_computed_color(`color-mix(in hwb, hwb(120deg 10% 20% / .4) 12.5%, hwb(30deg 30% 40% / .8) 37.5%)`, `color(srgb 0.628571 0.583929 0.271429 / 0.35)`);
+    fuzzy_test_computed_color(`color-mix(in hwb, hwb(120deg 10% 20% / .4) 0%, hwb(30deg 30% 40% / .8))`, `color(srgb 0.6 0.45 0.3 / 0.8)`);
 
-    test_computed_value(`color`, `color-mix(in hwb, transparent, hwb(30deg 30% 40%))`, `color(srgb 0.6 0.45 0.3 / 0.5)`);
-    test_computed_value(`color`, `color-mix(in hwb, transparent 10%, hwb(30deg 30% 40%))`, `color(srgb 0.6 0.45 0.3 / 0.9)`);
-    test_computed_value(`color`, `color-mix(in hwb, hwb(120deg 10% 20% / 0), hwb(30deg 30% 40%))`, `color(srgb 0.525 0.6 0.3 / 0.5)`);
-    test_computed_value(`color`, `color-mix(in hwb, hwb(120deg 10% 20% / 0) 10%, hwb(30deg 30% 40%))`, `color(srgb 0.6 0.495 0.3 / 0.9)`);
+    fuzzy_test_computed_color(`color-mix(in hwb, transparent, hwb(30deg 30% 40%))`, `color(srgb 0.6 0.45 0.3 / 0.5)`);
+    fuzzy_test_computed_color(`color-mix(in hwb, transparent 10%, hwb(30deg 30% 40%))`, `color(srgb 0.6 0.45 0.3 / 0.9)`);
+    fuzzy_test_computed_color(`color-mix(in hwb, hwb(120deg 10% 20% / 0), hwb(30deg 30% 40%))`, `color(srgb 0.525 0.6 0.3 / 0.5)`);
+    fuzzy_test_computed_color(`color-mix(in hwb, hwb(120deg 10% 20% / 0) 10%, hwb(30deg 30% 40%))`, `color(srgb 0.6 0.495 0.3 / 0.9)`);
 
-    test_computed_value(`color`, `color-mix(in hwb, hwb(40deg 30% 40%), hwb(60deg 30% 40%))`, `color(srgb 0.6 0.55 0.3)`);
-    test_computed_value(`color`, `color-mix(in hwb, hwb(60deg 30% 40%), hwb(40deg 30% 40%))`, `color(srgb 0.6 0.55 0.3)`);
-    test_computed_value(`color`, `color-mix(in hwb, hwb(50deg 30% 40%), hwb(330deg 30% 40%))`, `color(srgb 0.6 0.35 0.3)`);
-    test_computed_value(`color`, `color-mix(in hwb, hwb(330deg 30% 40%), hwb(50deg 30% 40%))`, `color(srgb 0.6 0.35 0.3)`);
-    test_computed_value(`color`, `color-mix(in hwb, hwb(20deg 30% 40%), hwb(320deg 30% 40%))`, `color(srgb 0.6 0.3 0.35)`);
-    test_computed_value(`color`, `color-mix(in hwb, hwb(320deg 30% 40%), hwb(20deg 30% 40%))`, `color(srgb 0.6 0.3 0.35)`);
+    fuzzy_test_computed_color(`color-mix(in hwb, hwb(40deg 30% 40%), hwb(60deg 30% 40%))`, `color(srgb 0.6 0.55 0.3)`);
+    fuzzy_test_computed_color(`color-mix(in hwb, hwb(60deg 30% 40%), hwb(40deg 30% 40%))`, `color(srgb 0.6 0.55 0.3)`);
+    fuzzy_test_computed_color(`color-mix(in hwb, hwb(50deg 30% 40%), hwb(330deg 30% 40%))`, `color(srgb 0.6 0.35 0.3)`);
+    fuzzy_test_computed_color(`color-mix(in hwb, hwb(330deg 30% 40%), hwb(50deg 30% 40%))`, `color(srgb 0.6 0.35 0.3)`);
+    fuzzy_test_computed_color(`color-mix(in hwb, hwb(20deg 30% 40%), hwb(320deg 30% 40%))`, `color(srgb 0.6 0.3 0.35)`);
+    fuzzy_test_computed_color(`color-mix(in hwb, hwb(320deg 30% 40%), hwb(20deg 30% 40%))`, `color(srgb 0.6 0.3 0.35)`);
 
-    test_computed_value(`color`, `color-mix(in hwb shorter hue, hwb(40deg 30% 40%), hwb(60deg 30% 40%))`, `color(srgb 0.6 0.55 0.3)`);
-    test_computed_value(`color`, `color-mix(in hwb shorter hue, hwb(60deg 30% 40%), hwb(40deg 30% 40%))`, `color(srgb 0.6 0.55 0.3)`);
-    test_computed_value(`color`, `color-mix(in hwb shorter hue, hwb(50deg 30% 40%), hwb(330deg 30% 40%))`, `color(srgb 0.6 0.35 0.3)`);
-    test_computed_value(`color`, `color-mix(in hwb shorter hue, hwb(330deg 30% 40%), hwb(50deg 30% 40%))`, `color(srgb 0.6 0.35 0.3)`);
-    test_computed_value(`color`, `color-mix(in hwb shorter hue, hwb(20deg 30% 40%), hwb(320deg 30% 40%))`, `color(srgb 0.6 0.3 0.35)`);
-    test_computed_value(`color`, `color-mix(in hwb shorter hue, hwb(320deg 30% 40%), hwb(20deg 30% 40%))`, `color(srgb 0.6 0.3 0.35)`);
+    fuzzy_test_computed_color(`color-mix(in hwb shorter hue, hwb(40deg 30% 40%), hwb(60deg 30% 40%))`, `color(srgb 0.6 0.55 0.3)`);
+    fuzzy_test_computed_color(`color-mix(in hwb shorter hue, hwb(60deg 30% 40%), hwb(40deg 30% 40%))`, `color(srgb 0.6 0.55 0.3)`);
+    fuzzy_test_computed_color(`color-mix(in hwb shorter hue, hwb(50deg 30% 40%), hwb(330deg 30% 40%))`, `color(srgb 0.6 0.35 0.3)`);
+    fuzzy_test_computed_color(`color-mix(in hwb shorter hue, hwb(330deg 30% 40%), hwb(50deg 30% 40%))`, `color(srgb 0.6 0.35 0.3)`);
+    fuzzy_test_computed_color(`color-mix(in hwb shorter hue, hwb(20deg 30% 40%), hwb(320deg 30% 40%))`, `color(srgb 0.6 0.3 0.35)`);
+    fuzzy_test_computed_color(`color-mix(in hwb shorter hue, hwb(320deg 30% 40%), hwb(20deg 30% 40%))`, `color(srgb 0.6 0.3 0.35)`);
 
-    test_computed_value(`color`, `color-mix(in hwb longer hue, hwb(40deg 30% 40%), hwb(60deg 30% 40%))`, `color(srgb 0.3 0.35 0.6)`);
-    test_computed_value(`color`, `color-mix(in hwb longer hue, hwb(60deg 30% 40%), hwb(40deg 30% 40%))`, `color(srgb 0.3 0.35 0.6)`);
-    test_computed_value(`color`, `color-mix(in hwb longer hue, hwb(50deg 30% 40%), hwb(330deg 30% 40%))`, `color(srgb 0.3 0.55 0.6)`);
-    test_computed_value(`color`, `color-mix(in hwb longer hue, hwb(330deg 30% 40%), hwb(50deg 30% 40%))`, `color(srgb 0.3 0.55 0.6)`);
-    test_computed_value(`color`, `color-mix(in hwb longer hue, hwb(20deg 30% 40%), hwb(320deg 30% 40%))`, `color(srgb 0.3 0.6 0.55)`);
-    test_computed_value(`color`, `color-mix(in hwb longer hue, hwb(320deg 30% 40%), hwb(20deg 30% 40%))`, `color(srgb 0.3 0.6 0.55)`);
+    fuzzy_test_computed_color(`color-mix(in hwb longer hue, hwb(40deg 30% 40%), hwb(60deg 30% 40%))`, `color(srgb 0.3 0.35 0.6)`);
+    fuzzy_test_computed_color(`color-mix(in hwb longer hue, hwb(60deg 30% 40%), hwb(40deg 30% 40%))`, `color(srgb 0.3 0.35 0.6)`);
+    fuzzy_test_computed_color(`color-mix(in hwb longer hue, hwb(50deg 30% 40%), hwb(330deg 30% 40%))`, `color(srgb 0.3 0.55 0.6)`);
+    fuzzy_test_computed_color(`color-mix(in hwb longer hue, hwb(330deg 30% 40%), hwb(50deg 30% 40%))`, `color(srgb 0.3 0.55 0.6)`);
+    fuzzy_test_computed_color(`color-mix(in hwb longer hue, hwb(20deg 30% 40%), hwb(320deg 30% 40%))`, `color(srgb 0.3 0.6 0.55)`);
+    fuzzy_test_computed_color(`color-mix(in hwb longer hue, hwb(320deg 30% 40%), hwb(20deg 30% 40%))`, `color(srgb 0.3 0.6 0.55)`);
 
-    test_computed_value(`color`, `color-mix(in hwb increasing hue, hwb(40deg 30% 40%), hwb(60deg 30% 40%))`, `color(srgb 0.6 0.55 0.3)`);
-    test_computed_value(`color`, `color-mix(in hwb increasing hue, hwb(60deg 30% 40%), hwb(40deg 30% 40%))`, `color(srgb 0.3 0.35 0.6)`);
-    test_computed_value(`color`, `color-mix(in hwb increasing hue, hwb(50deg 30% 40%), hwb(330deg 30% 40%))`, `color(srgb 0.3 0.55 0.6)`);
-    test_computed_value(`color`, `color-mix(in hwb increasing hue, hwb(330deg 30% 40%), hwb(50deg 30% 40%))`, `color(srgb 0.6 0.35 0.3)`);
-    test_computed_value(`color`, `color-mix(in hwb increasing hue, hwb(20deg 30% 40%), hwb(320deg 30% 40%))`, `color(srgb 0.3 0.6 0.55)`);
-    test_computed_value(`color`, `color-mix(in hwb increasing hue, hwb(320deg 30% 40%), hwb(20deg 30% 40%))`, `color(srgb 0.6 0.3 0.35)`);
+    fuzzy_test_computed_color(`color-mix(in hwb increasing hue, hwb(40deg 30% 40%), hwb(60deg 30% 40%))`, `color(srgb 0.6 0.55 0.3)`);
+    fuzzy_test_computed_color(`color-mix(in hwb increasing hue, hwb(60deg 30% 40%), hwb(40deg 30% 40%))`, `color(srgb 0.3 0.35 0.6)`);
+    fuzzy_test_computed_color(`color-mix(in hwb increasing hue, hwb(50deg 30% 40%), hwb(330deg 30% 40%))`, `color(srgb 0.3 0.55 0.6)`);
+    fuzzy_test_computed_color(`color-mix(in hwb increasing hue, hwb(330deg 30% 40%), hwb(50deg 30% 40%))`, `color(srgb 0.6 0.35 0.3)`);
+    fuzzy_test_computed_color(`color-mix(in hwb increasing hue, hwb(20deg 30% 40%), hwb(320deg 30% 40%))`, `color(srgb 0.3 0.6 0.55)`);
+    fuzzy_test_computed_color(`color-mix(in hwb increasing hue, hwb(320deg 30% 40%), hwb(20deg 30% 40%))`, `color(srgb 0.6 0.3 0.35)`);
 
-    test_computed_value(`color`, `color-mix(in hwb decreasing hue, hwb(40deg 30% 40%), hwb(60deg 30% 40%))`, `color(srgb 0.3 0.35 0.6)`);
-    test_computed_value(`color`, `color-mix(in hwb decreasing hue, hwb(60deg 30% 40%), hwb(40deg 30% 40%))`, `color(srgb 0.6 0.55 0.3)`);
-    test_computed_value(`color`, `color-mix(in hwb decreasing hue, hwb(50deg 30% 40%), hwb(330deg 30% 40%))`, `color(srgb 0.6 0.35 0.3)`);
-    test_computed_value(`color`, `color-mix(in hwb decreasing hue, hwb(330deg 30% 40%), hwb(50deg 30% 40%))`, `color(srgb 0.3 0.55 0.6)`);
-    test_computed_value(`color`, `color-mix(in hwb decreasing hue, hwb(20deg 30% 40%), hwb(320deg 30% 40%))`, `color(srgb 0.6 0.3 0.35)`);
-    test_computed_value(`color`, `color-mix(in hwb decreasing hue, hwb(320deg 30% 40%), hwb(20deg 30% 40%))`, `color(srgb 0.3 0.6 0.55)`);
+    fuzzy_test_computed_color(`color-mix(in hwb decreasing hue, hwb(40deg 30% 40%), hwb(60deg 30% 40%))`, `color(srgb 0.3 0.35 0.6)`);
+    fuzzy_test_computed_color(`color-mix(in hwb decreasing hue, hwb(60deg 30% 40%), hwb(40deg 30% 40%))`, `color(srgb 0.6 0.55 0.3)`);
+    fuzzy_test_computed_color(`color-mix(in hwb decreasing hue, hwb(50deg 30% 40%), hwb(330deg 30% 40%))`, `color(srgb 0.6 0.35 0.3)`);
+    fuzzy_test_computed_color(`color-mix(in hwb decreasing hue, hwb(330deg 30% 40%), hwb(50deg 30% 40%))`, `color(srgb 0.3 0.55 0.6)`);
+    fuzzy_test_computed_color(`color-mix(in hwb decreasing hue, hwb(20deg 30% 40%), hwb(320deg 30% 40%))`, `color(srgb 0.6 0.3 0.35)`);
+    fuzzy_test_computed_color(`color-mix(in hwb decreasing hue, hwb(320deg 30% 40%), hwb(20deg 30% 40%))`, `color(srgb 0.3 0.6 0.55)`);
 
-    test_computed_value(`color`, `color-mix(in hwb, hwb(none none none), hwb(none none none))`, `color(srgb none none none)`);
-    test_computed_value(`color`, `color-mix(in hwb, hwb(none none none), hwb(30deg 30% 40%))`, `color(srgb 0.6 0.45 0.3)`);
-    test_computed_value(`color`, `color-mix(in hwb, hwb(120deg 10% 20%), hwb(none none none))`, `color(srgb 0.1 0.8 0.1)`);
-    test_computed_value(`color`, `color-mix(in hwb, hwb(120deg 10% none), hwb(30deg 30% 40%))`, `color(srgb 0.5 0.6 0.2)`);
-    test_computed_value(`color`, `color-mix(in hwb, hwb(120deg 10% 20%), hwb(30deg 30% none))`, `color(srgb 0.65 0.8 0.2)`);
-    test_computed_value(`color`, `color-mix(in hwb, hwb(none 10% 20%), hwb(30deg none 40%))`, `color(srgb 0.7 0.4 0.1)`);
-    test_computed_value(`color`, `color-mix(in hwb, hwb(120deg 10% 20% / none), hwb(30deg 30% 40%))`, `color(srgb 0.575 0.7 0.2)`);
-    test_computed_value(`color`, `color-mix(in hwb, hwb(120deg 10% 20% / none), hwb(30deg 30% 40% / 0.5))`, `color(srgb 0.575 0.7 0.2 / 0.5)`);
-    test_computed_value(`color`, `color-mix(in hwb, hwb(120deg 10% 20% / none), hwb(30deg 30% 40% / none))`, `color(srgb 0.575 0.7 0.2 / none)`);
+    fuzzy_test_computed_color(`color-mix(in hwb, hwb(none none none), hwb(none none none))`, `color(srgb none none none)`);
+    fuzzy_test_computed_color(`color-mix(in hwb, hwb(none none none), hwb(30deg 30% 40%))`, `color(srgb 0.6 0.45 0.3)`);
+    fuzzy_test_computed_color(`color-mix(in hwb, hwb(120deg 10% 20%), hwb(none none none))`, `color(srgb 0.1 0.8 0.1)`);
+    fuzzy_test_computed_color(`color-mix(in hwb, hwb(120deg 10% none), hwb(30deg 30% 40%))`, `color(srgb 0.5 0.6 0.2)`);
+    fuzzy_test_computed_color(`color-mix(in hwb, hwb(120deg 10% 20%), hwb(30deg 30% none))`, `color(srgb 0.65 0.8 0.2)`);
+    fuzzy_test_computed_color(`color-mix(in hwb, hwb(none 10% 20%), hwb(30deg none 40%))`, `color(srgb 0.7 0.4 0.1)`);
+    fuzzy_test_computed_color(`color-mix(in hwb, hwb(120deg 10% 20% / none), hwb(30deg 30% 40%))`, `color(srgb 0.575 0.7 0.2)`);
+    fuzzy_test_computed_color(`color-mix(in hwb, hwb(120deg 10% 20% / none), hwb(30deg 30% 40% / 0.5))`, `color(srgb 0.575 0.7 0.2 / 0.5)`);
+    fuzzy_test_computed_color(`color-mix(in hwb, hwb(120deg 10% 20% / none), hwb(30deg 30% 40% / none))`, `color(srgb 0.575 0.7 0.2 / none)`);
 
     // lch()
-    test_computed_value(`color`, `color-mix(in lch, lch(10 20 30deg), lch(50 60 70deg))`, `lch(30 40 50)`);
-    test_computed_value(`color`, `color-mix(in lch, lch(10 20 30deg) 25%, lch(50 60 70deg))`, `lch(40 50 60)`);
-    test_computed_value(`color`, `color-mix(in lch, 25% lch(10 20 30deg), lch(50 60 70deg))`, `lch(40 50 60)`);
-    test_computed_value(`color`, `color-mix(in lch, lch(10 20 30deg), 25% lch(50 60 70deg))`, `lch(20 30 40)`);
-    test_computed_value(`color`, `color-mix(in lch, lch(10 20 30deg), lch(50 60 70deg) 25%)`, `lch(20 30 40)`);
-    test_computed_value(`color`, `color-mix(in lch, lch(10 20 30deg) 25%, lch(50 60 70deg) 75%)`, `lch(40 50 60)`);
-    test_computed_value(`color`, `color-mix(in lch, lch(10 20 30deg) 30%, lch(50 60 70deg) 90%)`, `lch(40 50 60)`); // Scale down > 100% sum.
-    test_computed_value(`color`, `color-mix(in lch, lch(10 20 30deg) 12.5%, lch(50 60 70deg) 37.5%)`, `lch(40 50 60 / 0.5)`); // Scale up < 100% sum, causes alpha multiplication.
-    test_computed_value(`color`, `color-mix(in lch, lch(10 20 30deg) 0%, lch(50 60 70deg))`, `lch(50 60 70)`);
+    fuzzy_test_computed_color(`color-mix(in lch, lch(10 20 30deg), lch(50 60 70deg))`, `lch(30 40 50)`);
+    fuzzy_test_computed_color(`color-mix(in lch, lch(10 20 30deg) 25%, lch(50 60 70deg))`, `lch(40 50 60)`);
+    fuzzy_test_computed_color(`color-mix(in lch, 25% lch(10 20 30deg), lch(50 60 70deg))`, `lch(40 50 60)`);
+    fuzzy_test_computed_color(`color-mix(in lch, lch(10 20 30deg), 25% lch(50 60 70deg))`, `lch(20 30 40)`);
+    fuzzy_test_computed_color(`color-mix(in lch, lch(10 20 30deg), lch(50 60 70deg) 25%)`, `lch(20 30 40)`);
+    fuzzy_test_computed_color(`color-mix(in lch, lch(10 20 30deg) 25%, lch(50 60 70deg) 75%)`, `lch(40 50 60)`);
+    fuzzy_test_computed_color(`color-mix(in lch, lch(10 20 30deg) 30%, lch(50 60 70deg) 90%)`, `lch(40 50 60)`); // Scale down > 100% sum.
+    fuzzy_test_computed_color(`color-mix(in lch, lch(10 20 30deg) 12.5%, lch(50 60 70deg) 37.5%)`, `lch(40 50 60 / 0.5)`); // Scale up < 100% sum, causes alpha multiplication.
+    fuzzy_test_computed_color(`color-mix(in lch, lch(10 20 30deg) 0%, lch(50 60 70deg))`, `lch(50 60 70)`);
 
-    test_computed_value(`color`, `color-mix(in lch, lch(10 20 30deg / .4), lch(50 60 70deg / .8))`, `lch(36.666664 46.666664 50 / 0.6)`);
-    test_computed_value(`color`, `color-mix(in lch, lch(10 20 30deg / .4) 25%, lch(50 60 70deg / .8))`, `lch(44.285713 54.285717 60 / 0.7)`);
-    test_computed_value(`color`, `color-mix(in lch, 25% lch(10 20 30deg / .4), lch(50 60 70deg / .8))`, `lch(44.285713 54.285717 60 / 0.7)`);
-    test_computed_value(`color`, `color-mix(in lch, lch(10 20 30deg / .4), 25% lch(50 60 70deg / .8))`, `lch(26 36 40 / 0.5)`);
-    test_computed_value(`color`, `color-mix(in lch, lch(10 20 30deg / .4), lch(50 60 70deg / .8) 25%)`, `lch(26 36 40 / 0.5)`);
-    test_computed_value(`color`, `color-mix(in lch, lch(10 20 30deg / .4) 25%, lch(50 60 70deg / .8) 75%)`, `lch(44.285713 54.285717 60 / 0.7)`);
-    test_computed_value(`color`, `color-mix(in lch, lch(10 20 30deg / .4) 30%, lch(50 60 70deg / .8) 90%)`, `lch(44.285713 54.285717 60 / 0.7)`); // Scale down > 100% sum.
-    test_computed_value(`color`, `color-mix(in lch, lch(10 20 30deg / .4) 12.5%, lch(50 60 70deg / .8) 37.5%)`, `lch(44.285713 54.285717 60 / 0.35)`); // Scale up < 100% sum, causes alpha multiplication.
-    test_computed_value(`color`, `color-mix(in lch, lch(10 20 30deg / .4) 0%, lch(50 60 70deg / .8))`, `lch(50 60 70 / 0.8)`);
+    fuzzy_test_computed_color(`color-mix(in lch, lch(10 20 30deg / .4), lch(50 60 70deg / .8))`, `lch(36.666664 46.666664 50 / 0.6)`);
+    fuzzy_test_computed_color(`color-mix(in lch, lch(10 20 30deg / .4) 25%, lch(50 60 70deg / .8))`, `lch(44.285713 54.285717 60 / 0.7)`);
+    fuzzy_test_computed_color(`color-mix(in lch, 25% lch(10 20 30deg / .4), lch(50 60 70deg / .8))`, `lch(44.285713 54.285717 60 / 0.7)`);
+    fuzzy_test_computed_color(`color-mix(in lch, lch(10 20 30deg / .4), 25% lch(50 60 70deg / .8))`, `lch(26 36 40 / 0.5)`);
+    fuzzy_test_computed_color(`color-mix(in lch, lch(10 20 30deg / .4), lch(50 60 70deg / .8) 25%)`, `lch(26 36 40 / 0.5)`);
+    fuzzy_test_computed_color(`color-mix(in lch, lch(10 20 30deg / .4) 25%, lch(50 60 70deg / .8) 75%)`, `lch(44.285713 54.285717 60 / 0.7)`);
+    fuzzy_test_computed_color(`color-mix(in lch, lch(10 20 30deg / .4) 30%, lch(50 60 70deg / .8) 90%)`, `lch(44.285713 54.285717 60 / 0.7)`); // Scale down > 100% sum.
+    fuzzy_test_computed_color(`color-mix(in lch, lch(10 20 30deg / .4) 12.5%, lch(50 60 70deg / .8) 37.5%)`, `lch(44.285713 54.285717 60 / 0.35)`); // Scale up < 100% sum, causes alpha multiplication.
+    fuzzy_test_computed_color(`color-mix(in lch, lch(10 20 30deg / .4) 0%, lch(50 60 70deg / .8))`, `lch(50 60 70 / 0.8)`);
 
-    test_computed_value(`color`, `color-mix(in lch, transparent, lch(0.3 0.4 30deg))`, canonicalize(`lch(0.3 0.4 30deg / 0.5)`));
-    test_computed_value(`color`, `color-mix(in lch, transparent 10%, lch(0.3 0.4 30deg))`, canonicalize(`lch(0.3 0.4 30deg / 0.9)`));
-    test_computed_value(`color`, `color-mix(in lch, lch(0.1 0.2 120deg / 0), lch(0.3 0.4 30deg))`, canonicalize(`lch(0.3 0.4 75deg / 0.5)`));
-    test_computed_value(`color`, `color-mix(in lch, lch(0.1 0.2 120deg / 0) 10%, lch(0.3 0.4 30deg))`, canonicalize(`lch(0.3 0.4 39deg / 0.9)`));
+    fuzzy_test_computed_color(`color-mix(in lch, transparent, lch(0.3 0.4 30deg))`, `lch(0.3 0.4 30 / 0.5)`);
+    fuzzy_test_computed_color(`color-mix(in lch, transparent 10%, lch(0.3 0.4 30deg))`, `lch(0.3 0.4 30 / 0.9)`);
+    fuzzy_test_computed_color(`color-mix(in lch, lch(0.1 0.2 120deg / 0), lch(0.3 0.4 30deg))`, `lch(0.3 0.4 75 / 0.5)`);
+    fuzzy_test_computed_color(`color-mix(in lch, lch(0.1 0.2 120deg / 0) 10%, lch(0.3 0.4 30deg))`, `lch(0.3 0.4 39 / 0.9)`);
 
-    test_computed_value(`color`, `color-mix(in lch, lch(100 0 40deg), lch(100 0 60deg))`, `lch(100 0 50)`);
-    test_computed_value(`color`, `color-mix(in lch, lch(100 0 60deg), lch(100 0 40deg))`, `lch(100 0 50)`);
-    test_computed_value(`color`, `color-mix(in lch, lch(100 0 50deg), lch(100 0 330deg))`, `lch(100 0 10)`);
-    test_computed_value(`color`, `color-mix(in lch, lch(100 0 330deg), lch(100 0 50deg))`, `lch(100 0 10)`);
-    test_computed_value(`color`, `color-mix(in lch, lch(100 0 20deg), lch(100 0 320deg))`, `lch(100 0 350)`);
-    test_computed_value(`color`, `color-mix(in lch, lch(100 0 320deg), lch(100 0 20deg))`, `lch(100 0 350)`);
+    fuzzy_test_computed_color(`color-mix(in lch, lch(100 0 40deg), lch(100 0 60deg))`, `lch(100 0 50)`);
+    fuzzy_test_computed_color(`color-mix(in lch, lch(100 0 60deg), lch(100 0 40deg))`, `lch(100 0 50)`);
+    fuzzy_test_computed_color(`color-mix(in lch, lch(100 0 50deg), lch(100 0 330deg))`, `lch(100 0 10)`);
+    fuzzy_test_computed_color(`color-mix(in lch, lch(100 0 330deg), lch(100 0 50deg))`, `lch(100 0 10)`);
+    fuzzy_test_computed_color(`color-mix(in lch, lch(100 0 20deg), lch(100 0 320deg))`, `lch(100 0 350)`);
+    fuzzy_test_computed_color(`color-mix(in lch, lch(100 0 320deg), lch(100 0 20deg))`, `lch(100 0 350)`);
 
-    test_computed_value(`color`, `color-mix(in lch shorter hue, lch(100 0 40deg), lch(100 0 60deg))`, `lch(100 0 50)`);
-    test_computed_value(`color`, `color-mix(in lch shorter hue, lch(100 0 60deg), lch(100 0 40deg))`, `lch(100 0 50)`);
-    test_computed_value(`color`, `color-mix(in lch shorter hue, lch(100 0 50deg), lch(100 0 330deg))`, `lch(100 0 10)`);
-    test_computed_value(`color`, `color-mix(in lch shorter hue, lch(100 0 330deg), lch(100 0 50deg))`, `lch(100 0 10)`);
-    test_computed_value(`color`, `color-mix(in lch shorter hue, lch(100 0 20deg), lch(100 0 320deg))`, `lch(100 0 350)`);
-    test_computed_value(`color`, `color-mix(in lch shorter hue, lch(100 0 320deg), lch(100 0 20deg))`, `lch(100 0 350)`);
+    fuzzy_test_computed_color(`color-mix(in lch shorter hue, lch(100 0 40deg), lch(100 0 60deg))`, `lch(100 0 50)`);
+    fuzzy_test_computed_color(`color-mix(in lch shorter hue, lch(100 0 60deg), lch(100 0 40deg))`, `lch(100 0 50)`);
+    fuzzy_test_computed_color(`color-mix(in lch shorter hue, lch(100 0 50deg), lch(100 0 330deg))`, `lch(100 0 10)`);
+    fuzzy_test_computed_color(`color-mix(in lch shorter hue, lch(100 0 330deg), lch(100 0 50deg))`, `lch(100 0 10)`);
+    fuzzy_test_computed_color(`color-mix(in lch shorter hue, lch(100 0 20deg), lch(100 0 320deg))`, `lch(100 0 350)`);
+    fuzzy_test_computed_color(`color-mix(in lch shorter hue, lch(100 0 320deg), lch(100 0 20deg))`, `lch(100 0 350)`);
 
-    test_computed_value(`color`, `color-mix(in lch longer hue, lch(100 0 40deg), lch(100 0 60deg))`, `lch(100 0 230)`);
-    test_computed_value(`color`, `color-mix(in lch longer hue, lch(100 0 60deg), lch(100 0 40deg))`, `lch(100 0 230)`);
-    test_computed_value(`color`, `color-mix(in lch longer hue, lch(100 0 50deg), lch(100 0 330deg))`, `lch(100 0 190)`);
-    test_computed_value(`color`, `color-mix(in lch longer hue, lch(100 0 330deg), lch(100 0 50deg))`, `lch(100 0 190)`);
-    test_computed_value(`color`, `color-mix(in lch longer hue, lch(100 0 20deg), lch(100 0 320deg))`, `lch(100 0 170)`);
-    test_computed_value(`color`, `color-mix(in lch longer hue, lch(100 0 320deg), lch(100 0 20deg))`, `lch(100 0 170)`);
+    fuzzy_test_computed_color(`color-mix(in lch longer hue, lch(100 0 40deg), lch(100 0 60deg))`, `lch(100 0 230)`);
+    fuzzy_test_computed_color(`color-mix(in lch longer hue, lch(100 0 60deg), lch(100 0 40deg))`, `lch(100 0 230)`);
+    fuzzy_test_computed_color(`color-mix(in lch longer hue, lch(100 0 50deg), lch(100 0 330deg))`, `lch(100 0 190)`);
+    fuzzy_test_computed_color(`color-mix(in lch longer hue, lch(100 0 330deg), lch(100 0 50deg))`, `lch(100 0 190)`);
+    fuzzy_test_computed_color(`color-mix(in lch longer hue, lch(100 0 20deg), lch(100 0 320deg))`, `lch(100 0 170)`);
+    fuzzy_test_computed_color(`color-mix(in lch longer hue, lch(100 0 320deg), lch(100 0 20deg))`, `lch(100 0 170)`);
 
-    test_computed_value(`color`, `color-mix(in lch increasing hue, lch(100 0 40deg), lch(100 0 60deg))`, `lch(100 0 50)`);
-    test_computed_value(`color`, `color-mix(in lch increasing hue, lch(100 0 60deg), lch(100 0 40deg))`, `lch(100 0 230)`);
-    test_computed_value(`color`, `color-mix(in lch increasing hue, lch(100 0 50deg), lch(100 0 330deg))`, `lch(100 0 190)`);
-    test_computed_value(`color`, `color-mix(in lch increasing hue, lch(100 0 330deg), lch(100 0 50deg))`, `lch(100 0 10)`);
-    test_computed_value(`color`, `color-mix(in lch increasing hue, lch(100 0 20deg), lch(100 0 320deg))`, `lch(100 0 170)`);
-    test_computed_value(`color`, `color-mix(in lch increasing hue, lch(100 0 320deg), lch(100 0 20deg))`, `lch(100 0 350)`);
+    fuzzy_test_computed_color(`color-mix(in lch increasing hue, lch(100 0 40deg), lch(100 0 60deg))`, `lch(100 0 50)`);
+    fuzzy_test_computed_color(`color-mix(in lch increasing hue, lch(100 0 60deg), lch(100 0 40deg))`, `lch(100 0 230)`);
+    fuzzy_test_computed_color(`color-mix(in lch increasing hue, lch(100 0 50deg), lch(100 0 330deg))`, `lch(100 0 190)`);
+    fuzzy_test_computed_color(`color-mix(in lch increasing hue, lch(100 0 330deg), lch(100 0 50deg))`, `lch(100 0 10)`);
+    fuzzy_test_computed_color(`color-mix(in lch increasing hue, lch(100 0 20deg), lch(100 0 320deg))`, `lch(100 0 170)`);
+    fuzzy_test_computed_color(`color-mix(in lch increasing hue, lch(100 0 320deg), lch(100 0 20deg))`, `lch(100 0 350)`);
 
-    test_computed_value(`color`, `color-mix(in lch decreasing hue, lch(100 0 40deg), lch(100 0 60deg))`, `lch(100 0 230)`);
-    test_computed_value(`color`, `color-mix(in lch decreasing hue, lch(100 0 60deg), lch(100 0 40deg))`, `lch(100 0 50)`);
-    test_computed_value(`color`, `color-mix(in lch decreasing hue, lch(100 0 50deg), lch(100 0 330deg))`, `lch(100 0 10)`);
-    test_computed_value(`color`, `color-mix(in lch decreasing hue, lch(100 0 330deg), lch(100 0 50deg))`, `lch(100 0 190)`);
-    test_computed_value(`color`, `color-mix(in lch decreasing hue, lch(100 0 20deg), lch(100 0 320deg))`, `lch(100 0 350)`);
-    test_computed_value(`color`, `color-mix(in lch decreasing hue, lch(100 0 320deg), lch(100 0 20deg))`, `lch(100 0 170)`);
+    fuzzy_test_computed_color(`color-mix(in lch decreasing hue, lch(100 0 40deg), lch(100 0 60deg))`, `lch(100 0 230)`);
+    fuzzy_test_computed_color(`color-mix(in lch decreasing hue, lch(100 0 60deg), lch(100 0 40deg))`, `lch(100 0 50)`);
+    fuzzy_test_computed_color(`color-mix(in lch decreasing hue, lch(100 0 50deg), lch(100 0 330deg))`, `lch(100 0 10)`);
+    fuzzy_test_computed_color(`color-mix(in lch decreasing hue, lch(100 0 330deg), lch(100 0 50deg))`, `lch(100 0 190)`);
+    fuzzy_test_computed_color(`color-mix(in lch decreasing hue, lch(100 0 20deg), lch(100 0 320deg))`, `lch(100 0 350)`);
+    fuzzy_test_computed_color(`color-mix(in lch decreasing hue, lch(100 0 320deg), lch(100 0 20deg))`, `lch(100 0 170)`);
 
-    test_computed_value(`color`, `color-mix(in lch, lch(none none none), lch(none none none))`, `lch(none none none)`);
-    test_computed_value(`color`, `color-mix(in lch, lch(none none none), lch(50 60 70deg))`, `lch(50 60 70)`);
-    test_computed_value(`color`, `color-mix(in lch, lch(10 20 30deg), lch(none none none))`, `lch(10 20 30)`);
-    test_computed_value(`color`, `color-mix(in lch, lch(10 20 none), lch(50 60 70deg))`, `lch(30 40 70)`);
-    test_computed_value(`color`, `color-mix(in lch, lch(10 20 30deg), lch(50 60 none))`, `lch(30 40 30)`);
-    test_computed_value(`color`, `color-mix(in lch, lch(none 20 30deg), lch(50 none 70deg))`, `lch(50 20 50)`);
-    test_computed_value(`color`, `color-mix(in lch, lch(10 20 30deg / none), lch(50 60 70deg))`, `lch(30 40 50)`);
-    test_computed_value(`color`, `color-mix(in lch, lch(10 20 30deg / none), lch(50 60 70deg / 0.5))`, `lch(30 40 50 / 0.5)`);
-    test_computed_value(`color`, `color-mix(in lch, lch(10 20 30deg / none), lch(50 60 70deg / none))`, `lch(30 40 50 / none)`);
+    fuzzy_test_computed_color(`color-mix(in lch, lch(none none none), lch(none none none))`, `lch(none none none)`);
+    fuzzy_test_computed_color(`color-mix(in lch, lch(none none none), lch(50 60 70deg))`, `lch(50 60 70)`);
+    fuzzy_test_computed_color(`color-mix(in lch, lch(10 20 30deg), lch(none none none))`, `lch(10 20 30)`);
+    fuzzy_test_computed_color(`color-mix(in lch, lch(10 20 none), lch(50 60 70deg))`, `lch(30 40 70)`);
+    fuzzy_test_computed_color(`color-mix(in lch, lch(10 20 30deg), lch(50 60 none))`, `lch(30 40 30)`);
+    fuzzy_test_computed_color(`color-mix(in lch, lch(none 20 30deg), lch(50 none 70deg))`, `lch(50 20 50)`);
+    fuzzy_test_computed_color(`color-mix(in lch, lch(10 20 30deg / none), lch(50 60 70deg))`, `lch(30 40 50)`);
+    fuzzy_test_computed_color(`color-mix(in lch, lch(10 20 30deg / none), lch(50 60 70deg / 0.5))`, `lch(30 40 50 / 0.5)`);
+    fuzzy_test_computed_color(`color-mix(in lch, lch(10 20 30deg / none), lch(50 60 70deg / none))`, `lch(30 40 50 / none)`);
 
     // oklch()
-    test_computed_value(`color`, `color-mix(in oklch, oklch(0.1 0.2 30deg), oklch(0.5 0.6 70deg))`, `oklch(0.3 0.4 50)`);
-    test_computed_value(`color`, `color-mix(in oklch, oklch(0.1 0.2 30deg) 25%, oklch(0.5 0.6 70deg))`, `oklch(0.4 0.5 60)`);
-    test_computed_value(`color`, `color-mix(in oklch, 25% oklch(0.1 0.2 30deg), oklch(0.5 0.6 70deg))`, `oklch(0.4 0.5 60)`);
-    test_computed_value(`color`, `color-mix(in oklch, oklch(0.1 0.2 30deg), 25% oklch(0.5 0.6 70deg))`, `oklch(0.2 0.3 40)`);
-    test_computed_value(`color`, `color-mix(in oklch, oklch(0.1 0.2 30deg), oklch(0.5 0.6 70deg) 25%)`, `oklch(0.2 0.3 40)`);
-    test_computed_value(`color`, `color-mix(in oklch, oklch(0.1 0.2 30deg) 25%, oklch(0.5 0.6 70deg) 75%)`, `oklch(0.4 0.5 60)`);
-    test_computed_value(`color`, `color-mix(in oklch, oklch(0.1 0.2 30deg) 30%, oklch(0.5 0.6 70deg) 90%)`, `oklch(0.4 0.5 60)`); // Scale down > 100% sum.
-    test_computed_value(`color`, `color-mix(in oklch, oklch(0.1 0.2 30deg) 12.5%, oklch(0.5 0.6 70deg) 37.5%)`, `oklch(0.4 0.5 60 / 0.5)`); // Scale up < 100% sum, causes alpha multiplication.
-    test_computed_value(`color`, `color-mix(in oklch, oklch(0.1 0.2 30deg) 0%, oklch(0.5 0.6 70deg))`, `oklch(0.5 0.6 70)`);
+    fuzzy_test_computed_color(`color-mix(in oklch, oklch(0.1 0.2 30deg), oklch(0.5 0.6 70deg))`, `oklch(0.3 0.4 50)`);
+    fuzzy_test_computed_color(`color-mix(in oklch, oklch(0.1 0.2 30deg) 25%, oklch(0.5 0.6 70deg))`, `oklch(0.4 0.5 60)`);
+    fuzzy_test_computed_color(`color-mix(in oklch, 25% oklch(0.1 0.2 30deg), oklch(0.5 0.6 70deg))`, `oklch(0.4 0.5 60)`);
+    fuzzy_test_computed_color(`color-mix(in oklch, oklch(0.1 0.2 30deg), 25% oklch(0.5 0.6 70deg))`, `oklch(0.2 0.3 40)`);
+    fuzzy_test_computed_color(`color-mix(in oklch, oklch(0.1 0.2 30deg), oklch(0.5 0.6 70deg) 25%)`, `oklch(0.2 0.3 40)`);
+    fuzzy_test_computed_color(`color-mix(in oklch, oklch(0.1 0.2 30deg) 25%, oklch(0.5 0.6 70deg) 75%)`, `oklch(0.4 0.5 60)`);
+    fuzzy_test_computed_color(`color-mix(in oklch, oklch(0.1 0.2 30deg) 30%, oklch(0.5 0.6 70deg) 90%)`, `oklch(0.4 0.5 60)`); // Scale down > 100% sum.
+    fuzzy_test_computed_color(`color-mix(in oklch, oklch(0.1 0.2 30deg) 12.5%, oklch(0.5 0.6 70deg) 37.5%)`, `oklch(0.4 0.5 60 / 0.5)`); // Scale up < 100% sum, causes alpha multiplication.
+    fuzzy_test_computed_color(`color-mix(in oklch, oklch(0.1 0.2 30deg) 0%, oklch(0.5 0.6 70deg))`, `oklch(0.5 0.6 70)`);
 
-    test_computed_value(`color`, `color-mix(in oklch, oklch(0.1 0.2 30deg / .4), oklch(0.5 0.6 70deg / .8))`, `oklch(0.36666664 0.46666664 50 / 0.6)`);
-    test_computed_value(`color`, `color-mix(in oklch, oklch(0.1 0.2 30deg / .4) 25%, oklch(0.5 0.6 70deg / .8))`, `oklch(0.44285713 0.54285717 60 / 0.7)`);
-    test_computed_value(`color`, `color-mix(in oklch, 25% oklch(0.1 0.2 30deg / .4), oklch(0.5 0.6 70deg / .8))`, `oklch(0.44285713 0.54285717 60 / 0.7)`);
-    test_computed_value(`color`, `color-mix(in oklch, oklch(0.1 0.2 30deg / .4), 25% oklch(0.5 0.6 70deg / .8))`, `oklch(0.26 0.36 40 / 0.5)`);
-    test_computed_value(`color`, `color-mix(in oklch, oklch(0.1 0.2 30deg / .4), oklch(0.5 0.6 70deg / .8) 25%)`, `oklch(0.26 0.36 40 / 0.5)`);
-    test_computed_value(`color`, `color-mix(in oklch, oklch(0.1 0.2 30deg / .4) 25%, oklch(0.5 0.6 70deg / .8) 75%)`, `oklch(0.44285713 0.54285717 60 / 0.7)`);
-    test_computed_value(`color`, `color-mix(in oklch, oklch(0.1 0.2 30deg / .4) 30%, oklch(0.5 0.6 70deg / .8) 90%)`, `oklch(0.44285713 0.54285717 60 / 0.7)`); // Scale down > 100% sum.
-    test_computed_value(`color`, `color-mix(in oklch, oklch(0.1 0.2 30deg / .4) 12.5%, oklch(0.5 0.6 70deg / .8) 37.5%)`, `oklch(0.44285713 0.54285717 60 / 0.35)`); // Scale up < 100% sum, causes alpha multiplication.
-    test_computed_value(`color`, `color-mix(in oklch, oklch(0.1 0.2 30deg / .4) 0%, oklch(0.5 0.6 70deg / .8))`, `oklch(0.5 0.6 70 / 0.8)`);
+    fuzzy_test_computed_color(`color-mix(in oklch, oklch(0.1 0.2 30deg / .4), oklch(0.5 0.6 70deg / .8))`, `oklch(0.36666664 0.46666664 50 / 0.6)`);
+    fuzzy_test_computed_color(`color-mix(in oklch, oklch(0.1 0.2 30deg / .4) 25%, oklch(0.5 0.6 70deg / .8))`, `oklch(0.44285713 0.54285717 60 / 0.7)`);
+    fuzzy_test_computed_color(`color-mix(in oklch, 25% oklch(0.1 0.2 30deg / .4), oklch(0.5 0.6 70deg / .8))`, `oklch(0.44285713 0.54285717 60 / 0.7)`);
+    fuzzy_test_computed_color(`color-mix(in oklch, oklch(0.1 0.2 30deg / .4), 25% oklch(0.5 0.6 70deg / .8))`, `oklch(0.26 0.36 40 / 0.5)`);
+    fuzzy_test_computed_color(`color-mix(in oklch, oklch(0.1 0.2 30deg / .4), oklch(0.5 0.6 70deg / .8) 25%)`, `oklch(0.26 0.36 40 / 0.5)`);
+    fuzzy_test_computed_color(`color-mix(in oklch, oklch(0.1 0.2 30deg / .4) 25%, oklch(0.5 0.6 70deg / .8) 75%)`, `oklch(0.44285713 0.54285717 60 / 0.7)`);
+    fuzzy_test_computed_color(`color-mix(in oklch, oklch(0.1 0.2 30deg / .4) 30%, oklch(0.5 0.6 70deg / .8) 90%)`, `oklch(0.44285713 0.54285717 60 / 0.7)`); // Scale down > 100% sum.
+    fuzzy_test_computed_color(`color-mix(in oklch, oklch(0.1 0.2 30deg / .4) 12.5%, oklch(0.5 0.6 70deg / .8) 37.5%)`, `oklch(0.44285713 0.54285717 60 / 0.35)`); // Scale up < 100% sum, causes alpha multiplication.
+    fuzzy_test_computed_color(`color-mix(in oklch, oklch(0.1 0.2 30deg / .4) 0%, oklch(0.5 0.6 70deg / .8))`, `oklch(0.5 0.6 70 / 0.8)`);
 
-    test_computed_value(`color`, `color-mix(in oklch, transparent, oklch(30 40 30deg))`, canonicalize(`oklch(30 40 30deg / 0.5)`));
-    test_computed_value(`color`, `color-mix(in oklch, transparent 10%, oklch(30 40 30deg))`, canonicalize(`oklch(30 40 30deg / 0.9)`));
-    test_computed_value(`color`, `color-mix(in oklch, oklch(10 20 120deg / 0), oklch(30 40 30deg))`, canonicalize(`oklch(30 40 75deg / 0.5)`));
-    test_computed_value(`color`, `color-mix(in oklch, oklch(10 20 120deg / 0) 10%, oklch(30 40 30deg))`, canonicalize(`oklch(30 40 39deg / 0.9)`));
+    fuzzy_test_computed_color(`color-mix(in oklch, transparent, oklch(0.3 40 30deg))`, `oklch(0.3 40 30 / 0.5)`);
+    fuzzy_test_computed_color(`color-mix(in oklch, transparent 10%, oklch(0.3 40 30deg))`, `oklch(0.3 40 30 / 0.9)`);
+    fuzzy_test_computed_color(`color-mix(in oklch, oklch(0.1 20 120deg / 0), oklch(0.3 40 30deg))`, `oklch(0.3 40 75 / 0.5)`);
+    fuzzy_test_computed_color(`color-mix(in oklch, oklch(0.1 20 120deg / 0) 10%, oklch(0.3 40 30deg))`, `oklch(0.3 40 39 / 0.9)`);
 
-    test_computed_value(`color`, `color-mix(in oklch, oklch(1 0 40deg), oklch(1 0 60deg))`, `oklch(1 0 50)`);
-    test_computed_value(`color`, `color-mix(in oklch, oklch(1 0 60deg), oklch(1 0 40deg))`, `oklch(1 0 50)`);
-    test_computed_value(`color`, `color-mix(in oklch, oklch(1 0 50deg), oklch(1 0 330deg))`, `oklch(1 0 10)`);
-    test_computed_value(`color`, `color-mix(in oklch, oklch(1 0 330deg), oklch(1 0 50deg))`, `oklch(1 0 10)`);
-    test_computed_value(`color`, `color-mix(in oklch, oklch(1 0 20deg), oklch(1 0 320deg))`, `oklch(1 0 350)`);
-    test_computed_value(`color`, `color-mix(in oklch, oklch(1 0 320deg), oklch(1 0 20deg))`, `oklch(1 0 350)`);
+    fuzzy_test_computed_color(`color-mix(in oklch, oklch(1 0 40deg), oklch(1 0 60deg))`, `oklch(1 0 50)`);
+    fuzzy_test_computed_color(`color-mix(in oklch, oklch(1 0 60deg), oklch(1 0 40deg))`, `oklch(1 0 50)`);
+    fuzzy_test_computed_color(`color-mix(in oklch, oklch(1 0 50deg), oklch(1 0 330deg))`, `oklch(1 0 10)`);
+    fuzzy_test_computed_color(`color-mix(in oklch, oklch(1 0 330deg), oklch(1 0 50deg))`, `oklch(1 0 10)`);
+    fuzzy_test_computed_color(`color-mix(in oklch, oklch(1 0 20deg), oklch(1 0 320deg))`, `oklch(1 0 350)`);
+    fuzzy_test_computed_color(`color-mix(in oklch, oklch(1 0 320deg), oklch(1 0 20deg))`, `oklch(1 0 350)`);
 
-    test_computed_value(`color`, `color-mix(in oklch shorter hue, oklch(1 0 40deg), oklch(1 0 60deg))`, `oklch(1 0 50)`);
-    test_computed_value(`color`, `color-mix(in oklch shorter hue, oklch(1 0 60deg), oklch(1 0 40deg))`, `oklch(1 0 50)`);
-    test_computed_value(`color`, `color-mix(in oklch shorter hue, oklch(1 0 50deg), oklch(1 0 330deg))`, `oklch(1 0 10)`);
-    test_computed_value(`color`, `color-mix(in oklch shorter hue, oklch(1 0 330deg), oklch(1 0 50deg))`, `oklch(1 0 10)`);
-    test_computed_value(`color`, `color-mix(in oklch shorter hue, oklch(1 0 20deg), oklch(1 0 320deg))`, `oklch(1 0 350)`);
-    test_computed_value(`color`, `color-mix(in oklch shorter hue, oklch(1 0 320deg), oklch(1 0 20deg))`, `oklch(1 0 350)`);
+    fuzzy_test_computed_color(`color-mix(in oklch shorter hue, oklch(1 0 40deg), oklch(1 0 60deg))`, `oklch(1 0 50)`);
+    fuzzy_test_computed_color(`color-mix(in oklch shorter hue, oklch(1 0 60deg), oklch(1 0 40deg))`, `oklch(1 0 50)`);
+    fuzzy_test_computed_color(`color-mix(in oklch shorter hue, oklch(1 0 50deg), oklch(1 0 330deg))`, `oklch(1 0 10)`);
+    fuzzy_test_computed_color(`color-mix(in oklch shorter hue, oklch(1 0 330deg), oklch(1 0 50deg))`, `oklch(1 0 10)`);
+    fuzzy_test_computed_color(`color-mix(in oklch shorter hue, oklch(1 0 20deg), oklch(1 0 320deg))`, `oklch(1 0 350)`);
+    fuzzy_test_computed_color(`color-mix(in oklch shorter hue, oklch(1 0 320deg), oklch(1 0 20deg))`, `oklch(1 0 350)`);
 
-    test_computed_value(`color`, `color-mix(in oklch longer hue, oklch(1 0 40deg), oklch(1 0 60deg))`, `oklch(1 0 230)`);
-    test_computed_value(`color`, `color-mix(in oklch longer hue, oklch(1 0 60deg), oklch(1 0 40deg))`, `oklch(1 0 230)`);
-    test_computed_value(`color`, `color-mix(in oklch longer hue, oklch(1 0 50deg), oklch(1 0 330deg))`, `oklch(1 0 190)`);
-    test_computed_value(`color`, `color-mix(in oklch longer hue, oklch(1 0 330deg), oklch(1 0 50deg))`, `oklch(1 0 190)`);
-    test_computed_value(`color`, `color-mix(in oklch longer hue, oklch(1 0 20deg), oklch(1 0 320deg))`, `oklch(1 0 170)`);
-    test_computed_value(`color`, `color-mix(in oklch longer hue, oklch(1 0 320deg), oklch(1 0 20deg))`, `oklch(1 0 170)`);
+    fuzzy_test_computed_color(`color-mix(in oklch longer hue, oklch(1 0 40deg), oklch(1 0 60deg))`, `oklch(1 0 230)`);
+    fuzzy_test_computed_color(`color-mix(in oklch longer hue, oklch(1 0 60deg), oklch(1 0 40deg))`, `oklch(1 0 230)`);
+    fuzzy_test_computed_color(`color-mix(in oklch longer hue, oklch(1 0 50deg), oklch(1 0 330deg))`, `oklch(1 0 190)`);
+    fuzzy_test_computed_color(`color-mix(in oklch longer hue, oklch(1 0 330deg), oklch(1 0 50deg))`, `oklch(1 0 190)`);
+    fuzzy_test_computed_color(`color-mix(in oklch longer hue, oklch(1 0 20deg), oklch(1 0 320deg))`, `oklch(1 0 170)`);
+    fuzzy_test_computed_color(`color-mix(in oklch longer hue, oklch(1 0 320deg), oklch(1 0 20deg))`, `oklch(1 0 170)`);
 
-    test_computed_value(`color`, `color-mix(in oklch increasing hue, oklch(1 0 40deg), oklch(1 0 60deg))`, `oklch(1 0 50)`);
-    test_computed_value(`color`, `color-mix(in oklch increasing hue, oklch(1 0 60deg), oklch(1 0 40deg))`, `oklch(1 0 230)`);
-    test_computed_value(`color`, `color-mix(in oklch increasing hue, oklch(1 0 50deg), oklch(1 0 330deg))`, `oklch(1 0 190)`);
-    test_computed_value(`color`, `color-mix(in oklch increasing hue, oklch(1 0 330deg), oklch(1 0 50deg))`, `oklch(1 0 10)`);
-    test_computed_value(`color`, `color-mix(in oklch increasing hue, oklch(1 0 20deg), oklch(1 0 320deg))`, `oklch(1 0 170)`);
-    test_computed_value(`color`, `color-mix(in oklch increasing hue, oklch(1 0 320deg), oklch(1 0 20deg))`, `oklch(1 0 350)`);
+    fuzzy_test_computed_color(`color-mix(in oklch increasing hue, oklch(1 0 40deg), oklch(1 0 60deg))`, `oklch(1 0 50)`);
+    fuzzy_test_computed_color(`color-mix(in oklch increasing hue, oklch(1 0 60deg), oklch(1 0 40deg))`, `oklch(1 0 230)`);
+    fuzzy_test_computed_color(`color-mix(in oklch increasing hue, oklch(1 0 50deg), oklch(1 0 330deg))`, `oklch(1 0 190)`);
+    fuzzy_test_computed_color(`color-mix(in oklch increasing hue, oklch(1 0 330deg), oklch(1 0 50deg))`, `oklch(1 0 10)`);
+    fuzzy_test_computed_color(`color-mix(in oklch increasing hue, oklch(1 0 20deg), oklch(1 0 320deg))`, `oklch(1 0 170)`);
+    fuzzy_test_computed_color(`color-mix(in oklch increasing hue, oklch(1 0 320deg), oklch(1 0 20deg))`, `oklch(1 0 350)`);
 
-    test_computed_value(`color`, `color-mix(in oklch decreasing hue, oklch(1 0 40deg), oklch(1 0 60deg))`, `oklch(1 0 230)`);
-    test_computed_value(`color`, `color-mix(in oklch decreasing hue, oklch(1 0 60deg), oklch(1 0 40deg))`, `oklch(1 0 50)`);
-    test_computed_value(`color`, `color-mix(in oklch decreasing hue, oklch(1 0 50deg), oklch(1 0 330deg))`, `oklch(1 0 10)`);
-    test_computed_value(`color`, `color-mix(in oklch decreasing hue, oklch(1 0 330deg), oklch(1 0 50deg))`, `oklch(1 0 190)`);
-    test_computed_value(`color`, `color-mix(in oklch decreasing hue, oklch(1 0 20deg), oklch(1 0 320deg))`, `oklch(1 0 350)`);
-    test_computed_value(`color`, `color-mix(in oklch decreasing hue, oklch(1 0 320deg), oklch(1 0 20deg))`, `oklch(1 0 170)`);
+    fuzzy_test_computed_color(`color-mix(in oklch decreasing hue, oklch(1 0 40deg), oklch(1 0 60deg))`, `oklch(1 0 230)`);
+    fuzzy_test_computed_color(`color-mix(in oklch decreasing hue, oklch(1 0 60deg), oklch(1 0 40deg))`, `oklch(1 0 50)`);
+    fuzzy_test_computed_color(`color-mix(in oklch decreasing hue, oklch(1 0 50deg), oklch(1 0 330deg))`, `oklch(1 0 10)`);
+    fuzzy_test_computed_color(`color-mix(in oklch decreasing hue, oklch(1 0 330deg), oklch(1 0 50deg))`, `oklch(1 0 190)`);
+    fuzzy_test_computed_color(`color-mix(in oklch decreasing hue, oklch(1 0 20deg), oklch(1 0 320deg))`, `oklch(1 0 350)`);
+    fuzzy_test_computed_color(`color-mix(in oklch decreasing hue, oklch(1 0 320deg), oklch(1 0 20deg))`, `oklch(1 0 170)`);
 
-    test_computed_value(`color`, `color-mix(in oklch, oklch(none none none), oklch(none none none))`, `oklch(none none none)`);
-    test_computed_value(`color`, `color-mix(in oklch, oklch(none none none), oklch(0.5 0.6 70deg))`, `oklch(0.5 0.6 70)`);
-    test_computed_value(`color`, `color-mix(in oklch, oklch(0.1 0.2 30deg), oklch(none none none))`, `oklch(0.1 0.2 30)`);
-    test_computed_value(`color`, `color-mix(in oklch, oklch(0.1 0.2 none), oklch(0.5 0.6 70deg))`, `oklch(0.3 0.4 70)`);
-    test_computed_value(`color`, `color-mix(in oklch, oklch(0.1 0.2 30deg), oklch(0.5 0.6 none))`, `oklch(0.3 0.4 30)`);
-    test_computed_value(`color`, `color-mix(in oklch, oklch(none 0.2 30deg), oklch(0.5 none 70deg))`, `oklch(0.5 0.2 50)`);
-    test_computed_value(`color`, `color-mix(in oklch, oklch(0.1 0.2 30deg / none), oklch(0.5 0.6 70deg))`, `oklch(0.3 0.4 50)`);
-    test_computed_value(`color`, `color-mix(in oklch, oklch(0.1 0.2 30deg / none), oklch(0.5 0.6 70deg / 0.5))`, `oklch(0.3 0.4 50 / 0.5)`);
-    test_computed_value(`color`, `color-mix(in oklch, oklch(0.1 0.2 30deg / none), oklch(0.5 0.6 70deg / none))`, `oklch(0.3 0.4 50 / none)`);
+    fuzzy_test_computed_color(`color-mix(in oklch, oklch(none none none), oklch(none none none))`, `oklch(none none none)`);
+    fuzzy_test_computed_color(`color-mix(in oklch, oklch(none none none), oklch(0.5 0.6 70deg))`, `oklch(0.5 0.6 70)`);
+    fuzzy_test_computed_color(`color-mix(in oklch, oklch(0.1 0.2 30deg), oklch(none none none))`, `oklch(0.1 0.2 30)`);
+    fuzzy_test_computed_color(`color-mix(in oklch, oklch(0.1 0.2 none), oklch(0.5 0.6 70deg))`, `oklch(0.3 0.4 70)`);
+    fuzzy_test_computed_color(`color-mix(in oklch, oklch(0.1 0.2 30deg), oklch(0.5 0.6 none))`, `oklch(0.3 0.4 30)`);
+    fuzzy_test_computed_color(`color-mix(in oklch, oklch(none 0.2 30deg), oklch(0.5 none 70deg))`, `oklch(0.5 0.2 50)`);
+    fuzzy_test_computed_color(`color-mix(in oklch, oklch(0.1 0.2 30deg / none), oklch(0.5 0.6 70deg))`, `oklch(0.3 0.4 50)`);
+    fuzzy_test_computed_color(`color-mix(in oklch, oklch(0.1 0.2 30deg / none), oklch(0.5 0.6 70deg / 0.5))`, `oklch(0.3 0.4 50 / 0.5)`);
+    fuzzy_test_computed_color(`color-mix(in oklch, oklch(0.1 0.2 30deg / none), oklch(0.5 0.6 70deg / none))`, `oklch(0.3 0.4 50 / none)`);
 
     // lab()
-    test_computed_value(`color`, `color-mix(in lab, lab(10 20 30), lab(50 60 70))`, `lab(30 40 50)`);
-    test_computed_value(`color`, `color-mix(in lab, lab(10 20 30) 25%, lab(50 60 70))`, `lab(40 50 60)`);
-    test_computed_value(`color`, `color-mix(in lab, 25% lab(10 20 30), lab(50 60 70))`, `lab(40 50 60)`);
-    test_computed_value(`color`, `color-mix(in lab, lab(10 20 30), 25% lab(50 60 70))`, `lab(20 30 40)`);
-    test_computed_value(`color`, `color-mix(in lab, lab(10 20 30), lab(50 60 70) 25%)`, `lab(20 30 40)`);
-    test_computed_value(`color`, `color-mix(in lab, lab(10 20 30) 25%, lab(50 60 70) 75%)`, `lab(40 50 60)`);
-    test_computed_value(`color`, `color-mix(in lab, lab(10 20 30) 30%, lab(50 60 70) 90%)`, `lab(40 50 60)`); // Scale down > 100% sum.
-    test_computed_value(`color`, `color-mix(in lab, lab(10 20 30) 12.5%, lab(50 60 70) 37.5%)`, `lab(40 50 60 / 0.5)`); // Scale up < 100% sum, causes alpha multiplication.
-    test_computed_value(`color`, `color-mix(in lab, lab(10 20 30) 0%, lab(50 60 70))`, `lab(50 60 70)`);
+    fuzzy_test_computed_color(`color-mix(in lab, lab(10 20 30), lab(50 60 70))`, `lab(30 40 50)`);
+    fuzzy_test_computed_color(`color-mix(in lab, lab(10 20 30) 25%, lab(50 60 70))`, `lab(40 50 60)`);
+    fuzzy_test_computed_color(`color-mix(in lab, 25% lab(10 20 30), lab(50 60 70))`, `lab(40 50 60)`);
+    fuzzy_test_computed_color(`color-mix(in lab, lab(10 20 30), 25% lab(50 60 70))`, `lab(20 30 40)`);
+    fuzzy_test_computed_color(`color-mix(in lab, lab(10 20 30), lab(50 60 70) 25%)`, `lab(20 30 40)`);
+    fuzzy_test_computed_color(`color-mix(in lab, lab(10 20 30) 25%, lab(50 60 70) 75%)`, `lab(40 50 60)`);
+    fuzzy_test_computed_color(`color-mix(in lab, lab(10 20 30) 30%, lab(50 60 70) 90%)`, `lab(40 50 60)`); // Scale down > 100% sum.
+    fuzzy_test_computed_color(`color-mix(in lab, lab(10 20 30) 12.5%, lab(50 60 70) 37.5%)`, `lab(40 50 60 / 0.5)`); // Scale up < 100% sum, causes alpha multiplication.
+    fuzzy_test_computed_color(`color-mix(in lab, lab(10 20 30) 0%, lab(50 60 70))`, `lab(50 60 70)`);
 
-    test_computed_value(`color`, `color-mix(in lab, lab(10 20 30 / .4), lab(50 60 70 / .8))`, `lab(36.666664 46.666664 56.666664 / 0.6)`);
-    test_computed_value(`color`, `color-mix(in lab, lab(10 20 30 / .4) 25%, lab(50 60 70 / .8))`, `lab(44.285713 54.285717 64.28571 / 0.7)`);
-    test_computed_value(`color`, `color-mix(in lab, 25% lab(10 20 30 / .4), lab(50 60 70 / .8))`, `lab(44.285713 54.285717 64.28571 / 0.7)`);
-    test_computed_value(`color`, `color-mix(in lab, lab(10 20 30 / .4), 25% lab(50 60 70 / .8))`, `lab(26 36 46 / 0.5)`);
-    test_computed_value(`color`, `color-mix(in lab, lab(10 20 30 / .4), lab(50 60 70 / .8) 25%)`, `lab(26 36 46 / 0.5)`);
-    test_computed_value(`color`, `color-mix(in lab, lab(10 20 30 / .4) 25%, lab(50 60 70 / .8) 75%)`, `lab(44.285713 54.285717 64.28571 / 0.7)`);
-    test_computed_value(`color`, `color-mix(in lab, lab(10 20 30 / .4) 30%, lab(50 60 70 / .8) 90%)`, `lab(44.285713 54.285717 64.28571 / 0.7)`); // Scale down > 100% sum.
-    test_computed_value(`color`, `color-mix(in lab, lab(10 20 30 / .4) 12.5%, lab(50 60 70 / .8) 37.5%)`, `lab(44.285713 54.285717 64.28571 / 0.35)`); // Scale up < 100% sum, causes alpha multiplication.
-    test_computed_value(`color`, `color-mix(in lab, lab(10 20 30 / .4) 0%, lab(50 60 70 / .8))`, `lab(50 60 70 / 0.8)`);
+    fuzzy_test_computed_color(`color-mix(in lab, lab(10 20 30 / .4), lab(50 60 70 / .8))`, `lab(36.666664 46.666664 56.666664 / 0.6)`);
+    fuzzy_test_computed_color(`color-mix(in lab, lab(10 20 30 / .4) 25%, lab(50 60 70 / .8))`, `lab(44.285713 54.285717 64.28571 / 0.7)`);
+    fuzzy_test_computed_color(`color-mix(in lab, 25% lab(10 20 30 / .4), lab(50 60 70 / .8))`, `lab(44.285713 54.285717 64.28571 / 0.7)`);
+    fuzzy_test_computed_color(`color-mix(in lab, lab(10 20 30 / .4), 25% lab(50 60 70 / .8))`, `lab(26 36 46 / 0.5)`);
+    fuzzy_test_computed_color(`color-mix(in lab, lab(10 20 30 / .4), lab(50 60 70 / .8) 25%)`, `lab(26 36 46 / 0.5)`);
+    fuzzy_test_computed_color(`color-mix(in lab, lab(10 20 30 / .4) 25%, lab(50 60 70 / .8) 75%)`, `lab(44.285713 54.285717 64.28571 / 0.7)`);
+    fuzzy_test_computed_color(`color-mix(in lab, lab(10 20 30 / .4) 30%, lab(50 60 70 / .8) 90%)`, `lab(44.285713 54.285717 64.28571 / 0.7)`); // Scale down > 100% sum.
+    fuzzy_test_computed_color(`color-mix(in lab, lab(10 20 30 / .4) 12.5%, lab(50 60 70 / .8) 37.5%)`, `lab(44.285713 54.285717 64.28571 / 0.35)`); // Scale up < 100% sum, causes alpha multiplication.
+    fuzzy_test_computed_color(`color-mix(in lab, lab(10 20 30 / .4) 0%, lab(50 60 70 / .8))`, `lab(50 60 70 / 0.8)`);
 
-    test_computed_value(`color`, `color-mix(in lab, transparent, lab(30 40 50))`, 'lab(30 40 50 / 0.5)');
-    test_computed_value(`color`, `color-mix(in lab, transparent 10%, lab(30 40 50))`, 'lab(30 40 50 / 0.9)');
-    test_computed_value(`color`, `color-mix(in lab, lab(10 20 30 / 0), lab(30 40 50))`, 'lab(30 40 50 / 0.5)');
-    test_computed_value(`color`, `color-mix(in lab, lab(10 20 30 / 0) 10%, lab(30 40 50))`, 'lab(30 40 50 / 0.9)');
+    fuzzy_test_computed_color(`color-mix(in lab, transparent, lab(30 40 50))`, 'lab(30 40 50 / 0.5)');
+    fuzzy_test_computed_color(`color-mix(in lab, transparent 10%, lab(30 40 50))`, 'lab(30 40 50 / 0.9)');
+    fuzzy_test_computed_color(`color-mix(in lab, lab(10 20 30 / 0), lab(30 40 50))`, 'lab(30 40 50 / 0.5)');
+    fuzzy_test_computed_color(`color-mix(in lab, lab(10 20 30 / 0) 10%, lab(30 40 50))`, 'lab(30 40 50 / 0.9)');
 
-    test_computed_value(`color`, `color-mix(in lab, lab(none none none), lab(none none none))`, `lab(none none none)`);
-    test_computed_value(`color`, `color-mix(in lab, lab(none none none), lab(50 60 70))`, `lab(50 60 70)`);
-    test_computed_value(`color`, `color-mix(in lab, lab(10 20 30), lab(none none none))`, `lab(10 20 30)`);
-    test_computed_value(`color`, `color-mix(in lab, lab(10 20 none), lab(50 60 70))`, `lab(30 40 70)`);
-    test_computed_value(`color`, `color-mix(in lab, lab(10 20 30), lab(50 60 none))`, `lab(30 40 30)`);
-    test_computed_value(`color`, `color-mix(in lab, lab(none 20 30), lab(50 none 70))`, `lab(50 20 50)`);
-    test_computed_value(`color`, `color-mix(in lab, lab(10 20 30 / none), lab(50 60 70))`, `lab(30 40 50)`);
-    test_computed_value(`color`, `color-mix(in lab, lab(10 20 30 / none), lab(50 60 70 / 0.5))`, `lab(30 40 50 / 0.5)`);
-    test_computed_value(`color`, `color-mix(in lab, lab(10 20 30 / none), lab(50 60 70 / none))`, `lab(30 40 50 / none)`);
+    fuzzy_test_computed_color(`color-mix(in lab, lab(none none none), lab(none none none))`, `lab(none none none)`);
+    fuzzy_test_computed_color(`color-mix(in lab, lab(none none none), lab(50 60 70))`, `lab(50 60 70)`);
+    fuzzy_test_computed_color(`color-mix(in lab, lab(10 20 30), lab(none none none))`, `lab(10 20 30)`);
+    fuzzy_test_computed_color(`color-mix(in lab, lab(10 20 none), lab(50 60 70))`, `lab(30 40 70)`);
+    fuzzy_test_computed_color(`color-mix(in lab, lab(10 20 30), lab(50 60 none))`, `lab(30 40 30)`);
+    fuzzy_test_computed_color(`color-mix(in lab, lab(none 20 30), lab(50 none 70))`, `lab(50 20 50)`);
+    fuzzy_test_computed_color(`color-mix(in lab, lab(10 20 30 / none), lab(50 60 70))`, `lab(30 40 50)`);
+    fuzzy_test_computed_color(`color-mix(in lab, lab(10 20 30 / none), lab(50 60 70 / 0.5))`, `lab(30 40 50 / 0.5)`);
+    fuzzy_test_computed_color(`color-mix(in lab, lab(10 20 30 / none), lab(50 60 70 / none))`, `lab(30 40 50 / none)`);
 
     // oklab()
-    test_computed_value(`color`, `color-mix(in oklab, oklab(0.1 0.2 0.3), oklab(0.5 0.6 0.7))`, `oklab(0.3 0.4 0.5)`);
-    test_computed_value(`color`, `color-mix(in oklab, oklab(0.1 0.2 0.3) 25%, oklab(0.5 0.6 0.7))`, `oklab(0.4 0.5 0.6)`);
-    test_computed_value(`color`, `color-mix(in oklab, 25% oklab(0.1 0.2 0.3), oklab(0.5 0.6 0.7))`, `oklab(0.4 0.5 0.6)`);
-    test_computed_value(`color`, `color-mix(in oklab, oklab(0.1 0.2 0.3), 25% oklab(0.5 0.6 0.7))`, `oklab(0.2 0.3 0.4)`);
-    test_computed_value(`color`, `color-mix(in oklab, oklab(0.1 0.2 0.3), oklab(0.5 0.6 0.7) 25%)`, `oklab(0.2 0.3 0.4)`);
-    test_computed_value(`color`, `color-mix(in oklab, oklab(0.1 0.2 0.3) 25%, oklab(0.5 0.6 0.7) 75%)`, `oklab(0.4 0.5 0.6)`);
-    test_computed_value(`color`, `color-mix(in oklab, oklab(0.1 0.2 0.3) 30%, oklab(0.5 0.6 0.7) 90%)`, `oklab(0.4 0.5 0.6)`); // Scale down > 100% sum.
-    test_computed_value(`color`, `color-mix(in oklab, oklab(0.1 0.2 0.3) 12.5%, oklab(0.5 0.6 0.7) 37.5%)`, `oklab(0.4 0.5 0.6 / 0.5)`); // Scale up < 100% sum, causes alpha multiplication.
-    test_computed_value(`color`, `color-mix(in oklab, oklab(0.1 0.2 0.3) 0%, oklab(0.5 0.6 0.7))`, `oklab(0.5 0.6 0.7)`);
+    fuzzy_test_computed_color(`color-mix(in oklab, oklab(0.1 0.2 0.3), oklab(0.5 0.6 0.7))`, `oklab(0.3 0.4 0.5)`);
+    fuzzy_test_computed_color(`color-mix(in oklab, oklab(0.1 0.2 0.3) 25%, oklab(0.5 0.6 0.7))`, `oklab(0.4 0.5 0.6)`);
+    fuzzy_test_computed_color(`color-mix(in oklab, 25% oklab(0.1 0.2 0.3), oklab(0.5 0.6 0.7))`, `oklab(0.4 0.5 0.6)`);
+    fuzzy_test_computed_color(`color-mix(in oklab, oklab(0.1 0.2 0.3), 25% oklab(0.5 0.6 0.7))`, `oklab(0.2 0.3 0.4)`);
+    fuzzy_test_computed_color(`color-mix(in oklab, oklab(0.1 0.2 0.3), oklab(0.5 0.6 0.7) 25%)`, `oklab(0.2 0.3 0.4)`);
+    fuzzy_test_computed_color(`color-mix(in oklab, oklab(0.1 0.2 0.3) 25%, oklab(0.5 0.6 0.7) 75%)`, `oklab(0.4 0.5 0.6)`);
+    fuzzy_test_computed_color(`color-mix(in oklab, oklab(0.1 0.2 0.3) 30%, oklab(0.5 0.6 0.7) 90%)`, `oklab(0.4 0.5 0.6)`); // Scale down > 100% sum.
+    fuzzy_test_computed_color(`color-mix(in oklab, oklab(0.1 0.2 0.3) 12.5%, oklab(0.5 0.6 0.7) 37.5%)`, `oklab(0.4 0.5 0.6 / 0.5)`); // Scale up < 100% sum, causes alpha multiplication.
+    fuzzy_test_computed_color(`color-mix(in oklab, oklab(0.1 0.2 0.3) 0%, oklab(0.5 0.6 0.7))`, `oklab(0.5 0.6 0.7)`);
 
-    test_computed_value(`color`, `color-mix(in oklab, oklab(0.1 0.2 0.3 / .4), oklab(0.5 0.6 0.7 / .8))`, `oklab(0.36666664 0.46666664 0.56666664 / 0.6)`);
-    test_computed_value(`color`, `color-mix(in oklab, oklab(0.1 0.2 0.3 / .4) 25%, oklab(0.5 0.6 0.7 / .8))`, `oklab(0.44285713 0.54285717 0.6428571 / 0.7)`);
-    test_computed_value(`color`, `color-mix(in oklab, 25% oklab(0.1 0.2 0.3 / .4), oklab(0.5 0.6 0.7 / .8))`, `oklab(0.44285713 0.54285717 0.6428571 / 0.7)`);
-    test_computed_value(`color`, `color-mix(in oklab, oklab(0.1 0.2 0.3 / .4), 25% oklab(0.5 0.6 0.7 / .8))`, `oklab(0.26 0.36 0.46 / 0.5)`);
-    test_computed_value(`color`, `color-mix(in oklab, oklab(0.1 0.2 0.3 / .4), oklab(0.5 0.6 0.7 / .8) 25%)`, `oklab(0.26 0.36 0.46 / 0.5)`);
-    test_computed_value(`color`, `color-mix(in oklab, oklab(0.1 0.2 0.3 / .4) 25%, oklab(0.5 0.6 0.7 / .8) 75%)`, `oklab(0.44285713 0.54285717 0.6428571 / 0.7)`);
-    test_computed_value(`color`, `color-mix(in oklab, oklab(0.1 0.2 0.3 / .4) 30%, oklab(0.5 0.6 0.7 / .8) 90%)`, `oklab(0.44285713 0.54285717 0.6428571 / 0.7)`); // Scale down > 100% sum.
-    test_computed_value(`color`, `color-mix(in oklab, oklab(0.1 0.2 0.3 / .4) 12.5%, oklab(0.5 0.6 0.7 / .8) 37.5%)`, `oklab(0.44285713 0.54285717 0.6428571 / 0.35)`); // Scale up < 100% sum, causes alpha multiplication.
-    test_computed_value(`color`, `color-mix(in oklab, oklab(0.1 0.2 0.3 / .4) 0%, oklab(0.5 0.6 0.7 / .8))`, `oklab(0.5 0.6 0.7 / 0.8)`);
+    fuzzy_test_computed_color(`color-mix(in oklab, oklab(0.1 0.2 0.3 / .4), oklab(0.5 0.6 0.7 / .8))`, `oklab(0.36666664 0.46666664 0.56666664 / 0.6)`);
+    fuzzy_test_computed_color(`color-mix(in oklab, oklab(0.1 0.2 0.3 / .4) 25%, oklab(0.5 0.6 0.7 / .8))`, `oklab(0.44285713 0.54285717 0.6428571 / 0.7)`);
+    fuzzy_test_computed_color(`color-mix(in oklab, 25% oklab(0.1 0.2 0.3 / .4), oklab(0.5 0.6 0.7 / .8))`, `oklab(0.44285713 0.54285717 0.6428571 / 0.7)`);
+    fuzzy_test_computed_color(`color-mix(in oklab, oklab(0.1 0.2 0.3 / .4), 25% oklab(0.5 0.6 0.7 / .8))`, `oklab(0.26 0.36 0.46 / 0.5)`);
+    fuzzy_test_computed_color(`color-mix(in oklab, oklab(0.1 0.2 0.3 / .4), oklab(0.5 0.6 0.7 / .8) 25%)`, `oklab(0.26 0.36 0.46 / 0.5)`);
+    fuzzy_test_computed_color(`color-mix(in oklab, oklab(0.1 0.2 0.3 / .4) 25%, oklab(0.5 0.6 0.7 / .8) 75%)`, `oklab(0.44285713 0.54285717 0.6428571 / 0.7)`);
+    fuzzy_test_computed_color(`color-mix(in oklab, oklab(0.1 0.2 0.3 / .4) 30%, oklab(0.5 0.6 0.7 / .8) 90%)`, `oklab(0.44285713 0.54285717 0.6428571 / 0.7)`); // Scale down > 100% sum.
+    fuzzy_test_computed_color(`color-mix(in oklab, oklab(0.1 0.2 0.3 / .4) 12.5%, oklab(0.5 0.6 0.7 / .8) 37.5%)`, `oklab(0.44285713 0.54285717 0.6428571 / 0.35)`); // Scale up < 100% sum, causes alpha multiplication.
+    fuzzy_test_computed_color(`color-mix(in oklab, oklab(0.1 0.2 0.3 / .4) 0%, oklab(0.5 0.6 0.7 / .8))`, `oklab(0.5 0.6 0.7 / 0.8)`);
 
-    test_computed_value(`color`, `color-mix(in oklab, transparent, oklab(0.3 0.4 0.5))`, 'oklab(0.3 0.4 0.5 / 0.5)');
-    test_computed_value(`color`, `color-mix(in oklab, transparent 10%, oklab(0.3 0.4 0.5))`, 'oklab(0.3 0.4 0.5 / 0.9)');
-    test_computed_value(`color`, `color-mix(in oklab, oklab(0.1 0.2 0.3 / 0), oklab(0.3 0.4 0.5))`, 'oklab(0.3 0.4 0.5 / 0.5)');
-    test_computed_value(`color`, `color-mix(in oklab, oklab(0.1 0.2 0.3 / 0) 10%, oklab(0.3 0.4 0.5))`, 'oklab(0.3 0.4 0.5 / 0.9)');
+    fuzzy_test_computed_color(`color-mix(in oklab, transparent, oklab(0.3 0.4 0.5))`, 'oklab(0.3 0.4 0.5 / 0.5)');
+    fuzzy_test_computed_color(`color-mix(in oklab, transparent 10%, oklab(0.3 0.4 0.5))`, 'oklab(0.3 0.4 0.5 / 0.9)');
+    fuzzy_test_computed_color(`color-mix(in oklab, oklab(0.1 0.2 0.3 / 0), oklab(0.3 0.4 0.5))`, 'oklab(0.3 0.4 0.5 / 0.5)');
+    fuzzy_test_computed_color(`color-mix(in oklab, oklab(0.1 0.2 0.3 / 0) 10%, oklab(0.3 0.4 0.5))`, 'oklab(0.3 0.4 0.5 / 0.9)');
 
-    test_computed_value(`color`, `color-mix(in oklab, oklab(none none none), oklab(none none none))`, `oklab(none none none)`);
-    test_computed_value(`color`, `color-mix(in oklab, oklab(none none none), oklab(0.5 0.6 0.7))`, `oklab(0.5 0.6 0.7)`);
-    test_computed_value(`color`, `color-mix(in oklab, oklab(0.1 0.2 0.3), oklab(none none none))`, `oklab(0.1 0.2 0.3)`);
-    test_computed_value(`color`, `color-mix(in oklab, oklab(0.1 0.2 none), oklab(0.5 0.6 0.7))`, `oklab(0.3 0.4 0.7)`);
-    test_computed_value(`color`, `color-mix(in oklab, oklab(0.1 0.2 0.3), oklab(0.5 0.6 none))`, `oklab(0.3 0.4 0.3)`);
-    test_computed_value(`color`, `color-mix(in oklab, oklab(none 0.2 0.3), oklab(0.5 none 0.7))`, `oklab(0.5 0.2 0.5)`);
-    test_computed_value(`color`, `color-mix(in oklab, oklab(0.1 0.2 0.3 / none), oklab(0.5 0.6 0.7))`, `oklab(0.3 0.4 0.5)`);
-    test_computed_value(`color`, `color-mix(in oklab, oklab(0.1 0.2 0.3 / none), oklab(0.5 0.6 0.7 / 0.5))`, `oklab(0.3 0.4 0.5 / 0.5)`);
-    test_computed_value(`color`, `color-mix(in oklab, oklab(0.1 0.2 0.3 / none), oklab(0.5 0.6 0.7 / none))`, `oklab(0.3 0.4 0.5 / none)`);
+    fuzzy_test_computed_color(`color-mix(in oklab, oklab(none none none), oklab(none none none))`, `oklab(none none none)`);
+    fuzzy_test_computed_color(`color-mix(in oklab, oklab(none none none), oklab(0.5 0.6 0.7))`, `oklab(0.5 0.6 0.7)`);
+    fuzzy_test_computed_color(`color-mix(in oklab, oklab(0.1 0.2 0.3), oklab(none none none))`, `oklab(0.1 0.2 0.3)`);
+    fuzzy_test_computed_color(`color-mix(in oklab, oklab(0.1 0.2 none), oklab(0.5 0.6 0.7))`, `oklab(0.3 0.4 0.7)`);
+    fuzzy_test_computed_color(`color-mix(in oklab, oklab(0.1 0.2 0.3), oklab(0.5 0.6 none))`, `oklab(0.3 0.4 0.3)`);
+    fuzzy_test_computed_color(`color-mix(in oklab, oklab(none 0.2 0.3), oklab(0.5 none 0.7))`, `oklab(0.5 0.2 0.5)`);
+    fuzzy_test_computed_color(`color-mix(in oklab, oklab(0.1 0.2 0.3 / none), oklab(0.5 0.6 0.7))`, `oklab(0.3 0.4 0.5)`);
+    fuzzy_test_computed_color(`color-mix(in oklab, oklab(0.1 0.2 0.3 / none), oklab(0.5 0.6 0.7 / 0.5))`, `oklab(0.3 0.4 0.5 / 0.5)`);
+    fuzzy_test_computed_color(`color-mix(in oklab, oklab(0.1 0.2 0.3 / none), oklab(0.5 0.6 0.7 / none))`, `oklab(0.3 0.4 0.5 / none)`);
 
 
     for (const colorSpace of [ "srgb", "srgb-linear", "xyz", "xyz-d50", "xyz-d65" ]) {
         const resultColorSpace = colorSpace == "xyz" ? "xyz-d65" : colorSpace;
 
-        test_computed_value(`color`, `color-mix(in ${colorSpace}, color(${colorSpace} .1 .2 .3), color(${colorSpace} .5 .6 .7))`, `color(${resultColorSpace} 0.3 0.4 0.5)`);
-        test_computed_value(`color`, `color-mix(in ${colorSpace}, color(${colorSpace} .1 .2 .3) 25%, color(${colorSpace} .5 .6 .7))`, `color(${resultColorSpace} 0.4 0.5 0.6)`);
-        test_computed_value(`color`, `color-mix(in ${colorSpace}, 25% color(${colorSpace} .1 .2 .3), color(${colorSpace} .5 .6 .7))`, `color(${resultColorSpace} 0.4 0.5 0.6)`);
-        test_computed_value(`color`, `color-mix(in ${colorSpace}, color(${colorSpace} .1 .2 .3), color(${colorSpace} .5 .6 .7) 25%)`, `color(${resultColorSpace} 0.2 0.3 0.4)`);
-        test_computed_value(`color`, `color-mix(in ${colorSpace}, color(${colorSpace} .1 .2 .3), 25% color(${colorSpace} .5 .6 .7))`, `color(${resultColorSpace} 0.2 0.3 0.4)`);
-        test_computed_value(`color`, `color-mix(in ${colorSpace}, color(${colorSpace} .1 .2 .3) 25%, color(${colorSpace} .5 .6 .7) 75%)`, `color(${resultColorSpace} 0.4 0.5 0.6)`);
-        test_computed_value(`color`, `color-mix(in ${colorSpace}, color(${colorSpace} .1 .2 .3) 30%, color(${colorSpace} .5 .6 .7) 90%)`, `color(${resultColorSpace} 0.4 0.5 0.6)`); // Scale down > 100% sum.
-        test_computed_value(`color`, `color-mix(in ${colorSpace}, color(${colorSpace} .1 .2 .3) 12.5%, color(${colorSpace} .5 .6 .7) 37.5%)`, `color(${resultColorSpace} 0.4 0.5 0.6 / 0.5)`); // Scale up < 100% sum, causes alpha multiplication.
-        test_computed_value(`color`, `color-mix(in ${colorSpace}, color(${colorSpace} .1 .2 .3) 0%, color(${colorSpace} .5 .6 .7))`, `color(${resultColorSpace} 0.5 0.6 0.7)`);
+        fuzzy_test_computed_color(`color-mix(in ${colorSpace}, color(${colorSpace} .1 .2 .3), color(${colorSpace} .5 .6 .7))`, `color(${resultColorSpace} 0.3 0.4 0.5)`);
+        fuzzy_test_computed_color(`color-mix(in ${colorSpace}, color(${colorSpace} .1 .2 .3) 25%, color(${colorSpace} .5 .6 .7))`, `color(${resultColorSpace} 0.4 0.5 0.6)`);
+        fuzzy_test_computed_color(`color-mix(in ${colorSpace}, 25% color(${colorSpace} .1 .2 .3), color(${colorSpace} .5 .6 .7))`, `color(${resultColorSpace} 0.4 0.5 0.6)`);
+        fuzzy_test_computed_color(`color-mix(in ${colorSpace}, color(${colorSpace} .1 .2 .3), color(${colorSpace} .5 .6 .7) 25%)`, `color(${resultColorSpace} 0.2 0.3 0.4)`);
+        fuzzy_test_computed_color(`color-mix(in ${colorSpace}, color(${colorSpace} .1 .2 .3), 25% color(${colorSpace} .5 .6 .7))`, `color(${resultColorSpace} 0.2 0.3 0.4)`);
+        fuzzy_test_computed_color(`color-mix(in ${colorSpace}, color(${colorSpace} .1 .2 .3) 25%, color(${colorSpace} .5 .6 .7) 75%)`, `color(${resultColorSpace} 0.4 0.5 0.6)`);
+        fuzzy_test_computed_color(`color-mix(in ${colorSpace}, color(${colorSpace} .1 .2 .3) 30%, color(${colorSpace} .5 .6 .7) 90%)`, `color(${resultColorSpace} 0.4 0.5 0.6)`); // Scale down > 100% sum.
+        fuzzy_test_computed_color(`color-mix(in ${colorSpace}, color(${colorSpace} .1 .2 .3) 12.5%, color(${colorSpace} .5 .6 .7) 37.5%)`, `color(${resultColorSpace} 0.4 0.5 0.6 / 0.5)`); // Scale up < 100% sum, causes alpha multiplication.
+        fuzzy_test_computed_color(`color-mix(in ${colorSpace}, color(${colorSpace} .1 .2 .3) 0%, color(${colorSpace} .5 .6 .7))`, `color(${resultColorSpace} 0.5 0.6 0.7)`);
 
-        test_computed_value(`color`, `color-mix(in ${colorSpace}, color(${colorSpace} .1 .2 .3 / .5), color(${colorSpace} .5 .6 .7 / .8))`, `color(${resultColorSpace} 0.3461539 0.4461539 0.5461539 / 0.65)`);
-        test_computed_value(`color`, `color-mix(in ${colorSpace}, color(${colorSpace} .1 .2 .3 / .4) 25%, color(${colorSpace} .5 .6 .7 / .8))`, `color(${resultColorSpace} 0.44285715 0.54285717 0.64285713 / 0.7)`);
-        test_computed_value(`color`, `color-mix(in ${colorSpace}, 25% color(${colorSpace} .1 .2 .3 / .4), color(${colorSpace} .5 .6 .7 / .8))`, `color(${resultColorSpace} 0.44285715 0.54285717 0.64285713 / 0.7)`);
-        test_computed_value(`color`, `color-mix(in ${colorSpace}, color(${colorSpace} .1 .2 .3 / .4), color(${colorSpace} .5 .6 .7 / .8) 25%)`, `color(${resultColorSpace} 0.26000002 0.36 0.46 / 0.5)`);
-        test_computed_value(`color`, `color-mix(in ${colorSpace}, color(${colorSpace} .1 .2 .3 / .4), 25% color(${colorSpace} .5 .6 .7 / .8))`, `color(${resultColorSpace} 0.26000002 0.36 0.46 / 0.5)`);
-        test_computed_value(`color`, `color-mix(in ${colorSpace}, color(${colorSpace} .1 .2 .3 / .4) 25%, color(${colorSpace} .5 .6 .7 / .8) 75%)`, `color(${resultColorSpace} 0.44285715 0.54285717 0.64285713 / 0.7)`);
-        test_computed_value(`color`, `color-mix(in ${colorSpace}, color(${colorSpace} .1 .2 .3 / .4) 30%, color(${colorSpace} .5 .6 .7 / .8) 90%)`, `color(${resultColorSpace} 0.44285715 0.54285717 0.64285713 / 0.7)`); // Scale down > 100% sum.
-        test_computed_value(`color`, `color-mix(in ${colorSpace}, color(${colorSpace} .1 .2 .3 / .4) 12.5%, color(${colorSpace} .5 .6 .7 / .8) 37.5%)`, `color(${resultColorSpace} 0.44285715 0.54285717 0.64285713 / 0.35)`); // Scale up < 100% sum, causes alpha multiplication.
-        test_computed_value(`color`, `color-mix(in ${colorSpace}, color(${colorSpace} .1 .2 .3 / .4) 0%, color(${colorSpace} .5 .6 .7 / .8))`, `color(${resultColorSpace} 0.5 0.6 0.7 / 0.8)`);
+        fuzzy_test_computed_color(`color-mix(in ${colorSpace}, color(${colorSpace} .1 .2 .3 / .5), color(${colorSpace} .5 .6 .7 / .8))`, `color(${resultColorSpace} 0.3461539 0.4461539 0.5461539 / 0.65)`);
+        fuzzy_test_computed_color(`color-mix(in ${colorSpace}, color(${colorSpace} .1 .2 .3 / .4) 25%, color(${colorSpace} .5 .6 .7 / .8))`, `color(${resultColorSpace} 0.44285715 0.54285717 0.64285713 / 0.7)`);
+        fuzzy_test_computed_color(`color-mix(in ${colorSpace}, 25% color(${colorSpace} .1 .2 .3 / .4), color(${colorSpace} .5 .6 .7 / .8))`, `color(${resultColorSpace} 0.44285715 0.54285717 0.64285713 / 0.7)`);
+        fuzzy_test_computed_color(`color-mix(in ${colorSpace}, color(${colorSpace} .1 .2 .3 / .4), color(${colorSpace} .5 .6 .7 / .8) 25%)`, `color(${resultColorSpace} 0.26000002 0.36 0.46 / 0.5)`);
+        fuzzy_test_computed_color(`color-mix(in ${colorSpace}, color(${colorSpace} .1 .2 .3 / .4), 25% color(${colorSpace} .5 .6 .7 / .8))`, `color(${resultColorSpace} 0.26000002 0.36 0.46 / 0.5)`);
+        fuzzy_test_computed_color(`color-mix(in ${colorSpace}, color(${colorSpace} .1 .2 .3 / .4) 25%, color(${colorSpace} .5 .6 .7 / .8) 75%)`, `color(${resultColorSpace} 0.44285715 0.54285717 0.64285713 / 0.7)`);
+        fuzzy_test_computed_color(`color-mix(in ${colorSpace}, color(${colorSpace} .1 .2 .3 / .4) 30%, color(${colorSpace} .5 .6 .7 / .8) 90%)`, `color(${resultColorSpace} 0.44285715 0.54285717 0.64285713 / 0.7)`); // Scale down > 100% sum.
+        fuzzy_test_computed_color(`color-mix(in ${colorSpace}, color(${colorSpace} .1 .2 .3 / .4) 12.5%, color(${colorSpace} .5 .6 .7 / .8) 37.5%)`, `color(${resultColorSpace} 0.44285715 0.54285717 0.64285713 / 0.35)`); // Scale up < 100% sum, causes alpha multiplication.
+        fuzzy_test_computed_color(`color-mix(in ${colorSpace}, color(${colorSpace} .1 .2 .3 / .4) 0%, color(${colorSpace} .5 .6 .7 / .8))`, `color(${resultColorSpace} 0.5 0.6 0.7 / 0.8)`);
 
-        test_computed_value(`color`, `color-mix(in ${colorSpace}, transparent, color(${colorSpace} 0.3 0.4 0.5))`, `color(${resultColorSpace} 0.3 0.4 0.5 / 0.5)`);
-        test_computed_value(`color`, `color-mix(in ${colorSpace}, transparent 10%, color(${colorSpace} 0.3 0.4 0.5))`, `color(${resultColorSpace} 0.3 0.4 0.5 / 0.9)`);
-        test_computed_value(`color`, `color-mix(in ${colorSpace}, color(${colorSpace} 0.1 0.2 0.3 / 0), color(${colorSpace} 0.3 0.4 0.5))`, `color(${resultColorSpace} 0.3 0.4 0.5 / 0.5)`);
-        test_computed_value(`color`, `color-mix(in ${colorSpace}, color(${colorSpace} 0.1 0.2 0.3 / 0) 10%, color(${colorSpace} 0.3 0.4 0.5))`, `color(${resultColorSpace} 0.3 0.4 0.5 / 0.9)`);
+        fuzzy_test_computed_color(`color-mix(in ${colorSpace}, transparent, color(${colorSpace} 0.3 0.4 0.5))`, `color(${resultColorSpace} 0.3 0.4 0.5 / 0.5)`);
+        fuzzy_test_computed_color(`color-mix(in ${colorSpace}, transparent 10%, color(${colorSpace} 0.3 0.4 0.5))`, `color(${resultColorSpace} 0.3 0.4 0.5 / 0.9)`);
+        fuzzy_test_computed_color(`color-mix(in ${colorSpace}, color(${colorSpace} 0.1 0.2 0.3 / 0), color(${colorSpace} 0.3 0.4 0.5))`, `color(${resultColorSpace} 0.3 0.4 0.5 / 0.5)`);
+        fuzzy_test_computed_color(`color-mix(in ${colorSpace}, color(${colorSpace} 0.1 0.2 0.3 / 0) 10%, color(${colorSpace} 0.3 0.4 0.5))`, `color(${resultColorSpace} 0.3 0.4 0.5 / 0.9)`);
 
-        test_computed_value(`color`, `color-mix(in ${colorSpace}, color(${colorSpace} 2 3 4 / 5), color(${colorSpace} 4 6 8 / 10))`, `color(${resultColorSpace} 3 4.5 6)`);
-        test_computed_value(`color`, `color-mix(in ${colorSpace}, color(${colorSpace} -2 -3 -4), color(${colorSpace} -4 -6 -8))`, `color(${resultColorSpace} -3 -4.5 -6)`);
-        test_computed_value(`color`, `color-mix(in ${colorSpace}, color(${colorSpace} -2 -3 -4 / -5), color(${colorSpace} -4 -6 -8 / -10))`, `color(${resultColorSpace} 0 0 0 / 0)`);
+        fuzzy_test_computed_color(`color-mix(in ${colorSpace}, color(${colorSpace} 2 3 4 / 5), color(${colorSpace} 4 6 8 / 10))`, `color(${resultColorSpace} 3 4.5 6)`);
+        fuzzy_test_computed_color(`color-mix(in ${colorSpace}, color(${colorSpace} -2 -3 -4), color(${colorSpace} -4 -6 -8))`, `color(${resultColorSpace} -3 -4.5 -6)`);
+        fuzzy_test_computed_color(`color-mix(in ${colorSpace}, color(${colorSpace} -2 -3 -4 / -5), color(${colorSpace} -4 -6 -8 / -10))`, `color(${resultColorSpace} 0 0 0 / 0)`);
 
-        test_computed_value(`color`, `color-mix(in ${colorSpace}, color(${colorSpace} none none none), color(${colorSpace} none none none))`, `color(${resultColorSpace} none none none)`);
-        test_computed_value(`color`, `color-mix(in ${colorSpace}, color(${colorSpace} none none none), color(${colorSpace} .5 .6 .7))`, `color(${resultColorSpace} 0.5 0.6 0.7)`);
-        test_computed_value(`color`, `color-mix(in ${colorSpace}, color(${colorSpace} .1 .2 .3), color(${colorSpace} none none none))`, `color(${resultColorSpace} 0.1 0.2 0.3)`);
-        test_computed_value(`color`, `color-mix(in ${colorSpace}, color(${colorSpace} .1 .2 none), color(${colorSpace} .5 .6 .7))`, `color(${resultColorSpace} 0.3 0.4 0.7)`);
-        test_computed_value(`color`, `color-mix(in ${colorSpace}, color(${colorSpace} .1 .2 .3), color(${colorSpace} .5 .6 none))`, `color(${resultColorSpace} 0.3 0.4 0.3)`);
-        test_computed_value(`color`, `color-mix(in ${colorSpace}, color(${colorSpace} none .2 .3), color(${colorSpace} .5 none .7))`, `color(${resultColorSpace} 0.5 0.2 0.5)`);
-        test_computed_value(`color`, `color-mix(in ${colorSpace}, color(${colorSpace} .1 .2 .3 / none), color(${colorSpace} .5 .6 .7))`, `color(${resultColorSpace} 0.3 0.4 0.5)`);
-        test_computed_value(`color`, `color-mix(in ${colorSpace}, color(${colorSpace} .1 .2 .3 / none), color(${colorSpace} .5 .6 .7 / 0.5))`, `color(${resultColorSpace} 0.3 0.4 0.5 / 0.5)`);
-        test_computed_value(`color`, `color-mix(in ${colorSpace}, color(${colorSpace} .1 .2 .3 / none), color(${colorSpace} .5 .6 .7 / none))`, `color(${resultColorSpace} 0.3 0.4 0.5 / none)`);
+        fuzzy_test_computed_color(`color-mix(in ${colorSpace}, color(${colorSpace} none none none), color(${colorSpace} none none none))`, `color(${resultColorSpace} none none none)`);
+        fuzzy_test_computed_color(`color-mix(in ${colorSpace}, color(${colorSpace} none none none), color(${colorSpace} .5 .6 .7))`, `color(${resultColorSpace} 0.5 0.6 0.7)`);
+        fuzzy_test_computed_color(`color-mix(in ${colorSpace}, color(${colorSpace} .1 .2 .3), color(${colorSpace} none none none))`, `color(${resultColorSpace} 0.1 0.2 0.3)`);
+        fuzzy_test_computed_color(`color-mix(in ${colorSpace}, color(${colorSpace} .1 .2 none), color(${colorSpace} .5 .6 .7))`, `color(${resultColorSpace} 0.3 0.4 0.7)`);
+        fuzzy_test_computed_color(`color-mix(in ${colorSpace}, color(${colorSpace} .1 .2 .3), color(${colorSpace} .5 .6 none))`, `color(${resultColorSpace} 0.3 0.4 0.3)`);
+        fuzzy_test_computed_color(`color-mix(in ${colorSpace}, color(${colorSpace} none .2 .3), color(${colorSpace} .5 none .7))`, `color(${resultColorSpace} 0.5 0.2 0.5)`);
+        fuzzy_test_computed_color(`color-mix(in ${colorSpace}, color(${colorSpace} .1 .2 .3 / none), color(${colorSpace} .5 .6 .7))`, `color(${resultColorSpace} 0.3 0.4 0.5)`);
+        fuzzy_test_computed_color(`color-mix(in ${colorSpace}, color(${colorSpace} .1 .2 .3 / none), color(${colorSpace} .5 .6 .7 / 0.5))`, `color(${resultColorSpace} 0.3 0.4 0.5 / 0.5)`);
+        fuzzy_test_computed_color(`color-mix(in ${colorSpace}, color(${colorSpace} .1 .2 .3 / none), color(${colorSpace} .5 .6 .7 / none))`, `color(${resultColorSpace} 0.3 0.4 0.5 / none)`);
     }
 </script>
 </body>
diff --git a/tests/wpt/tests/css/css-color/parsing/color-computed-relative-color.html b/tests/wpt/tests/css/css-color/parsing/color-computed-relative-color.html
index f1e0a734970..fd51bc2d2d4 100644
--- a/tests/wpt/tests/css/css-color/parsing/color-computed-relative-color.html
+++ b/tests/wpt/tests/css/css-color/parsing/color-computed-relative-color.html
@@ -10,6 +10,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/css/support/computed-testcommon.js"></script>
+<script src="/css/support/color-testcommon.js"></script>
 <style>
     html {
         --bg-color: blue;
@@ -23,757 +24,699 @@
 <body>
 <div id="target"></div>
 <script>
-    // rgb(from ...)
+  // rgb(from ...)
 
   // Testing no modifications.
-  test_computed_value(`color`, `rgb(from rebeccapurple r g b)`, `rgb(102, 51, 153)`);
-  test_computed_value(`color`, `rgb(from rebeccapurple r g b / alpha)`, `rgb(102, 51, 153)`);
-  test_computed_value(`color`, `rgb(from rgb(20%, 40%, 60%, 80%) r g b / alpha)`, `rgba(51, 102, 153, 0.8)`);
-  test_computed_value(`color`, `rgb(from hsl(120deg 20% 50% / .5) r g b / alpha)`, `rgba(102, 153, 102, 0.5)`);
+  fuzzy_test_computed_color(`rgb(from rebeccapurple r g b)`, `color(srgb 0.4 0.2 0.6)`);
+  fuzzy_test_computed_color(`rgb(from rebeccapurple r g b / alpha)`, `color(srgb 0.4 0.2 0.6)`);
+  fuzzy_test_computed_color(`rgb(from rgb(20%, 40%, 60%, 80%) r g b / alpha)`, `color(srgb 0.2 0.4 0.6 / 0.8)`);
+  fuzzy_test_computed_color(`rgb(from hsl(120deg 20% 50% / .5) r g b / alpha)`, `color(srgb 0.4 0.6 0.4 / 0.5)`);
 
   // Test nesting relative colors.
-  test_computed_value(`color`, `rgb(from rgb(from rebeccapurple r g b) r g b)`, `rgb(102, 51, 153)`);
-
-  // Testing non-sRGB origin colors to see gamut mapping.
-  test_computed_value(`color`, `rgb(from color(display-p3 0 1 0) r g b / alpha)`, `rgb(0, 249, 66)`); // Naive clip based mapping would give rgb(0, 255, 0).
-  test_computed_value(`color`, `rgb(from lab(100 104.3 -50.9) r g b)`, `rgb(255, 255, 255)`); // Naive clip based mapping would give rgb(255, 150, 255).
-  test_computed_value(`color`, `rgb(from lab(0 104.3 -50.9) r g b)`, `rgb(42, 0, 34)`); // Naive clip based mapping would give rgb(90, 0, 76). NOTE: 0% lightness in Lab/LCH does not automatically correspond with sRGB black,
-  test_computed_value(`color`, `rgb(from lch(100 116 334) r g b)`, `rgb(255, 255, 255)`); // Naive clip based mapping would give rgb(255, 150, 255).
-  test_computed_value(`color`, `rgb(from lch(0 116 334) r g b)`, `rgb(42, 0, 34)`); // Naive clip based mapping would give rgb(90, 0, 76). NOTE: 0% lightness in Lab/LCH does not automatically correspond with sRGB black,
-  test_computed_value(`color`, `rgb(from oklab(1 0.365 -0.16) r g b)`, `rgb(255, 255, 255)`); // Naive clip based mapping would give rgb(255, 92, 255).
-  test_computed_value(`color`, `rgb(from oklab(0 0.365 -0.16) r g b)`, `rgb(0, 0, 0)`); // Naive clip based mapping would give rgb(19, 0, 24).
-  test_computed_value(`color`, `rgb(from oklch(1 0.399 336.3) r g b)`, `rgb(255, 255, 255)`); // Naive clip based mapping would give rgb(255, 91, 255).
-  test_computed_value(`color`, `rgb(from oklch(0 0.399 336.3) r g b)`, `rgb(0, 0, 0)`); // Naive clip based mapping would give rgb(20, 0, 24).
+  fuzzy_test_computed_color(`rgb(from rgb(from rebeccapurple r g b) r g b)`, `color(srgb 0.4 0.2 0.6)`);
 
   // Testing replacement with 0.
-  test_computed_value(`color`, `rgb(from rebeccapurple 0 0 0)`, `rgb(0, 0, 0)`);
-  test_computed_value(`color`, `rgb(from rebeccapurple 0 0 0 / 0)`, `rgba(0, 0, 0, 0)`);
-  test_computed_value(`color`, `rgb(from rebeccapurple 0 g b / alpha)`, `rgb(0, 51, 153)`);
-  test_computed_value(`color`, `rgb(from rebeccapurple r 0 b / alpha)`, `rgb(102, 0, 153)`);
-  test_computed_value(`color`, `rgb(from rebeccapurple r g 0 / alpha)`, `rgb(102, 51, 0)`);
-  test_computed_value(`color`, `rgb(from rebeccapurple r g b / 0)`, `rgba(102, 51, 153, 0)`);
-  test_computed_value(`color`, `rgb(from rgb(20%, 40%, 60%, 80%) 0 g b / alpha)`, `rgba(0, 102, 153, 0.8)`);
-  test_computed_value(`color`, `rgb(from rgb(20%, 40%, 60%, 80%) r 0 b / alpha)`, `rgba(51, 0, 153, 0.8)`);
-  test_computed_value(`color`, `rgb(from rgb(20%, 40%, 60%, 80%) r g 0 / alpha)`, `rgba(51, 102, 0, 0.8)`);
-  test_computed_value(`color`, `rgb(from rgb(20%, 40%, 60%, 80%) r g b / 0)`, `rgba(51, 102, 153, 0)`);
+  fuzzy_test_computed_color(`rgb(from rebeccapurple 0 0 0)`, `color(srgb 0 0 0)`);
+  fuzzy_test_computed_color(`rgb(from rebeccapurple 0 0 0 / 0)`, `color(srgb 0 0 0 / 0)`);
+  fuzzy_test_computed_color(`rgb(from rebeccapurple 0 g b / alpha)`, `color(srgb 0 0.2 0.6)`);
+  fuzzy_test_computed_color(`rgb(from rebeccapurple r 0 b / alpha)`, `color(srgb 0.4 0 0.6)`);
+  fuzzy_test_computed_color(`rgb(from rebeccapurple r g 0 / alpha)`, `color(srgb 0.4 0.2 0)`);
+  fuzzy_test_computed_color(`rgb(from rebeccapurple r g b / 0)`, `color(srgb 0.4 0.2 0.6 / 0)`);
+  fuzzy_test_computed_color(`rgb(from rgb(20%, 40%, 60%, 80%) 0 g b / alpha)`, `color(srgb 0 0.4 0.6 / 0.8)`);
+  fuzzy_test_computed_color(`rgb(from rgb(20%, 40%, 60%, 80%) r 0 b / alpha)`, `color(srgb 0.2 0 0.6 / 0.8)`);
+  fuzzy_test_computed_color(`rgb(from rgb(20%, 40%, 60%, 80%) r g 0 / alpha)`, `color(srgb 0.2 0.4 0 / 0.8)`);
+  fuzzy_test_computed_color(`rgb(from rgb(20%, 40%, 60%, 80%) r g b / 0)`, `color(srgb 0.2 0.4 0.6 / 0)`);
 
   // Testing replacement with a number.
-  test_computed_value(`color`, `rgb(from rebeccapurple 25 g b / alpha)`, `rgb(25, 51, 153)`);
-  test_computed_value(`color`, `rgb(from rebeccapurple r 25 b / alpha)`, `rgb(102, 25, 153)`);
-  test_computed_value(`color`, `rgb(from rebeccapurple r g 25 / alpha)`, `rgb(102, 51, 25)`);
-  test_computed_value(`color`, `rgb(from rebeccapurple r g b / .25)`, `rgba(102, 51, 153, 0.25)`);
-  test_computed_value(`color`, `rgb(from rgb(20%, 40%, 60%, 80%) 25 g b / alpha)`, `rgba(25, 102, 153, 0.8)`);
-  test_computed_value(`color`, `rgb(from rgb(20%, 40%, 60%, 80%) r 25 b / alpha)`, `rgba(51, 25, 153, 0.8)`);
-  test_computed_value(`color`, `rgb(from rgb(20%, 40%, 60%, 80%) r g 25 / alpha)`, `rgba(51, 102, 25, 0.8)`);
-  test_computed_value(`color`, `rgb(from rgb(20%, 40%, 60%, 80%) r g b / .20)`, `rgba(51, 102, 153, 0.2)`);
+  fuzzy_test_computed_color(`rgb(from rebeccapurple 25 g b / alpha)`, `color(srgb 0.098 0.2 0.6)`);
+  fuzzy_test_computed_color(`rgb(from rebeccapurple r 25 b / alpha)`, `color(srgb 0.4 0.098 0.6)`);
+  fuzzy_test_computed_color(`rgb(from rebeccapurple r g 25 / alpha)`, `color(srgb 0.4 0.2 0.098)`);
+  fuzzy_test_computed_color(`rgb(from rebeccapurple r g b / .25)`, `color(srgb 0.4 0.2 0.6 / 0.25)`);
+  fuzzy_test_computed_color(`rgb(from rgb(20%, 40%, 60%, 80%) 25 g b / alpha)`, `color(srgb 0.098 0.4 0.6 / 0.8)`);
+  fuzzy_test_computed_color(`rgb(from rgb(20%, 40%, 60%, 80%) r 25 b / alpha)`, `color(srgb 0.2 0.098 0.6 / 0.8)`);
+  fuzzy_test_computed_color(`rgb(from rgb(20%, 40%, 60%, 80%) r g 25 / alpha)`, `color(srgb 0.2 0.4 0.098 / 0.8)`);
+  fuzzy_test_computed_color(`rgb(from rgb(20%, 40%, 60%, 80%) r g b / .20)`, `color(srgb 0.2 0.4 0.6 / 0.2)`);
 
   // Testing replacement with a percentage.
-  test_computed_value(`color`, `rgb(from rebeccapurple 20% g b / alpha)`, `rgb(51, 51, 153)`);
-  test_computed_value(`color`, `rgb(from rebeccapurple r 20% b / alpha)`, `rgb(102, 51, 153)`);
-  test_computed_value(`color`, `rgb(from rebeccapurple r g 20% / alpha)`, `rgb(102, 51, 51)`);
-  test_computed_value(`color`, `rgb(from rebeccapurple r g b / 20%)`, `rgba(102, 51, 153, 0.2)`);
-  test_computed_value(`color`, `rgb(from rgb(20%, 40%, 60%, 80%) 20% g b / alpha)`, `rgba(51, 102, 153, 0.8)`);
-  test_computed_value(`color`, `rgb(from rgb(20%, 40%, 60%, 80%) r 20% b / alpha)`, `rgba(51, 51, 153, 0.8)`);
-  test_computed_value(`color`, `rgb(from rgb(20%, 40%, 60%, 80%) r g 20% / alpha)`, `rgba(51, 102, 51, 0.8)`);
-  test_computed_value(`color`, `rgb(from rgb(20%, 40%, 60%, 80%) r g b / 20%)`, `rgba(51, 102, 153, 0.2)`);
+  fuzzy_test_computed_color(`rgb(from rebeccapurple 20% g b / alpha)`, `color(srgb 0.2 0.2 0.6)`);
+  fuzzy_test_computed_color(`rgb(from rebeccapurple r 20% b / alpha)`, `color(srgb 0.4 0.2 0.6)`);
+  fuzzy_test_computed_color(`rgb(from rebeccapurple r g 20% / alpha)`, `color(srgb 0.4 0.2 0.2)`);
+  fuzzy_test_computed_color(`rgb(from rebeccapurple r g b / 20%)`, `color(srgb 0.4 0.2 0.6 / 0.2)`);
+  fuzzy_test_computed_color(`rgb(from rgb(20%, 40%, 60%, 80%) 20% g b / alpha)`, `color(srgb 0.2 0.4 0.6 / 0.8)`);
+  fuzzy_test_computed_color(`rgb(from rgb(20%, 40%, 60%, 80%) r 20% b / alpha)`, `color(srgb 0.2 0.2 0.6 / 0.8)`);
+  fuzzy_test_computed_color(`rgb(from rgb(20%, 40%, 60%, 80%) r g 20% / alpha)`, `color(srgb 0.2 0.4 0.2 / 0.8)`);
+  fuzzy_test_computed_color(`rgb(from rgb(20%, 40%, 60%, 80%) r g b / 20%)`, `color(srgb 0.2 0.4 0.6 / 0.2)`);
 
   // Testing replacement with a number for r, g, b but percent for alpha.
-  test_computed_value(`color`, `rgb(from rebeccapurple 25 g b / 25%)`, `rgba(25, 51, 153, 0.25)`);
-  test_computed_value(`color`, `rgb(from rebeccapurple r 25 b / 25%)`, `rgba(102, 25, 153, 0.25)`);
-  test_computed_value(`color`, `rgb(from rebeccapurple r g 25 / 25%)`, `rgba(102, 51, 25, 0.25)`);
-  test_computed_value(`color`, `rgb(from rgb(20%, 40%, 60%, 80%) 25 g b / 25%)`, `rgba(25, 102, 153, 0.25)`);
-  test_computed_value(`color`, `rgb(from rgb(20%, 40%, 60%, 80%) r 25 b / 25%)`, `rgba(51, 25, 153, 0.25)`);
-  test_computed_value(`color`, `rgb(from rgb(20%, 40%, 60%, 80%) r g 25 / 25%)`, `rgba(51, 102, 25, 0.25)`);
+  fuzzy_test_computed_color(`rgb(from rebeccapurple 25 g b / 25%)`, `color(srgb 0.098 0.2 0.6 / 0.25)`);
+  fuzzy_test_computed_color(`rgb(from rebeccapurple r 25 b / 25%)`, `color(srgb 0.4 0.098 0.6 / 0.25)`);
+  fuzzy_test_computed_color(`rgb(from rebeccapurple r g 25 / 25%)`, `color(srgb 0.4 0.2 0.098 / 0.25)`);
+  fuzzy_test_computed_color(`rgb(from rgb(20%, 40%, 60%, 80%) 25 g b / 25%)`, `color(srgb 0.098 0.4 0.6 / 0.25)`);
+  fuzzy_test_computed_color(`rgb(from rgb(20%, 40%, 60%, 80%) r 25 b / 25%)`, `color(srgb 0.2 0.098 0.6 / 0.25)`);
+  fuzzy_test_computed_color(`rgb(from rgb(20%, 40%, 60%, 80%) r g 25 / 25%)`, `color(srgb 0.2 0.4 0.098 / 0.25)`);
 
   // Testing permutation.
-  test_computed_value(`color`, `rgb(from rebeccapurple g b r)`, `rgb(51, 153, 102)`);
-  test_computed_value(`color`, `rgb(from rebeccapurple b alpha r / g)`, `rgba(153, 255, 102, 0.2)`);
-  test_computed_value(`color`, `rgb(from rebeccapurple r r r / r)`, `rgba(102, 102, 102, 0.4)`);
-  test_computed_value(`color`, `rgb(from rebeccapurple alpha alpha alpha / alpha)`, `rgb(255, 255, 255)`);
-  test_computed_value(`color`, `rgb(from rgb(20%, 40%, 60%, 80%) g b r)`, `rgb(102, 153, 51)`);
-  test_computed_value(`color`, `rgb(from rgb(20%, 40%, 60%, 80%) b alpha r / g)`, `rgba(153, 204, 51, 0.4)`);
-  test_computed_value(`color`, `rgb(from rgb(20%, 40%, 60%, 80%) r r r / r)`, `rgba(51, 51, 51, 0.2)`);
-  test_computed_value(`color`, `rgb(from rgb(20%, 40%, 60%, 80%) alpha alpha alpha / alpha)`, `rgba(204, 204, 204, 0.8)`);
+  fuzzy_test_computed_color(`rgb(from rebeccapurple g b r)`, `color(srgb 0.2 0.6 0.4)`);
+  fuzzy_test_computed_color(`rgb(from rebeccapurple b alpha r / g)`, `color(srgb 0.6 1 0.4 / 0.2)`);
+  fuzzy_test_computed_color(`rgb(from rebeccapurple r r r / r)`, `color(srgb 0.4 0.4 0.4 / 0.4)`);
+  fuzzy_test_computed_color(`rgb(from rebeccapurple alpha alpha alpha / alpha)`, `color(srgb 1 1 1)`);
+  fuzzy_test_computed_color(`rgb(from rgb(20%, 40%, 60%, 80%) g b r)`, `color(srgb 0.4 0.6 0.2 / 0.8)`);
+  fuzzy_test_computed_color(`rgb(from rgb(20%, 40%, 60%, 80%) b alpha r / g)`, `color(srgb 0.6 0.8 0.2 / 0.4)`);
+  fuzzy_test_computed_color(`rgb(from rgb(20%, 40%, 60%, 80%) r r r / r)`, `color(srgb 0.2 0.2 0.2 / 0.2)`);
+  fuzzy_test_computed_color(`rgb(from rgb(20%, 40%, 60%, 80%) alpha alpha alpha / alpha)`, `color(srgb 0.8 0.8 0.8 / 0.8)`);
 
   // Testing mixes of number and percentage. (These would not be allowed in the non-relative syntax).
-  test_computed_value(`color`, `rgb(from rebeccapurple r 20% 10)`, `rgb(102, 51, 10)`);
-  test_computed_value(`color`, `rgb(from rebeccapurple r 10 20%)`, `rgb(102, 10, 51)`);
-  test_computed_value(`color`, `rgb(from rebeccapurple 0% 10 10)`, `rgb(0, 10, 10)`);
-  test_computed_value(`color`, `rgb(from rgb(20%, 40%, 60%, 80%) r 20% 10)`, `rgba(51, 51, 10, 0.8)`);
-  test_computed_value(`color`, `rgb(from rgb(20%, 40%, 60%, 80%) r 10 20%)`, `rgba(51, 10, 51, 0.8)`);
-  test_computed_value(`color`, `rgb(from rgb(20%, 40%, 60%, 80%) 0% 10 10)`, `rgba(0, 10, 10, 0.8)`);
+  fuzzy_test_computed_color(`rgb(from rebeccapurple r 20% 10)`, `color(srgb 0.4 0.2 0.0392)`);
+  fuzzy_test_computed_color(`rgb(from rebeccapurple r 10 20%)`, `color(srgb 0.4 0.0392 0.2)`);
+  fuzzy_test_computed_color(`rgb(from rebeccapurple 0% 10 10)`, `color(srgb 0 0.0392 0.0392)`);
+  fuzzy_test_computed_color(`rgb(from rgb(20%, 40%, 60%, 80%) r 20% 10)`, `color(srgb 0.2 0.2 0.0392 / 0.8)`);
+  fuzzy_test_computed_color(`rgb(from rgb(20%, 40%, 60%, 80%) r 10 20%)`, `color(srgb 0.2 0.0392 0.2 / 0.8)`);
+  fuzzy_test_computed_color(`rgb(from rgb(20%, 40%, 60%, 80%) 0% 10 10)`, `color(srgb 0 0.0392 0.0392 / 0.8)`);
 
       // r    g    b
       // 102  51   153
-      // 40%  20%  60%)
+      // 40%  20%  60%
   // Testing with calc().
-  test_computed_value(`color`, `rgb(from rebeccapurple calc(r) calc(g) calc(b))`, `rgb(102, 51, 153)`);
-  test_computed_value(`color`, `rgb(from rebeccapurple r calc(g * 2) 10)`, `rgb(102, 102, 10)`);
-  test_computed_value(`color`, `rgb(from rebeccapurple b calc(r * .5) 10)`, `rgb(153, 51, 10)`);
-  test_computed_value(`color`, `rgb(from rebeccapurple r calc(g * .5 + g * .5) 10)`, `rgb(102, 51, 10)`);
-  test_computed_value(`color`, `rgb(from rebeccapurple r calc(b * .5 - g * .5) 10)`, `rgb(102, 51, 10)`);
-  test_computed_value(`color`, `rgb(from rgb(20%, 40%, 60%, 80%) calc(r) calc(g) calc(b) / calc(alpha))`, `rgba(51, 102, 153, 0.8)`);
+  fuzzy_test_computed_color(`rgb(from rebeccapurple calc(r) calc(g) calc(b))`, `color(srgb 0.4 0.2 0.6)`);
+  fuzzy_test_computed_color(`rgb(from rebeccapurple r calc(g * 2) 10)`, `color(srgb 0.4 0.4 0.0392)`);
+  fuzzy_test_computed_color(`rgb(from rebeccapurple b calc(r * .5) 10)`, `color(srgb 0.6 0.2 0.0392)`);
+  fuzzy_test_computed_color(`rgb(from rebeccapurple r calc(g * .5 + g * .5) 10)`, `color(srgb 0.4 0.2 0.0392)`);
+  fuzzy_test_computed_color(`rgb(from rebeccapurple r calc(b * .5 - g * .5) 10)`, `color(srgb 0.4 0.2 0.0392)`);
+  fuzzy_test_computed_color(`rgb(from rgb(20%, 40%, 60%, 80%) calc(r) calc(g) calc(b) / calc(alpha))`, `color(srgb 0.2 0.4 0.6 / 0.8)`);
 
   // Testing with 'none'.
-  test_computed_value(`color`, `rgb(from rebeccapurple none none none)`,                         `rgb(0, 0, 0)`);
-  test_computed_value(`color`, `rgb(from rebeccapurple none none none / none)`,                  `rgba(0, 0, 0, 0)`);
-  test_computed_value(`color`, `rgb(from rebeccapurple r g none)`,                               `rgb(102, 51, 0)`);
-  test_computed_value(`color`, `rgb(from rebeccapurple r g none / alpha)`,                       `rgb(102, 51, 0)`);
-  test_computed_value(`color`, `rgb(from rebeccapurple r g b / none)`,                           `rgba(102, 51, 153, 0)`);
-  test_computed_value(`color`, `rgb(from rgb(20% 40% 60% / 80%) r g none / alpha)`,              `rgba(51, 102, 0, 0.8)`);
-  test_computed_value(`color`, `rgb(from rgb(20% 40% 60% / 80%) r g b / none)`,                  `rgba(51, 102, 153, 0)`);
+  fuzzy_test_computed_color(`rgb(from rebeccapurple none none none)`, `color(srgb none none none)`);
+  fuzzy_test_computed_color(`rgb(from rebeccapurple none none none / none)`, `color(srgb none none none / none)`);
+  fuzzy_test_computed_color(`rgb(from rebeccapurple r g none)`, `color(srgb 0.4 0.2 none)`);
+  fuzzy_test_computed_color(`rgb(from rebeccapurple r g none / alpha)`, `color(srgb 0.4 0.2 none)`);
+  fuzzy_test_computed_color(`rgb(from rebeccapurple r g b / none)`, `color(srgb 0.4 0.2 0.6 / none)`);
+  fuzzy_test_computed_color(`rgb(from rgb(20% 40% 60% / 80%) r g none / alpha)`, `color(srgb 0.2 0.4 none / 0.8)`);
+  fuzzy_test_computed_color(`rgb(from rgb(20% 40% 60% / 80%) r g b / none)`, `color(srgb 0.2 0.4 0.6 / none)`);
   // FIXME: Clarify with spec editors if 'none' should pass through to the constants.
-  test_computed_value(`color`, `rgb(from rgb(none none none) r g b)`,                            `rgb(0, 0, 0)`);
-  test_computed_value(`color`, `rgb(from rgb(none none none / none) r g b / alpha)`,             `rgba(0, 0, 0, 0)`);
-  test_computed_value(`color`, `rgb(from rgb(20% none 60%) r g b)`,                              `rgb(51, 0, 153)`);
-  test_computed_value(`color`, `rgb(from rgb(20% 40% 60% / none) r g b / alpha)`,                `rgba(51, 102, 153, 0)`);
+  fuzzy_test_computed_color(`rgb(from rgb(none none none) r g b)`, `color(srgb 0 0 0)`);
+  fuzzy_test_computed_color(`rgb(from rgb(none none none / none) r g b / alpha)`, `color(srgb 0 0 0 / 0)`);
+  fuzzy_test_computed_color(`rgb(from rgb(20% none 60%) r g b)`, `color(srgb 0.2 0 0.6)`);
+  fuzzy_test_computed_color(`rgb(from rgb(20% 40% 60% / none) r g b / alpha)`, `color(srgb 0.2 0.4 0.6 / 0)`);
 
 
   // hsl(from ...)
 
   // Testing no modifications.
-  test_computed_value(`color`, `hsl(from rebeccapurple h s l)`, `rgb(102, 51, 153)`);
-  test_computed_value(`color`, `hsl(from rebeccapurple h s l / alpha)`, `rgb(102, 51, 153)`);
-  test_computed_value(`color`, `hsl(from rgb(20%, 40%, 60%, 80%) h s l / alpha)`, `rgba(51, 102, 153, 0.8)`);
-  test_computed_value(`color`, `hsl(from hsl(120deg 20% 50% / .5) h s l / alpha)`, `rgba(102, 153, 102, 0.5)`);
+  fuzzy_test_computed_color(`hsl(from rebeccapurple h s l)`, `color(srgb 0.4 0.2 0.6)`);
+  fuzzy_test_computed_color(`hsl(from rebeccapurple h s l / alpha)`, `color(srgb 0.4 0.2 0.6)`);
+  fuzzy_test_computed_color(`hsl(from rgb(20%, 40%, 60%, 80%) h s l / alpha)`, `color(srgb 0.2 0.4 0.6 / 0.8)`);
+  fuzzy_test_computed_color(`hsl(from hsl(120deg 20% 50% / .5) h s l / alpha)`, `color(srgb 0.4 0.6 0.4 / 0.5)`);
 
   // Test nesting relative colors.
-  test_computed_value(`color`, `hsl(from hsl(from rebeccapurple h s l) h s l)`, `rgb(102, 51, 153)`);
+  fuzzy_test_computed_color(`hsl(from hsl(from rebeccapurple h s l) h s l)`, `color(srgb 0.4 0.2 0.6)`);
 
-  // Testing non-sRGB origin colors to see gamut mapping.
-  test_computed_value(`color`, `hsl(from color(display-p3 0 1 0) h s l / alpha)`, `rgb(0, 249, 66)`); // Naive clip based mapping would give rgb(0, 255, 0).
-  test_computed_value(`color`, `hsl(from lab(100 104.3 -50.9) h s l)`, `rgb(255, 255, 255)`); // Naive clip based mapping would give rgb(255, 150, 255).
-  test_computed_value(`color`, `hsl(from lab(0 104.3 -50.9) h s l)`, `rgb(42, 0, 34)`); // Naive clip based mapping would give rgb(90, 0, 76). NOTE: 0% lightness in Lab/LCH does not automatically correspond with sRGB black,
-  test_computed_value(`color`, `hsl(from lch(100 116 334) h s l)`, `rgb(255, 255, 255)`); // Naive clip based mapping would give rgb(255, 150, 255).
-  test_computed_value(`color`, `hsl(from lch(0 116 334) h s l)`, `rgb(42, 0, 34)`); // Naive clip based mapping would give rgb(90, 0, 76). NOTE: 0% lightness in Lab/LCH does not automatically correspond with sRGB black,
-  test_computed_value(`color`, `hsl(from oklab(1 0.365 -0.16) h s l)`, `rgb(255, 255, 255)`); // Naive clip based mapping would give rgb(255, 92, 255).
-  test_computed_value(`color`, `hsl(from oklab(0 0.365 -0.16) h s l)`, `rgb(0, 0, 0)`); // Naive clip based mapping would give rgb(19, 0, 24).
-  test_computed_value(`color`, `hsl(from oklch(1 0.399 336.3) h s l)`, `rgb(255, 255, 255)`); // Naive clip based mapping would give rgb(255, 91, 255).
-  test_computed_value(`color`, `hsl(from oklch(0 0.399 336.3) h s l)`, `rgb(0, 0, 0)`); // Naive clip based mapping would give rgb(20, 0, 24).
 
   // Testing replacement with 0.
-  test_computed_value(`color`, `hsl(from rebeccapurple 0 0% 0%)`, `rgb(0, 0, 0)`);
-  test_computed_value(`color`, `hsl(from rebeccapurple 0deg 0% 0%)`, `rgb(0, 0, 0)`);
-  test_computed_value(`color`, `hsl(from rebeccapurple 0 0% 0% / 0)`, `rgba(0, 0, 0, 0)`);
-  test_computed_value(`color`, `hsl(from rebeccapurple 0deg 0% 0% / 0)`, `rgba(0, 0, 0, 0)`);
-  test_computed_value(`color`, `hsl(from rebeccapurple 0 s l / alpha)`, `rgb(153, 51, 51)`);
-  test_computed_value(`color`, `hsl(from rebeccapurple 0deg s l / alpha)`, `rgb(153, 51, 51)`);
-  test_computed_value(`color`, `hsl(from rebeccapurple h 0% l / alpha)`, `rgb(102, 102, 102)`);
-  test_computed_value(`color`, `hsl(from rebeccapurple h s 0% / alpha)`, `rgb(0, 0, 0)`);
-  test_computed_value(`color`, `hsl(from rebeccapurple h s l / 0)`, `rgba(102, 51, 153, 0)`);
-  test_computed_value(`color`, `hsl(from rgb(20%, 40%, 60%, 80%) 0 s l / alpha)`, `rgba(153, 51, 51, 0.8)`);
-  test_computed_value(`color`, `hsl(from rgb(20%, 40%, 60%, 80%) 0deg s l / alpha)`, `rgba(153, 51, 51, 0.8)`);
-  test_computed_value(`color`, `hsl(from rgb(20%, 40%, 60%, 80%) h 0% l / alpha)`, `rgba(102, 102, 102, 0.8)`);
-  test_computed_value(`color`, `hsl(from rgb(20%, 40%, 60%, 80%) h s 0% / alpha)`, `rgba(0, 0, 0, 0.8)`);
-  test_computed_value(`color`, `hsl(from rgb(20%, 40%, 60%, 80%) h s l / 0)`, `rgba(51, 102, 153, 0)`);
+  fuzzy_test_computed_color(`hsl(from rebeccapurple 0 0% 0%)`, `color(srgb 0 0 0)`);
+  fuzzy_test_computed_color(`hsl(from rebeccapurple 0deg 0% 0%)`, `color(srgb 0 0 0)`);
+  fuzzy_test_computed_color(`hsl(from rebeccapurple 0 0% 0% / 0)`, `color(srgb 0 0 0 / 0)`);
+  fuzzy_test_computed_color(`hsl(from rebeccapurple 0deg 0% 0% / 0)`, `color(srgb 0 0 0 / 0)`);
+  fuzzy_test_computed_color(`hsl(from rebeccapurple 0 s l / alpha)`, `color(srgb 0.6 0.2 0.2)`);
+  fuzzy_test_computed_color(`hsl(from rebeccapurple 0deg s l / alpha)`, `color(srgb 0.6 0.2 0.2)`);
+  fuzzy_test_computed_color(`hsl(from rebeccapurple h 0% l / alpha)`, `color(srgb 0.4 0.4 0.4)`);
+  fuzzy_test_computed_color(`hsl(from rebeccapurple h s 0% / alpha)`, `color(srgb 0 0 0)`);
+  fuzzy_test_computed_color(`hsl(from rebeccapurple h s l / 0)`, `color(srgb 0.4 0.2 0.6 / 0)`);
+  fuzzy_test_computed_color(`hsl(from rgb(20%, 40%, 60%, 80%) 0 s l / alpha)`, `color(srgb 0.6 0.2 0.2 / 0.8)`);
+  fuzzy_test_computed_color(`hsl(from rgb(20%, 40%, 60%, 80%) 0deg s l / alpha)`, `color(srgb 0.6 0.2 0.2 / 0.8)`);
+  fuzzy_test_computed_color(`hsl(from rgb(20%, 40%, 60%, 80%) h 0% l / alpha)`, `color(srgb 0.4 0.4 0.4 / 0.8)`);
+  fuzzy_test_computed_color(`hsl(from rgb(20%, 40%, 60%, 80%) h s 0% / alpha)`, `color(srgb 0 0 0 / 0.8)`);
+  fuzzy_test_computed_color(`hsl(from rgb(20%, 40%, 60%, 80%) h s l / 0)`, `color(srgb 0.2 0.4 0.6 / 0)`);
 
   // Testing replacement with a constant.
-  test_computed_value(`color`, `hsl(from rebeccapurple 25 s l / alpha)`, `rgb(153, 94, 51)`);
-  test_computed_value(`color`, `hsl(from rebeccapurple 25deg s l / alpha)`, `rgb(153, 94, 51)`);
-  test_computed_value(`color`, `hsl(from rebeccapurple h 20% l / alpha)`, `rgb(102, 82, 122)`);
-  test_computed_value(`color`, `hsl(from rebeccapurple h s 20% / alpha)`, `rgb(51, 25, 77)`);
-  test_computed_value(`color`, `hsl(from rebeccapurple h s l / .25)`, `rgba(102, 51, 153, 0.25)`);
-  test_computed_value(`color`, `hsl(from rgb(20%, 40%, 60%, 80%) 25 s l / alpha)`, `rgba(153, 94, 51, 0.8)`);
-  test_computed_value(`color`, `hsl(from rgb(20%, 40%, 60%, 80%) 25deg s l / alpha)`, `rgba(153, 94, 51, 0.8)`);
-  test_computed_value(`color`, `hsl(from rgb(20%, 40%, 60%, 80%) h 20% l / alpha)`, `rgba(82, 102, 122, 0.8)`);
-  test_computed_value(`color`, `hsl(from rgb(20%, 40%, 60%, 80%) h s 20% / alpha)`, `rgba(25, 51, 77, 0.8)`);
-  test_computed_value(`color`, `hsl(from rgb(20%, 40%, 60%, 80%) h s l / .2)`, `rgba(51, 102, 153, 0.2)`);
+  fuzzy_test_computed_color(`hsl(from rebeccapurple 25 s l / alpha)`, `color(srgb 0.6 0.3667 0.2)`);
+  fuzzy_test_computed_color(`hsl(from rebeccapurple 25deg s l / alpha)`, `color(srgb 0.6 0.3667 0.2)`);
+  fuzzy_test_computed_color(`hsl(from rebeccapurple h 20% l / alpha)`, `color(srgb 0.4 0.32 0.48)`);
+  fuzzy_test_computed_color(`hsl(from rebeccapurple h s 20% / alpha)`, `color(srgb 0.2 0.1 0.3)`);
+  fuzzy_test_computed_color(`hsl(from rebeccapurple h s l / .25)`, `color(srgb 0.4 0.2 0.6 / 0.25)`);
+  fuzzy_test_computed_color(`hsl(from rgb(20%, 40%, 60%, 80%) 25 s l / alpha)`, `color(srgb 0.6 0.3667 0.2 / 0.8)`);
+  fuzzy_test_computed_color(`hsl(from rgb(20%, 40%, 60%, 80%) 25deg s l / alpha)`, `color(srgb 0.6 0.3667 0.2 / 0.8)`);
+  fuzzy_test_computed_color(`hsl(from rgb(20%, 40%, 60%, 80%) h 20% l / alpha)`, `color(srgb 0.32 0.4 0.48 / 0.8)`);
+  fuzzy_test_computed_color(`hsl(from rgb(20%, 40%, 60%, 80%) h s 20% / alpha)`, `color(srgb 0.1 0.2 0.3 / 0.8)`);
+  fuzzy_test_computed_color(`hsl(from rgb(20%, 40%, 60%, 80%) h s l / .2)`, `color(srgb 0.2 0.4 0.6 / 0.2)`);
 
   // Testing valid permutation (types match).
-  test_computed_value(`color`, `hsl(from rebeccapurple h l s)`, `rgb(128, 77, 179)`);
-  test_computed_value(`color`, `hsl(from rebeccapurple h alpha l / s)`, `rgba(102, 0, 204, 0.5)`);
-  test_computed_value(`color`, `hsl(from rebeccapurple h l l / l)`, `rgba(102, 61, 143, 0.4)`);
-  test_computed_value(`color`, `hsl(from rebeccapurple h alpha alpha / alpha)`, `rgb(255, 255, 255)`);
-  test_computed_value(`color`, `hsl(from rgb(20%, 40%, 60%, 80%) h l s)`, `rgba(77, 128, 179, 0.8)`);
-  test_computed_value(`color`, `hsl(from rgb(20%, 40%, 60%, 80%) h alpha l / s)`, `rgba(20, 102, 184, 0.5)`);
-  test_computed_value(`color`, `hsl(from rgb(20%, 40%, 60%, 80%) h l l / l)`, `rgba(61, 102, 143, 0.4)`);
-  test_computed_value(`color`, `hsl(from rgb(20%, 40%, 60%, 80%) h alpha alpha / alpha)`, `rgba(163, 204, 245, 0.8)`);
+  fuzzy_test_computed_color(`hsl(from rebeccapurple h l s)`, `color(srgb 0.5 0.3 0.7)`);
+  fuzzy_test_computed_color(`hsl(from rebeccapurple h alpha l / s)`, `color(srgb 0.4 0 0.8 / 0.5)`);
+  fuzzy_test_computed_color(`hsl(from rebeccapurple h l l / l)`, `color(srgb 0.4 0.24 0.56 / 0.4)`);
+  fuzzy_test_computed_color(`hsl(from rebeccapurple h alpha alpha / alpha)`, `color(srgb 1 1 1)`);
+  fuzzy_test_computed_color(`hsl(from rgb(20%, 40%, 60%, 80%) h l s)`, `color(srgb 0.3 0.5 0.7 / 0.8)`);
+  fuzzy_test_computed_color(`hsl(from rgb(20%, 40%, 60%, 80%) h alpha l / s)`, `color(srgb 0.08 0.4 0.72 / 0.5)`);
+  fuzzy_test_computed_color(`hsl(from rgb(20%, 40%, 60%, 80%) h l l / l)`, `color(srgb 0.24 0.4 0.56 / 0.4)`);
+  fuzzy_test_computed_color(`hsl(from rgb(20%, 40%, 60%, 80%) h alpha alpha / alpha)`, `color(srgb 0.64 0.8 0.96 / 0.8)`);
 
   // Testing with calc().
-  test_computed_value(`color`, `hsl(from rebeccapurple calc(h) calc(s) calc(l))`, `rgb(102, 51, 153)`);
-  test_computed_value(`color`, `hsl(from rgb(20%, 40%, 60%, 80%) calc(h) calc(s) calc(l) / calc(alpha))`, `rgba(51, 102, 153, 0.8)`);
+  fuzzy_test_computed_color(`hsl(from rebeccapurple calc(h) calc(s) calc(l))`, `color(srgb 0.4 0.2 0.6)`);
+  fuzzy_test_computed_color(`hsl(from rgb(20%, 40%, 60%, 80%) calc(h) calc(s) calc(l) / calc(alpha))`, `color(srgb 0.2 0.4 0.6 / 0.8)`);
 
   // Testing with 'none'.
-  test_computed_value(`color`, `hsl(from rebeccapurple none none none)`,                         `rgb(0, 0, 0)`);
-  test_computed_value(`color`, `hsl(from rebeccapurple none none none / none)`,                  `rgba(0, 0, 0, 0)`);
-  test_computed_value(`color`, `hsl(from rebeccapurple h s none)`,                               `rgb(0, 0, 0)`);
-  test_computed_value(`color`, `hsl(from rebeccapurple h s none / alpha)`,                       `rgb(0, 0, 0)`);
-  test_computed_value(`color`, `hsl(from rebeccapurple h s l / none)`,                           `rgba(102, 51, 153, 0)`);
-  test_computed_value(`color`, `hsl(from rebeccapurple none s l / alpha)`,                       `rgb(153, 51, 51)`);
-  test_computed_value(`color`, `hsl(from hsl(120deg 20% 50% / .5) h s none / alpha)`,            `rgba(0, 0, 0, 0.5)`);
-  test_computed_value(`color`, `hsl(from hsl(120deg 20% 50% / .5) h s l / none)`,                `rgba(102, 153, 102, 0)`);
-  test_computed_value(`color`, `hsl(from hsl(120deg 20% 50% / .5) none s l / alpha)`,            `rgba(153, 102, 102, 0.5)`);
+  fuzzy_test_computed_color(`hsl(from rebeccapurple none none none)`, `color(srgb none none none)`);
+  fuzzy_test_computed_color(`hsl(from rebeccapurple none none none / none)`, `color(srgb none none none / none)`);
+  fuzzy_test_computed_color(`hsl(from rebeccapurple h s none)`, `color(srgb 0 0 none)`);
+  fuzzy_test_computed_color(`hsl(from rebeccapurple h s none / alpha)`, `color(srgb 0 0 none)`);
+  fuzzy_test_computed_color(`hsl(from rebeccapurple h s l / none)`, `color(srgb 0.4 0.2 0.6 / none)`);
+  fuzzy_test_computed_color(`hsl(from rebeccapurple none s l / alpha)`, `color(srgb none 0.2 0.2)`);
+  fuzzy_test_computed_color(`hsl(from hsl(120deg 20% 50% / .5) h s none / alpha)`, `color(srgb 0 0 none / 0.5)`);
+  fuzzy_test_computed_color(`hsl(from hsl(120deg 20% 50% / .5) h s l / none)`, `color(srgb 0.4 0.6 0.4 / none)`);
+  fuzzy_test_computed_color(`hsl(from hsl(120deg 20% 50% / .5) none s l / alpha)`, `color(srgb none 0.4 0.4 / 0.5)`);
   // FIXME: Clarify with spec editors if 'none' should pass through to the constants.
-  test_computed_value(`color`, `hsl(from hsl(none none none) h s l)`,                            `rgb(0, 0, 0)`);
-  test_computed_value(`color`, `hsl(from hsl(none none none / none) h s l / alpha)`,             `rgba(0, 0, 0, 0)`);
-  test_computed_value(`color`, `hsl(from hsl(120deg none 50% / .5) h s l)`,                      `rgba(128, 128, 128, 0.5)`);
-  test_computed_value(`color`, `hsl(from hsl(120deg 20% 50% / none) h s l / alpha)`,             `rgba(102, 153, 102, 0)`);
-  test_computed_value(`color`, `hsl(from hsl(none 20% 50% / .5) h s l / alpha)`,                 `rgba(153, 102, 102, 0.5)`);
+  fuzzy_test_computed_color(`hsl(from hsl(none none none) h s l)`, `color(srgb 0 0 0)`);
+  fuzzy_test_computed_color(`hsl(from hsl(none none none / none) h s l / alpha)`, `color(srgb 0 0 0 / 0)`);
+  fuzzy_test_computed_color(`hsl(from hsl(120deg none 50% / .5) h s l)`, `color(srgb 0.5 0.5 0.5 / 0.5)`);
+  fuzzy_test_computed_color(`hsl(from hsl(120deg 20% 50% / none) h s l / alpha)`, `color(srgb 0.4 0.6 0.4 / 0)`);
+  fuzzy_test_computed_color(`hsl(from hsl(none 20% 50% / .5) h s l / alpha)`, `color(srgb 0.6 0.4 0.4 / 0.5)`);
 
   // hwb(from ...)
 
   // Testing no modifications.
-  test_computed_value(`color`, `hwb(from rebeccapurple h w b)`, `rgb(102, 51, 153)`);
-  test_computed_value(`color`, `hwb(from rebeccapurple h w b / alpha)`, `rgb(102, 51, 153)`);
-  test_computed_value(`color`, `hwb(from rgb(20%, 40%, 60%, 80%) h w b / alpha)`, `rgba(51, 102, 153, 0.8)`);
-  test_computed_value(`color`, `hwb(from hsl(120deg 20% 50% / .5) h w b / alpha)`, `rgba(102, 153, 102, 0.5)`);
+  fuzzy_test_computed_color(`hwb(from rebeccapurple h w b)`, `color(srgb 0.4 0.2 0.6)`);
+  fuzzy_test_computed_color(`hwb(from rebeccapurple h w b / alpha)`, `color(srgb 0.4 0.2 0.6)`);
+  fuzzy_test_computed_color(`hwb(from rgb(20%, 40%, 60%, 80%) h w b / alpha)`, `color(srgb 0.2 0.4 0.6 / 0.8)`);
+  fuzzy_test_computed_color(`hwb(from hsl(120deg 20% 50% / .5) h w b / alpha)`, `color(srgb 0.4 0.6 0.4 / 0.5)`);
 
   // Test nesting relative colors.
-  test_computed_value(`color`, `hwb(from hwb(from rebeccapurple h w b) h w b)`, `rgb(102, 51, 153)`);
-
-  // Testing non-sRGB origin colors to see gamut mapping.
-  test_computed_value(`color`, `hwb(from color(display-p3 0 1 0) h w b / alpha)`, `rgb(0, 249, 66)`); // Naive clip based mapping would give rgb(0, 255, 0).
-  test_computed_value(`color`, `hwb(from lab(100 104.3 -50.9) h w b)`, `rgb(255, 255, 255)`); // Naive clip based mapping would give rgb(255, 150, 255).
-  test_computed_value(`color`, `hwb(from lab(0 104.3 -50.9) h w b)`, `rgb(42, 0, 34)`); // Naive clip based mapping would give rgb(90, 0, 76). NOTE: 0% lightness in Lab/LCH does not automatically correspond with sRGB black,
-  test_computed_value(`color`, `hwb(from lch(100 116 334) h w b)`, `rgb(255, 255, 255)`); // Naive clip based mapping would give rgb(255, 150, 255).
-  test_computed_value(`color`, `hwb(from lch(0 116 334) h w b)`, `rgb(42, 0, 34)`); // Naive clip based mapping would give rgb(90, 0, 76). NOTE: 0% lightness in Lab/LCH does not automatically correspond with sRGB black,
-  test_computed_value(`color`, `hwb(from oklab(1 0.365 -0.16) h w b)`, `rgb(255, 255, 255)`); // Naive clip based mapping would give rgb(255, 92, 255).
-  test_computed_value(`color`, `hwb(from oklab(0 0.365 -0.16) h w b)`, `rgb(0, 0, 0)`); // Naive clip based mapping would give rgb(19, 0, 24).
-  test_computed_value(`color`, `hwb(from oklch(1 0.399 336.3) h w b)`, `rgb(255, 255, 255)`); // Naive clip based mapping would give rgb(255, 91, 255).
-  test_computed_value(`color`, `hwb(from oklch(0 0.399 336.3) h w b)`, `rgb(0, 0, 0)`); // Naive clip based mapping would give rgb(20, 0, 24).
+  fuzzy_test_computed_color(`hwb(from hwb(from rebeccapurple h w b) h w b)`, `color(srgb 0.4 0.2 0.6)`);
 
   // Testing replacement with 0.
-  test_computed_value(`color`, `hwb(from rebeccapurple 0 0% 0%)`, `rgb(255, 0, 0)`);
-  test_computed_value(`color`, `hwb(from rebeccapurple 0deg 0% 0%)`, `rgb(255, 0, 0)`);
-  test_computed_value(`color`, `hwb(from rebeccapurple 0 0% 0% / 0)`, `rgba(255, 0, 0, 0)`);
-  test_computed_value(`color`, `hwb(from rebeccapurple 0deg 0% 0% / 0)`, `rgba(255, 0, 0, 0)`);
-  test_computed_value(`color`, `hwb(from rebeccapurple 0 w b / alpha)`, `rgb(153, 51, 51)`);
-  test_computed_value(`color`, `hwb(from rebeccapurple 0deg w b / alpha)`, `rgb(153, 51, 51)`);
-  test_computed_value(`color`, `hwb(from rebeccapurple h 0% b / alpha)`, `rgb(77, 0, 153)`);
-  test_computed_value(`color`, `hwb(from rebeccapurple h w 0% / alpha)`, `rgb(153, 51, 255)`);
-  test_computed_value(`color`, `hwb(from rebeccapurple h w b / 0)`, `rgba(102, 51, 153, 0)`);
-  test_computed_value(`color`, `hwb(from rgb(20%, 40%, 60%, 80%) 0 w b / alpha)`, `rgba(153, 51, 51, 0.8)`);
-  test_computed_value(`color`, `hwb(from rgb(20%, 40%, 60%, 80%) 0deg w b / alpha)`, `rgba(153, 51, 51, 0.8)`);
-  test_computed_value(`color`, `hwb(from rgb(20%, 40%, 60%, 80%) h 0% b / alpha)`, `rgba(0, 77, 153, 0.8)`);
-  test_computed_value(`color`, `hwb(from rgb(20%, 40%, 60%, 80%) h w 0% / alpha)`, `rgba(51, 153, 255, 0.8)`);
-  test_computed_value(`color`, `hwb(from rgb(20%, 40%, 60%, 80%) h w b / 0)`, `rgba(51, 102, 153, 0)`);
+  fuzzy_test_computed_color(`hwb(from rebeccapurple 0 0% 0%)`, `color(srgb 1 0 0)`);
+  fuzzy_test_computed_color(`hwb(from rebeccapurple 0deg 0% 0%)`, `color(srgb 1 0 0)`);
+  fuzzy_test_computed_color(`hwb(from rebeccapurple 0 0% 0% / 0)`, `color(srgb 1 0 0 / 0)`);
+  fuzzy_test_computed_color(`hwb(from rebeccapurple 0deg 0% 0% / 0)`, `color(srgb 1 0 0 / 0)`);
+  fuzzy_test_computed_color(`hwb(from rebeccapurple 0 w b / alpha)`, `color(srgb 0.6 0.2 0.2)`);
+  fuzzy_test_computed_color(`hwb(from rebeccapurple 0deg w b / alpha)`, `color(srgb 0.6 0.2 0.2)`);
+  fuzzy_test_computed_color(`hwb(from rebeccapurple h 0% b / alpha)`, `color(srgb 0.3 0 0.6)`);
+  fuzzy_test_computed_color(`hwb(from rebeccapurple h w 0% / alpha)`, `color(srgb 0.6 0.2 1)`);
+  fuzzy_test_computed_color(`hwb(from rebeccapurple h w b / 0)`, `color(srgb 0.4 0.2 0.6 / 0)`);
+  fuzzy_test_computed_color(`hwb(from rgb(20%, 40%, 60%, 80%) 0 w b / alpha)`, `color(srgb 0.6 0.2 0.2 / 0.8)`);
+  fuzzy_test_computed_color(`hwb(from rgb(20%, 40%, 60%, 80%) 0deg w b / alpha)`, `color(srgb 0.6 0.2 0.2 / 0.8)`);
+  fuzzy_test_computed_color(`hwb(from rgb(20%, 40%, 60%, 80%) h 0% b / alpha)`, `color(srgb 0 0.3 0.6 / 0.8)`);
+  fuzzy_test_computed_color(`hwb(from rgb(20%, 40%, 60%, 80%) h w 0% / alpha)`, `color(srgb 0.2 0.6 1 / 0.8)`);
+  fuzzy_test_computed_color(`hwb(from rgb(20%, 40%, 60%, 80%) h w b / 0)`, `color(srgb 0.2 0.4 0.6 / 0)`);
 
   // Testing replacement with a constant.
-  test_computed_value(`color`, `hwb(from rebeccapurple 25 w b / alpha)`, `rgb(153, 94, 51)`);
-  test_computed_value(`color`, `hwb(from rebeccapurple 25deg w b / alpha)`, `rgb(153, 94, 51)`);
-  test_computed_value(`color`, `hwb(from rebeccapurple h 20% b / alpha)`, `rgb(102, 51, 153)`);
-  test_computed_value(`color`, `hwb(from rebeccapurple h w 20% / alpha)`, `rgb(128, 51, 204)`);
-  test_computed_value(`color`, `hwb(from rebeccapurple h w b / .2)`, `rgba(102, 51, 153, 0.2)`);
-  test_computed_value(`color`, `hwb(from rgb(20%, 40%, 60%, 80%) 25 w b / alpha)`, `rgba(153, 94, 51, 0.8)`);
-  test_computed_value(`color`, `hwb(from rgb(20%, 40%, 60%, 80%) 25deg w b / alpha)`, `rgba(153, 94, 51, 0.8)`);
-  test_computed_value(`color`, `hwb(from rgb(20%, 40%, 60%, 80%) h 20% b / alpha)`, `rgba(51, 102, 153, 0.8)`);
-  test_computed_value(`color`, `hwb(from rgb(20%, 40%, 60%, 80%) h w 20% / alpha)`, `rgba(51, 128, 204, 0.8)`);
-  test_computed_value(`color`, `hwb(from rgb(20%, 40%, 60%, 80%) h w b / .2)`, `rgba(51, 102, 153, 0.2)`);
+  fuzzy_test_computed_color(`hwb(from rebeccapurple 25 w b / alpha)`, `color(srgb 0.6 0.3667 0.2)`);
+  fuzzy_test_computed_color(`hwb(from rebeccapurple 25deg w b / alpha)`, `color(srgb 0.6 0.3667 0.2)`);
+  fuzzy_test_computed_color(`hwb(from rebeccapurple h 20% b / alpha)`, `color(srgb 0.4 0.2 0.6)`);
+  fuzzy_test_computed_color(`hwb(from rebeccapurple h w 20% / alpha)`, `color(srgb 0.5 0.2 0.8)`);
+  fuzzy_test_computed_color(`hwb(from rebeccapurple h w b / .2)`, `color(srgb 0.4 0.2 0.6 / 0.2)`);
+  fuzzy_test_computed_color(`hwb(from rgb(20%, 40%, 60%, 80%) 25 w b / alpha)`, `color(srgb 0.6 0.3667 0.2 / 0.8)`);
+  fuzzy_test_computed_color(`hwb(from rgb(20%, 40%, 60%, 80%) 25deg w b / alpha)`, `color(srgb 0.6 0.3667 0.2 / 0.8)`);
+  fuzzy_test_computed_color(`hwb(from rgb(20%, 40%, 60%, 80%) h 20% b / alpha)`, `color(srgb 0.2 0.4 0.6 / 0.8)`);
+  fuzzy_test_computed_color(`hwb(from rgb(20%, 40%, 60%, 80%) h w 20% / alpha)`, `color(srgb 0.2 0.5 0.8 / 0.8)`);
+  fuzzy_test_computed_color(`hwb(from rgb(20%, 40%, 60%, 80%) h w b / .2)`, `color(srgb 0.2 0.4 0.6 / 0.2)`);
 
   // Testing valid permutation (types match).
-  test_computed_value(`color`, `hwb(from rebeccapurple h b w)`, `rgb(153, 102, 204)`);
-  test_computed_value(`color`, `hwb(from rebeccapurple h alpha w / b)`, `rgba(213, 213, 213, 0.4)`);
-  test_computed_value(`color`, `hwb(from rebeccapurple h w w / w)`, `rgba(128, 51, 204, 0.2)`);
-  test_computed_value(`color`, `hwb(from rebeccapurple h alpha alpha / alpha)`, `rgb(128, 128, 128)`);
-  test_computed_value(`color`, `hwb(from rgb(20%, 40%, 60%, 80%) h b w)`, `rgba(102, 153, 204, 0.8)`);
-  test_computed_value(`color`, `hwb(from rgb(20%, 40%, 60%, 80%) h alpha w / b)`, `rgba(204, 204, 204, 0.4)`);
-  test_computed_value(`color`, `hwb(from rgb(20%, 40%, 60%, 80%) h w w / w)`, `rgba(51, 128, 204, 0.2)`);
-  test_computed_value(`color`, `hwb(from rgb(20%, 40%, 60%, 80%) h alpha alpha / alpha)`, `rgba(128, 128, 128, 0.8)`);
+  fuzzy_test_computed_color(`hwb(from rebeccapurple h b w)`, `color(srgb 0.6 0.4 0.8)`);
+  fuzzy_test_computed_color(`hwb(from rebeccapurple h alpha w / b)`, `color(srgb 0.8333 0.8333 0.8333 / 0.4)`);
+  fuzzy_test_computed_color(`hwb(from rebeccapurple h w w / w)`, `color(srgb 0.5 0.2 0.8 / 0.2)`);
+  fuzzy_test_computed_color(`hwb(from rebeccapurple h alpha alpha / alpha)`, `color(srgb 0.5 0.5 0.5)`);
+  fuzzy_test_computed_color(`hwb(from rgb(20%, 40%, 60%, 80%) h b w)`, `color(srgb 0.4 0.6 0.8 / 0.8)`);
+  fuzzy_test_computed_color(`hwb(from rgb(20%, 40%, 60%, 80%) h alpha w / b)`, `color(srgb 0.8 0.8 0.8 / 0.4)`);
+  fuzzy_test_computed_color(`hwb(from rgb(20%, 40%, 60%, 80%) h w w / w)`, `color(srgb 0.2 0.5 0.8 / 0.2)`);
+  fuzzy_test_computed_color(`hwb(from rgb(20%, 40%, 60%, 80%) h alpha alpha / alpha)`, `color(srgb 0.5 0.5 0.5 / 0.8)`);
 
   // Testing with calc().
-  test_computed_value(`color`, `hwb(from rebeccapurple calc(h) calc(w) calc(b))`, `rgb(102, 51, 153)`);
-  test_computed_value(`color`, `hwb(from rgb(20%, 40%, 60%, 80%) calc(h) calc(w) calc(b) / calc(alpha))`, `rgba(51, 102, 153, 0.8)`);
+  fuzzy_test_computed_color(`hwb(from rebeccapurple calc(h) calc(w) calc(b))`, `color(srgb 0.4 0.2 0.6)`);
+  fuzzy_test_computed_color(`hwb(from rgb(20%, 40%, 60%, 80%) calc(h) calc(w) calc(b) / calc(alpha))`, `color(srgb 0.2 0.4 0.6 / 0.8)`);
 
   // Testing with 'none'.
-  test_computed_value(`color`, `hwb(from rebeccapurple none none none)`,                         `rgb(255, 0, 0)`);
-  test_computed_value(`color`, `hwb(from rebeccapurple none none none / none)`,                  `rgba(255, 0, 0, 0)`);
-  test_computed_value(`color`, `hwb(from rebeccapurple h w none)`,                               `rgb(153, 51, 255)`);
-  test_computed_value(`color`, `hwb(from rebeccapurple h w none / alpha)`,                       `rgb(153, 51, 255)`);
-  test_computed_value(`color`, `hwb(from rebeccapurple h w b / none)`,                           `rgba(102, 51, 153, 0)`);
-  test_computed_value(`color`, `hwb(from rebeccapurple none w b / alpha)`,                       `rgb(153, 51, 51)`);
-  test_computed_value(`color`, `hwb(from hwb(120deg 20% 50% / .5) h w none / alpha)`,            `rgba(51, 255, 51, 0.5)`);
-  test_computed_value(`color`, `hwb(from hwb(120deg 20% 50% / .5) h w b / none)`,                `rgba(51, 128, 51, 0)`);
-  test_computed_value(`color`, `hwb(from hwb(120deg 20% 50% / .5) none w b / alpha)`,            `rgba(128, 51, 51, 0.5)`);
+  fuzzy_test_computed_color(`hwb(from rebeccapurple none none none)`, `color(srgb none none none)`);
+  fuzzy_test_computed_color(`hwb(from rebeccapurple none none none / none)`, `color(srgb none none none / none)`);
+  fuzzy_test_computed_color(`hwb(from rebeccapurple h w none)`, `color(srgb 0.6 0.2 none)`);
+  fuzzy_test_computed_color(`hwb(from rebeccapurple h w none / alpha)`, `color(srgb 0.6 0.2 none)`);
+  fuzzy_test_computed_color(`hwb(from rebeccapurple h w b / none)`, `color(srgb 0.4 0.2 0.6 / none)`);
+  fuzzy_test_computed_color(`hwb(from rebeccapurple none w b / alpha)`, `color(srgb none 0.2 0.2)`);
+  fuzzy_test_computed_color(`hwb(from hwb(120deg 20% 50% / .5) h w none / alpha)`, `color(srgb 0.2 1 none / 0.5)`);
+  fuzzy_test_computed_color(`hwb(from hwb(120deg 20% 50% / .5) h w b / none)`, `color(srgb 0.2 0.5 0.2 / none)`);
+  fuzzy_test_computed_color(`hwb(from hwb(120deg 20% 50% / .5) none w b / alpha)`, `color(srgb none 0.2 0.2 / 0.5)`);
   // FIXME: Clarify with spec editors if 'none' should pass through to the constants.
-  test_computed_value(`color`, `hwb(from hwb(none none none) h w b)`,                            `rgb(255, 0, 0)`);
-  test_computed_value(`color`, `hwb(from hwb(none none none / none) h w b / alpha)`,             `rgba(255, 0, 0, 0)`);
-  test_computed_value(`color`, `hwb(from hwb(120deg none 50% / .5) h w b)`,                      `rgba(0, 128, 0, 0.5)`);
-  test_computed_value(`color`, `hwb(from hwb(120deg 20% 50% / none) h w b / alpha)`,             `rgba(51, 128, 51, 0)`);
-  test_computed_value(`color`, `hwb(from hwb(none 20% 50% / .5) h w b / alpha)`,                 `rgba(128, 51, 51, 0.5)`);
+  fuzzy_test_computed_color(`hwb(from hwb(none none none) h w b)`, `color(srgb 1 0 0)`);
+  fuzzy_test_computed_color(`hwb(from hwb(none none none / none) h w b / alpha)`, `color(srgb 1 0 0 / 0)`);
+  fuzzy_test_computed_color(`hwb(from hwb(120deg none 50% / .5) h w b)`, `color(srgb 0 0.5 0 / 0.5)`);
+  fuzzy_test_computed_color(`hwb(from hwb(120deg 20% 50% / none) h w b / alpha)`, `color(srgb 0.2 0.5 0.2 / 0)`);
+  fuzzy_test_computed_color(`hwb(from hwb(none 20% 50% / .5) h w b / alpha)`, `color(srgb 0.5 0.2 0.2 / 0.5)`);
 
   // lab()
 
   // Testing no modifications.
-  test_computed_value(`color`, `lab(from lab(25 20 50) l a b)`, `lab(25 20 50)`);
-  test_computed_value(`color`, `lab(from lab(25 20 50) l a b / alpha)`, `lab(25 20 50)`);
-  test_computed_value(`color`, `lab(from lab(25 20 50 / 40%) l a b / alpha)`, `lab(25 20 50 / 0.4)`);
-  test_computed_value(`color`, `lab(from lab(200 300 400 / 500%) l a b / alpha)`, `lab(200 300 400)`);
-  test_computed_value(`color`, `lab(from lab(-200 -300 -400 / -500%) l a b / alpha)`, `lab(0 -300 -400 / 0)`);
+  fuzzy_test_computed_color(`lab(from lab(25 20 50) l a b)`, `lab(25 20 50)`);
+  fuzzy_test_computed_color(`lab(from lab(25 20 50) l a b / alpha)`, `lab(25 20 50)`);
+  fuzzy_test_computed_color(`lab(from lab(25 20 50 / 40%) l a b / alpha)`, `lab(25 20 50 / 0.4)`);
+  fuzzy_test_computed_color(`lab(from lab(200 300 400 / 500%) l a b / alpha)`, `lab(100 300 400)`);
+  fuzzy_test_computed_color(`lab(from lab(-200 -300 -400 / -500%) l a b / alpha)`, `lab(0 -300 -400 / 0)`);
 
   // Test nesting relative colors.
-  test_computed_value(`color`, `lab(from lab(from lab(25 20 50) l a b) l a b)`, `lab(25 20 50)`);
+  fuzzy_test_computed_color(`lab(from lab(from lab(25 20 50) l a b) l a b)`, `lab(25 20 50)`);
 
   // Testing non-lab origin to see conversion.
-  test_computed_value(`color`, `lab(from color(display-p3 0 0 0) l a b / alpha)`, `lab(0 0 0)`);
+  fuzzy_test_computed_color(`lab(from color(display-p3 0 0 0) l a b / alpha)`, `lab(0 0 0)`);
 
   // Testing replacement with 0.
-  test_computed_value(`color`, `lab(from lab(25 20 50) 0 0 0)`, `lab(0 0 0)`);
-  test_computed_value(`color`, `lab(from lab(25 20 50) 0 0 0 / 0)`, `lab(0 0 0 / 0)`);
-  test_computed_value(`color`, `lab(from lab(25 20 50) 0 a b / alpha)`, `lab(0 20 50)`);
-  test_computed_value(`color`, `lab(from lab(25 20 50) l 0 b / alpha)`, `lab(25 0 50)`);
-  test_computed_value(`color`, `lab(from lab(25 20 50) l a 0 / alpha)`, `lab(25 20 0)`);
-  test_computed_value(`color`, `lab(from lab(25 20 50) l a b / 0)`, `lab(25 20 50 / 0)`);
-  test_computed_value(`color`, `lab(from lab(25 20 50 / 40%) 0 a b / alpha)`, `lab(0 20 50 / 0.4)`);
-  test_computed_value(`color`, `lab(from lab(25 20 50 / 40%) l 0 b / alpha)`, `lab(25 0 50 / 0.4)`);
-  test_computed_value(`color`, `lab(from lab(25 20 50 / 40%) l a 0 / alpha)`, `lab(25 20 0 / 0.4)`);
-  test_computed_value(`color`, `lab(from lab(25 20 50 / 40%) l a b / 0)`, `lab(25 20 50 / 0)`);
+  fuzzy_test_computed_color(`lab(from lab(25 20 50) 0 0 0)`, `lab(0 0 0)`);
+  fuzzy_test_computed_color(`lab(from lab(25 20 50) 0 0 0 / 0)`, `lab(0 0 0 / 0)`);
+  fuzzy_test_computed_color(`lab(from lab(25 20 50) 0 a b / alpha)`, `lab(0 20 50)`);
+  fuzzy_test_computed_color(`lab(from lab(25 20 50) l 0 b / alpha)`, `lab(25 0 50)`);
+  fuzzy_test_computed_color(`lab(from lab(25 20 50) l a 0 / alpha)`, `lab(25 20 0)`);
+  fuzzy_test_computed_color(`lab(from lab(25 20 50) l a b / 0)`, `lab(25 20 50 / 0)`);
+  fuzzy_test_computed_color(`lab(from lab(25 20 50 / 40%) 0 a b / alpha)`, `lab(0 20 50 / 0.4)`);
+  fuzzy_test_computed_color(`lab(from lab(25 20 50 / 40%) l 0 b / alpha)`, `lab(25 0 50 / 0.4)`);
+  fuzzy_test_computed_color(`lab(from lab(25 20 50 / 40%) l a 0 / alpha)`, `lab(25 20 0 / 0.4)`);
+  fuzzy_test_computed_color(`lab(from lab(25 20 50 / 40%) l a b / 0)`, `lab(25 20 50 / 0)`);
 
   // Testing replacement with a constant.
-  test_computed_value(`color`, `lab(from lab(25 20 50) 35 a b / alpha)`, `lab(35 20 50)`);
-  test_computed_value(`color`, `lab(from lab(25 20 50) l 35 b / alpha)`, `lab(25 35 50)`);
-  test_computed_value(`color`, `lab(from lab(25 20 50) l a 35 / alpha)`, `lab(25 20 35)`);
-  test_computed_value(`color`, `lab(from lab(25 20 50) l a b / .35)`, `lab(25 20 50 / 0.35)`);
-  test_computed_value(`color`, `lab(from lab(25 20 50 / 40%) 35 a b / alpha)`, `lab(35 20 50 / 0.4)`);
-  test_computed_value(`color`, `lab(from lab(25 20 50 / 40%) l 35 b / alpha)`, `lab(25 35 50 / 0.4)`);
-  test_computed_value(`color`, `lab(from lab(25 20 50 / 40%) l a 35 / alpha)`, `lab(25 20 35 / 0.4)`);
-  test_computed_value(`color`, `lab(from lab(25 20 50 / 40%) l a b / .35)`, `lab(25 20 50 / 0.35)`);
-  test_computed_value(`color`, `lab(from lab(0.7 45 30 / 40%) 200 300 400 / 500)`, `lab(200 300 400)`);
-  test_computed_value(`color`, `lab(from lab(0.7 45 30 / 40%) -200 -300 -400 / -500)`, `lab(0 -300 -400 / 0)`);
+  fuzzy_test_computed_color(`lab(from lab(25 20 50) 35 a b / alpha)`, `lab(35 20 50)`);
+  fuzzy_test_computed_color(`lab(from lab(25 20 50) l 35 b / alpha)`, `lab(25 35 50)`);
+  fuzzy_test_computed_color(`lab(from lab(25 20 50) l a 35 / alpha)`, `lab(25 20 35)`);
+  fuzzy_test_computed_color(`lab(from lab(25 20 50) l a b / .35)`, `lab(25 20 50 / 0.35)`);
+  fuzzy_test_computed_color(`lab(from lab(25 20 50 / 40%) 35 a b / alpha)`, `lab(35 20 50 / 0.4)`);
+  fuzzy_test_computed_color(`lab(from lab(25 20 50 / 40%) l 35 b / alpha)`, `lab(25 35 50 / 0.4)`);
+  fuzzy_test_computed_color(`lab(from lab(25 20 50 / 40%) l a 35 / alpha)`, `lab(25 20 35 / 0.4)`);
+  fuzzy_test_computed_color(`lab(from lab(25 20 50 / 40%) l a b / .35)`, `lab(25 20 50 / 0.35)`);
+  fuzzy_test_computed_color(`lab(from lab(0.7 45 30 / 40%) 200 300 400 / 500)`, `lab(100 300 400)`);
+  fuzzy_test_computed_color(`lab(from lab(0.7 45 30 / 40%) -200 -300 -400 / -500)`, `lab(0 -300 -400 / 0)`);
 
   // Testing valid permutation (types match).
-  test_computed_value(`color`, `lab(from lab(25 20 50) l b a)`, `lab(25 50 20)`);
-  test_computed_value(`color`, `lab(from lab(25 20 50) l a a / a)`, `lab(25 20 20)`);
-  test_computed_value(`color`, `lab(from lab(25 20 50 / 40%) l b a)`, `lab(25 50 20 / 0.4)`);
-  test_computed_value(`color`, `lab(from lab(25 20 50 / 40%) l a a / a)`, `lab(25 20 20)`);
+  fuzzy_test_computed_color(`lab(from lab(25 20 50) l b a)`, `lab(25 50 20)`);
+  fuzzy_test_computed_color(`lab(from lab(25 20 50) l a a / a)`, `lab(25 20 20)`);
+  fuzzy_test_computed_color(`lab(from lab(25 20 50 / 40%) l b a)`, `lab(25 50 20 / 0.4)`);
+  fuzzy_test_computed_color(`lab(from lab(25 20 50 / 40%) l a a / a)`, `lab(25 20 20)`);
 
   // Testing with calc().
-  test_computed_value(`color`, `lab(from lab(25 20 50) calc(l) calc(a) calc(b))`, `lab(25 20 50)`);
-  test_computed_value(`color`, `lab(from lab(25 20 50 / 40%) calc(l) calc(a) calc(b) / calc(alpha))`, `lab(25 20 50 / 0.4)`);
+  fuzzy_test_computed_color(`lab(from lab(25 20 50) calc(l) calc(a) calc(b))`, `lab(25 20 50)`);
+  fuzzy_test_computed_color(`lab(from lab(25 20 50 / 40%) calc(l) calc(a) calc(b) / calc(alpha))`, `lab(25 20 50 / 0.4)`);
 
   // Testing with 'none'.
-  test_computed_value(`color`, `lab(from lab(25 20 50) none none none)`, `lab(none none none)`);
-  test_computed_value(`color`, `lab(from lab(25 20 50) none none none / none)`, `lab(none none none / none)`);
-  test_computed_value(`color`, `lab(from lab(25 20 50) l a none)`, `lab(25 20 none)`);
-  test_computed_value(`color`, `lab(from lab(25 20 50) l a none / alpha)`, `lab(25 20 none)`);
-  test_computed_value(`color`, `lab(from lab(25 20 50) l a b / none)`, `lab(25 20 50 / none)`);
-  test_computed_value(`color`, `lab(from lab(25 20 50 / 40%) l a none / alpha)`, `lab(25 20 none / 0.4)`);
-  test_computed_value(`color`, `lab(from lab(25 20 50 / 40%) l a b / none)`, `lab(25 20 50 / none)`);
+  fuzzy_test_computed_color(`lab(from lab(25 20 50) none none none)`, `lab(none none none)`);
+  fuzzy_test_computed_color(`lab(from lab(25 20 50) none none none / none)`, `lab(none none none / none)`);
+  fuzzy_test_computed_color(`lab(from lab(25 20 50) l a none)`, `lab(25 20 none)`);
+  fuzzy_test_computed_color(`lab(from lab(25 20 50) l a none / alpha)`, `lab(25 20 none)`);
+  fuzzy_test_computed_color(`lab(from lab(25 20 50) l a b / none)`, `lab(25 20 50 / none)`);
+  fuzzy_test_computed_color(`lab(from lab(25 20 50 / 40%) l a none / alpha)`, `lab(25 20 none / 0.4)`);
+  fuzzy_test_computed_color(`lab(from lab(25 20 50 / 40%) l a b / none)`, `lab(25 20 50 / none)`);
   // FIXME: Clarify with spec editors if 'none' should pass through to the constants.
-  test_computed_value(`color`, `lab(from lab(none none none) l a b)`, `lab(0 0 0)`);
-  test_computed_value(`color`, `lab(from lab(none none none / none) l a b / alpha)`, `lab(0 0 0 / 0)`);
-  test_computed_value(`color`, `lab(from lab(25 none 50) l a b)`, `lab(25 0 50)`);
-  test_computed_value(`color`, `lab(from lab(25 20 50 / none) l a b / alpha)`, `lab(25 20 50 / 0)`);
+  fuzzy_test_computed_color(`lab(from lab(none none none) l a b)`, `lab(0 0 0)`);
+  fuzzy_test_computed_color(`lab(from lab(none none none / none) l a b / alpha)`, `lab(0 0 0 / 0)`);
+  fuzzy_test_computed_color(`lab(from lab(25 none 50) l a b)`, `lab(25 0 50)`);
+  fuzzy_test_computed_color(`lab(from lab(25 20 50 / none) l a b / alpha)`, `lab(25 20 50 / 0)`);
 
   // oklab()
 
   // Testing no modifications.
-  test_computed_value(`color`, `oklab(from oklab(0.25 0.2 0.5) l a b)`, `oklab(0.25 0.2 0.5)`);
-  test_computed_value(`color`, `oklab(from oklab(0.25 0.2 0.5) l a b / alpha)`, `oklab(0.25 0.2 0.5)`);
-  test_computed_value(`color`, `oklab(from oklab(0.25 0.2 0.5 / 40%) l a b / alpha)`, `oklab(0.25 0.2 0.5 / 0.4)`);
-  test_computed_value(`color`, `oklab(from oklab(2 3 4 / 500%) l a b / alpha)`, `oklab(1 3 4)`);
-  test_computed_value(`color`, `oklab(from oklab(-2 -3 -4 / -500%) l a b / alpha)`, `oklab(0 -3 -4 / 0)`);
+  fuzzy_test_computed_color(`oklab(from oklab(0.25 0.2 0.5) l a b)`, `oklab(0.25 0.2 0.5)`);
+  fuzzy_test_computed_color(`oklab(from oklab(0.25 0.2 0.5) l a b / alpha)`, `oklab(0.25 0.2 0.5)`);
+  fuzzy_test_computed_color(`oklab(from oklab(0.25 0.2 0.5 / 40%) l a b / alpha)`, `oklab(0.25 0.2 0.5 / 0.4)`);
+  fuzzy_test_computed_color(`oklab(from oklab(2 3 4 / 500%) l a b / alpha)`, `oklab(1 3 4)`);
+  fuzzy_test_computed_color(`oklab(from oklab(-2 -3 -4 / -500%) l a b / alpha)`, `oklab(0 -3 -4 / 0)`);
 
   // Test nesting relative colors.
-  test_computed_value(`color`, `oklab(from oklab(from oklab(0.25 0.2 0.5) l a b) l a b)`, `oklab(0.25 0.2 0.5)`);
+  fuzzy_test_computed_color(`oklab(from oklab(from oklab(0.25 0.2 0.5) l a b) l a b)`, `oklab(0.25 0.2 0.5)`);
 
   // Testing non-oklab origin to see conversion.
-  test_computed_value(`color`, `oklab(from color(display-p3 0 0 0) l a b / alpha)`, `oklab(0 0 0)`);
+  fuzzy_test_computed_color(`oklab(from color(display-p3 0 0 0) l a b / alpha)`, `oklab(0 0 0)`);
 
   // Testing replacement with 0.
-  test_computed_value(`color`, `oklab(from oklab(0.25 0.2 0.5) 0 0 0)`, `oklab(0 0 0)`);
-  test_computed_value(`color`, `oklab(from oklab(0.25 0.2 0.5) 0 0 0 / 0)`, `oklab(0 0 0 / 0)`);
-  test_computed_value(`color`, `oklab(from oklab(0.25 0.2 0.5) 0 a b / alpha)`, `oklab(0 0.2 0.5)`);
-  test_computed_value(`color`, `oklab(from oklab(0.25 0.2 0.5) l 0 b / alpha)`, `oklab(0.25 0 0.5)`);
-  test_computed_value(`color`, `oklab(from oklab(0.25 0.2 0.5) l a 0 / alpha)`, `oklab(0.25 0.2 0)`);
-  test_computed_value(`color`, `oklab(from oklab(0.25 0.2 0.5) l a b / 0)`, `oklab(0.25 0.2 0.5 / 0)`);
-  test_computed_value(`color`, `oklab(from oklab(0.25 0.2 0.5 / 40%) 0 a b / alpha)`, `oklab(0 0.2 0.5 / 0.4)`);
-  test_computed_value(`color`, `oklab(from oklab(0.25 0.2 0.5 / 40%) l 0 b / alpha)`, `oklab(0.25 0 0.5 / 0.4)`);
-  test_computed_value(`color`, `oklab(from oklab(0.25 0.2 0.5 / 40%) l a 0 / alpha)`, `oklab(0.25 0.2 0 / 0.4)`);
-  test_computed_value(`color`, `oklab(from oklab(0.25 0.2 0.5 / 40%) l a b / 0)`, `oklab(0.25 0.2 0.5 / 0)`);
+  fuzzy_test_computed_color(`oklab(from oklab(0.25 0.2 0.5) 0 0 0)`, `oklab(0 0 0)`);
+  fuzzy_test_computed_color(`oklab(from oklab(0.25 0.2 0.5) 0 0 0 / 0)`, `oklab(0 0 0 / 0)`);
+  fuzzy_test_computed_color(`oklab(from oklab(0.25 0.2 0.5) 0 a b / alpha)`, `oklab(0 0.2 0.5)`);
+  fuzzy_test_computed_color(`oklab(from oklab(0.25 0.2 0.5) l 0 b / alpha)`, `oklab(0.25 0 0.5)`);
+  fuzzy_test_computed_color(`oklab(from oklab(0.25 0.2 0.5) l a 0 / alpha)`, `oklab(0.25 0.2 0)`);
+  fuzzy_test_computed_color(`oklab(from oklab(0.25 0.2 0.5) l a b / 0)`, `oklab(0.25 0.2 0.5 / 0)`);
+  fuzzy_test_computed_color(`oklab(from oklab(0.25 0.2 0.5 / 40%) 0 a b / alpha)`, `oklab(0 0.2 0.5 / 0.4)`);
+  fuzzy_test_computed_color(`oklab(from oklab(0.25 0.2 0.5 / 40%) l 0 b / alpha)`, `oklab(0.25 0 0.5 / 0.4)`);
+  fuzzy_test_computed_color(`oklab(from oklab(0.25 0.2 0.5 / 40%) l a 0 / alpha)`, `oklab(0.25 0.2 0 / 0.4)`);
+  fuzzy_test_computed_color(`oklab(from oklab(0.25 0.2 0.5 / 40%) l a b / 0)`, `oklab(0.25 0.2 0.5 / 0)`);
 
   // Testing replacement with a constant.
-  test_computed_value(`color`, `oklab(from oklab(0.25 0.2 0.5) 0.35 a b / alpha)`, `oklab(0.35 0.2 0.5)`);
-  test_computed_value(`color`, `oklab(from oklab(0.25 0.2 0.5) l 0.35 b / alpha)`, `oklab(0.25 0.35 0.5)`);
-  test_computed_value(`color`, `oklab(from oklab(0.25 0.2 0.5) l a 0.35 / alpha)`, `oklab(0.25 0.2 0.35)`);
-  test_computed_value(`color`, `oklab(from oklab(0.25 0.2 0.5) l a b / .35)`, `oklab(0.25 0.2 0.5 / 0.35)`);
-  test_computed_value(`color`, `oklab(from oklab(0.25 0.2 0.5 / 40%) 0.35 a b / alpha)`, `oklab(0.35 0.2 0.5 / 0.4)`);
-  test_computed_value(`color`, `oklab(from oklab(0.25 0.2 0.5 / 40%) l 0.35 b / alpha)`, `oklab(0.25 0.35 0.5 / 0.4)`);
-  test_computed_value(`color`, `oklab(from oklab(0.25 0.2 0.5 / 40%) l a 0.35 / alpha)`, `oklab(0.25 0.2 0.35 / 0.4)`);
-  test_computed_value(`color`, `oklab(from oklab(0.25 0.2 0.5 / 40%) l a b / .35)`, `oklab(0.25 0.2 0.5 / 0.35)`);
-  test_computed_value(`color`, `oklab(from oklab(0.7 0.45 0.3 / 40%) 2 3 4 / 500)`, `oklab(1 3 4)`);
-  test_computed_value(`color`, `oklab(from oklab(0.7 0.45 0.3 / 40%) -2 -3 -4 / -500)`, `oklab(0 -3 -4 / 0)`);
+  fuzzy_test_computed_color(`oklab(from oklab(0.25 0.2 0.5) 0.35 a b / alpha)`, `oklab(0.35 0.2 0.5)`);
+  fuzzy_test_computed_color(`oklab(from oklab(0.25 0.2 0.5) l 0.35 b / alpha)`, `oklab(0.25 0.35 0.5)`);
+  fuzzy_test_computed_color(`oklab(from oklab(0.25 0.2 0.5) l a 0.35 / alpha)`, `oklab(0.25 0.2 0.35)`);
+  fuzzy_test_computed_color(`oklab(from oklab(0.25 0.2 0.5) l a b / .35)`, `oklab(0.25 0.2 0.5 / 0.35)`);
+  fuzzy_test_computed_color(`oklab(from oklab(0.25 0.2 0.5 / 40%) 0.35 a b / alpha)`, `oklab(0.35 0.2 0.5 / 0.4)`);
+  fuzzy_test_computed_color(`oklab(from oklab(0.25 0.2 0.5 / 40%) l 0.35 b / alpha)`, `oklab(0.25 0.35 0.5 / 0.4)`);
+  fuzzy_test_computed_color(`oklab(from oklab(0.25 0.2 0.5 / 40%) l a 0.35 / alpha)`, `oklab(0.25 0.2 0.35 / 0.4)`);
+  fuzzy_test_computed_color(`oklab(from oklab(0.25 0.2 0.5 / 40%) l a b / .35)`, `oklab(0.25 0.2 0.5 / 0.35)`);
+  fuzzy_test_computed_color(`oklab(from oklab(0.7 0.45 0.3 / 40%) 2 3 4 / 500)`, `oklab(1 3 4)`);
+  fuzzy_test_computed_color(`oklab(from oklab(0.7 0.45 0.3 / 40%) -2 -3 -4 / -500)`, `oklab(0 -3 -4 / 0)`);
 
   // Testing valid permutation (types match).
-  test_computed_value(`color`, `oklab(from oklab(0.25 0.2 0.5) l b a)`, `oklab(0.25 0.5 0.2)`);
-  test_computed_value(`color`, `oklab(from oklab(0.25 0.2 0.5) l a a / a)`, `oklab(0.25 0.2 0.2 / 0.2)`);
-  test_computed_value(`color`, `oklab(from oklab(0.25 0.2 0.5 / 40%) l b a)`, `oklab(0.25 0.5 0.2 / 0.4)`);
-  test_computed_value(`color`, `oklab(from oklab(0.25 0.2 0.5 / 40%) l a a / a)`, `oklab(0.25 0.2 0.2 / 0.2)`);
+  fuzzy_test_computed_color(`oklab(from oklab(0.25 0.2 0.5) l b a)`, `oklab(0.25 0.5 0.2)`);
+  fuzzy_test_computed_color(`oklab(from oklab(0.25 0.2 0.5) l a a / a)`, `oklab(0.25 0.2 0.2 / 0.2)`);
+  fuzzy_test_computed_color(`oklab(from oklab(0.25 0.2 0.5 / 40%) l b a)`, `oklab(0.25 0.5 0.2 / 0.4)`);
+  fuzzy_test_computed_color(`oklab(from oklab(0.25 0.2 0.5 / 40%) l a a / a)`, `oklab(0.25 0.2 0.2 / 0.2)`);
 
   // Testing with calc().
-  test_computed_value(`color`, `oklab(from oklab(0.25 0.2 0.5) calc(l) calc(a) calc(b))`, `oklab(0.25 0.2 0.5)`);
-  test_computed_value(`color`, `oklab(from oklab(0.25 0.2 0.5 / 40%) calc(l) calc(a) calc(b) / calc(alpha))`, `oklab(0.25 0.2 0.5 / 0.4)`);
+  fuzzy_test_computed_color(`oklab(from oklab(0.25 0.2 0.5) calc(l) calc(a) calc(b))`, `oklab(0.25 0.2 0.5)`);
+  fuzzy_test_computed_color(`oklab(from oklab(0.25 0.2 0.5 / 40%) calc(l) calc(a) calc(b) / calc(alpha))`, `oklab(0.25 0.2 0.5 / 0.4)`);
 
   // Testing with 'none'.
-  test_computed_value(`color`, `oklab(from oklab(0.25 0.2 0.5) none none none)`, `oklab(none none none)`);
-  test_computed_value(`color`, `oklab(from oklab(0.25 0.2 0.5) none none none / none)`, `oklab(none none none / none)`);
-  test_computed_value(`color`, `oklab(from oklab(0.25 0.2 0.5) l a none)`, `oklab(0.25 0.2 none)`);
-  test_computed_value(`color`, `oklab(from oklab(0.25 0.2 0.5) l a none / alpha)`, `oklab(0.25 0.2 none)`);
-  test_computed_value(`color`, `oklab(from oklab(0.25 0.2 0.5) l a b / none)`, `oklab(0.25 0.2 0.5 / none)`);
-  test_computed_value(`color`, `oklab(from oklab(0.25 0.2 0.5 / 40%) l a none / alpha)`, `oklab(0.25 0.2 none / 0.4)`);
-  test_computed_value(`color`, `oklab(from oklab(0.25 0.2 0.5 / 40%) l a b / none)`, `oklab(0.25 0.2 0.5 / none)`);
+  fuzzy_test_computed_color(`oklab(from oklab(0.25 0.2 0.5) none none none)`, `oklab(none none none)`);
+  fuzzy_test_computed_color(`oklab(from oklab(0.25 0.2 0.5) none none none / none)`, `oklab(none none none / none)`);
+  fuzzy_test_computed_color(`oklab(from oklab(0.25 0.2 0.5) l a none)`, `oklab(0.25 0.2 none)`);
+  fuzzy_test_computed_color(`oklab(from oklab(0.25 0.2 0.5) l a none / alpha)`, `oklab(0.25 0.2 none)`);
+  fuzzy_test_computed_color(`oklab(from oklab(0.25 0.2 0.5) l a b / none)`, `oklab(0.25 0.2 0.5 / none)`);
+  fuzzy_test_computed_color(`oklab(from oklab(0.25 0.2 0.5 / 40%) l a none / alpha)`, `oklab(0.25 0.2 none / 0.4)`);
+  fuzzy_test_computed_color(`oklab(from oklab(0.25 0.2 0.5 / 40%) l a b / none)`, `oklab(0.25 0.2 0.5 / none)`);
   // FIXME: Clarify with spec editors if 'none' should pass through to the constants.
-  test_computed_value(`color`, `oklab(from oklab(none none none) l a b)`, `oklab(0 0 0)`);
-  test_computed_value(`color`, `oklab(from oklab(none none none / none) l a b / alpha)`, `oklab(0 0 0 / 0)`);
-  test_computed_value(`color`, `oklab(from oklab(0.25 none 0.5) l a b)`, `oklab(0.25 0 0.5)`);
-  test_computed_value(`color`, `oklab(from oklab(0.25 0.2 0.5 / none) l a b / alpha)`, `oklab(0.25 0.2 0.5 / 0)`);
-
-  // lab and oklab tests that require different results due to percent scaling differences.
-  test_computed_value(`color`, `lab(from lab(.7 45 30) alpha b a / l)`, `lab(100 30 45 / 0.7)`);
-  test_computed_value(`color`, `lab(from lab(.7 45 30) alpha a b / alpha)`, `lab(100 45 30)`);
-  test_computed_value(`color`, `lab(from lab(.7 45 30) alpha a a / alpha)`, `lab(100 45 45)`);
-  test_computed_value(`color`, `lab(from lab(.7 45 30 / 40%) alpha b a / l)`, `lab(40 30 45 / 0.7)`);
-  test_computed_value(`color`, `lab(from lab(.7 45 30 / 40%) alpha a b / alpha)`, `lab(40 45 30 / 0.4)`);
-  test_computed_value(`color`, `lab(from lab(.7 45 30 / 40%) alpha a a / alpha)`, `lab(40 45 45 / 0.4)`);
-
-  test_computed_value(`color`, `oklab(from oklab(.7 0.45 0.3) alpha b a / l)`, `oklab(1 0.3 0.45 / 0.7)`);
-  test_computed_value(`color`, `oklab(from oklab(.7 0.45 0.3) alpha a b / alpha)`, `oklab(1 0.45 0.3)`);
-  test_computed_value(`color`, `oklab(from oklab(.7 0.45 0.3) alpha a a / alpha)`, `oklab(1 0.45 0.45)`);
-  test_computed_value(`color`, `oklab(from oklab(.7 0.45 0.3 / 40%) alpha b a / l)`, `oklab(0.4 0.3 0.45 / 0.7)`);
-  test_computed_value(`color`, `oklab(from oklab(.7 0.45 0.3 / 40%) alpha a b / alpha)`, `oklab(0.4 0.45 0.3 / 0.4)`);
-  test_computed_value(`color`, `oklab(from oklab(.7 0.45 0.3 / 40%) alpha a a / alpha)`, `oklab(0.4 0.45 0.45 / 0.4)`);
+  fuzzy_test_computed_color(`oklab(from oklab(none none none) l a b)`, `oklab(0 0 0)`);
+  fuzzy_test_computed_color(`oklab(from oklab(none none none / none) l a b / alpha)`, `oklab(0 0 0 / 0)`);
+  fuzzy_test_computed_color(`oklab(from oklab(0.25 none 0.5) l a b)`, `oklab(0.25 0 0.5)`);
+  fuzzy_test_computed_color(`oklab(from oklab(0.25 0.2 0.5 / none) l a b / alpha)`, `oklab(0.25 0.2 0.5 / 0)`);
 
   // lch()
 
   // Testing no modifications.
-  test_computed_value(`color`, `lch(from lch(0.7 45 30) l c h)`, `lch(0.7 45 30)`);
-  test_computed_value(`color`, `lch(from lch(0.7 45 30) l c h / alpha)`, `lch(0.7 45 30)`);
-  test_computed_value(`color`, `lch(from lch(0.7 45 30 / 40%) l c h / alpha)`, `lch(0.7 45 30 / 0.4)`);
-  test_computed_value(`color`, `lch(from lch(200 300 400 / 500%) l c h / alpha)`, `lch(200 300 40)`);
-  test_computed_value(`color`, `lch(from lch(-200 -300 -400 / -500%) l c h / alpha)`, `lch(0 0 320 / 0)`);
+  fuzzy_test_computed_color(`lch(from lch(0.7 45 30) l c h)`, `lch(0.7 45 30)`);
+  fuzzy_test_computed_color(`lch(from lch(0.7 45 30) l c h / alpha)`, `lch(0.7 45 30)`);
+  fuzzy_test_computed_color(`lch(from lch(0.7 45 30 / 40%) l c h / alpha)`, `lch(0.7 45 30 / 0.4)`);
+  fuzzy_test_computed_color(`lch(from lch(200 300 400 / 500%) l c h / alpha)`, `lch(100 300 40)`);
+  fuzzy_test_computed_color(`lch(from lch(-200 -300 -400 / -500%) l c h / alpha)`, `lch(0 0 320 / 0)`);
 
   // Test nesting relative colors.
-  test_computed_value(`color`, `lch(from lch(from lch(0.7 45 30) l c h) l c h)`, `lch(0.7 45 30)`);
+  fuzzy_test_computed_color(`lch(from lch(from lch(0.7 45 30) l c h) l c h)`, `lch(0.7 45 30)`);
 
   // Testing non-sRGB origin colors (no gamut mapping will happen since the destination is not a bounded RGB color space).
-  test_computed_value(`color`, `lch(from color(display-p3 0 0 0) l c h / alpha)`, `lch(0 0 0)`);
-  test_computed_value(`color`, `lch(from lab(0.7 45 30) l c h / alpha)`, `lch(0.7 54.08327 33.690067)`);
+  fuzzy_test_computed_color(`lch(from color(display-p3 0 0 0) l c h / alpha)`, `lch(0 0 0)`);
+  fuzzy_test_computed_color(`lch(from lab(0.7 45 30) l c h / alpha)`, `lch(0.7 54.08327 33.690067)`);
 
   // Testing replacement with 0.
-  test_computed_value(`color`, `lch(from lch(0.7 45 30) 0 0 0)`, `lch(0 0 0)`);
-  test_computed_value(`color`, `lch(from lch(0.7 45 30) 0 0 0deg)`, `lch(0 0 0)`);
-  test_computed_value(`color`, `lch(from lch(0.7 45 30) 0 0 0 / 0)`, `lch(0 0 0 / 0)`);
-  test_computed_value(`color`, `lch(from lch(0.7 45 30) 0 0 0deg / 0)`, `lch(0 0 0 / 0)`);
-  test_computed_value(`color`, `lch(from lch(0.7 45 30) 0 c h / alpha)`, `lch(0 45 30)`);
-  test_computed_value(`color`, `lch(from lch(0.7 45 30) l 0 h / alpha)`, `lch(0.7 0 30)`);
-  test_computed_value(`color`, `lch(from lch(0.7 45 30) l c 0 / alpha)`, `lch(0.7 45 0)`);
-  test_computed_value(`color`, `lch(from lch(0.7 45 30) l c 0deg / alpha)`, `lch(0.7 45 0)`);
-  test_computed_value(`color`, `lch(from lch(0.7 45 30) l c h / 0)`, `lch(0.7 45 30 / 0)`);
-  test_computed_value(`color`, `lch(from lch(0.7 45 30 / 40%) 0 c h / alpha)`, `lch(0 45 30 / 0.4)`);
-  test_computed_value(`color`, `lch(from lch(0.7 45 30 / 40%) l 0 h / alpha)`, `lch(0.7 0 30 / 0.4)`);
-  test_computed_value(`color`, `lch(from lch(0.7 45 30 / 40%) l c 0 / alpha)`, `lch(0.7 45 0 / 0.4)`);
-  test_computed_value(`color`, `lch(from lch(0.7 45 30 / 40%) l c 0deg / alpha)`, `lch(0.7 45 0 / 0.4)`);
-  test_computed_value(`color`, `lch(from lch(0.7 45 30 / 40%) l c h / 0)`, `lch(0.7 45 30 / 0)`);
+  fuzzy_test_computed_color(`lch(from lch(0.7 45 30) 0 0 0)`, `lch(0 0 0)`);
+  fuzzy_test_computed_color(`lch(from lch(0.7 45 30) 0 0 0deg)`, `lch(0 0 0)`);
+  fuzzy_test_computed_color(`lch(from lch(0.7 45 30) 0 0 0 / 0)`, `lch(0 0 0 / 0)`);
+  fuzzy_test_computed_color(`lch(from lch(0.7 45 30) 0 0 0deg / 0)`, `lch(0 0 0 / 0)`);
+  fuzzy_test_computed_color(`lch(from lch(0.7 45 30) 0 c h / alpha)`, `lch(0 45 30)`);
+  fuzzy_test_computed_color(`lch(from lch(0.7 45 30) l 0 h / alpha)`, `lch(0.7 0 30)`);
+  fuzzy_test_computed_color(`lch(from lch(0.7 45 30) l c 0 / alpha)`, `lch(0.7 45 0)`);
+  fuzzy_test_computed_color(`lch(from lch(0.7 45 30) l c 0deg / alpha)`, `lch(0.7 45 0)`);
+  fuzzy_test_computed_color(`lch(from lch(0.7 45 30) l c h / 0)`, `lch(0.7 45 30 / 0)`);
+  fuzzy_test_computed_color(`lch(from lch(0.7 45 30 / 40%) 0 c h / alpha)`, `lch(0 45 30 / 0.4)`);
+  fuzzy_test_computed_color(`lch(from lch(0.7 45 30 / 40%) l 0 h / alpha)`, `lch(0.7 0 30 / 0.4)`);
+  fuzzy_test_computed_color(`lch(from lch(0.7 45 30 / 40%) l c 0 / alpha)`, `lch(0.7 45 0 / 0.4)`);
+  fuzzy_test_computed_color(`lch(from lch(0.7 45 30 / 40%) l c 0deg / alpha)`, `lch(0.7 45 0 / 0.4)`);
+  fuzzy_test_computed_color(`lch(from lch(0.7 45 30 / 40%) l c h / 0)`, `lch(0.7 45 30 / 0)`);
 
   // Testing replacement with a constant.
-  test_computed_value(`color`, `lch(from lch(0.7 45 30) 25 c h / alpha)`, `lch(25 45 30)`);
-  test_computed_value(`color`, `lch(from lch(0.7 45 30) l 25 h / alpha)`, `lch(0.7 25 30)`);
-  test_computed_value(`color`, `lch(from lch(0.7 45 30) l c 25 / alpha)`, `lch(0.7 45 25)`);
-  test_computed_value(`color`, `lch(from lch(0.7 45 30) l c 25deg / alpha)`, `lch(0.7 45 25)`);
-  test_computed_value(`color`, `lch(from lch(0.7 45 30) l c h / .25)`, `lch(0.7 45 30 / 0.25)`);
-  test_computed_value(`color`, `lch(from lch(0.7 45 30 / 40%) 25 c h / alpha)`, `lch(25 45 30 / 0.4)`);
-  test_computed_value(`color`, `lch(from lch(0.7 45 30 / 40%) l 25 h / alpha)`, `lch(0.7 25 30 / 0.4)`);
-  test_computed_value(`color`, `lch(from lch(0.7 45 30 / 40%) l c 25 / alpha)`, `lch(0.7 45 25 / 0.4)`);
-  test_computed_value(`color`, `lch(from lch(0.7 45 30 / 40%) l c 25deg / alpha)`, `lch(0.7 45 25 / 0.4)`);
-  test_computed_value(`color`, `lch(from lch(0.7 45 30 / 40%) l c h / .25)`, `lch(0.7 45 30 / 0.25)`);
-  test_computed_value(`color`, `lch(from lch(0.7 45 30 / 40%) 200 300 400 / 500)`, `lch(200 300 40)`);
-  test_computed_value(`color`, `lch(from lch(0.7 45 30 / 40%) -200 -300 -400 / -500)`, `lch(0 0 320 / 0)`);
-  test_computed_value(`color`, `lch(from lch(0.7 45 30 / 40%) 50 120 400deg / 500)`, `lch(50 120 40)`);
-  test_computed_value(`color`, `lch(from lch(0.7 45 30 / 40%) 50 120 -400deg / -500)`, `lch(50 120 320 / 0)`);
+  fuzzy_test_computed_color(`lch(from lch(0.7 45 30) 25 c h / alpha)`, `lch(25 45 30)`);
+  fuzzy_test_computed_color(`lch(from lch(0.7 45 30) l 25 h / alpha)`, `lch(0.7 25 30)`);
+  fuzzy_test_computed_color(`lch(from lch(0.7 45 30) l c 25 / alpha)`, `lch(0.7 45 25)`);
+  fuzzy_test_computed_color(`lch(from lch(0.7 45 30) l c 25deg / alpha)`, `lch(0.7 45 25)`);
+  fuzzy_test_computed_color(`lch(from lch(0.7 45 30) l c h / .25)`, `lch(0.7 45 30 / 0.25)`);
+  fuzzy_test_computed_color(`lch(from lch(0.7 45 30 / 40%) 25 c h / alpha)`, `lch(25 45 30 / 0.4)`);
+  fuzzy_test_computed_color(`lch(from lch(0.7 45 30 / 40%) l 25 h / alpha)`, `lch(0.7 25 30 / 0.4)`);
+  fuzzy_test_computed_color(`lch(from lch(0.7 45 30 / 40%) l c 25 / alpha)`, `lch(0.7 45 25 / 0.4)`);
+  fuzzy_test_computed_color(`lch(from lch(0.7 45 30 / 40%) l c 25deg / alpha)`, `lch(0.7 45 25 / 0.4)`);
+  fuzzy_test_computed_color(`lch(from lch(0.7 45 30 / 40%) l c h / .25)`, `lch(0.7 45 30 / 0.25)`);
+  fuzzy_test_computed_color(`lch(from lch(0.7 45 30 / 40%) 200 300 400 / 500)`, `lch(100 300 40)`);
+  fuzzy_test_computed_color(`lch(from lch(0.7 45 30 / 40%) -200 -300 -400 / -500)`, `lch(0 0 320 / 0)`);
+  fuzzy_test_computed_color(`lch(from lch(0.7 45 30 / 40%) 50 120 400deg / 500)`, `lch(50 120 40)`);
+  fuzzy_test_computed_color(`lch(from lch(0.7 45 30 / 40%) 50 120 -400deg / -500)`, `lch(50 120 320 / 0)`);
 
   // Testing valid permutation (types match).
   // NOTE: 'c' is a vaild hue, as hue is <angle>|<number>.
-  test_computed_value(`color`, `lch(from lch(.7 45 30) l c c / alpha)`, `lch(0.7 45 45)`);
-  test_computed_value(`color`, `lch(from lch(.7 45 30 / 40%) l c c / alpha)`, `lch(0.7 45 45 / 0.4)`);
+  fuzzy_test_computed_color(`lch(from lch(.7 45 30) l c c / alpha)`, `lch(0.7 45 45)`);
+  fuzzy_test_computed_color(`lch(from lch(.7 45 30 / 40%) l c c / alpha)`, `lch(0.7 45 45 / 0.4)`);
 
   // Testing with calc().
-  test_computed_value(`color`, `lch(from lch(0.7 45 30) calc(l) calc(c) calc(h))`, `lch(0.7 45 30)`);
-  test_computed_value(`color`, `lch(from lch(0.7 45 30 / 40%) calc(l) calc(c) calc(h) / calc(alpha))`, `lch(0.7 45 30 / 0.4)`);
+  fuzzy_test_computed_color(`lch(from lch(0.7 45 30) calc(l) calc(c) calc(h))`, `lch(0.7 45 30)`);
+  fuzzy_test_computed_color(`lch(from lch(0.7 45 30 / 40%) calc(l) calc(c) calc(h) / calc(alpha))`, `lch(0.7 45 30 / 0.4)`);
 
   // Testing with 'none'.
-  test_computed_value(`color`, `lch(from lch(0.7 45 30) none none none)`,                                   `lch(none none none)`);
-  test_computed_value(`color`, `lch(from lch(0.7 45 30) none none none / none)`,                            `lch(none none none / none)`);
-  test_computed_value(`color`, `lch(from lch(0.7 45 30) l c none)`,                                         `lch(0.7 45 none)`);
-  test_computed_value(`color`, `lch(from lch(0.7 45 30) l c none / alpha)`,                                 `lch(0.7 45 none)`);
-  test_computed_value(`color`, `lch(from lch(0.7 45 30) l c h / none)`,                                     `lch(0.7 45 30 / none)`);
-  test_computed_value(`color`, `lch(from lch(0.7 45 30 / 40%) l c none / alpha)`,                           `lch(0.7 45 none / 0.4)`);
-  test_computed_value(`color`, `lch(from lch(0.7 45 30 / 40%) l c h / none)`,                               `lch(0.7 45 30 / none)`);
+  fuzzy_test_computed_color(`lch(from lch(0.7 45 30) none none none)`,                                   `lch(none none none)`);
+  fuzzy_test_computed_color(`lch(from lch(0.7 45 30) none none none / none)`,                            `lch(none none none / none)`);
+  fuzzy_test_computed_color(`lch(from lch(0.7 45 30) l c none)`,                                         `lch(0.7 45 none)`);
+  fuzzy_test_computed_color(`lch(from lch(0.7 45 30) l c none / alpha)`,                                 `lch(0.7 45 none)`);
+  fuzzy_test_computed_color(`lch(from lch(0.7 45 30) l c h / none)`,                                     `lch(0.7 45 30 / none)`);
+  fuzzy_test_computed_color(`lch(from lch(0.7 45 30 / 40%) l c none / alpha)`,                           `lch(0.7 45 none / 0.4)`);
+  fuzzy_test_computed_color(`lch(from lch(0.7 45 30 / 40%) l c h / none)`,                               `lch(0.7 45 30 / none)`);
   // FIXME: Clarify with spec editors if 'none' should pass through to the constants.
-  test_computed_value(`color`, `lch(from lch(none none none) l c h)`,                                       `lch(0 0 0)`);
-  test_computed_value(`color`, `lch(from lch(none none none / none) l c h / alpha)`,                        `lch(0 0 0 / 0)`);
-  test_computed_value(`color`, `lch(from lch(0.7 none 30) l c h)`,                                          `lch(0.7 0 30)`);
-  test_computed_value(`color`, `lch(from lch(0.7 45 30 / none) l c h / alpha)`,                             `lch(0.7 45 30 / 0)`);
+  fuzzy_test_computed_color(`lch(from lch(none none none) l c h)`,                                       `lch(0 0 0)`);
+  fuzzy_test_computed_color(`lch(from lch(none none none / none) l c h / alpha)`,                        `lch(0 0 0 / 0)`);
+  fuzzy_test_computed_color(`lch(from lch(0.7 none 30) l c h)`,                                          `lch(0.7 0 30)`);
+  fuzzy_test_computed_color(`lch(from lch(0.7 45 30 / none) l c h / alpha)`,                             `lch(0.7 45 30 / 0)`);
 
   // oklch()
 
   // Testing no modifications.
-  test_computed_value(`color`, `oklch(from oklch(0.7 0.45 30) l c h)`, `oklch(0.7 0.45 30)`);
-  test_computed_value(`color`, `oklch(from oklch(0.7 0.45 30) l c h / alpha)`, `oklch(0.7 0.45 30)`);
-  test_computed_value(`color`, `oklch(from oklch(0.7 0.45 30 / 40%) l c h / alpha)`, `oklch(0.7 0.45 30 / 0.4)`);
-  test_computed_value(`color`, `oklch(from oklch(2 3 400 / 500%) l c h / alpha)`, `oklch(1 3 40)`);
-  test_computed_value(`color`, `oklch(from oklch(-2 -3 -400 / -500%) l c h / alpha)`, `oklch(0 0 320 / 0)`);
+  fuzzy_test_computed_color(`oklch(from oklch(0.7 0.45 30) l c h)`, `oklch(0.7 0.45 30)`);
+  fuzzy_test_computed_color(`oklch(from oklch(0.7 0.45 30) l c h / alpha)`, `oklch(0.7 0.45 30)`);
+  fuzzy_test_computed_color(`oklch(from oklch(0.7 0.45 30 / 40%) l c h / alpha)`, `oklch(0.7 0.45 30 / 0.4)`);
+  fuzzy_test_computed_color(`oklch(from oklch(2 3 400 / 500%) l c h / alpha)`, `oklch(1 3 40)`);
+  fuzzy_test_computed_color(`oklch(from oklch(-2 -3 -400 / -500%) l c h / alpha)`, `oklch(0 0 320 / 0)`);
 
   // Test nesting relative colors.
-  test_computed_value(`color`, `oklch(from oklch(from oklch(0.7 0.45 30) l c h) l c h)`, `oklch(0.7 0.45 30)`);
+  fuzzy_test_computed_color(`oklch(from oklch(from oklch(0.7 0.45 30) l c h) l c h)`, `oklch(0.7 0.45 30)`);
 
   // Testing non-sRGB origin colors (no gamut mapping will happen since the destination is not a bounded RGB color space).
-  test_computed_value(`color`, `oklch(from color(display-p3 0 0 0) l c h / alpha)`, `oklch(0 0 0)`);
+  fuzzy_test_computed_color(`oklch(from color(display-p3 0 0 0) l c h / alpha)`, `oklch(0 0 0)`);
   // TODO: redo conversion with oklab(0.7 0.45 0.3)
-  test_computed_value(`color`, `oklch(from oklab(0.7 45 30) l c h / alpha)`, `oklch(0.7 54.08327 33.690067)`);
+  fuzzy_test_computed_color(`oklch(from oklab(0.7 45 30) l c h / alpha)`, `oklch(0.7 54.08327 33.690067)`);
 
   // Testing replacement with 0.
-  test_computed_value(`color`, `oklch(from oklch(0.7 0.45 30) 0 0 0)`, `oklch(0 0 0)`);
-  test_computed_value(`color`, `oklch(from oklch(0.7 0.45 30) 0 0 0deg)`, `oklch(0 0 0)`);
-  test_computed_value(`color`, `oklch(from oklch(0.7 0.45 30) 0 0 0 / 0)`, `oklch(0 0 0 / 0)`);
-  test_computed_value(`color`, `oklch(from oklch(0.7 0.45 30) 0 0 0deg / 0)`, `oklch(0 0 0 / 0)`);
-  test_computed_value(`color`, `oklch(from oklch(0.7 0.45 30) 0 c h / alpha)`, `oklch(0 0.45 30)`);
-  test_computed_value(`color`, `oklch(from oklch(0.7 0.45 30) l 0 h / alpha)`, `oklch(0.7 0 30)`);
-  test_computed_value(`color`, `oklch(from oklch(0.7 0.45 30) l c 0 / alpha)`, `oklch(0.7 0.45 0)`);
-  test_computed_value(`color`, `oklch(from oklch(0.7 0.45 30) l c 0deg / alpha)`, `oklch(0.7 0.45 0)`);
-  test_computed_value(`color`, `oklch(from oklch(0.7 0.45 30) l c h / 0)`, `oklch(0.7 0.45 30 / 0)`);
-  test_computed_value(`color`, `oklch(from oklch(0.7 0.45 30 / 40%) 0 c h / alpha)`, `oklch(0 0.45 30 / 0.4)`);
-  test_computed_value(`color`, `oklch(from oklch(0.7 0.45 30 / 40%) l 0 h / alpha)`, `oklch(0.7 0 30 / 0.4)`);
-  test_computed_value(`color`, `oklch(from oklch(0.7 0.45 30 / 40%) l c 0 / alpha)`, `oklch(0.7 0.45 0 / 0.4)`);
-  test_computed_value(`color`, `oklch(from oklch(0.7 0.45 30 / 40%) l c 0deg / alpha)`, `oklch(0.7 0.45 0 / 0.4)`);
-  test_computed_value(`color`, `oklch(from oklch(0.7 0.45 30 / 40%) l c h / 0)`, `oklch(0.7 0.45 30 / 0)`);
+  fuzzy_test_computed_color(`oklch(from oklch(0.7 0.45 30) 0 0 0)`, `oklch(0 0 0)`);
+  fuzzy_test_computed_color(`oklch(from oklch(0.7 0.45 30) 0 0 0deg)`, `oklch(0 0 0)`);
+  fuzzy_test_computed_color(`oklch(from oklch(0.7 0.45 30) 0 0 0 / 0)`, `oklch(0 0 0 / 0)`);
+  fuzzy_test_computed_color(`oklch(from oklch(0.7 0.45 30) 0 0 0deg / 0)`, `oklch(0 0 0 / 0)`);
+  fuzzy_test_computed_color(`oklch(from oklch(0.7 0.45 30) 0 c h / alpha)`, `oklch(0 0.45 30)`);
+  fuzzy_test_computed_color(`oklch(from oklch(0.7 0.45 30) l 0 h / alpha)`, `oklch(0.7 0 30)`);
+  fuzzy_test_computed_color(`oklch(from oklch(0.7 0.45 30) l c 0 / alpha)`, `oklch(0.7 0.45 0)`);
+  fuzzy_test_computed_color(`oklch(from oklch(0.7 0.45 30) l c 0deg / alpha)`, `oklch(0.7 0.45 0)`);
+  fuzzy_test_computed_color(`oklch(from oklch(0.7 0.45 30) l c h / 0)`, `oklch(0.7 0.45 30 / 0)`);
+  fuzzy_test_computed_color(`oklch(from oklch(0.7 0.45 30 / 40%) 0 c h / alpha)`, `oklch(0 0.45 30 / 0.4)`);
+  fuzzy_test_computed_color(`oklch(from oklch(0.7 0.45 30 / 40%) l 0 h / alpha)`, `oklch(0.7 0 30 / 0.4)`);
+  fuzzy_test_computed_color(`oklch(from oklch(0.7 0.45 30 / 40%) l c 0 / alpha)`, `oklch(0.7 0.45 0 / 0.4)`);
+  fuzzy_test_computed_color(`oklch(from oklch(0.7 0.45 30 / 40%) l c 0deg / alpha)`, `oklch(0.7 0.45 0 / 0.4)`);
+  fuzzy_test_computed_color(`oklch(from oklch(0.7 0.45 30 / 40%) l c h / 0)`, `oklch(0.7 0.45 30 / 0)`);
 
   // Testing replacement with a constant.
-  test_computed_value(`color`, `oklch(from oklch(0.7 0.45 30) 0.25 c h / alpha)`, `oklch(0.25 0.45 30)`);
-  test_computed_value(`color`, `oklch(from oklch(0.7 0.45 30) l 0.25 h / alpha)`, `oklch(0.7 0.25 30)`);
-  test_computed_value(`color`, `oklch(from oklch(0.7 0.45 30) l c 25 / alpha)`, `oklch(0.7 0.45 25)`);
-  test_computed_value(`color`, `oklch(from oklch(0.7 0.45 30) l c 25deg / alpha)`, `oklch(0.7 0.45 25)`);
-  test_computed_value(`color`, `oklch(from oklch(0.7 0.45 30) l c h / .25)`, `oklch(0.7 0.45 30 / 0.25)`);
-  test_computed_value(`color`, `oklch(from oklch(0.7 0.45 30 / 40%) 0.25 c h / alpha)`, `oklch(0.25 0.45 30 / 0.4)`);
-  test_computed_value(`color`, `oklch(from oklch(0.7 0.45 30 / 40%) l 0.25 h / alpha)`, `oklch(0.7 0.25 30 / 0.4)`);
-  test_computed_value(`color`, `oklch(from oklch(0.7 0.45 30 / 40%) l c 25 / alpha)`, `oklch(0.7 0.45 25 / 0.4)`);
-  test_computed_value(`color`, `oklch(from oklch(0.7 0.45 30 / 40%) l c 25deg / alpha)`, `oklch(0.7 0.45 25 / 0.4)`);
-  test_computed_value(`color`, `oklch(from oklch(0.7 0.45 30 / 40%) l c h / .25)`, `oklch(0.7 0.45 30 / 0.25)`);
-  test_computed_value(`color`, `oklch(from oklch(0.7 0.45 30 / 40%) 2 3 400 / 500)`, `oklch(1 3 40)`);
-  test_computed_value(`color`, `oklch(from oklch(0.7 0.45 30 / 40%) -2 -3 -400 / -500)`, `oklch(0 0 320 / 0)`);
-  test_computed_value(`color`, `oklch(from oklch(0.7 0.45 30 / 40%) 0.5 1.2 400deg / 500)`, `oklch(0.5 1.2 40)`);
-  test_computed_value(`color`, `oklch(from oklch(0.7 0.45 30 / 40%) 0.5 1.2 -400deg / -500)`, `oklch(0.5 1.2 320 / 0)`);
+  fuzzy_test_computed_color(`oklch(from oklch(0.7 0.45 30) 0.25 c h / alpha)`, `oklch(0.25 0.45 30)`);
+  fuzzy_test_computed_color(`oklch(from oklch(0.7 0.45 30) l 0.25 h / alpha)`, `oklch(0.7 0.25 30)`);
+  fuzzy_test_computed_color(`oklch(from oklch(0.7 0.45 30) l c 25 / alpha)`, `oklch(0.7 0.45 25)`);
+  fuzzy_test_computed_color(`oklch(from oklch(0.7 0.45 30) l c 25deg / alpha)`, `oklch(0.7 0.45 25)`);
+  fuzzy_test_computed_color(`oklch(from oklch(0.7 0.45 30) l c h / .25)`, `oklch(0.7 0.45 30 / 0.25)`);
+  fuzzy_test_computed_color(`oklch(from oklch(0.7 0.45 30 / 40%) 0.25 c h / alpha)`, `oklch(0.25 0.45 30 / 0.4)`);
+  fuzzy_test_computed_color(`oklch(from oklch(0.7 0.45 30 / 40%) l 0.25 h / alpha)`, `oklch(0.7 0.25 30 / 0.4)`);
+  fuzzy_test_computed_color(`oklch(from oklch(0.7 0.45 30 / 40%) l c 25 / alpha)`, `oklch(0.7 0.45 25 / 0.4)`);
+  fuzzy_test_computed_color(`oklch(from oklch(0.7 0.45 30 / 40%) l c 25deg / alpha)`, `oklch(0.7 0.45 25 / 0.4)`);
+  fuzzy_test_computed_color(`oklch(from oklch(0.7 0.45 30 / 40%) l c h / .25)`, `oklch(0.7 0.45 30 / 0.25)`);
+  fuzzy_test_computed_color(`oklch(from oklch(0.7 0.45 30 / 40%) 2 3 400 / 500)`, `oklch(1 3 40)`);
+  fuzzy_test_computed_color(`oklch(from oklch(0.7 0.45 30 / 40%) -2 -3 -400 / -500)`, `oklch(0 0 320 / 0)`);
+  fuzzy_test_computed_color(`oklch(from oklch(0.7 0.45 30 / 40%) 0.5 1.2 400deg / 500)`, `oklch(0.5 1.2 40)`);
+  fuzzy_test_computed_color(`oklch(from oklch(0.7 0.45 30 / 40%) 0.5 1.2 -400deg / -500)`, `oklch(0.5 1.2 320 / 0)`);
 
   // Testing valid permutation (types match).
   // NOTE: 'c' is a vaild hue, as hue is <angle>|<number>.
-  test_computed_value(`color`, `oklch(from oklch(.7 0.45 30) l c c / alpha)`, `oklch(0.7 0.45 0.45)`);
-  test_computed_value(`color`, `oklch(from oklch(.7 0.45 30 / 40%) l c c / alpha)`, `oklch(0.7 0.45 0.45 / 0.4)`);
+  fuzzy_test_computed_color(`oklch(from oklch(.7 0.45 30) l c c / alpha)`, `oklch(0.7 0.45 0.45)`);
+  fuzzy_test_computed_color(`oklch(from oklch(.7 0.45 30 / 40%) l c c / alpha)`, `oklch(0.7 0.45 0.45 / 0.4)`);
 
   // Testing with calc().
-  test_computed_value(`color`, `oklch(from oklch(0.7 0.45 30) calc(l) calc(c) calc(h))`, `oklch(0.7 0.45 30)`);
-  test_computed_value(`color`, `oklch(from oklch(0.7 0.45 30 / 40%) calc(l) calc(c) calc(h) / calc(alpha))`, `oklch(0.7 0.45 30 / 0.4)`);
+  fuzzy_test_computed_color(`oklch(from oklch(0.7 0.45 30) calc(l) calc(c) calc(h))`, `oklch(0.7 0.45 30)`);
+  fuzzy_test_computed_color(`oklch(from oklch(0.7 0.45 30 / 40%) calc(l) calc(c) calc(h) / calc(alpha))`, `oklch(0.7 0.45 30 / 0.4)`);
 
   // Testing with 'none'.
-  test_computed_value(`color`, `oklch(from oklch(0.7 0.45 30) none none none)`,                                   `oklch(none none none)`);
-  test_computed_value(`color`, `oklch(from oklch(0.7 0.45 30) none none none / none)`,                            `oklch(none none none / none)`);
-  test_computed_value(`color`, `oklch(from oklch(0.7 0.45 30) l c none)`,                                         `oklch(0.7 0.45 none)`);
-  test_computed_value(`color`, `oklch(from oklch(0.7 0.45 30) l c none / alpha)`,                                 `oklch(0.7 0.45 none)`);
-  test_computed_value(`color`, `oklch(from oklch(0.7 0.45 30) l c h / none)`,                                     `oklch(0.7 0.45 30 / none)`);
-  test_computed_value(`color`, `oklch(from oklch(0.7 0.45 30 / 40%) l c none / alpha)`,                           `oklch(0.7 0.45 none / 0.4)`);
-  test_computed_value(`color`, `oklch(from oklch(0.7 0.45 30 / 40%) l c h / none)`,                               `oklch(0.7 0.45 30 / none)`);
+  fuzzy_test_computed_color(`oklch(from oklch(0.7 0.45 30) none none none)`,                                   `oklch(none none none)`);
+  fuzzy_test_computed_color(`oklch(from oklch(0.7 0.45 30) none none none / none)`,                            `oklch(none none none / none)`);
+  fuzzy_test_computed_color(`oklch(from oklch(0.7 0.45 30) l c none)`,                                         `oklch(0.7 0.45 none)`);
+  fuzzy_test_computed_color(`oklch(from oklch(0.7 0.45 30) l c none / alpha)`,                                 `oklch(0.7 0.45 none)`);
+  fuzzy_test_computed_color(`oklch(from oklch(0.7 0.45 30) l c h / none)`,                                     `oklch(0.7 0.45 30 / none)`);
+  fuzzy_test_computed_color(`oklch(from oklch(0.7 0.45 30 / 40%) l c none / alpha)`,                           `oklch(0.7 0.45 none / 0.4)`);
+  fuzzy_test_computed_color(`oklch(from oklch(0.7 0.45 30 / 40%) l c h / none)`,                               `oklch(0.7 0.45 30 / none)`);
   // FIXME: Clarify with spec editors if 'none' should pass through to the constants.
-  test_computed_value(`color`, `oklch(from oklch(none none none) l c h)`,                                       `oklch(0 0 0)`);
-  test_computed_value(`color`, `oklch(from oklch(none none none / none) l c h / alpha)`,                        `oklch(0 0 0 / 0)`);
-  test_computed_value(`color`, `oklch(from oklch(0.7 none 30) l c h)`,                                          `oklch(0.7 0 30)`);
-  test_computed_value(`color`, `oklch(from oklch(0.7 0.45 30 / none) l c h / alpha)`,                             `oklch(0.7 0.45 30 / 0)`);
-
-  // lch and oklch tests that require different results due to percent scaling differences.
-  test_computed_value(`color`, `lch(from lch(.7 45 30) alpha c h / l)`, `lch(100 45 30 / 0.7)`);
-  test_computed_value(`color`, `lch(from lch(.7 45 30) alpha c h / alpha)`, `lch(100 45 30)`);
-  test_computed_value(`color`, `lch(from lch(.7 45 30) alpha c c / alpha)`, `lch(100 45 45)`);
-  test_computed_value(`color`, `lch(from lch(.7 45 30 / 40%) alpha c h / l)`, `lch(40 45 30 / 0.7)`);
-  test_computed_value(`color`, `lch(from lch(.7 45 30 / 40%) alpha c h / alpha)`, `lch(40 45 30 / 0.4)`);
-  test_computed_value(`color`, `lch(from lch(.7 45 30 / 40%) alpha c c / alpha)`, `lch(40 45 45 / 0.4)`);
-
-  test_computed_value(`color`, `oklch(from oklch(.7 0.45 30) alpha c h / l)`, `oklch(1 0.45 30 / 0.7)`);
-  test_computed_value(`color`, `oklch(from oklch(.7 0.45 30) alpha c h / alpha)`, `oklch(1 0.45 30)`);
-  test_computed_value(`color`, `oklch(from oklch(.7 0.45 30) alpha c c / alpha)`, `oklch(1 0.45 0.45)`);
-  test_computed_value(`color`, `oklch(from oklch(.7 0.45 30 / 40%) alpha c h / l)`, `oklch(0.4 0.45 30 / 0.7)`);
-  test_computed_value(`color`, `oklch(from oklch(.7 0.45 30 / 40%) alpha c h / alpha)`, `oklch(0.4 0.45 30 / 0.4)`);
-  test_computed_value(`color`, `oklch(from oklch(.7 0.45 30 / 40%) alpha c c / alpha)`, `oklch(0.4 0.45 0.45 / 0.4)`);
-
+  fuzzy_test_computed_color(`oklch(from oklch(none none none) l c h)`,                                       `oklch(0 0 0)`);
+  fuzzy_test_computed_color(`oklch(from oklch(none none none / none) l c h / alpha)`,                        `oklch(0 0 0 / 0)`);
+  fuzzy_test_computed_color(`oklch(from oklch(0.7 none 30) l c h)`,                                          `oklch(0.7 0 30)`);
+  fuzzy_test_computed_color(`oklch(from oklch(0.7 0.45 30 / none) l c h / alpha)`,                             `oklch(0.7 0.45 30 / 0)`);
 
   for (const colorSpace of [ "srgb", "srgb-linear", "a98-rgb", "rec2020", "prophoto-rgb", "display-p3" ]) {
       // Testing no modifications.
-      test_computed_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} r g b)`,                              `color(${colorSpace} 0.7 0.5 0.3)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} r g b / alpha)`,                      `color(${colorSpace} 0.7 0.5 0.3)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} r g b)`,                        `color(${colorSpace} 0.7 0.5 0.3 / 0.4)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} r g b / alpha)`,                `color(${colorSpace} 0.7 0.5 0.3 / 0.4)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} r g b)`,                              `color(${colorSpace} 0.7 0.5 0.3)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} r g b / alpha)`,                      `color(${colorSpace} 0.7 0.5 0.3)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} r g b)`,                        `color(${colorSpace} 0.7 0.5 0.3 / 0.4)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} r g b / alpha)`,                `color(${colorSpace} 0.7 0.5 0.3 / 0.4)`);
 
       // Test nesting relative colors.
-      test_computed_value(`color`, `color(from color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} r g b) ${colorSpace} r g b)`,   `color(${colorSpace} 0.7 0.5 0.3)`);
+      fuzzy_test_computed_color(`color(from color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} r g b) ${colorSpace} r g b)`,   `color(${colorSpace} 0.7 0.5 0.3)`);
 
       // Testing replacement with 0.
-      test_computed_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} 0 0 0)`,                              `color(${colorSpace} 0 0 0)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} 0 0 0 / 0)`,                          `color(${colorSpace} 0 0 0 / 0)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} 0 g b / alpha)`,                      `color(${colorSpace} 0 0.5 0.3)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} r 0 b / alpha)`,                      `color(${colorSpace} 0.7 0 0.3)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} r g 0 / alpha)`,                      `color(${colorSpace} 0.7 0.5 0)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} r g b / 0)`,                          `color(${colorSpace} 0.7 0.5 0.3 / 0)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} 0 g b / alpha)`,                `color(${colorSpace} 0 0.5 0.3 / 0.4)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} r 0 b / alpha)`,                `color(${colorSpace} 0.7 0 0.3 / 0.4)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} r g 0 / alpha)`,                `color(${colorSpace} 0.7 0.5 0 / 0.4)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} r g b / 0)`,                    `color(${colorSpace} 0.7 0.5 0.3 / 0)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} 0 0 0)`,                              `color(${colorSpace} 0 0 0)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} 0 0 0 / 0)`,                          `color(${colorSpace} 0 0 0 / 0)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} 0 g b / alpha)`,                      `color(${colorSpace} 0 0.5 0.3)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} r 0 b / alpha)`,                      `color(${colorSpace} 0.7 0 0.3)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} r g 0 / alpha)`,                      `color(${colorSpace} 0.7 0.5 0)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} r g b / 0)`,                          `color(${colorSpace} 0.7 0.5 0.3 / 0)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} 0 g b / alpha)`,                `color(${colorSpace} 0 0.5 0.3 / 0.4)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} r 0 b / alpha)`,                `color(${colorSpace} 0.7 0 0.3 / 0.4)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} r g 0 / alpha)`,                `color(${colorSpace} 0.7 0.5 0 / 0.4)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} r g b / 0)`,                    `color(${colorSpace} 0.7 0.5 0.3 / 0)`);
 
       // Testing replacement with a constant.
-      test_computed_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} 0.2 g b / alpha)`,                    `color(${colorSpace} 0.2 0.5 0.3)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} 20% g b / alpha)`,                    `color(${colorSpace} 0.2 0.5 0.3)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} r 0.2 b / alpha)`,                    `color(${colorSpace} 0.7 0.2 0.3)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} r 20% b / alpha)`,                    `color(${colorSpace} 0.7 0.2 0.3)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} r g 0.2 / alpha)`,                    `color(${colorSpace} 0.7 0.5 0.2)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} r g 20% / alpha)`,                    `color(${colorSpace} 0.7 0.5 0.2)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} r g b / 0.2)`,                        `color(${colorSpace} 0.7 0.5 0.3 / 0.2)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} r g b / 20%)`,                        `color(${colorSpace} 0.7 0.5 0.3 / 0.2)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} 0.2 g b / alpha)`,              `color(${colorSpace} 0.2 0.5 0.3 / 0.4)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} 20% g b / alpha)`,              `color(${colorSpace} 0.2 0.5 0.3 / 0.4)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} r 0.2 b / alpha)`,              `color(${colorSpace} 0.7 0.2 0.3 / 0.4)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} r 20% b / alpha)`,              `color(${colorSpace} 0.7 0.2 0.3 / 0.4)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} r g 0.2 / alpha)`,              `color(${colorSpace} 0.7 0.5 0.2 / 0.4)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} r g 20% / alpha)`,              `color(${colorSpace} 0.7 0.5 0.2 / 0.4)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} r g b / 0.2)`,                  `color(${colorSpace} 0.7 0.5 0.3 / 0.2)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} r g b / 20%)`,                  `color(${colorSpace} 0.7 0.5 0.3 / 0.2)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} 2 3 4)`,                              `color(${colorSpace} 2 3 4)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} 2 3 4 / 5)`,                          `color(${colorSpace} 2 3 4)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} -2 -3 -4)`,                           `color(${colorSpace} -2 -3 -4)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} -2 -3 -4 / -5)`,                      `color(${colorSpace} -2 -3 -4 / 0)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} 200% 300% 400%)`,                     `color(${colorSpace} 2 3 4)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} 200% 300% 400% / 500%)`,              `color(${colorSpace} 2 3 4)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} -200% -300% -400%)`,                  `color(${colorSpace} -2 -3 -4)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} -200% -300% -400% / -500%)`,          `color(${colorSpace} -2 -3 -4 / 0)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} 0.2 g b / alpha)`,                    `color(${colorSpace} 0.2 0.5 0.3)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} 20% g b / alpha)`,                    `color(${colorSpace} 0.2 0.5 0.3)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} r 0.2 b / alpha)`,                    `color(${colorSpace} 0.7 0.2 0.3)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} r 20% b / alpha)`,                    `color(${colorSpace} 0.7 0.2 0.3)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} r g 0.2 / alpha)`,                    `color(${colorSpace} 0.7 0.5 0.2)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} r g 20% / alpha)`,                    `color(${colorSpace} 0.7 0.5 0.2)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} r g b / 0.2)`,                        `color(${colorSpace} 0.7 0.5 0.3 / 0.2)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} r g b / 20%)`,                        `color(${colorSpace} 0.7 0.5 0.3 / 0.2)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} 0.2 g b / alpha)`,              `color(${colorSpace} 0.2 0.5 0.3 / 0.4)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} 20% g b / alpha)`,              `color(${colorSpace} 0.2 0.5 0.3 / 0.4)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} r 0.2 b / alpha)`,              `color(${colorSpace} 0.7 0.2 0.3 / 0.4)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} r 20% b / alpha)`,              `color(${colorSpace} 0.7 0.2 0.3 / 0.4)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} r g 0.2 / alpha)`,              `color(${colorSpace} 0.7 0.5 0.2 / 0.4)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} r g 20% / alpha)`,              `color(${colorSpace} 0.7 0.5 0.2 / 0.4)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} r g b / 0.2)`,                  `color(${colorSpace} 0.7 0.5 0.3 / 0.2)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} r g b / 20%)`,                  `color(${colorSpace} 0.7 0.5 0.3 / 0.2)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} 2 3 4)`,                              `color(${colorSpace} 2 3 4)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} 2 3 4 / 5)`,                          `color(${colorSpace} 2 3 4)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} -2 -3 -4)`,                           `color(${colorSpace} -2 -3 -4)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} -2 -3 -4 / -5)`,                      `color(${colorSpace} -2 -3 -4 / 0)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} 200% 300% 400%)`,                     `color(${colorSpace} 2 3 4)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} 200% 300% 400% / 500%)`,              `color(${colorSpace} 2 3 4)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} -200% -300% -400%)`,                  `color(${colorSpace} -2 -3 -4)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} -200% -300% -400% / -500%)`,          `color(${colorSpace} -2 -3 -4 / 0)`);
 
       // Testing valid permutation (types match).
-      test_computed_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} g b r)`,                              `color(${colorSpace} 0.5 0.3 0.7)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} b alpha r / g)`,                      `color(${colorSpace} 0.3 1 0.7 / 0.5)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} r r r / r)`,                          `color(${colorSpace} 0.7 0.7 0.7 / 0.7)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} alpha alpha alpha / alpha)`,          `color(${colorSpace} 1 1 1)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} g b r)`,                        `color(${colorSpace} 0.5 0.3 0.7 / 0.4)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} b alpha r / g)`,                `color(${colorSpace} 0.3 0.4 0.7 / 0.5)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} r r r / r)`,                    `color(${colorSpace} 0.7 0.7 0.7 / 0.7)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} alpha alpha alpha / alpha)`,    `color(${colorSpace} 0.4 0.4 0.4 / 0.4)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} g b r)`,                              `color(${colorSpace} 0.5 0.3 0.7)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} b alpha r / g)`,                      `color(${colorSpace} 0.3 1 0.7 / 0.5)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} r r r / r)`,                          `color(${colorSpace} 0.7 0.7 0.7 / 0.7)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} alpha alpha alpha / alpha)`,          `color(${colorSpace} 1 1 1)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} g b r)`,                        `color(${colorSpace} 0.5 0.3 0.7 / 0.4)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} b alpha r / g)`,                `color(${colorSpace} 0.3 0.4 0.7 / 0.5)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} r r r / r)`,                    `color(${colorSpace} 0.7 0.7 0.7 / 0.7)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} alpha alpha alpha / alpha)`,    `color(${colorSpace} 0.4 0.4 0.4 / 0.4)`);
 
       // Testing out of gamut components.
-      test_computed_value(`color`, `color(from color(${colorSpace} 1.7 1.5 1.3) ${colorSpace} r g b)`,                              `color(${colorSpace} 1.7 1.5 1.3)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 1.7 1.5 1.3) ${colorSpace} r g b / alpha)`,                      `color(${colorSpace} 1.7 1.5 1.3)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 1.7 1.5 1.3 / 140%) ${colorSpace} r g b)`,                       `color(${colorSpace} 1.7 1.5 1.3)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 1.7 1.5 1.3 / 140%) ${colorSpace} r g b / alpha)`,               `color(${colorSpace} 1.7 1.5 1.3)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} -0.7 -0.5 -0.3) ${colorSpace} r g b)`,                           `color(${colorSpace} -0.7 -0.5 -0.3)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} -0.7 -0.5 -0.3) ${colorSpace} r g b / alpha)`,                   `color(${colorSpace} -0.7 -0.5 -0.3)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} -0.7 -0.5 -0.3 / -40%) ${colorSpace} r g b)`,                    `color(${colorSpace} -0.7 -0.5 -0.3 / 0)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} -0.7 -0.5 -0.3 / -40%) ${colorSpace} r g b / alpha)`,            `color(${colorSpace} -0.7 -0.5 -0.3 / 0)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 1.7 1.5 1.3) ${colorSpace} r g b)`,                              `color(${colorSpace} 1.7 1.5 1.3)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 1.7 1.5 1.3) ${colorSpace} r g b / alpha)`,                      `color(${colorSpace} 1.7 1.5 1.3)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 1.7 1.5 1.3 / 140%) ${colorSpace} r g b)`,                       `color(${colorSpace} 1.7 1.5 1.3)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 1.7 1.5 1.3 / 140%) ${colorSpace} r g b / alpha)`,               `color(${colorSpace} 1.7 1.5 1.3)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} -0.7 -0.5 -0.3) ${colorSpace} r g b)`,                           `color(${colorSpace} -0.7 -0.5 -0.3)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} -0.7 -0.5 -0.3) ${colorSpace} r g b / alpha)`,                   `color(${colorSpace} -0.7 -0.5 -0.3)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} -0.7 -0.5 -0.3 / -40%) ${colorSpace} r g b)`,                    `color(${colorSpace} -0.7 -0.5 -0.3 / 0)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} -0.7 -0.5 -0.3 / -40%) ${colorSpace} r g b / alpha)`,            `color(${colorSpace} -0.7 -0.5 -0.3 / 0)`);
 
       // Testing with calc().
-      test_computed_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} calc(r) calc(g) calc(b))`,                        `color(${colorSpace} 0.7 0.5 0.3)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} calc(r) calc(g) calc(b) / calc(alpha))`,    `color(${colorSpace} 0.7 0.5 0.3 / 0.4)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} calc(r) calc(g) calc(b))`,                        `color(${colorSpace} 0.7 0.5 0.3)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} calc(r) calc(g) calc(b) / calc(alpha))`,    `color(${colorSpace} 0.7 0.5 0.3 / 0.4)`);
 
       // Testing with 'none'.
-      test_computed_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} none none none)`,                     `color(${colorSpace} none none none)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} none none none / none)`,              `color(${colorSpace} none none none / none)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} r g none)`,                           `color(${colorSpace} 0.7 0.5 none)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} r g none / alpha)`,                   `color(${colorSpace} 0.7 0.5 none)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} r g b / none)`,                       `color(${colorSpace} 0.7 0.5 0.3 / none)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} r g none / alpha)`,             `color(${colorSpace} 0.7 0.5 none / 0.4)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} r g b / none)`,                 `color(${colorSpace} 0.7 0.5 0.3 / none)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} none none none)`,                     `color(${colorSpace} none none none)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} none none none / none)`,              `color(${colorSpace} none none none / none)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} r g none)`,                           `color(${colorSpace} 0.7 0.5 none)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} r g none / alpha)`,                   `color(${colorSpace} 0.7 0.5 none)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} r g b / none)`,                       `color(${colorSpace} 0.7 0.5 0.3 / none)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} r g none / alpha)`,             `color(${colorSpace} 0.7 0.5 none / 0.4)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} r g b / none)`,                 `color(${colorSpace} 0.7 0.5 0.3 / none)`);
       // FIXME: Clarify with spec editors if 'none' should pass through to the constants.
-      test_computed_value(`color`, `color(from color(${colorSpace} none none none) ${colorSpace} r g b)`,                           `color(${colorSpace} 0 0 0)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} none none none / none) ${colorSpace} r g b / alpha)`,            `color(${colorSpace} 0 0 0 / 0)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 0.7 none 0.3) ${colorSpace} r g b)`,                             `color(${colorSpace} 0.7 0 0.3)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3 / none) ${colorSpace} r g b / alpha)`,               `color(${colorSpace} 0.7 0.5 0.3 / 0)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} none none none) ${colorSpace} r g b)`,                           `color(${colorSpace} 0 0 0)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} none none none / none) ${colorSpace} r g b / alpha)`,            `color(${colorSpace} 0 0 0 / 0)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 0.7 none 0.3) ${colorSpace} r g b)`,                             `color(${colorSpace} 0.7 0 0.3)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 0.7 0.5 0.3 / none) ${colorSpace} r g b / alpha)`,               `color(${colorSpace} 0.7 0.5 0.3 / 0)`);
   }
 
   for (const colorSpace of [ "xyz", "xyz-d50", "xyz-d65" ]) {
       const resultColorSpace = colorSpace == "xyz" ? "xyz-d65" : colorSpace;
 
       // Testing no modifications.
-      test_computed_value(`color`, `color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} x y z)`,                              `color(${resultColorSpace} 7 -20.5 100)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} x y z / alpha)`,                      `color(${resultColorSpace} 7 -20.5 100)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 7 -20.5 100 / 40%) ${colorSpace} x y z)`,                        `color(${resultColorSpace} 7 -20.5 100 / 0.4)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 7 -20.5 100 / 40%) ${colorSpace} x y z / alpha)`,                `color(${resultColorSpace} 7 -20.5 100 / 0.4)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} x y z)`,                              `color(${resultColorSpace} 7 -20.5 100)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} x y z / alpha)`,                      `color(${resultColorSpace} 7 -20.5 100)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 7 -20.5 100 / 40%) ${colorSpace} x y z)`,                        `color(${resultColorSpace} 7 -20.5 100 / 0.4)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 7 -20.5 100 / 40%) ${colorSpace} x y z / alpha)`,                `color(${resultColorSpace} 7 -20.5 100 / 0.4)`);
 
       // Test nesting relative colors.
-      test_computed_value(`color`, `color(from color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} x y z) ${colorSpace} x y z)`,        `color(${resultColorSpace} 7 -20.5 100)`);
+      fuzzy_test_computed_color(`color(from color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} x y z) ${colorSpace} x y z)`,        `color(${resultColorSpace} 7 -20.5 100)`);
 
       // Testing replacement with 0.
-      test_computed_value(`color`, `color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} 0 0 0)`,                              `color(${resultColorSpace} 0 0 0)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} 0 0 0 / 0)`,                          `color(${resultColorSpace} 0 0 0 / 0)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} 0 y z / alpha)`,                      `color(${resultColorSpace} 0 -20.5 100)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} x 0 z / alpha)`,                      `color(${resultColorSpace} 7 0 100)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} x y 0 / alpha)`,                      `color(${resultColorSpace} 7 -20.5 0)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} x y z / 0)`,                          `color(${resultColorSpace} 7 -20.5 100 / 0)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 7 -20.5 100 / 40%) ${colorSpace} 0 y z / alpha)`,                `color(${resultColorSpace} 0 -20.5 100 / 0.4)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 7 -20.5 100 / 40%) ${colorSpace} x 0 z / alpha)`,                `color(${resultColorSpace} 7 0 100 / 0.4)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 7 -20.5 100 / 40%) ${colorSpace} x y 0 / alpha)`,                `color(${resultColorSpace} 7 -20.5 0 / 0.4)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 7 -20.5 100 / 40%) ${colorSpace} x y z / 0)`,                    `color(${resultColorSpace} 7 -20.5 100 / 0)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} 0 0 0)`,                              `color(${resultColorSpace} 0 0 0)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} 0 0 0 / 0)`,                          `color(${resultColorSpace} 0 0 0 / 0)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} 0 y z / alpha)`,                      `color(${resultColorSpace} 0 -20.5 100)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} x 0 z / alpha)`,                      `color(${resultColorSpace} 7 0 100)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} x y 0 / alpha)`,                      `color(${resultColorSpace} 7 -20.5 0)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} x y z / 0)`,                          `color(${resultColorSpace} 7 -20.5 100 / 0)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 7 -20.5 100 / 40%) ${colorSpace} 0 y z / alpha)`,                `color(${resultColorSpace} 0 -20.5 100 / 0.4)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 7 -20.5 100 / 40%) ${colorSpace} x 0 z / alpha)`,                `color(${resultColorSpace} 7 0 100 / 0.4)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 7 -20.5 100 / 40%) ${colorSpace} x y 0 / alpha)`,                `color(${resultColorSpace} 7 -20.5 0 / 0.4)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 7 -20.5 100 / 40%) ${colorSpace} x y z / 0)`,                    `color(${resultColorSpace} 7 -20.5 100 / 0)`);
 
       // Testing replacement with a constant.
-      test_computed_value(`color`, `color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} 0.2 y z / alpha)`,                    `color(${resultColorSpace} 0.2 -20.5 100)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} x 0.2 z / alpha)`,                    `color(${resultColorSpace} 7 0.2 100)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} x y 0.2 / alpha)`,                    `color(${resultColorSpace} 7 -20.5 0.2)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} x y z / 0.2)`,                        `color(${resultColorSpace} 7 -20.5 100 / 0.2)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} x y z / 20%)`,                        `color(${resultColorSpace} 7 -20.5 100 / 0.2)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 7 -20.5 100 / 40%) ${colorSpace} 0.2 y z / alpha)`,              `color(${resultColorSpace} 0.2 -20.5 100 / 0.4)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 7 -20.5 100 / 40%) ${colorSpace} x 0.2 z / alpha)`,              `color(${resultColorSpace} 7 0.2 100 / 0.4)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 7 -20.5 100 / 40%) ${colorSpace} x y 0.2 / alpha)`,              `color(${resultColorSpace} 7 -20.5 0.2 / 0.4)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 7 -20.5 100 / 40%) ${colorSpace} x y z / 0.2)`,                  `color(${resultColorSpace} 7 -20.5 100 / 0.2)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} 0.2 y z / alpha)`,                    `color(${resultColorSpace} 0.2 -20.5 100)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} x 0.2 z / alpha)`,                    `color(${resultColorSpace} 7 0.2 100)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} x y 0.2 / alpha)`,                    `color(${resultColorSpace} 7 -20.5 0.2)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} x y z / 0.2)`,                        `color(${resultColorSpace} 7 -20.5 100 / 0.2)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} x y z / 20%)`,                        `color(${resultColorSpace} 7 -20.5 100 / 0.2)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 7 -20.5 100 / 40%) ${colorSpace} 0.2 y z / alpha)`,              `color(${resultColorSpace} 0.2 -20.5 100 / 0.4)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 7 -20.5 100 / 40%) ${colorSpace} x 0.2 z / alpha)`,              `color(${resultColorSpace} 7 0.2 100 / 0.4)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 7 -20.5 100 / 40%) ${colorSpace} x y 0.2 / alpha)`,              `color(${resultColorSpace} 7 -20.5 0.2 / 0.4)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 7 -20.5 100 / 40%) ${colorSpace} x y z / 0.2)`,                  `color(${resultColorSpace} 7 -20.5 100 / 0.2)`);
 
       // Testing valid permutation (types match).
-      test_computed_value(`color`, `color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} y z x)`,                              `color(${resultColorSpace} -20.5 100 7)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} x x x / x)`,                          `color(${resultColorSpace} 7 7 7)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 7 -20.5 100 / 40%) ${colorSpace} y z x)`,                        `color(${resultColorSpace} -20.5 100 7 / 0.4)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 7 -20.5 100 / 40%) ${colorSpace} x x x / x)`,                    `color(${resultColorSpace} 7 7 7)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} y z x)`,                              `color(${resultColorSpace} -20.5 100 7)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} x x x / x)`,                          `color(${resultColorSpace} 7 7 7)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 7 -20.5 100 / 40%) ${colorSpace} y z x)`,                        `color(${resultColorSpace} -20.5 100 7 / 0.4)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 7 -20.5 100 / 40%) ${colorSpace} x x x / x)`,                    `color(${resultColorSpace} 7 7 7)`);
 
       // Testing with calc().
-      test_computed_value(`color`, `color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} calc(x) calc(y) calc(z))`,                        `color(${resultColorSpace} 7 -20.5 100)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 7 -20.5 100 / 40%) ${colorSpace} calc(x) calc(y) calc(z) / calc(alpha))`,    `color(${resultColorSpace} 7 -20.5 100 / 0.4)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} calc(x) calc(y) calc(z))`,                        `color(${resultColorSpace} 7 -20.5 100)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 7 -20.5 100 / 40%) ${colorSpace} calc(x) calc(y) calc(z) / calc(alpha))`,    `color(${resultColorSpace} 7 -20.5 100 / 0.4)`);
 
       // Testing with 'none'.
-      test_computed_value(`color`, `color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} none none none)`,                     `color(${resultColorSpace} none none none)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} none none none / none)`,              `color(${resultColorSpace} none none none / none)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} x y none)`,                           `color(${resultColorSpace} 7 -20.5 none)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} x y none / alpha)`,                   `color(${resultColorSpace} 7 -20.5 none)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} x y z / none)`,                       `color(${resultColorSpace} 7 -20.5 100 / none)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 7 -20.5 100 / 40%) ${colorSpace} x y none / alpha)`,             `color(${resultColorSpace} 7 -20.5 none / 0.4)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 7 -20.5 100 / 40%) ${colorSpace} x y z / none)`,                 `color(${resultColorSpace} 7 -20.5 100 / none)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} none none none)`,                     `color(${resultColorSpace} none none none)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} none none none / none)`,              `color(${resultColorSpace} none none none / none)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} x y none)`,                           `color(${resultColorSpace} 7 -20.5 none)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} x y none / alpha)`,                   `color(${resultColorSpace} 7 -20.5 none)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} x y z / none)`,                       `color(${resultColorSpace} 7 -20.5 100 / none)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 7 -20.5 100 / 40%) ${colorSpace} x y none / alpha)`,             `color(${resultColorSpace} 7 -20.5 none / 0.4)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 7 -20.5 100 / 40%) ${colorSpace} x y z / none)`,                 `color(${resultColorSpace} 7 -20.5 100 / none)`);
       // FIXME: Clarify with spec editors if 'none' should pass through to the constants.
-      test_computed_value(`color`, `color(from color(${colorSpace} none none none) ${colorSpace} x y z)`,                           `color(${resultColorSpace} 0 0 0)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} none none none / none) ${colorSpace} x y z / alpha)`,            `color(${resultColorSpace} 0 0 0 / 0)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 7 none 100) ${colorSpace} x y z)`,                               `color(${resultColorSpace} 7 0 100)`);
-      test_computed_value(`color`, `color(from color(${colorSpace} 7 -20.5 100 / none) ${colorSpace} x y z / alpha)`,               `color(${resultColorSpace} 7 -20.5 100 / 0)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} none none none) ${colorSpace} x y z)`,                           `color(${resultColorSpace} 0 0 0)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} none none none / none) ${colorSpace} x y z / alpha)`,            `color(${resultColorSpace} 0 0 0 / 0)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 7 none 100) ${colorSpace} x y z)`,                               `color(${resultColorSpace} 7 0 100)`);
+      fuzzy_test_computed_color(`color(from color(${colorSpace} 7 -20.5 100 / none) ${colorSpace} x y z / alpha)`,               `color(${resultColorSpace} 7 -20.5 100 / 0)`);
   }
 
-    // Spec Examples
+  // Test origin colors with different color spaces, going both to and from srgb.
+  fuzzy_test_computed_color(`color(from color(srgb-linear 0.25 0.5 0.75) srgb r g b)`, `color(srgb 0.537121 0.735394 0.880852)`, 0.001);
+  fuzzy_test_computed_color(`color(from color(srgb 0.25 0.5 0.75) srgb-linear r g b)`, `color(srgb-linear 0.050864 0.213993 0.522484)`, 0.001);
+  fuzzy_test_computed_color(`color(from color(display-p3 0.25 0.5 0.75) srgb r g b)`, `color(srgb 0.123874 0.507355 0.771198)`, 0.001);
+  fuzzy_test_computed_color(`color(from color(srgb 0.25 0.5 0.75) display-p3 r g b)`, `color(display-p3 0.313084 0.494041 0.730118)`, 0.001);
+  fuzzy_test_computed_color(`color(from color(a98-rgb 0.25 0.5 0.75) srgb r g b)`, `color(srgb -0.153808 0.503925 0.763874)`, 0.001);
+  fuzzy_test_computed_color(`color(from color(srgb 0.25 0.5 0.75) a98-rgb r g b)`, `color(a98-rgb 0.346851 0.496124 0.736271)`, 0.001);
+  fuzzy_test_computed_color(`color(from color(prophoto-rgb 0.25 0.5 0.75) srgb r g b)`, `color(srgb -0.510605 0.612396 0.825333)`, 0.001);
+  fuzzy_test_computed_color(`color(from color(srgb 0.25 0.5 0.75) prophoto-rgb r g b)`, `color(prophoto-rgb 0.374905 0.416401 0.663692)`, 0.001);
+  fuzzy_test_computed_color(`color(from color(rec2020 0.25 0.5 0.75) srgb r g b)`, `color(srgb -0.280102 0.565536 0.79958)`, 0.001);
+  fuzzy_test_computed_color(`color(from color(srgb 0.25 0.5 0.75) rec2020 r g b)`, `color(rec2020 0.331976 0.440887 0.696358)`, 0.001);
+  fuzzy_test_computed_color(`color(from color(xyz-d50 0.25 0.5 0.75) srgb r g b)`, `color(srgb -0.660065 0.874863 0.981117)`, 0.001);
+  fuzzy_test_computed_color(`color(from color(srgb 0.25 0.5 0.75) xyz-d50 r g b)`, `color(xyz-d50 0.179349 0.196389 0.394585)`, 0.001);
+  fuzzy_test_computed_color(`color(from color(xyz-d65 0.25 0.5 0.75) srgb r g b)`, `color(srgb -0.611881 0.868732 0.856899)`, 0.001);
+  fuzzy_test_computed_color(`color(from color(srgb 0.25 0.5 0.75) xyz-d65 r g b)`, `color(xyz-d65 0.191791 0.201562 0.523057)`, 0.001);
+  fuzzy_test_computed_color(`lab(from color(srgb 0.25 0.5 0.75) l a b)`, `lab(51.4265 -5.21401 -40.1491)`, 0.02); // Larger values means larger epsilon.
+  fuzzy_test_computed_color(`color(from lab(67.5345 -8.6911 -41.6019) srgb r g b)`, `color(srgb 0.382744 0.672806 0.938545)`, 0.001);
+  fuzzy_test_computed_color(`oklab(from color(srgb 0.25 0.5 0.75) l a b)`, `oklab(0.585502 -0.0393846 -0.111503)`, 0.001);
+  fuzzy_test_computed_color(`color(from oklab(72.322% -0.0465 -0.1150) srgb r g b)`, `color(srgb 0.382504 0.672783 0.938919)`, 0.001);
+  fuzzy_test_computed_color(`lch(from color(srgb 0.25 0.5 0.75) l c h)`, `lch(51.4265 40.4863 262.601)`, 0.02); // Larger values means larger epsilon.
+  fuzzy_test_computed_color(`color(from lch(67.5345% 42.5 258.2) srgb r g b)`, `color(srgb 0.382744 0.672806 0.938545)`, 0.001);
+  fuzzy_test_computed_color(`oklch(from color(srgb 0.25 0.5 0.75) l c h)`, `oklch(0.585502 0.118254 250.546)`, 0.02); // Larger values means larger epsilon.
+  fuzzy_test_computed_color(`color(from oklch(72.322% 0.12403 247.996) srgb r g b)`, `color(srgb 0.382631 0.672756 0.938904)`, 0.001);
 
-    // Example 11.
-    test_computed_value(`color`, `rgb(from var(--bg-color) r g b / 80%)`, `rgba(0, 0, 255, 0.8)`);
-
-    // Example 12.
-    test_computed_value(`color`, `lch(from var(--color) calc(l / 2) c h)`, `lch(23.138971 67.989716 134.39125)`);
-
-    // Example 13.
-    test_computed_value(`color`, `rgb(from var(--color) calc(r * .3 + g * .59 + b * .11) calc(r * .3 + g * .59 + b * .11) calc(r * .3 + g * .59 + b * .11))`, `rgb(76, 76, 76)`)
-    test_computed_value(`color`, `lch(from var(--color) l 0 h)`, `lch(46.277943 0 134.39125)`)
-
-    // Example 14.
-    test_computed_value(`color`, `rgb(from indianred 255 g b)`, `rgb(255, 92, 92)`);
-
-    // Example 15.
-    test_computed_value(`color`, `hsl(from var(--accent) calc(h + 180deg) s l)`, `rgb(178, 32, 40)`);
-
-    // Example 16.
-    test_computed_value(`color`, `lab(from var(--mycolor) l a b / 100%)`, `lab(62.751923 52.45802 -34.117283)`);
-    test_computed_value(`color`, `lab(from var(--mycolor) l a b / calc(alpha * 0.8))`, `lab(62.751923 52.45802 -34.117283 / 0.8)`);
-    test_computed_value(`color`, `lab(from var(--mycolor) l a b / calc(alpha - 20%))`, `lab(62.751923 52.45802 -34.117283 / 0.8)`);
-
-    // Example 17.
-    test_computed_value(`color`, `lab(from var(--mycolor) l 0 0)`, `lab(62.751923 0 0)`);
-
-    // Example 18.
-    test_computed_value(`color`, `lch(from peru calc(l * 0.8) c h)`, `lch(49.80138 54.003296 63.680317)`);
-
-    // Example 19.
-    test_computed_value(`color`, `LCH(from var(--accent) l c calc(h + 180deg))`, `lch(65.49473 39.446903 10.114471)`);
-
-    // Example 20.
-    test_computed_value(`color`, `lch(from var(--mycolor) l 0 h)`, `lch(62.751923 0 326.96112)`);
-    test_computed_value(`color`, `var(--mygray)`, `lch(62.751923 0 326.96112)`);
-    test_computed_value(`color`, `lch(from var(--mygray) l 30 h)`, `lch(62.751923 30 326.96112)`);
+  // Spec Examples: https://www.w3.org/TR/css-color-5/#relative-colors
+  // All examples here have multiple stages of calculations so minor disagreements in the values of keyword colors and other constants can compound.
+  // These tests require a wider epsilon of 0.02.
+  fuzzy_test_computed_color(`rgb(from var(--bg-color) r g b / 80%)`, `color(srgb 0 0 1 / 0.8)`, 0.02);
+  fuzzy_test_computed_color(`lch(from var(--color) calc(l / 2) c h)`, `lch(23.14 67.99 134.39)`, 0.02);
+  fuzzy_test_computed_color(`rgb(from var(--color) calc(r * .3 + g * .59 + b * .11) calc(r * .3 + g * .59 + b * .11) calc(r * .3 + g * .59 + b * .11))`, `color(srgb 0.3 0.3 0.3)`, 0.02);
+  fuzzy_test_computed_color(`lch(from var(--color) l 0 h)`, `lch(46.28 0 134.39)`, 0.02);
+  fuzzy_test_computed_color(`rgb(from indianred 255 g b)`, `color(srgb 1 0.36 0.36)`, 0.02);
+  fuzzy_test_computed_color(`hsl(from var(--accent) calc(h + 180) s l)`, `color(srgb 0.7 0.13 0.16)`, 0.02);
+  fuzzy_test_computed_color(`lab(from var(--mycolor) l a b / 100%)`, `lab(62.75 52.46 -34.12)`, 0.02);
+  fuzzy_test_computed_color(`lab(from var(--mycolor) l a b / calc(alpha * 0.8))`, `lab(62.75 52.46 -34.12 / 0.8)`, 0.02);
+  fuzzy_test_computed_color(`lab(from var(--mycolor) l 0 0)`, `lab(62.75 0 0)`, 0.02);
+  fuzzy_test_computed_color(`lch(from peru calc(l * 0.8) c h)`, `lch(49.80 54 63.68)`, 0.02);
+  fuzzy_test_computed_color(`LCH(from var(--accent) l c calc(h + 180))`, `lch(65.49 39.45 10.11)`, 0.02);
+  fuzzy_test_computed_color(`lch(from var(--mycolor) l 0 h)`, `lch(62.75 0 326.96)`, 0.02);
+  fuzzy_test_computed_color(`var(--mygray)`, `lch(62.75 0 326.96)`, 0.02);
+  fuzzy_test_computed_color(`lch(from var(--mygray) l 30 h)`, `lch(62.75 30 326.96)`, 0.02);
 </script>
 </body>
 </html>
diff --git a/tests/wpt/tests/css/css-color/parsing/color-computed-rgb.html b/tests/wpt/tests/css/css-color/parsing/color-computed-rgb.html
index 3b6fa200568..1f62567f5c7 100644
--- a/tests/wpt/tests/css/css-color/parsing/color-computed-rgb.html
+++ b/tests/wpt/tests/css/css-color/parsing/color-computed-rgb.html
@@ -16,6 +16,10 @@
   <div id="target"></div>
 </div>
 <style>
+  :root {
+    --high: 500;
+    --negative: -100;
+  }
   #container {
     color: rgb(255, 0, 0);
   }
@@ -86,7 +90,8 @@ tests = [
     ["rgba(0%, 0%, 0%)", "rgb(0, 0, 0)", "RGB and RGBA are synonyms"],
     ["rgba(0, 0, 0)", "rgb(0, 0, 0)", "RGB and RGBA are synonyms"],
 
-    // calc(+/-infinity) remains infinity but calc(NaN) becomes zero for all channels.
+    // rgb are in the range [0, 255], alpha is in the range [0, 1].
+    // calc(infinity) resolves to the upper bound while calc(-infinity) and calc(NaN) resolves the lower bound.
     // See: https://github.com/w3c/csswg-drafts/issues/8629
     ["rgb(calc(infinity), 0, 0)", "rgb(255, 0, 0)", "Red channel resolves positive infinity to 255"],
     ["rgb(0, calc(infinity), 0)", "rgb(0, 255, 0)", "Green channel resolves positive infinity to 255"],
@@ -104,6 +109,9 @@ tests = [
     ["rgb(0, calc(0 / 0), 0)", "rgb(0, 0, 0)", "Green channel resolves NaN equivalent calc statements to zero"],
     ["rgb(0, 0, calc(0 / 0))", "rgb(0, 0, 0)", "Blue channel resolves NaN equivalent calc statements to zero"],
     ["rgba(0, 0, 0, calc(0 / 0))", "rgba(0, 0, 0, 0)", "Alpha channel resolves NaN equivalent calc statements to zero"],
+
+    ["rgb(var(--high), 0, 0)", "rgb(255, 0, 0)", "Variables above 255 get clamped to 255."],
+    ["rgb(var(--negative), 64, 128)", "rgb(0, 64, 128)", "Variables below 0 get clamped to 0."],
 ];
 
 for (const test of tests) {
diff --git a/tests/wpt/tests/css/css-color/parsing/color-invalid-hsl.html b/tests/wpt/tests/css/css-color/parsing/color-invalid-hsl.html
index 1ea5cf3518d..9ac84c82ea7 100644
--- a/tests/wpt/tests/css/css-color/parsing/color-invalid-hsl.html
+++ b/tests/wpt/tests/css/css-color/parsing/color-invalid-hsl.html
@@ -34,6 +34,12 @@ tests = [
     ["hsla(0)", "The hsla function requires 3 or 4 arguments"],
     ["hsla(0, 0%)", "The hsla function requires 3 or 4 arguments"],
     ["hsla(0, 0%, 0%, 1, 0%)", "The hsla function requires 3 or 4 arguments"],
+    ["hsl(90 calc(infinity) 50%)", "Saturation must be a percentage."],
+    ["hsl(90 calc(0) 50%)", "Saturation must be a percentage."],
+    ["hsl(90 calc(0 / 0) 50%)", "Saturation must be a percentage."],
+    ["hsl(90 50% calc(infinity))", "Lightness must be a percentage."],
+    ["hsl(90 50% calc(-infinity))", "Lightness must be a percentage."],
+    ["hsl(90 50% calc(0 / 0))", "Lightness must be a percentage."],
 ];
 
 for (const test of tests) {
diff --git a/tests/wpt/tests/css/css-color/parsing/color-invalid-hwb.html b/tests/wpt/tests/css/css-color/parsing/color-invalid-hwb.html
index 058ec03b681..2b5e49e4edf 100644
--- a/tests/wpt/tests/css/css-color/parsing/color-invalid-hwb.html
+++ b/tests/wpt/tests/css/css-color/parsing/color-invalid-hwb.html
@@ -21,6 +21,12 @@ tests = [
     ["hwb(90deg, 50%, 50%, 0.2)", "HWB value with commas should not be parsed"],
     ["hwb(90, 50%, 50%)", "HWB value with commas should not be parsed"],
     ["hwb(90, 50%, 50%, 0.2)", "HWB value with commas should not be parsed"],
+    ["hwb(90 calc(infinity) 50%)", "W must be a percentage"],
+    ["hwb(90 calc(0) 50%)", "W must be a percentage"],
+    ["hwb(90 calc(0 / 0) 50%)", "W must be a percentage"],
+    ["hwb(90 50% calc(infinity))", "B must be a percentage"],
+    ["hwb(90 50% calc(-infinity))", "B must be a percentage"],
+    ["hwb(90 50% calc(0 / 0))", "B must be a percentage"],
 ];
 
 for (const test of tests) {
diff --git a/tests/wpt/tests/css/css-color/parsing/color-invalid-relative-color.html b/tests/wpt/tests/css/css-color/parsing/color-invalid-relative-color.html
index 1e95ef3997d..db0aa0b2fe8 100644
--- a/tests/wpt/tests/css/css-color/parsing/color-invalid-relative-color.html
+++ b/tests/wpt/tests/css/css-color/parsing/color-invalid-relative-color.html
@@ -35,16 +35,6 @@
 
     // hsl(from ...)
 
-    // Testing invalid permutation (types don't match).
-    test_invalid_value(`color`, `hsl(from rebeccapurple s h l)`);
-    test_invalid_value(`color`, `hsl(from rebeccapurple s s s / s)`);
-    test_invalid_value(`color`, `hsl(from rebeccapurple h h h / h)`);
-    test_invalid_value(`color`, `hsl(from rebeccapurple alpha alpha alpha / alpha)`);
-    test_invalid_value(`color`, `hsl(from rgb(10%, 20%, 30%, 40%) s h l)`);
-    test_invalid_value(`color`, `hsl(from rgb(10%, 20%, 30%, 40%) s s s / s)`);
-    test_invalid_value(`color`, `hsl(from rgb(10%, 20%, 30%, 40%) h h h / h)`);
-    test_invalid_value(`color`, `hsl(from rgb(10%, 20%, 30%, 40%) alpha alpha alpha / alpha)`);
-
     // Testing invalid values.
     test_invalid_value(`color`, `hsl(from rebeccapurple h 10% 10)`);
     test_invalid_value(`color`, `hsl(from rebeccapurple h 10 10%)`);
@@ -64,16 +54,6 @@
 
     // hwb(from ...)
 
-    // Testing invalid permutation (types don't match).
-    test_invalid_value(`color`, `hwb(from rebeccapurple w h b)`);
-    test_invalid_value(`color`, `hwb(from rebeccapurple b b b / b)`);
-    test_invalid_value(`color`, `hwb(from rebeccapurple h h h / h)`);
-    test_invalid_value(`color`, `hwb(from rebeccapurple alpha alpha alpha / alpha)`);
-    test_invalid_value(`color`, `hwb(from rgb(10%, 20%, 30%, 40%) w b h)`);
-    test_invalid_value(`color`, `hwb(from rgb(10%, 20%, 30%, 40%) b b b / b)`);
-    test_invalid_value(`color`, `hwb(from rgb(10%, 20%, 30%, 40%) h h h / h)`);
-    test_invalid_value(`color`, `hwb(from rgb(10%, 20%, 30%, 40%) alpha alpha alpha / alpha)`);
-
     // Testing invalid values.
     test_invalid_value(`color`, `hwb(from rebeccapurple h 10% 10)`);
     test_invalid_value(`color`, `hwb(from rebeccapurple h 10 10%)`);
@@ -103,12 +83,6 @@
     }
 
     for (const colorSpace of [ "lch", "oklch" ]) {
-        // Testing invalid permutation (types don't match).
-        test_invalid_value(`color`, `${colorSpace}(from ${colorSpace}(.70 45 30) h l c / alpha)`);
-        test_invalid_value(`color`, `${colorSpace}(from ${colorSpace}(.70 45 30) alpha alpha alpha / alpha)`);
-        test_invalid_value(`color`, `${colorSpace}(from ${colorSpace}(.70 45 30 / 40%) h l c / alpha)`);
-        test_invalid_value(`color`, `${colorSpace}(from ${colorSpace}(.70 45 30 / 40%) alpha alpha alpha / alpha)`);
-
         // Testing invalid values.
         test_invalid_value(`color`, `${colorSpace}(from ${colorSpace}(.70 45 30) l 10deg h)`);
         test_invalid_value(`color`, `${colorSpace}(from ${colorSpace}(.70 45 30) l c 10%)`);
diff --git a/tests/wpt/tests/css/css-color/parsing/color-mix-out-of-gamut.html b/tests/wpt/tests/css/css-color/parsing/color-mix-out-of-gamut.html
index 1803397f8a7..d3e8a3560d0 100644
--- a/tests/wpt/tests/css/css-color/parsing/color-mix-out-of-gamut.html
+++ b/tests/wpt/tests/css/css-color/parsing/color-mix-out-of-gamut.html
@@ -12,29 +12,30 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/css/support/computed-testcommon.js"></script>
+<script src="/css/support/color-testcommon.js"></script>
 </head>
 <body>
 <div id="target"></div>
 <script>
-    test_computed_value(`color`, `color-mix(in hsl, color(display-p3 0 1 0) 100%, rgb(0, 0, 0) 0%)`, `color(srgb -0.511814 1.01832 -0.310726)`);
-    test_computed_value(`color`, `color-mix(in hsl, lab(100 104.3 -50.9) 100%, rgb(0, 0, 0) 0%)`, `color(srgb 1.59343 0.58802 1.40564)`);
-    test_computed_value(`color`, `color-mix(in hsl, lab(0 104.3 -50.9) 100%, rgb(0, 0, 0) 0%)`, `color(srgb 0.351376 -0.213938 0.299501)`);
-    test_computed_value(`color`, `color-mix(in hsl, lch(100 116 334) 100%, rgb(0, 0, 0) 0%)`, `color(srgb 1.59328 0.588284 1.40527)`);
-    test_computed_value(`color`, `color-mix(in hsl, lch(0 116 334) 100%, rgb(0, 0, 0) 0%)`, `color(srgb 0.351307 -0.213865 0.299236)`);
-    test_computed_value(`color`, `color-mix(in hsl, oklab(1 0.365 -0.16) 100%, rgb(0, 0, 0) 0%)`, `color(srgb 1.59295 0.360371 1.38571)`);
-    test_computed_value(`color`, `color-mix(in hsl, oklab(0 0.365 -0.16) 100%, rgb(0, 0, 0) 0%)`, `color(srgb 0.0763893 -0.0456266 0.0932598)`);
-    test_computed_value(`color`, `color-mix(in hsl, oklch(1 0.399 336.3) 100%, rgb(0, 0, 0) 0%)`, `color(srgb 1.59328 0.358734 1.38664)`);
-    test_computed_value(`color`, `color-mix(in hsl, oklch(0 0.399 336.3) 100%, rgb(0, 0, 0) 0%)`, `color(srgb 0.076536 -0.045825 0.0937443)`);
+    fuzzy_test_computed_color(`color-mix(in hsl, color(display-p3 0 1 0) 100%, rgb(0, 0, 0) 0%)`, `color(srgb -0.511814 1.01832 -0.310726)`);
+    fuzzy_test_computed_color(`color-mix(in hsl, lab(100 104.3 -50.9) 100%, rgb(0, 0, 0) 0%)`, `color(srgb 1.59343 0.58802 1.40564)`);
+    fuzzy_test_computed_color(`color-mix(in hsl, lab(0 104.3 -50.9) 100%, rgb(0, 0, 0) 0%)`, `color(srgb 0.351376 -0.213938 0.299501)`);
+    fuzzy_test_computed_color(`color-mix(in hsl, lch(100 116 334) 100%, rgb(0, 0, 0) 0%)`, `color(srgb 1.59328 0.588284 1.40527)`);
+    fuzzy_test_computed_color(`color-mix(in hsl, lch(0 116 334) 100%, rgb(0, 0, 0) 0%)`, `color(srgb 0.351307 -0.213865 0.299236)`);
+    fuzzy_test_computed_color(`color-mix(in hsl, oklab(1 0.365 -0.16) 100%, rgb(0, 0, 0) 0%)`, `color(srgb 1.59295 0.360371 1.38571)`);
+    fuzzy_test_computed_color(`color-mix(in hsl, oklab(0 0.365 -0.16) 100%, rgb(0, 0, 0) 0%)`, `color(srgb 0.0763893 -0.0456266 0.0932598)`);
+    fuzzy_test_computed_color(`color-mix(in hsl, oklch(1 0.399 336.3) 100%, rgb(0, 0, 0) 0%)`, `color(srgb 1.59328 0.358734 1.38664)`);
+    fuzzy_test_computed_color(`color-mix(in hsl, oklch(0 0.399 336.3) 100%, rgb(0, 0, 0) 0%)`, `color(srgb 0.076536 -0.045825 0.0937443)`);
 
-    test_computed_value(`color`, `color-mix(in hwb, color(display-p3 0 1 0) 100%, rgb(0, 0, 0) 0%)`, `color(srgb -0.511814 1.01832 -0.310726)`);
-    test_computed_value(`color`, `color-mix(in hwb, lab(100 104.3 -50.9) 100%, rgb(0, 0, 0) 0%)`, `color(srgb 1.59343 0.58802 1.40564)`);
-    test_computed_value(`color`, `color-mix(in hwb, lab(0 104.3 -50.9) 100%, rgb(0, 0, 0) 0%)`, `color(srgb 0.351376 -0.213938 0.299501)`);
-    test_computed_value(`color`, `color-mix(in hwb, lch(100 116 334) 100%, rgb(0, 0, 0) 0%)`, `color(srgb 1.59328 0.588284 1.40527)`);
-    test_computed_value(`color`, `color-mix(in hwb, lch(0 116 334) 100%, rgb(0, 0, 0) 0%)`, `color(srgb 0.351307 -0.213865 0.299236)`);
-    test_computed_value(`color`, `color-mix(in hwb, oklab(1 0.365 -0.16) 100%, rgb(0, 0, 0) 0%)`, `color(srgb 1.59295 0.360371 1.38571)`);
-    test_computed_value(`color`, `color-mix(in hwb, oklab(0 0.365 -0.16) 100%, rgb(0, 0, 0) 0%)`, `color(srgb 0.0763893 -0.0456266 0.0932598)`);
-    test_computed_value(`color`, `color-mix(in hwb, oklch(1 0.399 336.3) 100%, rgb(0, 0, 0) 0%)`, `color(srgb 1.59328 0.358736 1.38664)`);
-    test_computed_value(`color`, `color-mix(in hwb, oklch(0 0.399 336.3) 100%, rgb(0, 0, 0) 0%)`, `color(srgb 0.0765361 -0.045825 0.0937443)`);
+    fuzzy_test_computed_color(`color-mix(in hwb, color(display-p3 0 1 0) 100%, rgb(0, 0, 0) 0%)`, `color(srgb -0.511814 1.01832 -0.310726)`);
+    fuzzy_test_computed_color(`color-mix(in hwb, lab(100 104.3 -50.9) 100%, rgb(0, 0, 0) 0%)`, `color(srgb 1.59343 0.58802 1.40564)`);
+    fuzzy_test_computed_color(`color-mix(in hwb, lab(0 104.3 -50.9) 100%, rgb(0, 0, 0) 0%)`, `color(srgb 0.351376 -0.213938 0.299501)`);
+    fuzzy_test_computed_color(`color-mix(in hwb, lch(100 116 334) 100%, rgb(0, 0, 0) 0%)`, `color(srgb 1.59328 0.588284 1.40527)`);
+    fuzzy_test_computed_color(`color-mix(in hwb, lch(0 116 334) 100%, rgb(0, 0, 0) 0%)`, `color(srgb 0.351307 -0.213865 0.299236)`);
+    fuzzy_test_computed_color(`color-mix(in hwb, oklab(1 0.365 -0.16) 100%, rgb(0, 0, 0) 0%)`, `color(srgb 1.59295 0.360371 1.38571)`);
+    fuzzy_test_computed_color(`color-mix(in hwb, oklab(0 0.365 -0.16) 100%, rgb(0, 0, 0) 0%)`, `color(srgb 0.0763893 -0.0456266 0.0932598)`);
+    fuzzy_test_computed_color(`color-mix(in hwb, oklch(1 0.399 336.3) 100%, rgb(0, 0, 0) 0%)`, `color(srgb 1.59328 0.358736 1.38664)`);
+    fuzzy_test_computed_color(`color-mix(in hwb, oklch(0 0.399 336.3) 100%, rgb(0, 0, 0) 0%)`, `color(srgb 0.0765361 -0.045825 0.0937443)`);
 </script>
 </body>
 </html>
diff --git a/tests/wpt/tests/css/css-color/parsing/color-valid-hsl.html b/tests/wpt/tests/css/css-color/parsing/color-valid-hsl.html
index 135a0a39db4..cc40c3b27f6 100644
--- a/tests/wpt/tests/css/css-color/parsing/color-valid-hsl.html
+++ b/tests/wpt/tests/css/css-color/parsing/color-valid-hsl.html
@@ -32,6 +32,15 @@ test_valid_value("color", "hsl(120 100% 50% / none)", "rgba(0, 255, 0, 0)");
 test_valid_value("color", "hsl(120 100% 50% / 0)", "rgba(0, 255, 0, 0)");
 test_valid_value("color", "hsl(none 100% 50%)", "rgb(255, 0, 0)");
 test_valid_value("color", "hsl(0 100% 50%)", "rgb(255, 0, 0)");
+
+// Test non-finite values. calc(infinity) goes to upper bound while calc(-infinity) and NaN go to the lower bound.
+// See: https://github.com/w3c/csswg-drafts/issues/8629
+test_valid_value("color", "hsl(calc(infinity) 100% 50%)", "rgb(255, 0, 0)"); // hsl(360 100% 50%)
+test_valid_value("color", "hsl(calc(-infinity) 100% 50%)", "rgb(255, 0, 0)"); // hsl(0 100% 50%)
+test_valid_value("color", "hsl(calc(0 / 0) 100% 50%)", "rgb(255, 0, 0)"); // hsl(0 100% 50%)
+test_valid_value("color", "hsl(90 50% 50% / calc(infinity))", "rgb(128, 191, 64)"); // hsl(90 50% 50%)
+test_valid_value("color", "hsl(90 50% 50% / calc(-infinity))", "rgba(128, 191, 64, 0)"); // hsl(90 50% 50% / 0)
+test_valid_value("color", "hsl(90 50% 50% / calc(0 / 0))", "rgba(128, 191, 64, 0)"); // hsl(90 50% 50% / 0)
 </script>
 </body>
 </html>
diff --git a/tests/wpt/tests/css/css-color/parsing/color-valid-hwb.html b/tests/wpt/tests/css/css-color/parsing/color-valid-hwb.html
index dc2cec5276e..a827c1f761b 100644
--- a/tests/wpt/tests/css/css-color/parsing/color-valid-hwb.html
+++ b/tests/wpt/tests/css/css-color/parsing/color-valid-hwb.html
@@ -33,6 +33,16 @@ test_valid_value("color", "hwb(0 100% 50% / 0)", "rgba(170, 170, 170, 0)");
 // channel of exactly one-half.
 // 0.5 * 255 = 127.5. This value should be rounded UP to 128, not down to 127.
 test_valid_value("color", "hwb(320deg 30% 40%)", "rgb(153, 77, 128)");
+
+// Test non-finite values. calc(infinity) goes to upper bound while calc(-infinity) and NaN go to the lower bound.
+// See: https://github.com/w3c/csswg-drafts/issues/8629
+test_valid_value("color", "hwb(calc(infinity) 20% 10%)", "rgb(230, 51, 51)"); // hwb(360 20% 10%)
+test_valid_value("color", "hwb(calc(-infinity) 20% 10%)", "rgb(230, 51, 51)"); // hwb(0 20% 10%)
+test_valid_value("color", "hwb(calc(0 / 0) 20% 10%)", "rgb(230, 51, 51)"); // hwb(0 20% 10%)
+test_valid_value("color", "hwb(90 20% 10% / calc(infinity))", "rgb(140, 230, 51)"); // hwb(90 20% 10%)
+test_valid_value("color", "hwb(90 20% 10% / calc(-infinity))", "rgba(140, 230, 51, 0)"); // hwb(90 20% 10% / 0)
+test_valid_value("color", "hwb(90 20% 10% / calc(0 / 0))", "rgba(140, 230, 51, 0)"); // hwb(90 20% 10% / 0)
+
 </script>
 </body>
 </html>
diff --git a/tests/wpt/tests/css/css-color/parsing/color-valid-relative-color.html b/tests/wpt/tests/css/css-color/parsing/color-valid-relative-color.html
index 68a78a8d44c..26f766ed4ce 100644
--- a/tests/wpt/tests/css/css-color/parsing/color-valid-relative-color.html
+++ b/tests/wpt/tests/css/css-color/parsing/color-valid-relative-color.html
@@ -10,6 +10,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/css/support/parsing-testcommon.js"></script>
+<script src="/css/support/color-testcommon.js"></script>
 <style>
     html {
         --bg-color: blue;
@@ -25,754 +26,703 @@
     // rgb(from ...)
 
     // Testing no modifications.
-    test_valid_value(`color`, `rgb(from rebeccapurple r g b)`, `rgb(102, 51, 153)`);
-    test_valid_value(`color`, `rgb(from rebeccapurple r g b / alpha)`, `rgb(102, 51, 153)`);
-    test_valid_value(`color`, `rgb(from rgb(20%, 40%, 60%, 80%) r g b / alpha)`, `rgba(51, 102, 153, 0.8)`);
-    test_valid_value(`color`, `rgb(from hsl(120deg 20% 50% / .5) r g b / alpha)`, `rgba(102, 153, 102, 0.5)`);
+    fuzzy_test_valid_color(`rgb(from rebeccapurple r g b)`, `color(srgb 0.4 0.2 0.6)`);
+    fuzzy_test_valid_color(`rgb(from rebeccapurple r g b / alpha)`, `color(srgb 0.4 0.2 0.6)`);
+    fuzzy_test_valid_color(`rgb(from rgb(20%, 40%, 60%, 80%) r g b / alpha)`, `color(srgb 0.2 0.4 0.6 / 0.8)`);
+    fuzzy_test_valid_color(`rgb(from hsl(120deg 20% 50% / .5) r g b / alpha)`, `color(srgb 0.4 0.6 0.4 / 0.5)`);
 
     // Test nesting relative colors.
-    test_valid_value(`color`, `rgb(from rgb(from rebeccapurple r g b) r g b)`, `rgb(102, 51, 153)`);
-
-    // Testing non-sRGB origin colors to see gamut mapping.
-    test_valid_value(`color`, `rgb(from color(display-p3 0 1 0) r g b / alpha)`, `rgb(0, 249, 66)`); // Naive clip based mapping would give rgb(0, 255, 0).
-    test_valid_value(`color`, `rgb(from lab(100 104.3 -50.9) r g b)`, `rgb(255, 255, 255)`); // Naive clip based mapping would give rgb(255, 150, 255).
-    test_valid_value(`color`, `rgb(from lab(0 104.3 -50.9) r g b)`, `rgb(42, 0, 34)`); // Naive clip based mapping would give rgb(90, 0, 76). NOTE: 0% lightness in Lab/LCH does not automatically correspond with sRGB black,
-    test_valid_value(`color`, `rgb(from lch(100 116 334) r g b)`, `rgb(255, 255, 255)`); // Naive clip based mapping would give rgb(255, 150, 255).
-    test_valid_value(`color`, `rgb(from lch(0 116 334) r g b)`, `rgb(42, 0, 34)`); // Naive clip based mapping would give rgb(90, 0, 76). NOTE: 0% lightness in Lab/LCH does not automatically correspond with sRGB black,
-    test_valid_value(`color`, `rgb(from oklab(1 0.365 -0.16) r g b)`, `rgb(255, 255, 255)`); // Naive clip based mapping would give rgb(255, 92, 255).
-    test_valid_value(`color`, `rgb(from oklab(0 0.365 -0.16) r g b)`, `rgb(0, 0, 0)`); // Naive clip based mapping would give rgb(19, 0, 24).
-    test_valid_value(`color`, `rgb(from oklch(1 0.399 336.3) r g b)`, `rgb(255, 255, 255)`); // Naive clip based mapping would give rgb(255, 91, 255).
-    test_valid_value(`color`, `rgb(from oklch(0 0.399 336.3) r g b)`, `rgb(0, 0, 0)`); // Naive clip based mapping would give rgb(20, 0, 24).
+    fuzzy_test_valid_color(`rgb(from rgb(from rebeccapurple r g b) r g b)`, `color(srgb 0.4 0.2 0.6)`);
 
     // Testing replacement with 0.
-    test_valid_value(`color`, `rgb(from rebeccapurple 0 0 0)`, `rgb(0, 0, 0)`);
-    test_valid_value(`color`, `rgb(from rebeccapurple 0 0 0 / 0)`, `rgba(0, 0, 0, 0)`);
-    test_valid_value(`color`, `rgb(from rebeccapurple 0 g b / alpha)`, `rgb(0, 51, 153)`);
-    test_valid_value(`color`, `rgb(from rebeccapurple r 0 b / alpha)`, `rgb(102, 0, 153)`);
-    test_valid_value(`color`, `rgb(from rebeccapurple r g 0 / alpha)`, `rgb(102, 51, 0)`);
-    test_valid_value(`color`, `rgb(from rebeccapurple r g b / 0)`, `rgba(102, 51, 153, 0)`);
-    test_valid_value(`color`, `rgb(from rgb(20%, 40%, 60%, 80%) 0 g b / alpha)`, `rgba(0, 102, 153, 0.8)`);
-    test_valid_value(`color`, `rgb(from rgb(20%, 40%, 60%, 80%) r 0 b / alpha)`, `rgba(51, 0, 153, 0.8)`);
-    test_valid_value(`color`, `rgb(from rgb(20%, 40%, 60%, 80%) r g 0 / alpha)`, `rgba(51, 102, 0, 0.8)`);
-    test_valid_value(`color`, `rgb(from rgb(20%, 40%, 60%, 80%) r g b / 0)`, `rgba(51, 102, 153, 0)`);
+    fuzzy_test_valid_color(`rgb(from rebeccapurple 0 0 0)`, `color(srgb 0 0 0)`);
+    fuzzy_test_valid_color(`rgb(from rebeccapurple 0 0 0 / 0)`, `color(srgb 0 0 0 / 0)`);
+    fuzzy_test_valid_color(`rgb(from rebeccapurple 0 g b / alpha)`, `color(srgb 0 0.2 0.6)`);
+    fuzzy_test_valid_color(`rgb(from rebeccapurple r 0 b / alpha)`, `color(srgb 0.4 0 0.6)`);
+    fuzzy_test_valid_color(`rgb(from rebeccapurple r g 0 / alpha)`, `color(srgb 0.4 0.2 0)`);
+    fuzzy_test_valid_color(`rgb(from rebeccapurple r g b / 0)`, `color(srgb 0.4 0.2 0.6 / 0)`);
+    fuzzy_test_valid_color(`rgb(from rgb(20%, 40%, 60%, 80%) 0 g b / alpha)`, `color(srgb 0 0.4 0.6 / 0.8)`);
+    fuzzy_test_valid_color(`rgb(from rgb(20%, 40%, 60%, 80%) r 0 b / alpha)`, `color(srgb 0.2 0 0.6 / 0.8)`);
+    fuzzy_test_valid_color(`rgb(from rgb(20%, 40%, 60%, 80%) r g 0 / alpha)`, `color(srgb 0.2 0.4 0 / 0.8)`);
+    fuzzy_test_valid_color(`rgb(from rgb(20%, 40%, 60%, 80%) r g b / 0)`, `color(srgb 0.2 0.4 0.6 / 0)`);
 
     // Testing replacement with a number.
-    test_valid_value(`color`, `rgb(from rebeccapurple 25 g b / alpha)`, `rgb(25, 51, 153)`);
-    test_valid_value(`color`, `rgb(from rebeccapurple r 25 b / alpha)`, `rgb(102, 25, 153)`);
-    test_valid_value(`color`, `rgb(from rebeccapurple r g 25 / alpha)`, `rgb(102, 51, 25)`);
-    test_valid_value(`color`, `rgb(from rebeccapurple r g b / .25)`, `rgba(102, 51, 153, 0.25)`);
-    test_valid_value(`color`, `rgb(from rgb(20%, 40%, 60%, 80%) 25 g b / alpha)`, `rgba(25, 102, 153, 0.8)`);
-    test_valid_value(`color`, `rgb(from rgb(20%, 40%, 60%, 80%) r 25 b / alpha)`, `rgba(51, 25, 153, 0.8)`);
-    test_valid_value(`color`, `rgb(from rgb(20%, 40%, 60%, 80%) r g 25 / alpha)`, `rgba(51, 102, 25, 0.8)`);
-    test_valid_value(`color`, `rgb(from rgb(20%, 40%, 60%, 80%) r g b / .20)`, `rgba(51, 102, 153, 0.2)`);
+    fuzzy_test_valid_color(`rgb(from rebeccapurple 25 g b / alpha)`, `color(srgb 0.098 0.2 0.6)`);
+    fuzzy_test_valid_color(`rgb(from rebeccapurple r 25 b / alpha)`, `color(srgb 0.4 0.098 0.6)`);
+    fuzzy_test_valid_color(`rgb(from rebeccapurple r g 25 / alpha)`, `color(srgb 0.4 0.2 0.098)`);
+    fuzzy_test_valid_color(`rgb(from rebeccapurple r g b / .25)`, `color(srgb 0.4 0.2 0.6 / 0.25)`);
+    fuzzy_test_valid_color(`rgb(from rgb(20%, 40%, 60%, 80%) 25 g b / alpha)`, `color(srgb 0.098 0.4 0.6 / 0.8)`);
+    fuzzy_test_valid_color(`rgb(from rgb(20%, 40%, 60%, 80%) r 25 b / alpha)`, `color(srgb 0.2 0.098 0.6 / 0.8)`);
+    fuzzy_test_valid_color(`rgb(from rgb(20%, 40%, 60%, 80%) r g 25 / alpha)`, `color(srgb 0.2 0.4 0.098 / 0.8)`);
+    fuzzy_test_valid_color(`rgb(from rgb(20%, 40%, 60%, 80%) r g b / .20)`, `color(srgb 0.2 0.4 0.6 / 0.2)`);
 
     // Testing replacement with a percentage.
-    test_valid_value(`color`, `rgb(from rebeccapurple 20% g b / alpha)`, `rgb(51, 51, 153)`);
-    test_valid_value(`color`, `rgb(from rebeccapurple r 20% b / alpha)`, `rgb(102, 51, 153)`);
-    test_valid_value(`color`, `rgb(from rebeccapurple r g 20% / alpha)`, `rgb(102, 51, 51)`);
-    test_valid_value(`color`, `rgb(from rebeccapurple r g b / 20%)`, `rgba(102, 51, 153, 0.2)`);
-    test_valid_value(`color`, `rgb(from rgb(20%, 40%, 60%, 80%) 20% g b / alpha)`, `rgba(51, 102, 153, 0.8)`);
-    test_valid_value(`color`, `rgb(from rgb(20%, 40%, 60%, 80%) r 20% b / alpha)`, `rgba(51, 51, 153, 0.8)`);
-    test_valid_value(`color`, `rgb(from rgb(20%, 40%, 60%, 80%) r g 20% / alpha)`, `rgba(51, 102, 51, 0.8)`);
-    test_valid_value(`color`, `rgb(from rgb(20%, 40%, 60%, 80%) r g b / 20%)`, `rgba(51, 102, 153, 0.2)`);
+    fuzzy_test_valid_color(`rgb(from rebeccapurple 20% g b / alpha)`, `color(srgb 0.2 0.2 0.6)`);
+    fuzzy_test_valid_color(`rgb(from rebeccapurple r 20% b / alpha)`, `color(srgb 0.4 0.2 0.6)`);
+    fuzzy_test_valid_color(`rgb(from rebeccapurple r g 20% / alpha)`, `color(srgb 0.4 0.2 0.2)`);
+    fuzzy_test_valid_color(`rgb(from rebeccapurple r g b / 20%)`, `color(srgb 0.4 0.2 0.6 / 0.2)`);
+    fuzzy_test_valid_color(`rgb(from rgb(20%, 40%, 60%, 80%) 20% g b / alpha)`, `color(srgb 0.2 0.4 0.6 / 0.8)`);
+    fuzzy_test_valid_color(`rgb(from rgb(20%, 40%, 60%, 80%) r 20% b / alpha)`, `color(srgb 0.2 0.2 0.6 / 0.8)`);
+    fuzzy_test_valid_color(`rgb(from rgb(20%, 40%, 60%, 80%) r g 20% / alpha)`, `color(srgb 0.2 0.4 0.2 / 0.8)`);
+    fuzzy_test_valid_color(`rgb(from rgb(20%, 40%, 60%, 80%) r g b / 20%)`, `color(srgb 0.2 0.4 0.6 / 0.2)`);
 
     // Testing replacement with a number for r, g, b but percent for alpha.
-    test_valid_value(`color`, `rgb(from rebeccapurple 25 g b / 25%)`, `rgba(25, 51, 153, 0.25)`);
-    test_valid_value(`color`, `rgb(from rebeccapurple r 25 b / 25%)`, `rgba(102, 25, 153, 0.25)`);
-    test_valid_value(`color`, `rgb(from rebeccapurple r g 25 / 25%)`, `rgba(102, 51, 25, 0.25)`);
-    test_valid_value(`color`, `rgb(from rgb(20%, 40%, 60%, 80%) 25 g b / 25%)`, `rgba(25, 102, 153, 0.25)`);
-    test_valid_value(`color`, `rgb(from rgb(20%, 40%, 60%, 80%) r 25 b / 25%)`, `rgba(51, 25, 153, 0.25)`);
-    test_valid_value(`color`, `rgb(from rgb(20%, 40%, 60%, 80%) r g 25 / 25%)`, `rgba(51, 102, 25, 0.25)`);
+    fuzzy_test_valid_color(`rgb(from rebeccapurple 25 g b / 25%)`, `color(srgb 0.098 0.2 0.6 / 0.25)`);
+    fuzzy_test_valid_color(`rgb(from rebeccapurple r 25 b / 25%)`, `color(srgb 0.4 0.098 0.6 / 0.25)`);
+    fuzzy_test_valid_color(`rgb(from rebeccapurple r g 25 / 25%)`, `color(srgb 0.4 0.2 0.098 / 0.25)`);
+    fuzzy_test_valid_color(`rgb(from rgb(20%, 40%, 60%, 80%) 25 g b / 25%)`, `color(srgb 0.098 0.4 0.6 / 0.25)`);
+    fuzzy_test_valid_color(`rgb(from rgb(20%, 40%, 60%, 80%) r 25 b / 25%)`, `color(srgb 0.2 0.098 0.6 / 0.25)`);
+    fuzzy_test_valid_color(`rgb(from rgb(20%, 40%, 60%, 80%) r g 25 / 25%)`, `color(srgb 0.2 0.4 0.098 / 0.25)`);
 
     // Testing permutation.
-    test_valid_value(`color`, `rgb(from rebeccapurple g b r)`, `rgb(51, 153, 102)`);
-    test_valid_value(`color`, `rgb(from rebeccapurple b alpha r / g)`, `rgba(153, 255, 102, 0.2)`);
-    test_valid_value(`color`, `rgb(from rebeccapurple r r r / r)`, `rgba(102, 102, 102, 0.4)`);
-    test_valid_value(`color`, `rgb(from rebeccapurple alpha alpha alpha / alpha)`, `rgb(255, 255, 255)`);
-    test_valid_value(`color`, `rgb(from rgb(20%, 40%, 60%, 80%) g b r)`, `rgb(102, 153, 51)`);
-    test_valid_value(`color`, `rgb(from rgb(20%, 40%, 60%, 80%) b alpha r / g)`, `rgba(153, 204, 51, 0.4)`);
-    test_valid_value(`color`, `rgb(from rgb(20%, 40%, 60%, 80%) r r r / r)`, `rgba(51, 51, 51, 0.2)`);
-    test_valid_value(`color`, `rgb(from rgb(20%, 40%, 60%, 80%) alpha alpha alpha / alpha)`, `rgba(204, 204, 204, 0.8)`);
+    fuzzy_test_valid_color(`rgb(from rebeccapurple g b r)`, `color(srgb 0.2 0.6 0.4)`);
+    fuzzy_test_valid_color(`rgb(from rebeccapurple b alpha r / g)`, `color(srgb 0.6 1 0.4 / 0.2)`);
+    fuzzy_test_valid_color(`rgb(from rebeccapurple r r r / r)`, `color(srgb 0.4 0.4 0.4 / 0.4)`);
+    fuzzy_test_valid_color(`rgb(from rebeccapurple alpha alpha alpha / alpha)`, `color(srgb 1 1 1)`);
+    fuzzy_test_valid_color(`rgb(from rgb(20%, 40%, 60%, 80%) g b r)`, `color(srgb 0.4 0.6 0.2 / 0.8)`);
+    fuzzy_test_valid_color(`rgb(from rgb(20%, 40%, 60%, 80%) b alpha r / g)`, `color(srgb 0.6 0.8 0.2 / 0.4)`);
+    fuzzy_test_valid_color(`rgb(from rgb(20%, 40%, 60%, 80%) r r r / r)`, `color(srgb 0.2 0.2 0.2 / 0.2)`);
+    fuzzy_test_valid_color(`rgb(from rgb(20%, 40%, 60%, 80%) alpha alpha alpha / alpha)`, `color(srgb 0.8 0.8 0.8 / 0.8)`);
 
     // Testing mixes of number and percentage. (These would not be allowed in the non-relative syntax).
-    test_valid_value(`color`, `rgb(from rebeccapurple r 20% 10)`, `rgb(102, 51, 10)`);
-    test_valid_value(`color`, `rgb(from rebeccapurple r 10 20%)`, `rgb(102, 10, 51)`);
-    test_valid_value(`color`, `rgb(from rebeccapurple 0% 10 10)`, `rgb(0, 10, 10)`);
-    test_valid_value(`color`, `rgb(from rgb(20%, 40%, 60%, 80%) r 20% 10)`, `rgba(51, 51, 10, 0.8)`);
-    test_valid_value(`color`, `rgb(from rgb(20%, 40%, 60%, 80%) r 10 20%)`, `rgba(51, 10, 51, 0.8)`);
-    test_valid_value(`color`, `rgb(from rgb(20%, 40%, 60%, 80%) 0% 10 10)`, `rgba(0, 10, 10, 0.8)`);
+    fuzzy_test_valid_color(`rgb(from rebeccapurple r 20% 10)`, `color(srgb 0.4 0.2 0.0392)`);
+    fuzzy_test_valid_color(`rgb(from rebeccapurple r 10 20%)`, `color(srgb 0.4 0.0392 0.2)`);
+    fuzzy_test_valid_color(`rgb(from rebeccapurple 0% 10 10)`, `color(srgb 0 0.0392 0.0392)`);
+    fuzzy_test_valid_color(`rgb(from rgb(20%, 40%, 60%, 80%) r 20% 10)`, `color(srgb 0.2 0.2 0.0392 / 0.8)`);
+    fuzzy_test_valid_color(`rgb(from rgb(20%, 40%, 60%, 80%) r 10 20%)`, `color(srgb 0.2 0.0392 0.2 / 0.8)`);
+    fuzzy_test_valid_color(`rgb(from rgb(20%, 40%, 60%, 80%) 0% 10 10)`, `color(srgb 0 0.0392 0.0392 / 0.8)`);
 
-        // r    g    b
-        // 102  51   153
-        // 40%  20%  60%)
+    // r    g    b
+    // 102  51   153
+    // 40%  20%  60%
     // Testing with calc().
-    test_valid_value(`color`, `rgb(from rebeccapurple calc(r) calc(g) calc(b))`, `rgb(102, 51, 153)`);
-    test_valid_value(`color`, `rgb(from rebeccapurple r calc(g * 2) 10)`, `rgb(102, 102, 10)`);
-    test_valid_value(`color`, `rgb(from rebeccapurple b calc(r * .5) 10)`, `rgb(153, 51, 10)`);
-    test_valid_value(`color`, `rgb(from rebeccapurple r calc(g * .5 + g * .5) 10)`, `rgb(102, 51, 10)`);
-    test_valid_value(`color`, `rgb(from rebeccapurple r calc(b * .5 - g * .5) 10)`, `rgb(102, 51, 10)`);
-    test_valid_value(`color`, `rgb(from rgb(20%, 40%, 60%, 80%) calc(r) calc(g) calc(b) / calc(alpha))`, `rgba(51, 102, 153, 0.8)`);
+    fuzzy_test_valid_color(`rgb(from rebeccapurple calc(r) calc(g) calc(b))`, `color(srgb 0.4 0.2 0.6)`);
+    fuzzy_test_valid_color(`rgb(from rebeccapurple r calc(g * 2) 10)`, `color(srgb 0.4 0.4 0.0392)`);
+    fuzzy_test_valid_color(`rgb(from rebeccapurple b calc(r * .5) 10)`, `color(srgb 0.6 0.2 0.0392)`);
+    fuzzy_test_valid_color(`rgb(from rebeccapurple r calc(g * .5 + g * .5) 10)`, `color(srgb 0.4 0.2 0.0392)`);
+    fuzzy_test_valid_color(`rgb(from rebeccapurple r calc(b * .5 - g * .5) 10)`, `color(srgb 0.4 0.2 0.0392)`);
+    fuzzy_test_valid_color(`rgb(from rgb(20%, 40%, 60%, 80%) calc(r) calc(g) calc(b) / calc(alpha))`, `color(srgb 0.2 0.4 0.6 / 0.8)`);
 
     // Testing with 'none'.
-    test_valid_value(`color`, `rgb(from rebeccapurple none none none)`,                         `rgb(0, 0, 0)`);
-    test_valid_value(`color`, `rgb(from rebeccapurple none none none / none)`,                  `rgba(0, 0, 0, 0)`);
-    test_valid_value(`color`, `rgb(from rebeccapurple r g none)`,                               `rgb(102, 51, 0)`);
-    test_valid_value(`color`, `rgb(from rebeccapurple r g none / alpha)`,                       `rgb(102, 51, 0)`);
-    test_valid_value(`color`, `rgb(from rebeccapurple r g b / none)`,                           `rgba(102, 51, 153, 0)`);
-    test_valid_value(`color`, `rgb(from rgb(20% 40% 60% / 80%) r g none / alpha)`,              `rgba(51, 102, 0, 0.8)`);
-    test_valid_value(`color`, `rgb(from rgb(20% 40% 60% / 80%) r g b / none)`,                  `rgba(51, 102, 153, 0)`);
+    fuzzy_test_valid_color(`rgb(from rebeccapurple none none none)`, `color(srgb none none none)`);
+    fuzzy_test_valid_color(`rgb(from rebeccapurple none none none / none)`, `color(srgb none none none / none)`);
+    fuzzy_test_valid_color(`rgb(from rebeccapurple r g none)`, `color(srgb 0.4 0.2 none)`);
+    fuzzy_test_valid_color(`rgb(from rebeccapurple r g none / alpha)`, `color(srgb 0.4 0.2 none)`);
+    fuzzy_test_valid_color(`rgb(from rebeccapurple r g b / none)`, `color(srgb 0.4 0.2 0.6 / none)`);
+    fuzzy_test_valid_color(`rgb(from rgb(20% 40% 60% / 80%) r g none / alpha)`, `color(srgb 0.2 0.4 none / 0.8)`);
+    fuzzy_test_valid_color(`rgb(from rgb(20% 40% 60% / 80%) r g b / none)`, `color(srgb 0.2 0.4 0.6 / none)`);
     // FIXME: Clarify with spec editors if 'none' should pass through to the constants.
-    test_valid_value(`color`, `rgb(from rgb(none none none) r g b)`,                            `rgb(0, 0, 0)`);
-    test_valid_value(`color`, `rgb(from rgb(none none none / none) r g b / alpha)`,             `rgba(0, 0, 0, 0)`);
-    test_valid_value(`color`, `rgb(from rgb(20% none 60%) r g b)`,                              `rgb(51, 0, 153)`);
-    test_valid_value(`color`, `rgb(from rgb(20% 40% 60% / none) r g b / alpha)`,                `rgba(51, 102, 153, 0)`);
+    fuzzy_test_valid_color(`rgb(from rgb(none none none) r g b)`, `color(srgb 0 0 0)`);
+    fuzzy_test_valid_color(`rgb(from rgb(none none none / none) r g b / alpha)`, `color(srgb 0 0 0 / 0)`);
+    fuzzy_test_valid_color(`rgb(from rgb(20% none 60%) r g b)`, `color(srgb 0.2 0 0.6)`);
+    fuzzy_test_valid_color(`rgb(from rgb(20% 40% 60% / none) r g b / alpha)`, `color(srgb 0.2 0.4 0.6 / 0)`);
 
+    // Testing with 'currentColor'
+    fuzzy_test_valid_color(`rgb(from currentColor r g b)`, `rgb(from currentColor r g b)`);
 
     // hsl(from ...)
 
     // Testing no modifications.
-    test_valid_value(`color`, `hsl(from rebeccapurple h s l)`, `rgb(102, 51, 153)`);
-    test_valid_value(`color`, `hsl(from rebeccapurple h s l / alpha)`, `rgb(102, 51, 153)`);
-    test_valid_value(`color`, `hsl(from rgb(20%, 40%, 60%, 80%) h s l / alpha)`, `rgba(51, 102, 153, 0.8)`);
-    test_valid_value(`color`, `hsl(from hsl(120deg 20% 50% / .5) h s l / alpha)`, `rgba(102, 153, 102, 0.5)`);
+    fuzzy_test_valid_color(`hsl(from rebeccapurple h s l)`, `color(srgb 0.4 0.2 0.6)`);
+    fuzzy_test_valid_color(`hsl(from rebeccapurple h s l / alpha)`, `color(srgb 0.4 0.2 0.6)`);
+    fuzzy_test_valid_color(`hsl(from rgb(20%, 40%, 60%, 80%) h s l / alpha)`, `color(srgb 0.2 0.4 0.6 / 0.8)`);
+    fuzzy_test_valid_color(`hsl(from hsl(120deg 20% 50% / .5) h s l / alpha)`, `color(srgb 0.4 0.6 0.4 / 0.5)`);
 
     // Test nesting relative colors.
-    test_valid_value(`color`, `hsl(from hsl(from rebeccapurple h s l) h s l)`, `rgb(102, 51, 153)`);
-
-    // Testing non-sRGB origin colors to see gamut mapping.
-    test_valid_value(`color`, `hsl(from color(display-p3 0 1 0) h s l / alpha)`, `rgb(0, 249, 66)`); // Naive clip based mapping would give rgb(0, 255, 0).
-    test_valid_value(`color`, `hsl(from lab(100 104.3 -50.9) h s l)`, `rgb(255, 255, 255)`); // Naive clip based mapping would give rgb(255, 150, 255).
-    test_valid_value(`color`, `hsl(from lab(0 104.3 -50.9) h s l)`, `rgb(42, 0, 34)`); // Naive clip based mapping would give rgb(90, 0, 76). NOTE: 0% lightness in Lab/LCH does not automatically correspond with sRGB black,
-    test_valid_value(`color`, `hsl(from lch(100 116 334) h s l)`, `rgb(255, 255, 255)`); // Naive clip based mapping would give rgb(255, 150, 255).
-    test_valid_value(`color`, `hsl(from lch(0 116 334) h s l)`, `rgb(42, 0, 34)`); // Naive clip based mapping would give rgb(90, 0, 76). NOTE: 0% lightness in Lab/LCH does not automatically correspond with sRGB black,
-    test_valid_value(`color`, `hsl(from oklab(1 0.365 -0.16) h s l)`, `rgb(255, 255, 255)`); // Naive clip based mapping would give rgb(255, 92, 255).
-    test_valid_value(`color`, `hsl(from oklab(0 0.365 -0.16) h s l)`, `rgb(0, 0, 0)`); // Naive clip based mapping would give rgb(19, 0, 24).
-    test_valid_value(`color`, `hsl(from oklch(1 0.399 336.3) h s l)`, `rgb(255, 255, 255)`); // Naive clip based mapping would give rgb(255, 91, 255).
-    test_valid_value(`color`, `hsl(from oklch(0 0.399 336.3) h s l)`, `rgb(0, 0, 0)`); // Naive clip based mapping would give rgb(20, 0, 24).
+    fuzzy_test_valid_color(`hsl(from hsl(from rebeccapurple h s l) h s l)`, `color(srgb 0.4 0.2 0.6)`);
 
     // Testing replacement with 0.
-    test_valid_value(`color`, `hsl(from rebeccapurple 0 0% 0%)`, `rgb(0, 0, 0)`);
-    test_valid_value(`color`, `hsl(from rebeccapurple 0deg 0% 0%)`, `rgb(0, 0, 0)`);
-    test_valid_value(`color`, `hsl(from rebeccapurple 0 0% 0% / 0)`, `rgba(0, 0, 0, 0)`);
-    test_valid_value(`color`, `hsl(from rebeccapurple 0deg 0% 0% / 0)`, `rgba(0, 0, 0, 0)`);
-    test_valid_value(`color`, `hsl(from rebeccapurple 0 s l / alpha)`, `rgb(153, 51, 51)`);
-    test_valid_value(`color`, `hsl(from rebeccapurple 0deg s l / alpha)`, `rgb(153, 51, 51)`);
-    test_valid_value(`color`, `hsl(from rebeccapurple h 0% l / alpha)`, `rgb(102, 102, 102)`);
-    test_valid_value(`color`, `hsl(from rebeccapurple h s 0% / alpha)`, `rgb(0, 0, 0)`);
-    test_valid_value(`color`, `hsl(from rebeccapurple h s l / 0)`, `rgba(102, 51, 153, 0)`);
-    test_valid_value(`color`, `hsl(from rgb(20%, 40%, 60%, 80%) 0 s l / alpha)`, `rgba(153, 51, 51, 0.8)`);
-    test_valid_value(`color`, `hsl(from rgb(20%, 40%, 60%, 80%) 0deg s l / alpha)`, `rgba(153, 51, 51, 0.8)`);
-    test_valid_value(`color`, `hsl(from rgb(20%, 40%, 60%, 80%) h 0% l / alpha)`, `rgba(102, 102, 102, 0.8)`);
-    test_valid_value(`color`, `hsl(from rgb(20%, 40%, 60%, 80%) h s 0% / alpha)`, `rgba(0, 0, 0, 0.8)`);
-    test_valid_value(`color`, `hsl(from rgb(20%, 40%, 60%, 80%) h s l / 0)`, `rgba(51, 102, 153, 0)`);
+    fuzzy_test_valid_color(`hsl(from rebeccapurple 0 0% 0%)`, `color(srgb 0 0 0)`);
+    fuzzy_test_valid_color(`hsl(from rebeccapurple 0deg 0% 0%)`, `color(srgb 0 0 0)`);
+    fuzzy_test_valid_color(`hsl(from rebeccapurple 0 0% 0% / 0)`, `color(srgb 0 0 0 / 0)`);
+    fuzzy_test_valid_color(`hsl(from rebeccapurple 0deg 0% 0% / 0)`, `color(srgb 0 0 0 / 0)`);
+    fuzzy_test_valid_color(`hsl(from rebeccapurple 0 s l / alpha)`, `color(srgb 0.6 0.2 0.2)`);
+    fuzzy_test_valid_color(`hsl(from rebeccapurple 0deg s l / alpha)`, `color(srgb 0.6 0.2 0.2)`);
+    fuzzy_test_valid_color(`hsl(from rebeccapurple h 0% l / alpha)`, `color(srgb 0.4 0.4 0.4)`);
+    fuzzy_test_valid_color(`hsl(from rebeccapurple h s 0% / alpha)`, `color(srgb 0 0 0)`);
+    fuzzy_test_valid_color(`hsl(from rebeccapurple h s l / 0)`, `color(srgb 0.4 0.2 0.6 / 0)`);
+    fuzzy_test_valid_color(`hsl(from rgb(20%, 40%, 60%, 80%) 0 s l / alpha)`, `color(srgb 0.6 0.2 0.2 / 0.8)`);
+    fuzzy_test_valid_color(`hsl(from rgb(20%, 40%, 60%, 80%) 0deg s l / alpha)`, `color(srgb 0.6 0.2 0.2 / 0.8)`);
+    fuzzy_test_valid_color(`hsl(from rgb(20%, 40%, 60%, 80%) h 0% l / alpha)`, `color(srgb 0.4 0.4 0.4 / 0.8)`);
+    fuzzy_test_valid_color(`hsl(from rgb(20%, 40%, 60%, 80%) h s 0% / alpha)`, `color(srgb 0 0 0 / 0.8)`);
+    fuzzy_test_valid_color(`hsl(from rgb(20%, 40%, 60%, 80%) h s l / 0)`, `color(srgb 0.2 0.4 0.6 / 0)`);
 
-    // Testing replacement with a constant.
-    test_valid_value(`color`, `hsl(from rebeccapurple 25 s l / alpha)`, `rgb(153, 94, 51)`);
-    test_valid_value(`color`, `hsl(from rebeccapurple 25deg s l / alpha)`, `rgb(153, 94, 51)`);
-    test_valid_value(`color`, `hsl(from rebeccapurple h 20% l / alpha)`, `rgb(102, 82, 122)`);
-    test_valid_value(`color`, `hsl(from rebeccapurple h s 20% / alpha)`, `rgb(51, 25, 77)`);
-    test_valid_value(`color`, `hsl(from rebeccapurple h s l / .25)`, `rgba(102, 51, 153, 0.25)`);
-    test_valid_value(`color`, `hsl(from rgb(20%, 40%, 60%, 80%) 25 s l / alpha)`, `rgba(153, 94, 51, 0.8)`);
-    test_valid_value(`color`, `hsl(from rgb(20%, 40%, 60%, 80%) 25deg s l / alpha)`, `rgba(153, 94, 51, 0.8)`);
-    test_valid_value(`color`, `hsl(from rgb(20%, 40%, 60%, 80%) h 20% l / alpha)`, `rgba(82, 102, 122, 0.8)`);
-    test_valid_value(`color`, `hsl(from rgb(20%, 40%, 60%, 80%) h s 20% / alpha)`, `rgba(25, 51, 77, 0.8)`);
-    test_valid_value(`color`, `hsl(from rgb(20%, 40%, 60%, 80%) h s l / .2)`, `rgba(51, 102, 153, 0.2)`);
+    fuzzy_test_valid_color(`hsl(from rebeccapurple 25 s l / alpha)`, `color(srgb 0.6 0.3667 0.2)`);
+    fuzzy_test_valid_color(`hsl(from rebeccapurple 25deg s l / alpha)`, `color(srgb 0.6 0.3667 0.2)`);
+    fuzzy_test_valid_color(`hsl(from rebeccapurple h 20% l / alpha)`, `color(srgb 0.4 0.32 0.48)`);
+    // hsl(from rebeccapurple h s 20% / alpha) is equivalent to color(srgb 0.2 0.1 0.3).
+    // For the green channel: 0.1 * 255 = 25.5. This should get rounded towards infinity to 26.
+    // https://www.w3.org/TR/css-color-4/#rgb-functions
+    fuzzy_test_valid_color(`hsl(from rebeccapurple h s 20% / alpha)`, `color(srgb 0.2 0.1 0.3)`);
+    fuzzy_test_valid_color(`hsl(from rebeccapurple h s l / .25)`, `color(srgb 0.4 0.2 0.6 / 0.25)`);
+    fuzzy_test_valid_color(`hsl(from rgb(20%, 40%, 60%, 80%) 25 s l / alpha)`, `color(srgb 0.6 0.3667 0.2 / 0.8)`);
+    fuzzy_test_valid_color(`hsl(from rgb(20%, 40%, 60%, 80%) 25deg s l / alpha)`, `color(srgb 0.6 0.3667 0.2 / 0.8)`);
+    fuzzy_test_valid_color(`hsl(from rgb(20%, 40%, 60%, 80%) h 20% l / alpha)`, `color(srgb 0.32 0.4 0.48 / 0.8)`);
+    // hsl(from rgb(20%, 40%, 60%, 80%) h s 20% / alpha) is equivalent to color(srgb 0.1 0.2 0.3).
+    // For the red channel: 0.1 * 255 = 25.5. This should get rounded towards infinity to 26.
+    // https://www.w3.org/TR/css-color-4/#rgb-functions
+    fuzzy_test_valid_color(`hsl(from rgb(20%, 40%, 60%, 80%) h s 20% / alpha)`, `color(srgb 0.1 0.2 0.3 / 0.8)`);
+    fuzzy_test_valid_color(`hsl(from rgb(20%, 40%, 60%, 80%) h s l / .2)`, `color(srgb 0.2 0.4 0.6 / 0.2)`);
 
     // Testing valid permutation (types match).
-    test_valid_value(`color`, `hsl(from rebeccapurple h l s)`, `rgb(128, 77, 179)`);
-    test_valid_value(`color`, `hsl(from rebeccapurple h alpha l / s)`, `rgba(102, 0, 204, 0.5)`);
-    test_valid_value(`color`, `hsl(from rebeccapurple h l l / l)`, `rgba(102, 61, 143, 0.4)`);
-    test_valid_value(`color`, `hsl(from rebeccapurple h alpha alpha / alpha)`, `rgb(255, 255, 255)`);
-    test_valid_value(`color`, `hsl(from rgb(20%, 40%, 60%, 80%) h l s)`, `rgba(77, 128, 179, 0.8)`);
-    test_valid_value(`color`, `hsl(from rgb(20%, 40%, 60%, 80%) h alpha l / s)`, `rgba(20, 102, 184, 0.5)`);
-    test_valid_value(`color`, `hsl(from rgb(20%, 40%, 60%, 80%) h l l / l)`, `rgba(61, 102, 143, 0.4)`);
-    test_valid_value(`color`, `hsl(from rgb(20%, 40%, 60%, 80%) h alpha alpha / alpha)`, `rgba(163, 204, 245, 0.8)`);
+    fuzzy_test_valid_color(`hsl(from rebeccapurple h l s)`, `color(srgb 0.5 0.3 0.7)`);
+    fuzzy_test_valid_color(`hsl(from rebeccapurple h alpha l / s)`, `color(srgb 0.4 0 0.8 / 0.5)`);
+    fuzzy_test_valid_color(`hsl(from rebeccapurple h l l / l)`, `color(srgb 0.4 0.24 0.56 / 0.4)`);
+    fuzzy_test_valid_color(`hsl(from rebeccapurple h alpha alpha / alpha)`, `color(srgb 1 1 1)`);
+    fuzzy_test_valid_color(`hsl(from rgb(20%, 40%, 60%, 80%) h l s)`, `color(srgb 0.3 0.5 0.7 / 0.8)`);
+    fuzzy_test_valid_color(`hsl(from rgb(20%, 40%, 60%, 80%) h alpha l / s)`, `color(srgb 0.08 0.4 0.72 / 0.5)`);
+    fuzzy_test_valid_color(`hsl(from rgb(20%, 40%, 60%, 80%) h l l / l)`, `color(srgb 0.24 0.4 0.56 / 0.4)`);
+    fuzzy_test_valid_color(`hsl(from rgb(20%, 40%, 60%, 80%) h alpha alpha / alpha)`, `color(srgb 0.64 0.8 0.96 / 0.8)`);
 
     // Testing with calc().
-    test_valid_value(`color`, `hsl(from rebeccapurple calc(h) calc(s) calc(l))`, `rgb(102, 51, 153)`);
-    test_valid_value(`color`, `hsl(from rgb(20%, 40%, 60%, 80%) calc(h) calc(s) calc(l) / calc(alpha))`, `rgba(51, 102, 153, 0.8)`);
+    fuzzy_test_valid_color(`hsl(from rebeccapurple calc(h) calc(s) calc(l))`, `color(srgb 0.4 0.2 0.6)`);
+    fuzzy_test_valid_color(`hsl(from rgb(20%, 40%, 60%, 80%) calc(h) calc(s) calc(l) / calc(alpha))`, `color(srgb 0.2 0.4 0.6 / 0.8)`);
 
     // Testing with 'none'.
-    test_valid_value(`color`, `hsl(from rebeccapurple none none none)`,                         `rgb(0, 0, 0)`);
-    test_valid_value(`color`, `hsl(from rebeccapurple none none none / none)`,                  `rgba(0, 0, 0, 0)`);
-    test_valid_value(`color`, `hsl(from rebeccapurple h s none)`,                               `rgb(0, 0, 0)`);
-    test_valid_value(`color`, `hsl(from rebeccapurple h s none / alpha)`,                       `rgb(0, 0, 0)`);
-    test_valid_value(`color`, `hsl(from rebeccapurple h s l / none)`,                           `rgba(102, 51, 153, 0)`);
-    test_valid_value(`color`, `hsl(from rebeccapurple none s l / alpha)`,                       `rgb(153, 51, 51)`);
-    test_valid_value(`color`, `hsl(from hsl(120deg 20% 50% / .5) h s none / alpha)`,            `rgba(0, 0, 0, 0.5)`);
-    test_valid_value(`color`, `hsl(from hsl(120deg 20% 50% / .5) h s l / none)`,                `rgba(102, 153, 102, 0)`);
-    test_valid_value(`color`, `hsl(from hsl(120deg 20% 50% / .5) none s l / alpha)`,            `rgba(153, 102, 102, 0.5)`);
+    fuzzy_test_valid_color(`hsl(from rebeccapurple none none none)`, `color(srgb none none none)`);
+    fuzzy_test_valid_color(`hsl(from rebeccapurple none none none / none)`, `color(srgb none none none / none)`);
+    fuzzy_test_valid_color(`hsl(from rebeccapurple h s none)`, `color(srgb 0 0 none)`);
+    fuzzy_test_valid_color(`hsl(from rebeccapurple h s none / alpha)`, `color(srgb 0 0 none)`);
+    fuzzy_test_valid_color(`hsl(from rebeccapurple h s l / none)`, `color(srgb 0.4 0.2 0.6 / none)`);
+    fuzzy_test_valid_color(`hsl(from rebeccapurple none s l / alpha)`, `color(srgb none 0.2 0.2)`);
+    fuzzy_test_valid_color(`hsl(from hsl(120deg 20% 50% / .5) h s none / alpha)`, `color(srgb 0 0 none / 0.5)`);
+    fuzzy_test_valid_color(`hsl(from hsl(120deg 20% 50% / .5) h s l / none)`, `color(srgb 0.4 0.6 0.4 / none)`);
+    fuzzy_test_valid_color(`hsl(from hsl(120deg 20% 50% / .5) none s l / alpha)`, `color(srgb none 0.4 0.4 / 0.5)`);
     // FIXME: Clarify with spec editors if 'none' should pass through to the constants.
-    test_valid_value(`color`, `hsl(from hsl(none none none) h s l)`,                            `rgb(0, 0, 0)`);
-    test_valid_value(`color`, `hsl(from hsl(none none none / none) h s l / alpha)`,             `rgba(0, 0, 0, 0)`);
-    test_valid_value(`color`, `hsl(from hsl(120deg none 50% / .5) h s l)`,                      `rgba(128, 128, 128, 0.5)`);
-    test_valid_value(`color`, `hsl(from hsl(120deg 20% 50% / none) h s l / alpha)`,             `rgba(102, 153, 102, 0)`);
-    test_valid_value(`color`, `hsl(from hsl(none 20% 50% / .5) h s l / alpha)`,                 `rgba(153, 102, 102, 0.5)`);
+    fuzzy_test_valid_color(`hsl(from hsl(none none none) h s l)`, `color(srgb 0 0 0)`);
+    fuzzy_test_valid_color(`hsl(from hsl(none none none / none) h s l / alpha)`, `color(srgb 0 0 0 / 0)`);
+    fuzzy_test_valid_color(`hsl(from hsl(120deg none 50% / .5) h s l)`, `color(srgb 0.5 0.5 0.5 / 0.5)`);
+    fuzzy_test_valid_color(`hsl(from hsl(120deg 20% 50% / none) h s l / alpha)`, `color(srgb 0.4 0.6 0.4 / 0)`);
+    fuzzy_test_valid_color(`hsl(from hsl(none 20% 50% / .5) h s l / alpha)`, `color(srgb 0.6 0.4 0.4 / 0.5)`);
+
+    // Testing with 'currentColor'
+    fuzzy_test_valid_color(`hsl(from currentColor h s l)`, `hsl(from currentColor h s l)`);
 
     // hwb(from ...)
 
     // Testing no modifications.
-    test_valid_value(`color`, `hwb(from rebeccapurple h w b)`, `rgb(102, 51, 153)`);
-    test_valid_value(`color`, `hwb(from rebeccapurple h w b / alpha)`, `rgb(102, 51, 153)`);
-    test_valid_value(`color`, `hwb(from rgb(20%, 40%, 60%, 80%) h w b / alpha)`, `rgba(51, 102, 153, 0.8)`);
-    test_valid_value(`color`, `hwb(from hsl(120deg 20% 50% / .5) h w b / alpha)`, `rgba(102, 153, 102, 0.5)`);
+    fuzzy_test_valid_color(`hwb(from rebeccapurple h w b)`, `color(srgb 0.4 0.2 0.6)`);
+    fuzzy_test_valid_color(`hwb(from rebeccapurple h w b / alpha)`, `color(srgb 0.4 0.2 0.6)`);
+    fuzzy_test_valid_color(`hwb(from rgb(20%, 40%, 60%, 80%) h w b / alpha)`, `color(srgb 0.2 0.4 0.6 / 0.8)`);
+    fuzzy_test_valid_color(`hwb(from hsl(120deg 20% 50% / .5) h w b / alpha)`, `color(srgb 0.4 0.6 0.4 / 0.5)`);
 
     // Test nesting relative colors.
-    test_valid_value(`color`, `hwb(from hwb(from rebeccapurple h w b) h w b)`, `rgb(102, 51, 153)`);
-
-    // Testing non-sRGB origin colors to see gamut mapping.
-    test_valid_value(`color`, `hwb(from color(display-p3 0 1 0) h w b / alpha)`, `rgb(0, 249, 66)`); // Naive clip based mapping would give rgb(0, 255, 0).
-    test_valid_value(`color`, `hwb(from lab(100 104.3 -50.9) h w b)`, `rgb(255, 255, 255)`); // Naive clip based mapping would give rgb(255, 150, 255).
-    test_valid_value(`color`, `hwb(from lab(0 104.3 -50.9) h w b)`, `rgb(42, 0, 34)`); // Naive clip based mapping would give rgb(90, 0, 76). NOTE: 0% lightness in Lab/LCH does not automatically correspond with sRGB black,
-    test_valid_value(`color`, `hwb(from lch(100 116 334) h w b)`, `rgb(255, 255, 255)`); // Naive clip based mapping would give rgb(255, 150, 255).
-    test_valid_value(`color`, `hwb(from lch(0 116 334) h w b)`, `rgb(42, 0, 34)`); // Naive clip based mapping would give rgb(90, 0, 76). NOTE: 0% lightness in Lab/LCH does not automatically correspond with sRGB black,
-    test_valid_value(`color`, `hwb(from oklab(1 0.365 -0.16) h w b)`, `rgb(255, 255, 255)`); // Naive clip based mapping would give rgb(255, 92, 255).
-    test_valid_value(`color`, `hwb(from oklab(0 0.365 -0.16) h w b)`, `rgb(0, 0, 0)`); // Naive clip based mapping would give rgb(19, 0, 24).
-    test_valid_value(`color`, `hwb(from oklch(1 0.399 336.3) h w b)`, `rgb(255, 255, 255)`); // Naive clip based mapping would give rgb(255, 91, 255).
-    test_valid_value(`color`, `hwb(from oklch(0 0.399 336.3) h w b)`, `rgb(0, 0, 0)`); // Naive clip based mapping would give rgb(20, 0, 24).
+    fuzzy_test_valid_color(`hwb(from hwb(from rebeccapurple h w b) h w b)`, `color(srgb 0.4 0.2 0.6)`);
 
     // Testing replacement with 0.
-    test_valid_value(`color`, `hwb(from rebeccapurple 0 0% 0%)`, `rgb(255, 0, 0)`);
-    test_valid_value(`color`, `hwb(from rebeccapurple 0deg 0% 0%)`, `rgb(255, 0, 0)`);
-    test_valid_value(`color`, `hwb(from rebeccapurple 0 0% 0% / 0)`, `rgba(255, 0, 0, 0)`);
-    test_valid_value(`color`, `hwb(from rebeccapurple 0deg 0% 0% / 0)`, `rgba(255, 0, 0, 0)`);
-    test_valid_value(`color`, `hwb(from rebeccapurple 0 w b / alpha)`, `rgb(153, 51, 51)`);
-    test_valid_value(`color`, `hwb(from rebeccapurple 0deg w b / alpha)`, `rgb(153, 51, 51)`);
-    test_valid_value(`color`, `hwb(from rebeccapurple h 0% b / alpha)`, `rgb(77, 0, 153)`);
-    test_valid_value(`color`, `hwb(from rebeccapurple h w 0% / alpha)`, `rgb(153, 51, 255)`);
-    test_valid_value(`color`, `hwb(from rebeccapurple h w b / 0)`, `rgba(102, 51, 153, 0)`);
-    test_valid_value(`color`, `hwb(from rgb(20%, 40%, 60%, 80%) 0 w b / alpha)`, `rgba(153, 51, 51, 0.8)`);
-    test_valid_value(`color`, `hwb(from rgb(20%, 40%, 60%, 80%) 0deg w b / alpha)`, `rgba(153, 51, 51, 0.8)`);
-    test_valid_value(`color`, `hwb(from rgb(20%, 40%, 60%, 80%) h 0% b / alpha)`, `rgba(0, 77, 153, 0.8)`);
-    test_valid_value(`color`, `hwb(from rgb(20%, 40%, 60%, 80%) h w 0% / alpha)`, `rgba(51, 153, 255, 0.8)`);
-    test_valid_value(`color`, `hwb(from rgb(20%, 40%, 60%, 80%) h w b / 0)`, `rgba(51, 102, 153, 0)`);
+    fuzzy_test_valid_color(`hwb(from rebeccapurple 0 0% 0%)`, `color(srgb 1 0 0)`);
+    fuzzy_test_valid_color(`hwb(from rebeccapurple 0deg 0% 0%)`, `color(srgb 1 0 0)`);
+    fuzzy_test_valid_color(`hwb(from rebeccapurple 0 0% 0% / 0)`, `color(srgb 1 0 0 / 0)`);
+    fuzzy_test_valid_color(`hwb(from rebeccapurple 0deg 0% 0% / 0)`, `color(srgb 1 0 0 / 0)`);
+    fuzzy_test_valid_color(`hwb(from rebeccapurple 0 w b / alpha)`, `color(srgb 0.6 0.2 0.2)`);
+    fuzzy_test_valid_color(`hwb(from rebeccapurple 0deg w b / alpha)`, `color(srgb 0.6 0.2 0.2)`);
+    fuzzy_test_valid_color(`hwb(from rebeccapurple h 0% b / alpha)`, `color(srgb 0.3 0 0.6)`);
+    fuzzy_test_valid_color(`hwb(from rebeccapurple h w 0% / alpha)`, `color(srgb 0.6 0.2 1)`);
+    fuzzy_test_valid_color(`hwb(from rebeccapurple h w b / 0)`, `color(srgb 0.4 0.2 0.6 / 0)`);
+    fuzzy_test_valid_color(`hwb(from rgb(20%, 40%, 60%, 80%) 0 w b / alpha)`, `color(srgb 0.6 0.2 0.2 / 0.8)`);
+    fuzzy_test_valid_color(`hwb(from rgb(20%, 40%, 60%, 80%) 0deg w b / alpha)`, `color(srgb 0.6 0.2 0.2 / 0.8)`);
+    fuzzy_test_valid_color(`hwb(from rgb(20%, 40%, 60%, 80%) h 0% b / alpha)`, `color(srgb 0 0.3 0.6 / 0.8)`);
+    fuzzy_test_valid_color(`hwb(from rgb(20%, 40%, 60%, 80%) h w 0% / alpha)`, `color(srgb 0.2 0.6 1 / 0.8)`);
+    fuzzy_test_valid_color(`hwb(from rgb(20%, 40%, 60%, 80%) h w b / 0)`, `color(srgb 0.2 0.4 0.6 / 0)`);
 
     // Testing replacement with a constant.
-    test_valid_value(`color`, `hwb(from rebeccapurple 25 w b / alpha)`, `rgb(153, 94, 51)`);
-    test_valid_value(`color`, `hwb(from rebeccapurple 25deg w b / alpha)`, `rgb(153, 94, 51)`);
-    test_valid_value(`color`, `hwb(from rebeccapurple h 20% b / alpha)`, `rgb(102, 51, 153)`);
-    test_valid_value(`color`, `hwb(from rebeccapurple h w 20% / alpha)`, `rgb(128, 51, 204)`);
-    test_valid_value(`color`, `hwb(from rebeccapurple h w b / .2)`, `rgba(102, 51, 153, 0.2)`);
-    test_valid_value(`color`, `hwb(from rgb(20%, 40%, 60%, 80%) 25 w b / alpha)`, `rgba(153, 94, 51, 0.8)`);
-    test_valid_value(`color`, `hwb(from rgb(20%, 40%, 60%, 80%) 25deg w b / alpha)`, `rgba(153, 94, 51, 0.8)`);
-    test_valid_value(`color`, `hwb(from rgb(20%, 40%, 60%, 80%) h 20% b / alpha)`, `rgba(51, 102, 153, 0.8)`);
-    test_valid_value(`color`, `hwb(from rgb(20%, 40%, 60%, 80%) h w 20% / alpha)`, `rgba(51, 128, 204, 0.8)`);
-    test_valid_value(`color`, `hwb(from rgb(20%, 40%, 60%, 80%) h w b / .2)`, `rgba(51, 102, 153, 0.2)`);
+    fuzzy_test_valid_color(`hwb(from rebeccapurple 25 w b / alpha)`, `color(srgb 0.6 0.3667 0.2)`);
+    fuzzy_test_valid_color(`hwb(from rebeccapurple 25deg w b / alpha)`, `color(srgb 0.6 0.3667 0.2)`);
+    fuzzy_test_valid_color(`hwb(from rebeccapurple h 20% b / alpha)`, `color(srgb 0.4 0.2 0.6)`);
+    fuzzy_test_valid_color(`hwb(from rebeccapurple h w 20% / alpha)`, `color(srgb 0.5 0.2 0.8)`);
+    fuzzy_test_valid_color(`hwb(from rebeccapurple h w b / .2)`, `color(srgb 0.4 0.2 0.6 / 0.2)`);
+    fuzzy_test_valid_color(`hwb(from rgb(20%, 40%, 60%, 80%) 25 w b / alpha)`, `color(srgb 0.6 0.3667 0.2 / 0.8)`);
+    fuzzy_test_valid_color(`hwb(from rgb(20%, 40%, 60%, 80%) 25deg w b / alpha)`, `color(srgb 0.6 0.3667 0.2 / 0.8)`);
+    fuzzy_test_valid_color(`hwb(from rgb(20%, 40%, 60%, 80%) h 20% b / alpha)`, `color(srgb 0.2 0.4 0.6 / 0.8)`);
+    fuzzy_test_valid_color(`hwb(from rgb(20%, 40%, 60%, 80%) h w 20% / alpha)`, `color(srgb 0.2 0.5 0.8 / 0.8)`);
+    fuzzy_test_valid_color(`hwb(from rgb(20%, 40%, 60%, 80%) h w b / .2)`, `color(srgb 0.2 0.4 0.6 / 0.2)`);
 
     // Testing valid permutation (types match).
-    test_valid_value(`color`, `hwb(from rebeccapurple h b w)`, `rgb(153, 102, 204)`);
-    test_valid_value(`color`, `hwb(from rebeccapurple h alpha w / b)`, `rgba(213, 213, 213, 0.4)`);
-    test_valid_value(`color`, `hwb(from rebeccapurple h w w / w)`, `rgba(128, 51, 204, 0.2)`);
-    test_valid_value(`color`, `hwb(from rebeccapurple h alpha alpha / alpha)`, `rgb(128, 128, 128)`);
-    test_valid_value(`color`, `hwb(from rgb(20%, 40%, 60%, 80%) h b w)`, `rgba(102, 153, 204, 0.8)`);
-    test_valid_value(`color`, `hwb(from rgb(20%, 40%, 60%, 80%) h alpha w / b)`, `rgba(204, 204, 204, 0.4)`);
-    test_valid_value(`color`, `hwb(from rgb(20%, 40%, 60%, 80%) h w w / w)`, `rgba(51, 128, 204, 0.2)`);
-    test_valid_value(`color`, `hwb(from rgb(20%, 40%, 60%, 80%) h alpha alpha / alpha)`, `rgba(128, 128, 128, 0.8)`);
+    fuzzy_test_valid_color(`hwb(from rebeccapurple h b w)`, `color(srgb 0.6 0.4 0.8)`);
+    fuzzy_test_valid_color(`hwb(from rebeccapurple h alpha w / b)`, `color(srgb 0.8333 0.8333 0.8333 / 0.4)`);
+    fuzzy_test_valid_color(`hwb(from rebeccapurple h w w / w)`, `color(srgb 0.5 0.2 0.8 / 0.2)`);
+    fuzzy_test_valid_color(`hwb(from rebeccapurple h alpha alpha / alpha)`, `color(srgb 0.5 0.5 0.5)`);
+    fuzzy_test_valid_color(`hwb(from rgb(20%, 40%, 60%, 80%) h b w)`, `color(srgb 0.4 0.6 0.8 / 0.8)`);
+    fuzzy_test_valid_color(`hwb(from rgb(20%, 40%, 60%, 80%) h alpha w / b)`, `color(srgb 0.8 0.8 0.8 / 0.4)`);
+    fuzzy_test_valid_color(`hwb(from rgb(20%, 40%, 60%, 80%) h w w / w)`, `color(srgb 0.2 0.5 0.8 / 0.2)`);
+    fuzzy_test_valid_color(`hwb(from rgb(20%, 40%, 60%, 80%) h alpha alpha / alpha)`, `color(srgb 0.5 0.5 0.5 / 0.8)`);
 
     // Testing with calc().
-    test_valid_value(`color`, `hwb(from rebeccapurple calc(h) calc(w) calc(b))`, `rgb(102, 51, 153)`);
-    test_valid_value(`color`, `hwb(from rgb(20%, 40%, 60%, 80%) calc(h) calc(w) calc(b) / calc(alpha))`, `rgba(51, 102, 153, 0.8)`);
+    fuzzy_test_valid_color(`hwb(from rebeccapurple calc(h) calc(w) calc(b))`, `color(srgb 0.4 0.2 0.6)`);
+    fuzzy_test_valid_color(`hwb(from rgb(20%, 40%, 60%, 80%) calc(h) calc(w) calc(b) / calc(alpha))`, `color(srgb 0.2 0.4 0.6 / 0.8)`);
 
     // Testing with 'none'.
-    test_valid_value(`color`, `hwb(from rebeccapurple none none none)`,                         `rgb(255, 0, 0)`);
-    test_valid_value(`color`, `hwb(from rebeccapurple none none none / none)`,                  `rgba(255, 0, 0, 0)`);
-    test_valid_value(`color`, `hwb(from rebeccapurple h w none)`,                               `rgb(153, 51, 255)`);
-    test_valid_value(`color`, `hwb(from rebeccapurple h w none / alpha)`,                       `rgb(153, 51, 255)`);
-    test_valid_value(`color`, `hwb(from rebeccapurple h w b / none)`,                           `rgba(102, 51, 153, 0)`);
-    test_valid_value(`color`, `hwb(from rebeccapurple none w b / alpha)`,                       `rgb(153, 51, 51)`);
-    test_valid_value(`color`, `hwb(from hwb(120deg 20% 50% / .5) h w none / alpha)`,            `rgba(51, 255, 51, 0.5)`);
-    test_valid_value(`color`, `hwb(from hwb(120deg 20% 50% / .5) h w b / none)`,                `rgba(51, 128, 51, 0)`);
-    test_valid_value(`color`, `hwb(from hwb(120deg 20% 50% / .5) none w b / alpha)`,            `rgba(128, 51, 51, 0.5)`);
+    fuzzy_test_valid_color(`hwb(from rebeccapurple none none none)`, `color(srgb none none none)`);
+    fuzzy_test_valid_color(`hwb(from rebeccapurple none none none / none)`, `color(srgb none none none / none)`);
+    fuzzy_test_valid_color(`hwb(from rebeccapurple h w none)`, `color(srgb 0.6 0.2 none)`);
+    fuzzy_test_valid_color(`hwb(from rebeccapurple h w none / alpha)`, `color(srgb 0.6 0.2 none)`);
+    fuzzy_test_valid_color(`hwb(from rebeccapurple h w b / none)`, `color(srgb 0.4 0.2 0.6 / none)`);
+    fuzzy_test_valid_color(`hwb(from rebeccapurple none w b / alpha)`, `color(srgb none 0.2 0.2)`);
+    fuzzy_test_valid_color(`hwb(from hwb(120deg 20% 50% / .5) h w none / alpha)`, `color(srgb 0.2 1 none / 0.5)`);
+    fuzzy_test_valid_color(`hwb(from hwb(120deg 20% 50% / .5) h w b / none)`, `color(srgb 0.2 0.5 0.2 / none)`);
+    fuzzy_test_valid_color(`hwb(from hwb(120deg 20% 50% / .5) none w b / alpha)`, `color(srgb none 0.2 0.2 / 0.5)`);
     // FIXME: Clarify with spec editors if 'none' should pass through to the constants.
-    test_valid_value(`color`, `hwb(from hwb(none none none) h w b)`,                            `rgb(255, 0, 0)`);
-    test_valid_value(`color`, `hwb(from hwb(none none none / none) h w b / alpha)`,             `rgba(255, 0, 0, 0)`);
-    test_valid_value(`color`, `hwb(from hwb(120deg none 50% / .5) h w b)`,                      `rgba(0, 128, 0, 0.5)`);
-    test_valid_value(`color`, `hwb(from hwb(120deg 20% 50% / none) h w b / alpha)`,             `rgba(51, 128, 51, 0)`);
-    test_valid_value(`color`, `hwb(from hwb(none 20% 50% / .5) h w b / alpha)`,                 `rgba(128, 51, 51, 0.5)`);
+    fuzzy_test_valid_color(`hwb(from hwb(none none none) h w b)`, `color(srgb 1 0 0)`);
+    fuzzy_test_valid_color(`hwb(from hwb(none none none / none) h w b / alpha)`, `color(srgb 1 0 0 / 0)`);
+    fuzzy_test_valid_color(`hwb(from hwb(120deg none 50% / .5) h w b)`, `color(srgb 0 0.5 0 / 0.5)`);
+    fuzzy_test_valid_color(`hwb(from hwb(120deg 20% 50% / none) h w b / alpha)`, `color(srgb 0.2 0.5 0.2 / 0)`);
+    fuzzy_test_valid_color(`hwb(from hwb(none 20% 50% / .5) h w b / alpha)`, `color(srgb 0.5 0.2 0.2 / 0.5)`);
+
+    // Testing with 'currentColor'
+    fuzzy_test_valid_color(`hwb(from currentColor h w b)`, `hwb(from currentColor h w b)`);
 
     // lab()
 
     // Testing no modifications.
-    test_valid_value(`color`, `lab(from lab(25 20 50) l a b)`, `lab(25 20 50)`);
-    test_valid_value(`color`, `lab(from lab(25 20 50) l a b / alpha)`, `lab(25 20 50)`);
-    test_valid_value(`color`, `lab(from lab(25 20 50 / 40%) l a b / alpha)`, `lab(25 20 50 / 0.4)`);
-    test_valid_value(`color`, `lab(from lab(200 300 400 / 500%) l a b / alpha)`, `lab(100 300 400)`);
-    test_valid_value(`color`, `lab(from lab(-200 -300 -400 / -500%) l a b / alpha)`, `lab(0 -300 -400 / 0)`);
+    fuzzy_test_valid_color(`lab(from lab(25 20 50) l a b)`, `lab(25 20 50)`);
+    fuzzy_test_valid_color(`lab(from lab(25 20 50) l a b / alpha)`, `lab(25 20 50)`);
+    fuzzy_test_valid_color(`lab(from lab(25 20 50 / 40%) l a b / alpha)`, `lab(25 20 50 / 0.4)`);
+    fuzzy_test_valid_color(`lab(from lab(200 300 400 / 500%) l a b / alpha)`, `lab(100 300 400)`);
+    fuzzy_test_valid_color(`lab(from lab(-200 -300 -400 / -500%) l a b / alpha)`, `lab(0 -300 -400 / 0)`);
 
     // Test nesting relative colors.
-    test_valid_value(`color`, `lab(from lab(from lab(25 20 50) l a b) l a b)`, `lab(25 20 50)`);
+    fuzzy_test_valid_color(`lab(from lab(from lab(25 20 50) l a b) l a b)`, `lab(25 20 50)`);
 
     // Testing non-lab origin to see conversion.
-    test_valid_value(`color`, `lab(from color(display-p3 0 0 0) l a b / alpha)`, `lab(0 0 0)`);
+    fuzzy_test_valid_color(`lab(from color(display-p3 0 0 0) l a b / alpha)`, `lab(0 0 0)`);
 
     // Testing replacement with 0.
-    test_valid_value(`color`, `lab(from lab(25 20 50) 0 0 0)`, `lab(0 0 0)`);
-    test_valid_value(`color`, `lab(from lab(25 20 50) 0 0 0 / 0)`, `lab(0 0 0 / 0)`);
-    test_valid_value(`color`, `lab(from lab(25 20 50) 0 a b / alpha)`, `lab(0 20 50)`);
-    test_valid_value(`color`, `lab(from lab(25 20 50) l 0 b / alpha)`, `lab(25 0 50)`);
-    test_valid_value(`color`, `lab(from lab(25 20 50) l a 0 / alpha)`, `lab(25 20 0)`);
-    test_valid_value(`color`, `lab(from lab(25 20 50) l a b / 0)`, `lab(25 20 50 / 0)`);
-    test_valid_value(`color`, `lab(from lab(25 20 50 / 40%) 0 a b / alpha)`, `lab(0 20 50 / 0.4)`);
-    test_valid_value(`color`, `lab(from lab(25 20 50 / 40%) l 0 b / alpha)`, `lab(25 0 50 / 0.4)`);
-    test_valid_value(`color`, `lab(from lab(25 20 50 / 40%) l a 0 / alpha)`, `lab(25 20 0 / 0.4)`);
-    test_valid_value(`color`, `lab(from lab(25 20 50 / 40%) l a b / 0)`, `lab(25 20 50 / 0)`);
+    fuzzy_test_valid_color(`lab(from lab(25 20 50) 0 0 0)`, `lab(0 0 0)`);
+    fuzzy_test_valid_color(`lab(from lab(25 20 50) 0 0 0 / 0)`, `lab(0 0 0 / 0)`);
+    fuzzy_test_valid_color(`lab(from lab(25 20 50) 0 a b / alpha)`, `lab(0 20 50)`);
+    fuzzy_test_valid_color(`lab(from lab(25 20 50) l 0 b / alpha)`, `lab(25 0 50)`);
+    fuzzy_test_valid_color(`lab(from lab(25 20 50) l a 0 / alpha)`, `lab(25 20 0)`);
+    fuzzy_test_valid_color(`lab(from lab(25 20 50) l a b / 0)`, `lab(25 20 50 / 0)`);
+    fuzzy_test_valid_color(`lab(from lab(25 20 50 / 40%) 0 a b / alpha)`, `lab(0 20 50 / 0.4)`);
+    fuzzy_test_valid_color(`lab(from lab(25 20 50 / 40%) l 0 b / alpha)`, `lab(25 0 50 / 0.4)`);
+    fuzzy_test_valid_color(`lab(from lab(25 20 50 / 40%) l a 0 / alpha)`, `lab(25 20 0 / 0.4)`);
+    fuzzy_test_valid_color(`lab(from lab(25 20 50 / 40%) l a b / 0)`, `lab(25 20 50 / 0)`);
 
     // Testing replacement with a constant.
-    test_valid_value(`color`, `lab(from lab(25 20 50) 35 a b / alpha)`, `lab(35 20 50)`);
-    test_valid_value(`color`, `lab(from lab(25 20 50) l 35 b / alpha)`, `lab(25 35 50)`);
-    test_valid_value(`color`, `lab(from lab(25 20 50) l a 35 / alpha)`, `lab(25 20 35)`);
-    test_valid_value(`color`, `lab(from lab(25 20 50) l a b / .35)`, `lab(25 20 50 / 0.35)`);
-    test_valid_value(`color`, `lab(from lab(25 20 50 / 40%) 35 a b / alpha)`, `lab(35 20 50 / 0.4)`);
-    test_valid_value(`color`, `lab(from lab(25 20 50 / 40%) l 35 b / alpha)`, `lab(25 35 50 / 0.4)`);
-    test_valid_value(`color`, `lab(from lab(25 20 50 / 40%) l a 35 / alpha)`, `lab(25 20 35 / 0.4)`);
-    test_valid_value(`color`, `lab(from lab(25 20 50 / 40%) l a b / .35)`, `lab(25 20 50 / 0.35)`);
-    test_valid_value(`color`, `lab(from lab(0.7 45 30 / 40%) 200 300 400 / 500)`, `lab(200 300 400)`);
-    test_valid_value(`color`, `lab(from lab(0.7 45 30 / 40%) -200 -300 -400 / -500)`, `lab(0 -300 -400 / 0)`);
+    fuzzy_test_valid_color(`lab(from lab(25 20 50) 35 a b / alpha)`, `lab(35 20 50)`);
+    fuzzy_test_valid_color(`lab(from lab(25 20 50) l 35 b / alpha)`, `lab(25 35 50)`);
+    fuzzy_test_valid_color(`lab(from lab(25 20 50) l a 35 / alpha)`, `lab(25 20 35)`);
+    fuzzy_test_valid_color(`lab(from lab(25 20 50) l a b / .35)`, `lab(25 20 50 / 0.35)`);
+    fuzzy_test_valid_color(`lab(from lab(25 20 50 / 40%) 35 a b / alpha)`, `lab(35 20 50 / 0.4)`);
+    fuzzy_test_valid_color(`lab(from lab(25 20 50 / 40%) l 35 b / alpha)`, `lab(25 35 50 / 0.4)`);
+    fuzzy_test_valid_color(`lab(from lab(25 20 50 / 40%) l a 35 / alpha)`, `lab(25 20 35 / 0.4)`);
+    fuzzy_test_valid_color(`lab(from lab(25 20 50 / 40%) l a b / .35)`, `lab(25 20 50 / 0.35)`);
+    fuzzy_test_valid_color(`lab(from lab(0.7 45 30 / 40%) 200 300 400 / 500)`, `lab(100 300 400)`);
+    fuzzy_test_valid_color(`lab(from lab(0.7 45 30 / 40%) -200 -300 -400 / -500)`, `lab(0 -300 -400 / 0)`);
 
     // Testing valid permutation (types match).
-    test_valid_value(`color`, `lab(from lab(25 20 50) l b a)`, `lab(25 50 20)`);
-    test_valid_value(`color`, `lab(from lab(25 20 50) l a a / a)`, `lab(25 20 20)`);
-    test_valid_value(`color`, `lab(from lab(25 20 50 / 40%) l b a)`, `lab(25 50 20 / 0.4)`);
-    test_valid_value(`color`, `lab(from lab(25 20 50 / 40%) l a a / a)`, `lab(25 20 20)`);
+    fuzzy_test_valid_color(`lab(from lab(25 20 50) l b a)`, `lab(25 50 20)`);
+    fuzzy_test_valid_color(`lab(from lab(25 20 50) l a a / a)`, `lab(25 20 20)`);
+    fuzzy_test_valid_color(`lab(from lab(25 20 50 / 40%) l b a)`, `lab(25 50 20 / 0.4)`);
+    fuzzy_test_valid_color(`lab(from lab(25 20 50 / 40%) l a a / a)`, `lab(25 20 20)`);
 
     // Testing with calc().
-    test_valid_value(`color`, `lab(from lab(25 20 50) calc(l) calc(a) calc(b))`, `lab(25 20 50)`);
-    test_valid_value(`color`, `lab(from lab(25 20 50 / 40%) calc(l) calc(a) calc(b) / calc(alpha))`, `lab(25 20 50 / 0.4)`);
+    fuzzy_test_valid_color(`lab(from lab(25 20 50) calc(l) calc(a) calc(b))`, `lab(25 20 50)`);
+    fuzzy_test_valid_color(`lab(from lab(25 20 50 / 40%) calc(l) calc(a) calc(b) / calc(alpha))`, `lab(25 20 50 / 0.4)`);
 
     // Testing with 'none'.
-    test_valid_value(`color`, `lab(from lab(25 20 50) none none none)`, `lab(none none none)`);
-    test_valid_value(`color`, `lab(from lab(25 20 50) none none none / none)`, `lab(none none none / none)`);
-    test_valid_value(`color`, `lab(from lab(25 20 50) l a none)`, `lab(25 20 none)`);
-    test_valid_value(`color`, `lab(from lab(25 20 50) l a none / alpha)`, `lab(25 20 none)`);
-    test_valid_value(`color`, `lab(from lab(25 20 50) l a b / none)`, `lab(25 20 50 / none)`);
-    test_valid_value(`color`, `lab(from lab(25 20 50 / 40%) l a none / alpha)`, `lab(25 20 none / 0.4)`);
-    test_valid_value(`color`, `lab(from lab(25 20 50 / 40%) l a b / none)`, `lab(25 20 50 / none)`);
+    fuzzy_test_valid_color(`lab(from lab(25 20 50) none none none)`, `lab(none none none)`);
+    fuzzy_test_valid_color(`lab(from lab(25 20 50) none none none / none)`, `lab(none none none / none)`);
+    fuzzy_test_valid_color(`lab(from lab(25 20 50) l a none)`, `lab(25 20 none)`);
+    fuzzy_test_valid_color(`lab(from lab(25 20 50) l a none / alpha)`, `lab(25 20 none)`);
+    fuzzy_test_valid_color(`lab(from lab(25 20 50) l a b / none)`, `lab(25 20 50 / none)`);
+    fuzzy_test_valid_color(`lab(from lab(25 20 50 / 40%) l a none / alpha)`, `lab(25 20 none / 0.4)`);
+    fuzzy_test_valid_color(`lab(from lab(25 20 50 / 40%) l a b / none)`, `lab(25 20 50 / none)`);
     // FIXME: Clarify with spec editors if 'none' should pass through to the constants.
-    test_valid_value(`color`, `lab(from lab(none none none) l a b)`, `lab(0 0 0)`);
-    test_valid_value(`color`, `lab(from lab(none none none / none) l a b / alpha)`, `lab(0 0 0 / 0)`);
-    test_valid_value(`color`, `lab(from lab(25 none 50) l a b)`, `lab(25 0 50)`);
-    test_valid_value(`color`, `lab(from lab(25 20 50 / none) l a b / alpha)`, `lab(25 20 50 / 0)`);
+    fuzzy_test_valid_color(`lab(from lab(none none none) l a b)`, `lab(0 0 0)`);
+    fuzzy_test_valid_color(`lab(from lab(none none none / none) l a b / alpha)`, `lab(0 0 0 / 0)`);
+    fuzzy_test_valid_color(`lab(from lab(25 none 50) l a b)`, `lab(25 0 50)`);
+    fuzzy_test_valid_color(`lab(from lab(25 20 50 / none) l a b / alpha)`, `lab(25 20 50 / 0)`);
+
+    // Testing with 'currentColor'
+    fuzzy_test_valid_color(`lab(from currentColor l a b)`, `lab(from currentColor l a b)`);
 
     // oklab()
 
     // Testing no modifications.
-    test_valid_value(`color`, `oklab(from oklab(0.25 0.2 0.5) l a b)`, `oklab(0.25 0.2 0.5)`);
-    test_valid_value(`color`, `oklab(from oklab(0.25 0.2 0.5) l a b / alpha)`, `oklab(0.25 0.2 0.5)`);
-    test_valid_value(`color`, `oklab(from oklab(0.25 0.2 0.5 / 40%) l a b / alpha)`, `oklab(0.25 0.2 0.5 / 0.4)`);
-    test_valid_value(`color`, `oklab(from oklab(2 3 4 / 500%) l a b / alpha)`, `oklab(1 3 4)`);
-    test_valid_value(`color`, `oklab(from oklab(-2 -3 -4 / -500%) l a b / alpha)`, `oklab(0 -3 -4 / 0)`);
+    fuzzy_test_valid_color(`oklab(from oklab(0.25 0.2 0.5) l a b)`, `oklab(0.25 0.2 0.5)`);
+    fuzzy_test_valid_color(`oklab(from oklab(0.25 0.2 0.5) l a b / alpha)`, `oklab(0.25 0.2 0.5)`);
+    fuzzy_test_valid_color(`oklab(from oklab(0.25 0.2 0.5 / 40%) l a b / alpha)`, `oklab(0.25 0.2 0.5 / 0.4)`);
+    fuzzy_test_valid_color(`oklab(from oklab(2 3 4 / 500%) l a b / alpha)`, `oklab(1 3 4)`);
+    fuzzy_test_valid_color(`oklab(from oklab(-2 -3 -4 / -500%) l a b / alpha)`, `oklab(0 -3 -4 / 0)`);
 
     // Test nesting relative colors.
-    test_valid_value(`color`, `oklab(from oklab(from oklab(0.25 0.2 0.5) l a b) l a b)`, `oklab(0.25 0.2 0.5)`);
+    fuzzy_test_valid_color(`oklab(from oklab(from oklab(0.25 0.2 0.5) l a b) l a b)`, `oklab(0.25 0.2 0.5)`);
 
     // Testing non-oklab origin to see conversion.
-    test_valid_value(`color`, `oklab(from color(display-p3 0 0 0) l a b / alpha)`, `oklab(0 0 0)`);
+    fuzzy_test_valid_color(`oklab(from color(display-p3 0 0 0) l a b / alpha)`, `oklab(0 0 0)`);
 
     // Testing replacement with 0.
-    test_valid_value(`color`, `oklab(from oklab(0.25 0.2 0.5) 0 0 0)`, `oklab(0 0 0)`);
-    test_valid_value(`color`, `oklab(from oklab(0.25 0.2 0.5) 0 0 0 / 0)`, `oklab(0 0 0 / 0)`);
-    test_valid_value(`color`, `oklab(from oklab(0.25 0.2 0.5) 0 a b / alpha)`, `oklab(0 0.2 0.5)`);
-    test_valid_value(`color`, `oklab(from oklab(0.25 0.2 0.5) l 0 b / alpha)`, `oklab(0.25 0 0.5)`);
-    test_valid_value(`color`, `oklab(from oklab(0.25 0.2 0.5) l a 0 / alpha)`, `oklab(0.25 0.2 0)`);
-    test_valid_value(`color`, `oklab(from oklab(0.25 0.2 0.5) l a b / 0)`, `oklab(0.25 0.2 0.5 / 0)`);
-    test_valid_value(`color`, `oklab(from oklab(0.25 0.2 0.5 / 40%) 0 a b / alpha)`, `oklab(0 0.2 0.5 / 0.4)`);
-    test_valid_value(`color`, `oklab(from oklab(0.25 0.2 0.5 / 40%) l 0 b / alpha)`, `oklab(0.25 0 0.5 / 0.4)`);
-    test_valid_value(`color`, `oklab(from oklab(0.25 0.2 0.5 / 40%) l a 0 / alpha)`, `oklab(0.25 0.2 0 / 0.4)`);
-    test_valid_value(`color`, `oklab(from oklab(0.25 0.2 0.5 / 40%) l a b / 0)`, `oklab(0.25 0.2 0.5 / 0)`);
+    fuzzy_test_valid_color(`oklab(from oklab(0.25 0.2 0.5) 0 0 0)`, `oklab(0 0 0)`);
+    fuzzy_test_valid_color(`oklab(from oklab(0.25 0.2 0.5) 0 0 0 / 0)`, `oklab(0 0 0 / 0)`);
+    fuzzy_test_valid_color(`oklab(from oklab(0.25 0.2 0.5) 0 a b / alpha)`, `oklab(0 0.2 0.5)`);
+    fuzzy_test_valid_color(`oklab(from oklab(0.25 0.2 0.5) l 0 b / alpha)`, `oklab(0.25 0 0.5)`);
+    fuzzy_test_valid_color(`oklab(from oklab(0.25 0.2 0.5) l a 0 / alpha)`, `oklab(0.25 0.2 0)`);
+    fuzzy_test_valid_color(`oklab(from oklab(0.25 0.2 0.5) l a b / 0)`, `oklab(0.25 0.2 0.5 / 0)`);
+    fuzzy_test_valid_color(`oklab(from oklab(0.25 0.2 0.5 / 40%) 0 a b / alpha)`, `oklab(0 0.2 0.5 / 0.4)`);
+    fuzzy_test_valid_color(`oklab(from oklab(0.25 0.2 0.5 / 40%) l 0 b / alpha)`, `oklab(0.25 0 0.5 / 0.4)`);
+    fuzzy_test_valid_color(`oklab(from oklab(0.25 0.2 0.5 / 40%) l a 0 / alpha)`, `oklab(0.25 0.2 0 / 0.4)`);
+    fuzzy_test_valid_color(`oklab(from oklab(0.25 0.2 0.5 / 40%) l a b / 0)`, `oklab(0.25 0.2 0.5 / 0)`);
 
     // Testing replacement with a constant.
-    test_valid_value(`color`, `oklab(from oklab(0.25 0.2 0.5) 0.35 a b / alpha)`, `oklab(0.35 0.2 0.5)`);
-    test_valid_value(`color`, `oklab(from oklab(0.25 0.2 0.5) l 0.35 b / alpha)`, `oklab(0.25 0.35 0.5)`);
-    test_valid_value(`color`, `oklab(from oklab(0.25 0.2 0.5) l a 0.35 / alpha)`, `oklab(0.25 0.2 0.35)`);
-    test_valid_value(`color`, `oklab(from oklab(0.25 0.2 0.5) l a b / .35)`, `oklab(0.25 0.2 0.5 / 0.35)`);
-    test_valid_value(`color`, `oklab(from oklab(0.25 0.2 0.5 / 40%) 0.35 a b / alpha)`, `oklab(0.35 0.2 0.5 / 0.4)`);
-    test_valid_value(`color`, `oklab(from oklab(0.25 0.2 0.5 / 40%) l 0.35 b / alpha)`, `oklab(0.25 0.35 0.5 / 0.4)`);
-    test_valid_value(`color`, `oklab(from oklab(0.25 0.2 0.5 / 40%) l a 0.35 / alpha)`, `oklab(0.25 0.2 0.35 / 0.4)`);
-    test_valid_value(`color`, `oklab(from oklab(0.25 0.2 0.5 / 40%) l a b / .35)`, `oklab(0.25 0.2 0.5 / 0.35)`);
-    test_valid_value(`color`, `oklab(from oklab(0.7 0.45 0.3 / 40%) 2 3 4 / 500)`, `oklab(1 3 4)`);
-    test_valid_value(`color`, `oklab(from oklab(0.7 0.45 0.3 / 40%) -2 -3 -4 / -500)`, `oklab(0 -3 -4 / 0)`);
+    fuzzy_test_valid_color(`oklab(from oklab(0.25 0.2 0.5) 0.35 a b / alpha)`, `oklab(0.35 0.2 0.5)`);
+    fuzzy_test_valid_color(`oklab(from oklab(0.25 0.2 0.5) l 0.35 b / alpha)`, `oklab(0.25 0.35 0.5)`);
+    fuzzy_test_valid_color(`oklab(from oklab(0.25 0.2 0.5) l a 0.35 / alpha)`, `oklab(0.25 0.2 0.35)`);
+    fuzzy_test_valid_color(`oklab(from oklab(0.25 0.2 0.5) l a b / .35)`, `oklab(0.25 0.2 0.5 / 0.35)`);
+    fuzzy_test_valid_color(`oklab(from oklab(0.25 0.2 0.5 / 40%) 0.35 a b / alpha)`, `oklab(0.35 0.2 0.5 / 0.4)`);
+    fuzzy_test_valid_color(`oklab(from oklab(0.25 0.2 0.5 / 40%) l 0.35 b / alpha)`, `oklab(0.25 0.35 0.5 / 0.4)`);
+    fuzzy_test_valid_color(`oklab(from oklab(0.25 0.2 0.5 / 40%) l a 0.35 / alpha)`, `oklab(0.25 0.2 0.35 / 0.4)`);
+    fuzzy_test_valid_color(`oklab(from oklab(0.25 0.2 0.5 / 40%) l a b / .35)`, `oklab(0.25 0.2 0.5 / 0.35)`);
+    fuzzy_test_valid_color(`oklab(from oklab(0.7 0.45 0.3 / 40%) 2 3 4 / 500)`, `oklab(1 3 4)`);
+    fuzzy_test_valid_color(`oklab(from oklab(0.7 0.45 0.3 / 40%) -2 -3 -4 / -500)`, `oklab(0 -3 -4 / 0)`);
 
     // Testing valid permutation (types match).
-    test_valid_value(`color`, `oklab(from oklab(0.25 0.2 0.5) l b a)`, `oklab(0.25 0.5 0.2)`);
-    test_valid_value(`color`, `oklab(from oklab(0.25 0.2 0.5) l a a / a)`, `oklab(0.25 0.2 0.2 / 0.2)`);
-    test_valid_value(`color`, `oklab(from oklab(0.25 0.2 0.5 / 40%) l b a)`, `oklab(0.25 0.5 0.2 / 0.4)`);
-    test_valid_value(`color`, `oklab(from oklab(0.25 0.2 0.5 / 40%) l a a / a)`, `oklab(0.25 0.2 0.2 / 0.2)`);
+    fuzzy_test_valid_color(`oklab(from oklab(0.25 0.2 0.5) l b a)`, `oklab(0.25 0.5 0.2)`);
+    fuzzy_test_valid_color(`oklab(from oklab(0.25 0.2 0.5) l a a / a)`, `oklab(0.25 0.2 0.2 / 0.2)`);
+    fuzzy_test_valid_color(`oklab(from oklab(0.25 0.2 0.5 / 40%) l b a)`, `oklab(0.25 0.5 0.2 / 0.4)`);
+    fuzzy_test_valid_color(`oklab(from oklab(0.25 0.2 0.5 / 40%) l a a / a)`, `oklab(0.25 0.2 0.2 / 0.2)`);
 
     // Testing with calc().
-    test_valid_value(`color`, `oklab(from oklab(0.25 0.2 0.5) calc(l) calc(a) calc(b))`, `oklab(0.25 0.2 0.5)`);
-    test_valid_value(`color`, `oklab(from oklab(0.25 0.2 0.5 / 40%) calc(l) calc(a) calc(b) / calc(alpha))`, `oklab(0.25 0.2 0.5 / 0.4)`);
+    fuzzy_test_valid_color(`oklab(from oklab(0.25 0.2 0.5) calc(l) calc(a) calc(b))`, `oklab(0.25 0.2 0.5)`);
+    fuzzy_test_valid_color(`oklab(from oklab(0.25 0.2 0.5 / 40%) calc(l) calc(a) calc(b) / calc(alpha))`, `oklab(0.25 0.2 0.5 / 0.4)`);
 
     // Testing with 'none'.
-    test_valid_value(`color`, `oklab(from oklab(0.25 0.2 0.5) none none none)`, `oklab(none none none)`);
-    test_valid_value(`color`, `oklab(from oklab(0.25 0.2 0.5) none none none / none)`, `oklab(none none none / none)`);
-    test_valid_value(`color`, `oklab(from oklab(0.25 0.2 0.5) l a none)`, `oklab(0.25 0.2 none)`);
-    test_valid_value(`color`, `oklab(from oklab(0.25 0.2 0.5) l a none / alpha)`, `oklab(0.25 0.2 none)`);
-    test_valid_value(`color`, `oklab(from oklab(0.25 0.2 0.5) l a b / none)`, `oklab(0.25 0.2 0.5 / none)`);
-    test_valid_value(`color`, `oklab(from oklab(0.25 0.2 0.5 / 40%) l a none / alpha)`, `oklab(0.25 0.2 none / 0.4)`);
-    test_valid_value(`color`, `oklab(from oklab(0.25 0.2 0.5 / 40%) l a b / none)`, `oklab(0.25 0.2 0.5 / none)`);
+    fuzzy_test_valid_color(`oklab(from oklab(0.25 0.2 0.5) none none none)`, `oklab(none none none)`);
+    fuzzy_test_valid_color(`oklab(from oklab(0.25 0.2 0.5) none none none / none)`, `oklab(none none none / none)`);
+    fuzzy_test_valid_color(`oklab(from oklab(0.25 0.2 0.5) l a none)`, `oklab(0.25 0.2 none)`);
+    fuzzy_test_valid_color(`oklab(from oklab(0.25 0.2 0.5) l a none / alpha)`, `oklab(0.25 0.2 none)`);
+    fuzzy_test_valid_color(`oklab(from oklab(0.25 0.2 0.5) l a b / none)`, `oklab(0.25 0.2 0.5 / none)`);
+    fuzzy_test_valid_color(`oklab(from oklab(0.25 0.2 0.5 / 40%) l a none / alpha)`, `oklab(0.25 0.2 none / 0.4)`);
+    fuzzy_test_valid_color(`oklab(from oklab(0.25 0.2 0.5 / 40%) l a b / none)`, `oklab(0.25 0.2 0.5 / none)`);
     // FIXME: Clarify with spec editors if 'none' should pass through to the constants.
-    test_valid_value(`color`, `oklab(from oklab(none none none) l a b)`, `oklab(0 0 0)`);
-    test_valid_value(`color`, `oklab(from oklab(none none none / none) l a b / alpha)`, `oklab(0 0 0 / 0)`);
-    test_valid_value(`color`, `oklab(from oklab(0.25 none 0.5) l a b)`, `oklab(0.25 0 0.5)`);
-    test_valid_value(`color`, `oklab(from oklab(0.25 0.2 0.5 / none) l a b / alpha)`, `oklab(0.25 0.2 0.5 / 0)`);
+    fuzzy_test_valid_color(`oklab(from oklab(none none none) l a b)`, `oklab(0 0 0)`);
+    fuzzy_test_valid_color(`oklab(from oklab(none none none / none) l a b / alpha)`, `oklab(0 0 0 / 0)`);
+    fuzzy_test_valid_color(`oklab(from oklab(0.25 none 0.5) l a b)`, `oklab(0.25 0 0.5)`);
+    fuzzy_test_valid_color(`oklab(from oklab(0.25 0.2 0.5 / none) l a b / alpha)`, `oklab(0.25 0.2 0.5 / 0)`);
 
-    // lab and oklab tests that require different results due to percent scaling differences.
-    test_valid_value(`color`, `lab(from lab(.7 45 30) alpha b a / l)`, `lab(100 30 45 / 0.7)`);
-    test_valid_value(`color`, `lab(from lab(.7 45 30) alpha a b / alpha)`, `lab(100 45 30)`);
-    test_valid_value(`color`, `lab(from lab(.7 45 30) alpha a a / alpha)`, `lab(100 45 45)`);
-    test_valid_value(`color`, `lab(from lab(.7 45 30 / 40%) alpha b a / l)`, `lab(40 30 45 / 0.7)`);
-    test_valid_value(`color`, `lab(from lab(.7 45 30 / 40%) alpha a b / alpha)`, `lab(40 45 30 / 0.4)`);
-    test_valid_value(`color`, `lab(from lab(.7 45 30 / 40%) alpha a a / alpha)`, `lab(40 45 45 / 0.4)`);
-
-    test_valid_value(`color`, `oklab(from oklab(.7 0.45 0.3) alpha b a / l)`, `oklab(1 0.3 0.45 / 0.7)`);
-    test_valid_value(`color`, `oklab(from oklab(.7 0.45 0.3) alpha a b / alpha)`, `oklab(1 0.45 0.3)`);
-    test_valid_value(`color`, `oklab(from oklab(.7 0.45 0.3) alpha a a / alpha)`, `oklab(1 0.45 0.45)`);
-    test_valid_value(`color`, `oklab(from oklab(.7 0.45 0.3 / 40%) alpha b a / l)`, `oklab(0.4 0.3 0.45 / 0.7)`);
-    test_valid_value(`color`, `oklab(from oklab(.7 0.45 0.3 / 40%) alpha a b / alpha)`, `oklab(0.4 0.45 0.3 / 0.4)`);
-    test_valid_value(`color`, `oklab(from oklab(.7 0.45 0.3 / 40%) alpha a a / alpha)`, `oklab(0.4 0.45 0.45 / 0.4)`);
+    // Testing with 'currentColor'
+    fuzzy_test_valid_color(`oklab(from currentColor l a b)`, `oklab(from currentColor l a b)`);
 
     // lch()
 
     // Testing no modifications.
-    test_valid_value(`color`, `lch(from lch(0.7 45 30) l c h)`, `lch(0.7 45 30)`);
-    test_valid_value(`color`, `lch(from lch(0.7 45 30) l c h / alpha)`, `lch(0.7 45 30)`);
-    test_valid_value(`color`, `lch(from lch(0.7 45 30 / 40%) l c h / alpha)`, `lch(0.7 45 30 / 0.4)`);
-    test_valid_value(`color`, `lch(from lch(200 300 400 / 500%) l c h / alpha)`, `lch(100 300 40)`);
-    test_valid_value(`color`, `lch(from lch(-200 -300 -400 / -500%) l c h / alpha)`, `lch(0 0 320 / 0)`);
+    fuzzy_test_valid_color(`lch(from lch(0.7 45 30) l c h)`, `lch(0.7 45 30)`);
+    fuzzy_test_valid_color(`lch(from lch(0.7 45 30) l c h / alpha)`, `lch(0.7 45 30)`);
+    fuzzy_test_valid_color(`lch(from lch(0.7 45 30 / 40%) l c h / alpha)`, `lch(0.7 45 30 / 0.4)`);
+    fuzzy_test_valid_color(`lch(from lch(200 300 400 / 500%) l c h / alpha)`, `lch(100 300 40)`);
+    fuzzy_test_valid_color(`lch(from lch(-200 -300 -400 / -500%) l c h / alpha)`, `lch(0 0 320 / 0)`);
 
     // Test nesting relative colors.
-    test_valid_value(`color`, `lch(from lch(from lch(0.7 45 30) l c h) l c h)`, `lch(0.7 45 30)`);
+    fuzzy_test_valid_color(`lch(from lch(from lch(0.7 45 30) l c h) l c h)`, `lch(0.7 45 30)`);
 
     // Testing non-sRGB origin colors (no gamut mapping will happen since the destination is not a bounded RGB color space).
-    test_valid_value(`color`, `lch(from color(display-p3 0 0 0) l c h / alpha)`, `lch(0 0 0)`);
-    test_valid_value(`color`, `lch(from lab(0.7 45 30) l c h / alpha)`, `lch(0.7 54.08327 33.690067)`);
+    fuzzy_test_valid_color(`lch(from color(display-p3 0 0 0) l c h / alpha)`, `lch(0 0 0)`);
+    fuzzy_test_valid_color(`lch(from lab(0.7 45 30) l c h / alpha)`, `lch(0.7 54.08327 33.690067)`);
 
     // Testing replacement with 0.
-    test_valid_value(`color`, `lch(from lch(0.7 45 30) 0 0 0)`, `lch(0 0 0)`);
-    test_valid_value(`color`, `lch(from lch(0.7 45 30) 0 0 0deg)`, `lch(0 0 0)`);
-    test_valid_value(`color`, `lch(from lch(0.7 45 30) 0 0 0 / 0)`, `lch(0 0 0 / 0)`);
-    test_valid_value(`color`, `lch(from lch(0.7 45 30) 0 0 0deg / 0)`, `lch(0 0 0 / 0)`);
-    test_valid_value(`color`, `lch(from lch(0.7 45 30) 0 c h / alpha)`, `lch(0 45 30)`);
-    test_valid_value(`color`, `lch(from lch(0.7 45 30) l 0 h / alpha)`, `lch(0.7 0 30)`);
-    test_valid_value(`color`, `lch(from lch(0.7 45 30) l c 0 / alpha)`, `lch(0.7 45 0)`);
-    test_valid_value(`color`, `lch(from lch(0.7 45 30) l c 0deg / alpha)`, `lch(0.7 45 0)`);
-    test_valid_value(`color`, `lch(from lch(0.7 45 30) l c h / 0)`, `lch(0.7 45 30 / 0)`);
-    test_valid_value(`color`, `lch(from lch(0.7 45 30 / 40%) 0 c h / alpha)`, `lch(0 45 30 / 0.4)`);
-    test_valid_value(`color`, `lch(from lch(0.7 45 30 / 40%) l 0 h / alpha)`, `lch(0.7 0 30 / 0.4)`);
-    test_valid_value(`color`, `lch(from lch(0.7 45 30 / 40%) l c 0 / alpha)`, `lch(0.7 45 0 / 0.4)`);
-    test_valid_value(`color`, `lch(from lch(0.7 45 30 / 40%) l c 0deg / alpha)`, `lch(0.7 45 0 / 0.4)`);
-    test_valid_value(`color`, `lch(from lch(0.7 45 30 / 40%) l c h / 0)`, `lch(0.7 45 30 / 0)`);
+    fuzzy_test_valid_color(`lch(from lch(0.7 45 30) 0 0 0)`, `lch(0 0 0)`);
+    fuzzy_test_valid_color(`lch(from lch(0.7 45 30) 0 0 0deg)`, `lch(0 0 0)`);
+    fuzzy_test_valid_color(`lch(from lch(0.7 45 30) 0 0 0 / 0)`, `lch(0 0 0 / 0)`);
+    fuzzy_test_valid_color(`lch(from lch(0.7 45 30) 0 0 0deg / 0)`, `lch(0 0 0 / 0)`);
+    fuzzy_test_valid_color(`lch(from lch(0.7 45 30) 0 c h / alpha)`, `lch(0 45 30)`);
+    fuzzy_test_valid_color(`lch(from lch(0.7 45 30) l 0 h / alpha)`, `lch(0.7 0 30)`);
+    fuzzy_test_valid_color(`lch(from lch(0.7 45 30) l c 0 / alpha)`, `lch(0.7 45 0)`);
+    fuzzy_test_valid_color(`lch(from lch(0.7 45 30) l c 0deg / alpha)`, `lch(0.7 45 0)`);
+    fuzzy_test_valid_color(`lch(from lch(0.7 45 30) l c h / 0)`, `lch(0.7 45 30 / 0)`);
+    fuzzy_test_valid_color(`lch(from lch(0.7 45 30 / 40%) 0 c h / alpha)`, `lch(0 45 30 / 0.4)`);
+    fuzzy_test_valid_color(`lch(from lch(0.7 45 30 / 40%) l 0 h / alpha)`, `lch(0.7 0 30 / 0.4)`);
+    fuzzy_test_valid_color(`lch(from lch(0.7 45 30 / 40%) l c 0 / alpha)`, `lch(0.7 45 0 / 0.4)`);
+    fuzzy_test_valid_color(`lch(from lch(0.7 45 30 / 40%) l c 0deg / alpha)`, `lch(0.7 45 0 / 0.4)`);
+    fuzzy_test_valid_color(`lch(from lch(0.7 45 30 / 40%) l c h / 0)`, `lch(0.7 45 30 / 0)`);
 
     // Testing replacement with a constant.
-    test_valid_value(`color`, `lch(from lch(0.7 45 30) 25 c h / alpha)`, `lch(25 45 30)`);
-    test_valid_value(`color`, `lch(from lch(0.7 45 30) l 25 h / alpha)`, `lch(0.7 25 30)`);
-    test_valid_value(`color`, `lch(from lch(0.7 45 30) l c 25 / alpha)`, `lch(0.7 45 25)`);
-    test_valid_value(`color`, `lch(from lch(0.7 45 30) l c 25deg / alpha)`, `lch(0.7 45 25)`);
-    test_valid_value(`color`, `lch(from lch(0.7 45 30) l c h / .25)`, `lch(0.7 45 30 / 0.25)`);
-    test_valid_value(`color`, `lch(from lch(0.7 45 30 / 40%) 25 c h / alpha)`, `lch(25 45 30 / 0.4)`);
-    test_valid_value(`color`, `lch(from lch(0.7 45 30 / 40%) l 25 h / alpha)`, `lch(0.7 25 30 / 0.4)`);
-    test_valid_value(`color`, `lch(from lch(0.7 45 30 / 40%) l c 25 / alpha)`, `lch(0.7 45 25 / 0.4)`);
-    test_valid_value(`color`, `lch(from lch(0.7 45 30 / 40%) l c 25deg / alpha)`, `lch(0.7 45 25 / 0.4)`);
-    test_valid_value(`color`, `lch(from lch(0.7 45 30 / 40%) l c h / .25)`, `lch(0.7 45 30 / 0.25)`);
-    test_valid_value(`color`, `lch(from lch(0.7 45 30 / 40%) 200 300 400 / 500)`, `lch(100 300 40)`);
-    test_valid_value(`color`, `lch(from lch(0.7 45 30 / 40%) -200 -300 -400 / -500)`, `lch(0 0 320 / 0)`);
-    test_valid_value(`color`, `lch(from lch(0.7 45 30 / 40%) 50 120 400deg / 500)`, `lch(50 120 40)`);
-    test_valid_value(`color`, `lch(from lch(0.7 45 30 / 40%) 50 120 -400deg / -500)`, `lch(50 120 320 / 0)`);
+    fuzzy_test_valid_color(`lch(from lch(0.7 45 30) 25 c h / alpha)`, `lch(25 45 30)`);
+    fuzzy_test_valid_color(`lch(from lch(0.7 45 30) l 25 h / alpha)`, `lch(0.7 25 30)`);
+    fuzzy_test_valid_color(`lch(from lch(0.7 45 30) l c 25 / alpha)`, `lch(0.7 45 25)`);
+    fuzzy_test_valid_color(`lch(from lch(0.7 45 30) l c 25deg / alpha)`, `lch(0.7 45 25)`);
+    fuzzy_test_valid_color(`lch(from lch(0.7 45 30) l c h / .25)`, `lch(0.7 45 30 / 0.25)`);
+    fuzzy_test_valid_color(`lch(from lch(0.7 45 30 / 40%) 25 c h / alpha)`, `lch(25 45 30 / 0.4)`);
+    fuzzy_test_valid_color(`lch(from lch(0.7 45 30 / 40%) l 25 h / alpha)`, `lch(0.7 25 30 / 0.4)`);
+    fuzzy_test_valid_color(`lch(from lch(0.7 45 30 / 40%) l c 25 / alpha)`, `lch(0.7 45 25 / 0.4)`);
+    fuzzy_test_valid_color(`lch(from lch(0.7 45 30 / 40%) l c 25deg / alpha)`, `lch(0.7 45 25 / 0.4)`);
+    fuzzy_test_valid_color(`lch(from lch(0.7 45 30 / 40%) l c h / .25)`, `lch(0.7 45 30 / 0.25)`);
+    fuzzy_test_valid_color(`lch(from lch(0.7 45 30 / 40%) 200 300 400 / 500)`, `lch(100 300 40)`);
+    fuzzy_test_valid_color(`lch(from lch(0.7 45 30 / 40%) -200 -300 -400 / -500)`, `lch(0 0 320 / 0)`);
+    fuzzy_test_valid_color(`lch(from lch(0.7 45 30 / 40%) 50 120 400deg / 500)`, `lch(50 120 40)`);
+    fuzzy_test_valid_color(`lch(from lch(0.7 45 30 / 40%) 50 120 -400deg / -500)`, `lch(50 120 320 / 0)`);
 
     // Testing valid permutation (types match).
     // NOTE: 'c' is a vaild hue, as hue is <angle>|<number>.
-    test_valid_value(`color`, `lch(from lch(.7 45 30) l c c / alpha)`, `lch(0.7 45 45)`);
-    test_valid_value(`color`, `lch(from lch(.7 45 30 / 40%) l c c / alpha)`, `lch(0.7 45 45 / 0.4)`);
+    fuzzy_test_valid_color(`lch(from lch(.7 45 30) l c c / alpha)`, `lch(0.7 45 45)`);
+    fuzzy_test_valid_color(`lch(from lch(.7 45 30 / 40%) l c c / alpha)`, `lch(0.7 45 45 / 0.4)`);
 
     // Testing with calc().
-    test_valid_value(`color`, `lch(from lch(0.7 45 30) calc(l) calc(c) calc(h))`, `lch(0.7 45 30)`);
-    test_valid_value(`color`, `lch(from lch(0.7 45 30 / 40%) calc(l) calc(c) calc(h) / calc(alpha))`, `lch(0.7 45 30 / 0.4)`);
+    fuzzy_test_valid_color(`lch(from lch(0.7 45 30) calc(l) calc(c) calc(h))`, `lch(0.7 45 30)`);
+    fuzzy_test_valid_color(`lch(from lch(0.7 45 30 / 40%) calc(l) calc(c) calc(h) / calc(alpha))`, `lch(0.7 45 30 / 0.4)`);
 
     // Testing with 'none'.
-    test_valid_value(`color`, `lch(from lch(0.7 45 30) none none none)`,                                   `lch(none none none)`);
-    test_valid_value(`color`, `lch(from lch(0.7 45 30) none none none / none)`,                            `lch(none none none / none)`);
-    test_valid_value(`color`, `lch(from lch(0.7 45 30) l c none)`,                                         `lch(0.7 45 none)`);
-    test_valid_value(`color`, `lch(from lch(0.7 45 30) l c none / alpha)`,                                 `lch(0.7 45 none)`);
-    test_valid_value(`color`, `lch(from lch(0.7 45 30) l c h / none)`,                                     `lch(0.7 45 30 / none)`);
-    test_valid_value(`color`, `lch(from lch(0.7 45 30 / 40%) l c none / alpha)`,                           `lch(0.7 45 none / 0.4)`);
-    test_valid_value(`color`, `lch(from lch(0.7 45 30 / 40%) l c h / none)`,                               `lch(0.7 45 30 / none)`);
+    fuzzy_test_valid_color(`lch(from lch(0.7 45 30) none none none)`,                                   `lch(none none none)`);
+    fuzzy_test_valid_color(`lch(from lch(0.7 45 30) none none none / none)`,                            `lch(none none none / none)`);
+    fuzzy_test_valid_color(`lch(from lch(0.7 45 30) l c none)`,                                         `lch(0.7 45 none)`);
+    fuzzy_test_valid_color(`lch(from lch(0.7 45 30) l c none / alpha)`,                                 `lch(0.7 45 none)`);
+    fuzzy_test_valid_color(`lch(from lch(0.7 45 30) l c h / none)`,                                     `lch(0.7 45 30 / none)`);
+    fuzzy_test_valid_color(`lch(from lch(0.7 45 30 / 40%) l c none / alpha)`,                           `lch(0.7 45 none / 0.4)`);
+    fuzzy_test_valid_color(`lch(from lch(0.7 45 30 / 40%) l c h / none)`,                               `lch(0.7 45 30 / none)`);
     // FIXME: Clarify with spec editors if 'none' should pass through to the constants.
-    test_valid_value(`color`, `lch(from lch(none none none) l c h)`,                                       `lch(0 0 0)`);
-    test_valid_value(`color`, `lch(from lch(none none none / none) l c h / alpha)`,                        `lch(0 0 0 / 0)`);
-    test_valid_value(`color`, `lch(from lch(0.7 none 30) l c h)`,                                          `lch(0.7 0 30)`);
-    test_valid_value(`color`, `lch(from lch(0.7 45 30 / none) l c h / alpha)`,                             `lch(0.7 45 30 / 0)`);
+    fuzzy_test_valid_color(`lch(from lch(none none none) l c h)`,                                       `lch(0 0 0)`);
+    fuzzy_test_valid_color(`lch(from lch(none none none / none) l c h / alpha)`,                        `lch(0 0 0 / 0)`);
+    fuzzy_test_valid_color(`lch(from lch(0.7 none 30) l c h)`,                                          `lch(0.7 0 30)`);
+    fuzzy_test_valid_color(`lch(from lch(0.7 45 30 / none) l c h / alpha)`,                             `lch(0.7 45 30 / 0)`);
+
+    // Testing with 'currentColor'
+    fuzzy_test_valid_color(`lch(from currentColor) l c h)`, `lch(from currentColor) l c h)`);
 
     // oklch()
 
     // Testing no modifications.
-    test_valid_value(`color`, `oklch(from oklch(0.7 0.45 30) l c h)`, `oklch(0.7 0.45 30)`);
-    test_valid_value(`color`, `oklch(from oklch(0.7 0.45 30) l c h / alpha)`, `oklch(0.7 0.45 30)`);
-    test_valid_value(`color`, `oklch(from oklch(0.7 0.45 30 / 40%) l c h / alpha)`, `oklch(0.7 0.45 30 / 0.4)`);
-    test_valid_value(`color`, `oklch(from oklch(2 3 400 / 500%) l c h / alpha)`, `oklch(1 3 40)`);
-    test_valid_value(`color`, `oklch(from oklch(-2 -3 -400 / -500%) l c h / alpha)`, `oklch(0 0 320 / 0)`);
+    fuzzy_test_valid_color(`oklch(from oklch(0.7 0.45 30) l c h)`, `oklch(0.7 0.45 30)`);
+    fuzzy_test_valid_color(`oklch(from oklch(0.7 0.45 30) l c h / alpha)`, `oklch(0.7 0.45 30)`);
+    fuzzy_test_valid_color(`oklch(from oklch(0.7 0.45 30 / 40%) l c h / alpha)`, `oklch(0.7 0.45 30 / 0.4)`);
+    fuzzy_test_valid_color(`oklch(from oklch(2 3 400 / 500%) l c h / alpha)`, `oklch(1 3 40)`);
+    fuzzy_test_valid_color(`oklch(from oklch(-2 -3 -400 / -500%) l c h / alpha)`, `oklch(0 0 320 / 0)`);
 
     // Test nesting relative colors.
-    test_valid_value(`color`, `oklch(from oklch(from oklch(0.7 0.45 30) l c h) l c h)`, `oklch(0.7 0.45 30)`);
+    fuzzy_test_valid_color(`oklch(from oklch(from oklch(0.7 0.45 30) l c h) l c h)`, `oklch(0.7 0.45 30)`);
 
     // Testing non-sRGB origin colors (no gamut mapping will happen since the destination is not a bounded RGB color space).
-    test_valid_value(`color`, `oklch(from color(display-p3 0 0 0) l c h / alpha)`, `oklch(0 0 0)`);
+    fuzzy_test_valid_color(`oklch(from color(display-p3 0 0 0) l c h / alpha)`, `oklch(0 0 0)`);
     // TODO: redo conversion with oklab(0.7 0.45 0.3)
-    test_valid_value(`color`, `oklch(from oklab(0.7 45 30) l c h / alpha)`, `oklch(0.7 54.08327 33.690067)`);
+    fuzzy_test_valid_color(`oklch(from oklab(0.7 45 30) l c h / alpha)`, `oklch(0.7 54.08327 33.690067)`);
 
     // Testing replacement with 0.
-    test_valid_value(`color`, `oklch(from oklch(0.7 0.45 30) 0 0 0)`, `oklch(0 0 0)`);
-    test_valid_value(`color`, `oklch(from oklch(0.7 0.45 30) 0 0 0deg)`, `oklch(0 0 0)`);
-    test_valid_value(`color`, `oklch(from oklch(0.7 0.45 30) 0 0 0 / 0)`, `oklch(0 0 0 / 0)`);
-    test_valid_value(`color`, `oklch(from oklch(0.7 0.45 30) 0 0 0deg / 0)`, `oklch(0 0 0 / 0)`);
-    test_valid_value(`color`, `oklch(from oklch(0.7 0.45 30) 0 c h / alpha)`, `oklch(0 0.45 30)`);
-    test_valid_value(`color`, `oklch(from oklch(0.7 0.45 30) l 0 h / alpha)`, `oklch(0.7 0 30)`);
-    test_valid_value(`color`, `oklch(from oklch(0.7 0.45 30) l c 0 / alpha)`, `oklch(0.7 0.45 0)`);
-    test_valid_value(`color`, `oklch(from oklch(0.7 0.45 30) l c 0deg / alpha)`, `oklch(0.7 0.45 0)`);
-    test_valid_value(`color`, `oklch(from oklch(0.7 0.45 30) l c h / 0)`, `oklch(0.7 0.45 30 / 0)`);
-    test_valid_value(`color`, `oklch(from oklch(0.7 0.45 30 / 40%) 0 c h / alpha)`, `oklch(0 0.45 30 / 0.4)`);
-    test_valid_value(`color`, `oklch(from oklch(0.7 0.45 30 / 40%) l 0 h / alpha)`, `oklch(0.7 0 30 / 0.4)`);
-    test_valid_value(`color`, `oklch(from oklch(0.7 0.45 30 / 40%) l c 0 / alpha)`, `oklch(0.7 0.45 0 / 0.4)`);
-    test_valid_value(`color`, `oklch(from oklch(0.7 0.45 30 / 40%) l c 0deg / alpha)`, `oklch(0.7 0.45 0 / 0.4)`);
-    test_valid_value(`color`, `oklch(from oklch(0.7 0.45 30 / 40%) l c h / 0)`, `oklch(0.7 0.45 30 / 0)`);
+    fuzzy_test_valid_color(`oklch(from oklch(0.7 0.45 30) 0 0 0)`, `oklch(0 0 0)`);
+    fuzzy_test_valid_color(`oklch(from oklch(0.7 0.45 30) 0 0 0deg)`, `oklch(0 0 0)`);
+    fuzzy_test_valid_color(`oklch(from oklch(0.7 0.45 30) 0 0 0 / 0)`, `oklch(0 0 0 / 0)`);
+    fuzzy_test_valid_color(`oklch(from oklch(0.7 0.45 30) 0 0 0deg / 0)`, `oklch(0 0 0 / 0)`);
+    fuzzy_test_valid_color(`oklch(from oklch(0.7 0.45 30) 0 c h / alpha)`, `oklch(0 0.45 30)`);
+    fuzzy_test_valid_color(`oklch(from oklch(0.7 0.45 30) l 0 h / alpha)`, `oklch(0.7 0 30)`);
+    fuzzy_test_valid_color(`oklch(from oklch(0.7 0.45 30) l c 0 / alpha)`, `oklch(0.7 0.45 0)`);
+    fuzzy_test_valid_color(`oklch(from oklch(0.7 0.45 30) l c 0deg / alpha)`, `oklch(0.7 0.45 0)`);
+    fuzzy_test_valid_color(`oklch(from oklch(0.7 0.45 30) l c h / 0)`, `oklch(0.7 0.45 30 / 0)`);
+    fuzzy_test_valid_color(`oklch(from oklch(0.7 0.45 30 / 40%) 0 c h / alpha)`, `oklch(0 0.45 30 / 0.4)`);
+    fuzzy_test_valid_color(`oklch(from oklch(0.7 0.45 30 / 40%) l 0 h / alpha)`, `oklch(0.7 0 30 / 0.4)`);
+    fuzzy_test_valid_color(`oklch(from oklch(0.7 0.45 30 / 40%) l c 0 / alpha)`, `oklch(0.7 0.45 0 / 0.4)`);
+    fuzzy_test_valid_color(`oklch(from oklch(0.7 0.45 30 / 40%) l c 0deg / alpha)`, `oklch(0.7 0.45 0 / 0.4)`);
+    fuzzy_test_valid_color(`oklch(from oklch(0.7 0.45 30 / 40%) l c h / 0)`, `oklch(0.7 0.45 30 / 0)`);
 
     // Testing replacement with a constant.
-    test_valid_value(`color`, `oklch(from oklch(0.7 0.45 30) 0.25 c h / alpha)`, `oklch(0.25 0.45 30)`);
-    test_valid_value(`color`, `oklch(from oklch(0.7 0.45 30) l 0.25 h / alpha)`, `oklch(0.7 0.25 30)`);
-    test_valid_value(`color`, `oklch(from oklch(0.7 0.45 30) l c 0.25 / alpha)`, `oklch(0.7 0.45 0.25)`);
-    test_valid_value(`color`, `oklch(from oklch(0.7 0.45 30) l c 25deg / alpha)`, `oklch(0.7 0.45 25)`);
-    test_valid_value(`color`, `oklch(from oklch(0.7 0.45 30) l c h / .25)`, `oklch(0.7 0.45 30 / 0.25)`);
-    test_valid_value(`color`, `oklch(from oklch(0.7 0.45 30 / 40%) 0.25 c h / alpha)`, `oklch(0.25 0.45 30 / 0.4)`);
-    test_valid_value(`color`, `oklch(from oklch(0.7 0.45 30 / 40%) l 0.25 h / alpha)`, `oklch(0.7 0.25 30 / 0.4)`);
-    test_valid_value(`color`, `oklch(from oklch(0.7 0.45 30 / 40%) l c 0.25 / alpha)`, `oklch(0.7 0.45 0.25 / 0.4)`);
-    test_valid_value(`color`, `oklch(from oklch(0.7 0.45 30 / 40%) l c 25deg / alpha)`, `oklch(0.7 0.45 25 / 0.4)`);
-    test_valid_value(`color`, `oklch(from oklch(0.7 0.45 30 / 40%) l c h / .25)`, `oklch(0.7 0.45 30 / 0.25)`);
-    test_valid_value(`color`, `oklch(from oklch(0.7 0.45 30 / 40%) 2 3 400 / 500)`, `oklch(2 3 40)`);
-    test_valid_value(`color`, `oklch(from oklch(0.7 0.45 30 / 40%) -2 -3 -400 / -500)`, `oklch(0 0 320 / 0)`);
-    test_valid_value(`color`, `oklch(from oklch(0.7 0.45 30 / 40%) 0.5 1.2 400deg / 500)`, `oklch(0.5 1.2 40)`);
-    test_valid_value(`color`, `oklch(from oklch(0.7 0.45 30 / 40%) 0.5 1.2 -400deg / -500)`, `oklch(0.5 1.2 320 / 0)`);
+    fuzzy_test_valid_color(`oklch(from oklch(0.7 0.45 30) 0.25 c h / alpha)`, `oklch(0.25 0.45 30)`);
+    fuzzy_test_valid_color(`oklch(from oklch(0.7 0.45 30) l 0.25 h / alpha)`, `oklch(0.7 0.25 30)`);
+    fuzzy_test_valid_color(`oklch(from oklch(0.7 0.45 30) l c 0.25 / alpha)`, `oklch(0.7 0.45 0.25)`);
+    fuzzy_test_valid_color(`oklch(from oklch(0.7 0.45 30) l c 25deg / alpha)`, `oklch(0.7 0.45 25)`);
+    fuzzy_test_valid_color(`oklch(from oklch(0.7 0.45 30) l c h / .25)`, `oklch(0.7 0.45 30 / 0.25)`);
+    fuzzy_test_valid_color(`oklch(from oklch(0.7 0.45 30 / 40%) 0.25 c h / alpha)`, `oklch(0.25 0.45 30 / 0.4)`);
+    fuzzy_test_valid_color(`oklch(from oklch(0.7 0.45 30 / 40%) l 0.25 h / alpha)`, `oklch(0.7 0.25 30 / 0.4)`);
+    fuzzy_test_valid_color(`oklch(from oklch(0.7 0.45 30 / 40%) l c 0.25 / alpha)`, `oklch(0.7 0.45 0.25 / 0.4)`);
+    fuzzy_test_valid_color(`oklch(from oklch(0.7 0.45 30 / 40%) l c 25deg / alpha)`, `oklch(0.7 0.45 25 / 0.4)`);
+    fuzzy_test_valid_color(`oklch(from oklch(0.7 0.45 30 / 40%) l c h / .25)`, `oklch(0.7 0.45 30 / 0.25)`);
+    fuzzy_test_valid_color(`oklch(from oklch(0.7 0.45 30 / 40%) 2 3 400 / 500)`, `oklch(1 3 40)`);
+    fuzzy_test_valid_color(`oklch(from oklch(0.7 0.45 30 / 40%) -2 -3 -400 / -500)`, `oklch(0 0 320 / 0)`);
+    fuzzy_test_valid_color(`oklch(from oklch(0.7 0.45 30 / 40%) 0.5 1.2 400deg / 500)`, `oklch(0.5 1.2 40)`);
+    fuzzy_test_valid_color(`oklch(from oklch(0.7 0.45 30 / 40%) 0.5 1.2 -400deg / -500)`, `oklch(0.5 1.2 320 / 0)`);
 
     // Testing valid permutation (types match).
     // NOTE: 'c' is a vaild hue, as hue is <angle>|<number>.
-    test_valid_value(`color`, `oklch(from oklch(.7 0.45 30) l c c / alpha)`, `oklch(0.7 0.45 0.45)`);
-    test_valid_value(`color`, `oklch(from oklch(.7 0.45 30 / 40%) l c c / alpha)`, `oklch(0.7 0.45 0.45 / 0.4)`);
+    fuzzy_test_valid_color(`oklch(from oklch(.7 0.45 30) l c c / alpha)`, `oklch(0.7 0.45 0.45)`);
+    fuzzy_test_valid_color(`oklch(from oklch(.7 0.45 30 / 40%) l c c / alpha)`, `oklch(0.7 0.45 0.45 / 0.4)`);
 
     // Testing with calc().
-    test_valid_value(`color`, `oklch(from oklch(0.7 0.45 30) calc(l) calc(c) calc(h))`, `oklch(0.7 0.45 30)`);
-    test_valid_value(`color`, `oklch(from oklch(0.7 0.45 30 / 40%) calc(l) calc(c) calc(h) / calc(alpha))`, `oklch(0.7 0.45 30 / 0.4)`);
+    fuzzy_test_valid_color(`oklch(from oklch(0.7 0.45 30) calc(l) calc(c) calc(h))`, `oklch(0.7 0.45 30)`);
+    fuzzy_test_valid_color(`oklch(from oklch(0.7 0.45 30 / 40%) calc(l) calc(c) calc(h) / calc(alpha))`, `oklch(0.7 0.45 30 / 0.4)`);
 
     // Testing with 'none'.
-    test_valid_value(`color`, `oklch(from oklch(0.7 0.45 30) none none none)`,                                   `oklch(none none none)`);
-    test_valid_value(`color`, `oklch(from oklch(0.7 0.45 30) none none none / none)`,                            `oklch(none none none / none)`);
-    test_valid_value(`color`, `oklch(from oklch(0.7 0.45 30) l c none)`,                                         `oklch(0.7 0.45 none)`);
-    test_valid_value(`color`, `oklch(from oklch(0.7 0.45 30) l c none / alpha)`,                                 `oklch(0.7 0.45 none)`);
-    test_valid_value(`color`, `oklch(from oklch(0.7 0.45 30) l c h / none)`,                                     `oklch(0.7 0.45 30 / none)`);
-    test_valid_value(`color`, `oklch(from oklch(0.7 0.45 30 / 40%) l c none / alpha)`,                           `oklch(0.7 0.45 none / 0.4)`);
-    test_valid_value(`color`, `oklch(from oklch(0.7 0.45 30 / 40%) l c h / none)`,                               `oklch(0.7 0.45 30 / none)`);
+    fuzzy_test_valid_color(`oklch(from oklch(0.7 0.45 30) none none none)`,                                   `oklch(none none none)`);
+    fuzzy_test_valid_color(`oklch(from oklch(0.7 0.45 30) none none none / none)`,                            `oklch(none none none / none)`);
+    fuzzy_test_valid_color(`oklch(from oklch(0.7 0.45 30) l c none)`,                                         `oklch(0.7 0.45 none)`);
+    fuzzy_test_valid_color(`oklch(from oklch(0.7 0.45 30) l c none / alpha)`,                                 `oklch(0.7 0.45 none)`);
+    fuzzy_test_valid_color(`oklch(from oklch(0.7 0.45 30) l c h / none)`,                                     `oklch(0.7 0.45 30 / none)`);
+    fuzzy_test_valid_color(`oklch(from oklch(0.7 0.45 30 / 40%) l c none / alpha)`,                           `oklch(0.7 0.45 none / 0.4)`);
+    fuzzy_test_valid_color(`oklch(from oklch(0.7 0.45 30 / 40%) l c h / none)`,                               `oklch(0.7 0.45 30 / none)`);
     // FIXME: Clarify with spec editors if 'none' should pass through to the constants.
-    test_valid_value(`color`, `oklch(from oklch(none none none) l c h)`,                                       `oklch(0 0 0)`);
-    test_valid_value(`color`, `oklch(from oklch(none none none / none) l c h / alpha)`,                        `oklch(0 0 0 / 0)`);
-    test_valid_value(`color`, `oklch(from oklch(0.7 none 30) l c h)`,                                          `oklch(0.7 0 30)`);
-    test_valid_value(`color`, `oklch(from oklch(0.7 0.45 30 / none) l c h / alpha)`,                             `oklch(0.7 0.45 30 / 0)`);
-
-    // lch and oklch tests that require different results due to percent scaling differences.
-    test_valid_value(`color`, `lch(from lch(.7 45 30) alpha c h / l)`, `lch(100 45 30 / 0.7)`);
-    test_valid_value(`color`, `lch(from lch(.7 45 30) alpha c h / alpha)`, `lch(100 45 30)`);
-    test_valid_value(`color`, `lch(from lch(.7 45 30) alpha c c / alpha)`, `lch(100 45 45)`);
-    test_valid_value(`color`, `lch(from lch(.7 45 30 / 40%) alpha c h / l)`, `lch(40 45 30 / 0.7)`);
-    test_valid_value(`color`, `lch(from lch(.7 45 30 / 40%) alpha c h / alpha)`, `lch(40 45 30 / 0.4)`);
-    test_valid_value(`color`, `lch(from lch(.7 45 30 / 40%) alpha c c / alpha)`, `lch(40 45 45 / 0.4)`);
-
-    test_valid_value(`color`, `oklch(from oklch(.7 0.45 30) alpha c h / l)`, `oklch(1 0.45 30 / 0.7)`);
-    test_valid_value(`color`, `oklch(from oklch(.7 0.45 30) alpha c h / alpha)`, `oklch(1 0.45 30)`);
-    test_valid_value(`color`, `oklch(from oklch(.7 0.45 30) alpha c c / alpha)`, `oklch(1 0.45 0.45)`);
-    test_valid_value(`color`, `oklch(from oklch(.7 0.45 30 / 40%) alpha c h / l)`, `oklch(0.4 0.45 30 / 0.7)`);
-    test_valid_value(`color`, `oklch(from oklch(.7 0.45 30 / 40%) alpha c h / alpha)`, `oklch(0.4 0.45 30 / 0.4)`);
-    test_valid_value(`color`, `oklch(from oklch(.7 0.45 30 / 40%) alpha c c / alpha)`, `oklch(0.4 0.45 0.45 / 0.4)`);
+    fuzzy_test_valid_color(`oklch(from oklch(none none none) l c h)`,                                       `oklch(0 0 0)`);
+    fuzzy_test_valid_color(`oklch(from oklch(none none none / none) l c h / alpha)`,                        `oklch(0 0 0 / 0)`);
+    fuzzy_test_valid_color(`oklch(from oklch(0.7 none 30) l c h)`,                                          `oklch(0.7 0 30)`);
+    fuzzy_test_valid_color(`oklch(from oklch(0.7 0.45 30 / none) l c h / alpha)`,                             `oklch(0.7 0.45 30 / 0)`);
 
+    // Testing with 'currentColor'
+    fuzzy_test_valid_color(`oklch(from currentColor l c h)`, `oklch(from currentColor l c h)`);
 
     for (const colorSpace of [ "srgb", "srgb-linear", "a98-rgb", "rec2020", "prophoto-rgb", "display-p3" ]) {
         // Testing no modifications.
-        test_valid_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} r g b)`,                              `color(${colorSpace} 0.7 0.5 0.3)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} r g b / alpha)`,                      `color(${colorSpace} 0.7 0.5 0.3)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} r g b)`,                        `color(${colorSpace} 0.7 0.5 0.3 / 0.4)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} r g b / alpha)`,                `color(${colorSpace} 0.7 0.5 0.3 / 0.4)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} r g b)`,                              `color(${colorSpace} 0.7 0.5 0.3)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} r g b / alpha)`,                      `color(${colorSpace} 0.7 0.5 0.3)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} r g b)`,                        `color(${colorSpace} 0.7 0.5 0.3 / 0.4)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} r g b / alpha)`,                `color(${colorSpace} 0.7 0.5 0.3 / 0.4)`);
 
         // Test nesting relative colors.
-        test_valid_value(`color`, `color(from color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} r g b) ${colorSpace} r g b)`,   `color(${colorSpace} 0.7 0.5 0.3)`);
+        fuzzy_test_valid_color(`color(from color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} r g b) ${colorSpace} r g b)`,   `color(${colorSpace} 0.7 0.5 0.3)`);
 
         // Testing replacement with 0.
-        test_valid_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} 0 0 0)`,                              `color(${colorSpace} 0 0 0)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} 0 0 0 / 0)`,                          `color(${colorSpace} 0 0 0 / 0)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} 0 g b / alpha)`,                      `color(${colorSpace} 0 0.5 0.3)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} r 0 b / alpha)`,                      `color(${colorSpace} 0.7 0 0.3)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} r g 0 / alpha)`,                      `color(${colorSpace} 0.7 0.5 0)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} r g b / 0)`,                          `color(${colorSpace} 0.7 0.5 0.3 / 0)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} 0 g b / alpha)`,                `color(${colorSpace} 0 0.5 0.3 / 0.4)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} r 0 b / alpha)`,                `color(${colorSpace} 0.7 0 0.3 / 0.4)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} r g 0 / alpha)`,                `color(${colorSpace} 0.7 0.5 0 / 0.4)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} r g b / 0)`,                    `color(${colorSpace} 0.7 0.5 0.3 / 0)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} 0 0 0)`,                              `color(${colorSpace} 0 0 0)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} 0 0 0 / 0)`,                          `color(${colorSpace} 0 0 0 / 0)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} 0 g b / alpha)`,                      `color(${colorSpace} 0 0.5 0.3)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} r 0 b / alpha)`,                      `color(${colorSpace} 0.7 0 0.3)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} r g 0 / alpha)`,                      `color(${colorSpace} 0.7 0.5 0)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} r g b / 0)`,                          `color(${colorSpace} 0.7 0.5 0.3 / 0)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} 0 g b / alpha)`,                `color(${colorSpace} 0 0.5 0.3 / 0.4)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} r 0 b / alpha)`,                `color(${colorSpace} 0.7 0 0.3 / 0.4)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} r g 0 / alpha)`,                `color(${colorSpace} 0.7 0.5 0 / 0.4)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} r g b / 0)`,                    `color(${colorSpace} 0.7 0.5 0.3 / 0)`);
 
         // Testing replacement with a constant.
-        test_valid_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} 0.2 g b / alpha)`,                    `color(${colorSpace} 0.2 0.5 0.3)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} 20% g b / alpha)`,                    `color(${colorSpace} 0.2 0.5 0.3)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} r 0.2 b / alpha)`,                    `color(${colorSpace} 0.7 0.2 0.3)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} r 20% b / alpha)`,                    `color(${colorSpace} 0.7 0.2 0.3)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} r g 0.2 / alpha)`,                    `color(${colorSpace} 0.7 0.5 0.2)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} r g 20% / alpha)`,                    `color(${colorSpace} 0.7 0.5 0.2)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} r g b / 0.2)`,                        `color(${colorSpace} 0.7 0.5 0.3 / 0.2)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} r g b / 20%)`,                        `color(${colorSpace} 0.7 0.5 0.3 / 0.2)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} 0.2 g b / alpha)`,              `color(${colorSpace} 0.2 0.5 0.3 / 0.4)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} 20% g b / alpha)`,              `color(${colorSpace} 0.2 0.5 0.3 / 0.4)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} r 0.2 b / alpha)`,              `color(${colorSpace} 0.7 0.2 0.3 / 0.4)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} r 20% b / alpha)`,              `color(${colorSpace} 0.7 0.2 0.3 / 0.4)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} r g 0.2 / alpha)`,              `color(${colorSpace} 0.7 0.5 0.2 / 0.4)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} r g 20% / alpha)`,              `color(${colorSpace} 0.7 0.5 0.2 / 0.4)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} r g b / 0.2)`,                  `color(${colorSpace} 0.7 0.5 0.3 / 0.2)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} r g b / 20%)`,                  `color(${colorSpace} 0.7 0.5 0.3 / 0.2)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} 2 3 4)`,                              `color(${colorSpace} 2 3 4)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} 2 3 4 / 5)`,                          `color(${colorSpace} 2 3 4)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} -2 -3 -4)`,                           `color(${colorSpace} -2 -3 -4)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} -2 -3 -4 / -5)`,                      `color(${colorSpace} -2 -3 -4 / 0)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} 200% 300% 400%)`,                     `color(${colorSpace} 2 3 4)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} 200% 300% 400% / 500%)`,              `color(${colorSpace} 2 3 4)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} -200% -300% -400%)`,                  `color(${colorSpace} -2 -3 -4)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} -200% -300% -400% / -500%)`,          `color(${colorSpace} -2 -3 -4 / 0)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} 0.2 g b / alpha)`,                    `color(${colorSpace} 0.2 0.5 0.3)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} 20% g b / alpha)`,                    `color(${colorSpace} 0.2 0.5 0.3)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} r 0.2 b / alpha)`,                    `color(${colorSpace} 0.7 0.2 0.3)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} r 20% b / alpha)`,                    `color(${colorSpace} 0.7 0.2 0.3)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} r g 0.2 / alpha)`,                    `color(${colorSpace} 0.7 0.5 0.2)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} r g 20% / alpha)`,                    `color(${colorSpace} 0.7 0.5 0.2)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} r g b / 0.2)`,                        `color(${colorSpace} 0.7 0.5 0.3 / 0.2)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} r g b / 20%)`,                        `color(${colorSpace} 0.7 0.5 0.3 / 0.2)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} 0.2 g b / alpha)`,              `color(${colorSpace} 0.2 0.5 0.3 / 0.4)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} 20% g b / alpha)`,              `color(${colorSpace} 0.2 0.5 0.3 / 0.4)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} r 0.2 b / alpha)`,              `color(${colorSpace} 0.7 0.2 0.3 / 0.4)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} r 20% b / alpha)`,              `color(${colorSpace} 0.7 0.2 0.3 / 0.4)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} r g 0.2 / alpha)`,              `color(${colorSpace} 0.7 0.5 0.2 / 0.4)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} r g 20% / alpha)`,              `color(${colorSpace} 0.7 0.5 0.2 / 0.4)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} r g b / 0.2)`,                  `color(${colorSpace} 0.7 0.5 0.3 / 0.2)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} r g b / 20%)`,                  `color(${colorSpace} 0.7 0.5 0.3 / 0.2)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} 2 3 4)`,                              `color(${colorSpace} 2 3 4)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} 2 3 4 / 5)`,                          `color(${colorSpace} 2 3 4)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} -2 -3 -4)`,                           `color(${colorSpace} -2 -3 -4)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} -2 -3 -4 / -5)`,                      `color(${colorSpace} -2 -3 -4 / 0)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} 200% 300% 400%)`,                     `color(${colorSpace} 2 3 4)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} 200% 300% 400% / 500%)`,              `color(${colorSpace} 2 3 4)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} -200% -300% -400%)`,                  `color(${colorSpace} -2 -3 -4)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} -200% -300% -400% / -500%)`,          `color(${colorSpace} -2 -3 -4 / 0)`);
 
         // Testing valid permutation (types match).
-        test_valid_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} g b r)`,                              `color(${colorSpace} 0.5 0.3 0.7)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} b alpha r / g)`,                      `color(${colorSpace} 0.3 1 0.7 / 0.5)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} r r r / r)`,                          `color(${colorSpace} 0.7 0.7 0.7 / 0.7)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} alpha alpha alpha / alpha)`,          `color(${colorSpace} 1 1 1)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} g b r)`,                        `color(${colorSpace} 0.5 0.3 0.7 / 0.4)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} b alpha r / g)`,                `color(${colorSpace} 0.3 0.4 0.7 / 0.5)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} r r r / r)`,                    `color(${colorSpace} 0.7 0.7 0.7 / 0.7)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} alpha alpha alpha / alpha)`,    `color(${colorSpace} 0.4 0.4 0.4 / 0.4)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} g b r)`,                              `color(${colorSpace} 0.5 0.3 0.7)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} b alpha r / g)`,                      `color(${colorSpace} 0.3 1 0.7 / 0.5)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} r r r / r)`,                          `color(${colorSpace} 0.7 0.7 0.7 / 0.7)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} alpha alpha alpha / alpha)`,          `color(${colorSpace} 1 1 1)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} g b r)`,                        `color(${colorSpace} 0.5 0.3 0.7 / 0.4)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} b alpha r / g)`,                `color(${colorSpace} 0.3 0.4 0.7 / 0.5)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} r r r / r)`,                    `color(${colorSpace} 0.7 0.7 0.7 / 0.7)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} alpha alpha alpha / alpha)`,    `color(${colorSpace} 0.4 0.4 0.4 / 0.4)`);
 
         // Testing out of gamut components.
-        test_valid_value(`color`, `color(from color(${colorSpace} 1.7 1.5 1.3) ${colorSpace} r g b)`,                              `color(${colorSpace} 1.7 1.5 1.3)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 1.7 1.5 1.3) ${colorSpace} r g b / alpha)`,                      `color(${colorSpace} 1.7 1.5 1.3)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 1.7 1.5 1.3 / 140%) ${colorSpace} r g b)`,                       `color(${colorSpace} 1.7 1.5 1.3)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 1.7 1.5 1.3 / 140%) ${colorSpace} r g b / alpha)`,               `color(${colorSpace} 1.7 1.5 1.3)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} -0.7 -0.5 -0.3) ${colorSpace} r g b)`,                           `color(${colorSpace} -0.7 -0.5 -0.3)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} -0.7 -0.5 -0.3) ${colorSpace} r g b / alpha)`,                   `color(${colorSpace} -0.7 -0.5 -0.3)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} -0.7 -0.5 -0.3 / -40%) ${colorSpace} r g b)`,                    `color(${colorSpace} -0.7 -0.5 -0.3 / 0)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} -0.7 -0.5 -0.3 / -40%) ${colorSpace} r g b / alpha)`,            `color(${colorSpace} -0.7 -0.5 -0.3 / 0)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 1.7 1.5 1.3) ${colorSpace} r g b)`,                              `color(${colorSpace} 1.7 1.5 1.3)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 1.7 1.5 1.3) ${colorSpace} r g b / alpha)`,                      `color(${colorSpace} 1.7 1.5 1.3)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 1.7 1.5 1.3 / 140%) ${colorSpace} r g b)`,                       `color(${colorSpace} 1.7 1.5 1.3)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 1.7 1.5 1.3 / 140%) ${colorSpace} r g b / alpha)`,               `color(${colorSpace} 1.7 1.5 1.3)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} -0.7 -0.5 -0.3) ${colorSpace} r g b)`,                           `color(${colorSpace} -0.7 -0.5 -0.3)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} -0.7 -0.5 -0.3) ${colorSpace} r g b / alpha)`,                   `color(${colorSpace} -0.7 -0.5 -0.3)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} -0.7 -0.5 -0.3 / -40%) ${colorSpace} r g b)`,                    `color(${colorSpace} -0.7 -0.5 -0.3 / 0)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} -0.7 -0.5 -0.3 / -40%) ${colorSpace} r g b / alpha)`,            `color(${colorSpace} -0.7 -0.5 -0.3 / 0)`);
 
         // Testing with calc().
-        test_valid_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} calc(r) calc(g) calc(b))`,                        `color(${colorSpace} 0.7 0.5 0.3)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} calc(r) calc(g) calc(b) / calc(alpha))`,    `color(${colorSpace} 0.7 0.5 0.3 / 0.4)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} calc(r) calc(g) calc(b))`,                        `color(${colorSpace} 0.7 0.5 0.3)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} calc(r) calc(g) calc(b) / calc(alpha))`,    `color(${colorSpace} 0.7 0.5 0.3 / 0.4)`);
 
         // Testing with 'none'.
-        test_valid_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} none none none)`,                     `color(${colorSpace} none none none)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} none none none / none)`,              `color(${colorSpace} none none none / none)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} r g none)`,                           `color(${colorSpace} 0.7 0.5 none)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} r g none / alpha)`,                   `color(${colorSpace} 0.7 0.5 none)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} r g b / none)`,                       `color(${colorSpace} 0.7 0.5 0.3 / none)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} r g none / alpha)`,             `color(${colorSpace} 0.7 0.5 none / 0.4)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} r g b / none)`,                 `color(${colorSpace} 0.7 0.5 0.3 / none)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} none none none)`,                     `color(${colorSpace} none none none)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} none none none / none)`,              `color(${colorSpace} none none none / none)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} r g none)`,                           `color(${colorSpace} 0.7 0.5 none)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} r g none / alpha)`,                   `color(${colorSpace} 0.7 0.5 none)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 0.7 0.5 0.3) ${colorSpace} r g b / none)`,                       `color(${colorSpace} 0.7 0.5 0.3 / none)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} r g none / alpha)`,             `color(${colorSpace} 0.7 0.5 none / 0.4)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 0.7 0.5 0.3 / 40%) ${colorSpace} r g b / none)`,                 `color(${colorSpace} 0.7 0.5 0.3 / none)`);
         // FIXME: Clarify with spec editors if 'none' should pass through to the constants.
-        test_valid_value(`color`, `color(from color(${colorSpace} none none none) ${colorSpace} r g b)`,                           `color(${colorSpace} 0 0 0)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} none none none / none) ${colorSpace} r g b / alpha)`,            `color(${colorSpace} 0 0 0 / 0)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 0.7 none 0.3) ${colorSpace} r g b)`,                             `color(${colorSpace} 0.7 0 0.3)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 0.7 0.5 0.3 / none) ${colorSpace} r g b / alpha)`,               `color(${colorSpace} 0.7 0.5 0.3 / 0)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} none none none) ${colorSpace} r g b)`,                           `color(${colorSpace} 0 0 0)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} none none none / none) ${colorSpace} r g b / alpha)`,            `color(${colorSpace} 0 0 0 / 0)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 0.7 none 0.3) ${colorSpace} r g b)`,                             `color(${colorSpace} 0.7 0 0.3)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 0.7 0.5 0.3 / none) ${colorSpace} r g b / alpha)`,               `color(${colorSpace} 0.7 0.5 0.3 / 0)`);
+
+        // Testing with 'currentColor'
+        fuzzy_test_valid_color(`color(from currentColor ${colorSpace} r g b)`,                                                  `color(from currentColor ${colorSpace} r g b)`);
+
     }
 
     for (const colorSpace of [ "xyz", "xyz-d50", "xyz-d65" ]) {
         const resultColorSpace = colorSpace == "xyz" ? "xyz-d65" : colorSpace;
 
         // Testing no modifications.
-        test_valid_value(`color`, `color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} x y z)`,                              `color(${resultColorSpace} 7 -20.5 100)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} x y z / alpha)`,                      `color(${resultColorSpace} 7 -20.5 100)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 7 -20.5 100 / 40%) ${colorSpace} x y z)`,                        `color(${resultColorSpace} 7 -20.5 100 / 0.4)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 7 -20.5 100 / 40%) ${colorSpace} x y z / alpha)`,                `color(${resultColorSpace} 7 -20.5 100 / 0.4)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} x y z)`,                              `color(${resultColorSpace} 7 -20.5 100)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} x y z / alpha)`,                      `color(${resultColorSpace} 7 -20.5 100)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 7 -20.5 100 / 40%) ${colorSpace} x y z)`,                        `color(${resultColorSpace} 7 -20.5 100 / 0.4)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 7 -20.5 100 / 40%) ${colorSpace} x y z / alpha)`,                `color(${resultColorSpace} 7 -20.5 100 / 0.4)`);
 
         // Test nesting relative colors.
-        test_valid_value(`color`, `color(from color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} x y z) ${colorSpace} x y z)`,        `color(${resultColorSpace} 7 -20.5 100)`);
+        fuzzy_test_valid_color(`color(from color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} x y z) ${colorSpace} x y z)`,        `color(${resultColorSpace} 7 -20.5 100)`);
 
         // Testing replacement with 0.
-        test_valid_value(`color`, `color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} 0 0 0)`,                              `color(${resultColorSpace} 0 0 0)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} 0 0 0 / 0)`,                          `color(${resultColorSpace} 0 0 0 / 0)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} 0 y z / alpha)`,                      `color(${resultColorSpace} 0 -20.5 100)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} x 0 z / alpha)`,                      `color(${resultColorSpace} 7 0 100)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} x y 0 / alpha)`,                      `color(${resultColorSpace} 7 -20.5 0)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} x y z / 0)`,                          `color(${resultColorSpace} 7 -20.5 100 / 0)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 7 -20.5 100 / 40%) ${colorSpace} 0 y z / alpha)`,                `color(${resultColorSpace} 0 -20.5 100 / 0.4)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 7 -20.5 100 / 40%) ${colorSpace} x 0 z / alpha)`,                `color(${resultColorSpace} 7 0 100 / 0.4)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 7 -20.5 100 / 40%) ${colorSpace} x y 0 / alpha)`,                `color(${resultColorSpace} 7 -20.5 0 / 0.4)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 7 -20.5 100 / 40%) ${colorSpace} x y z / 0)`,                    `color(${resultColorSpace} 7 -20.5 100 / 0)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} 0 0 0)`,                              `color(${resultColorSpace} 0 0 0)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} 0 0 0 / 0)`,                          `color(${resultColorSpace} 0 0 0 / 0)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} 0 y z / alpha)`,                      `color(${resultColorSpace} 0 -20.5 100)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} x 0 z / alpha)`,                      `color(${resultColorSpace} 7 0 100)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} x y 0 / alpha)`,                      `color(${resultColorSpace} 7 -20.5 0)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} x y z / 0)`,                          `color(${resultColorSpace} 7 -20.5 100 / 0)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 7 -20.5 100 / 40%) ${colorSpace} 0 y z / alpha)`,                `color(${resultColorSpace} 0 -20.5 100 / 0.4)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 7 -20.5 100 / 40%) ${colorSpace} x 0 z / alpha)`,                `color(${resultColorSpace} 7 0 100 / 0.4)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 7 -20.5 100 / 40%) ${colorSpace} x y 0 / alpha)`,                `color(${resultColorSpace} 7 -20.5 0 / 0.4)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 7 -20.5 100 / 40%) ${colorSpace} x y z / 0)`,                    `color(${resultColorSpace} 7 -20.5 100 / 0)`);
 
         // Testing replacement with a constant.
-        test_valid_value(`color`, `color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} 0.2 y z / alpha)`,                    `color(${resultColorSpace} 0.2 -20.5 100)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} x 0.2 z / alpha)`,                    `color(${resultColorSpace} 7 0.2 100)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} x y 0.2 / alpha)`,                    `color(${resultColorSpace} 7 -20.5 0.2)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} x y z / 0.2)`,                        `color(${resultColorSpace} 7 -20.5 100 / 0.2)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} x y z / 20%)`,                        `color(${resultColorSpace} 7 -20.5 100 / 0.2)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 7 -20.5 100 / 40%) ${colorSpace} 0.2 y z / alpha)`,              `color(${resultColorSpace} 0.2 -20.5 100 / 0.4)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 7 -20.5 100 / 40%) ${colorSpace} x 0.2 z / alpha)`,              `color(${resultColorSpace} 7 0.2 100 / 0.4)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 7 -20.5 100 / 40%) ${colorSpace} x y 0.2 / alpha)`,              `color(${resultColorSpace} 7 -20.5 0.2 / 0.4)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 7 -20.5 100 / 40%) ${colorSpace} x y z / 0.2)`,                  `color(${resultColorSpace} 7 -20.5 100 / 0.2)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} 0.2 y z / alpha)`,                    `color(${resultColorSpace} 0.2 -20.5 100)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} x 0.2 z / alpha)`,                    `color(${resultColorSpace} 7 0.2 100)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} x y 0.2 / alpha)`,                    `color(${resultColorSpace} 7 -20.5 0.2)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} x y z / 0.2)`,                        `color(${resultColorSpace} 7 -20.5 100 / 0.2)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} x y z / 20%)`,                        `color(${resultColorSpace} 7 -20.5 100 / 0.2)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 7 -20.5 100 / 40%) ${colorSpace} 0.2 y z / alpha)`,              `color(${resultColorSpace} 0.2 -20.5 100 / 0.4)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 7 -20.5 100 / 40%) ${colorSpace} x 0.2 z / alpha)`,              `color(${resultColorSpace} 7 0.2 100 / 0.4)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 7 -20.5 100 / 40%) ${colorSpace} x y 0.2 / alpha)`,              `color(${resultColorSpace} 7 -20.5 0.2 / 0.4)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 7 -20.5 100 / 40%) ${colorSpace} x y z / 0.2)`,                  `color(${resultColorSpace} 7 -20.5 100 / 0.2)`);
 
         // Testing valid permutation (types match).
-        test_valid_value(`color`, `color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} y z x)`,                              `color(${resultColorSpace} -20.5 100 7)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} x x x / x)`,                          `color(${resultColorSpace} 7 7 7)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 7 -20.5 100 / 40%) ${colorSpace} y z x)`,                        `color(${resultColorSpace} -20.5 100 7 / 0.4)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 7 -20.5 100 / 40%) ${colorSpace} x x x / x)`,                    `color(${resultColorSpace} 7 7 7)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} y z x)`,                              `color(${resultColorSpace} -20.5 100 7)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} x x x / x)`,                          `color(${resultColorSpace} 7 7 7)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 7 -20.5 100 / 40%) ${colorSpace} y z x)`,                        `color(${resultColorSpace} -20.5 100 7 / 0.4)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 7 -20.5 100 / 40%) ${colorSpace} x x x / x)`,                    `color(${resultColorSpace} 7 7 7)`);
 
         // Testing with calc().
-        test_valid_value(`color`, `color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} calc(x) calc(y) calc(z))`,                        `color(${resultColorSpace} 7 -20.5 100)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 7 -20.5 100 / 40%) ${colorSpace} calc(x) calc(y) calc(z) / calc(alpha))`,    `color(${resultColorSpace} 7 -20.5 100 / 0.4)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} calc(x) calc(y) calc(z))`,                        `color(${resultColorSpace} 7 -20.5 100)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 7 -20.5 100 / 40%) ${colorSpace} calc(x) calc(y) calc(z) / calc(alpha))`,    `color(${resultColorSpace} 7 -20.5 100 / 0.4)`);
 
         // Testing with 'none'.
-        test_valid_value(`color`, `color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} none none none)`,                     `color(${resultColorSpace} none none none)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} none none none / none)`,              `color(${resultColorSpace} none none none / none)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} x y none)`,                           `color(${resultColorSpace} 7 -20.5 none)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} x y none / alpha)`,                   `color(${resultColorSpace} 7 -20.5 none)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} x y z / none)`,                       `color(${resultColorSpace} 7 -20.5 100 / none)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 7 -20.5 100 / 40%) ${colorSpace} x y none / alpha)`,             `color(${resultColorSpace} 7 -20.5 none / 0.4)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 7 -20.5 100 / 40%) ${colorSpace} x y z / none)`,                 `color(${resultColorSpace} 7 -20.5 100 / none)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} none none none)`,                     `color(${resultColorSpace} none none none)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} none none none / none)`,              `color(${resultColorSpace} none none none / none)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} x y none)`,                           `color(${resultColorSpace} 7 -20.5 none)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} x y none / alpha)`,                   `color(${resultColorSpace} 7 -20.5 none)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 7 -20.5 100) ${colorSpace} x y z / none)`,                       `color(${resultColorSpace} 7 -20.5 100 / none)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 7 -20.5 100 / 40%) ${colorSpace} x y none / alpha)`,             `color(${resultColorSpace} 7 -20.5 none / 0.4)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 7 -20.5 100 / 40%) ${colorSpace} x y z / none)`,                 `color(${resultColorSpace} 7 -20.5 100 / none)`);
         // FIXME: Clarify with spec editors if 'none' should pass through to the constants.
-        test_valid_value(`color`, `color(from color(${colorSpace} none none none) ${colorSpace} x y z)`,                           `color(${resultColorSpace} 0 0 0)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} none none none / none) ${colorSpace} x y z / alpha)`,            `color(${resultColorSpace} 0 0 0 / 0)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 7 none 100) ${colorSpace} x y z)`,                               `color(${resultColorSpace} 7 0 100)`);
-        test_valid_value(`color`, `color(from color(${colorSpace} 7 -20.5 100 / none) ${colorSpace} x y z / alpha)`,               `color(${resultColorSpace} 7 -20.5 100 / 0)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} none none none) ${colorSpace} x y z)`,                           `color(${resultColorSpace} 0 0 0)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} none none none / none) ${colorSpace} x y z / alpha)`,            `color(${resultColorSpace} 0 0 0 / 0)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 7 none 100) ${colorSpace} x y z)`,                               `color(${resultColorSpace} 7 0 100)`);
+        fuzzy_test_valid_color(`color(from color(${colorSpace} 7 -20.5 100 / none) ${colorSpace} x y z / alpha)`,               `color(${resultColorSpace} 7 -20.5 100 / 0)`);
+
+        // Testing with 'currentColor'
+        fuzzy_test_valid_color(`color(from currentColor ${colorSpace} x y z)`,                                                  `color(from currentColor ${colorSpace} x y z)`);
     }
 
-    // Spec Examples
-
-    // Example 11.
-    test_valid_value(`color`, `rgb(from var(--bg-color) r g b / 80%)`);
-
-    // Example 12.
-    test_valid_value(`color`, `lch(from var(--color) calc(l / 2) c h)`);
-
-    // Example 13.
-    test_valid_value(`color`, `rgb(from var(--color) calc(r * .3 + g * .59 + b * .11) calc(r * .3 + g * .59 + b * .11) calc(r * .3 + g * .59 + b * .11))`);
-    test_valid_value(`color`, `lch(from var(--color) l 0 h)`);
-
-    // Example 14.
-    test_valid_value(`color`, `rgb(from indianred 255 g b)`, `rgb(255, 92, 92)`);
-
-    // Example 15.
-    test_valid_value(`color`, `hsl(from var(--accent) calc(h + 180deg) s l)`);
-
-    // Example 16.
-    test_valid_value(`color`, `lab(from var(--mycolor) l a b / 100%)`);
-    test_valid_value(`color`, `lab(from var(--mycolor) l a b / calc(alpha * 0.8))`);
-    test_valid_value(`color`, `lab(from var(--mycolor) l a b / calc(alpha - 20%))`);
-
-    // Example 17.
-    test_valid_value(`color`, `lab(from var(--mycolor) l 0 0)`);
-
-    // Example 18.
-    test_valid_value(`color`, `lch(from peru calc(l * 0.8) c h)`, `lch(49.80138 54.003296 63.680317)`);
-
-    // Example 19.
-    test_valid_value(`color`, `LCH(from var(--accent) l c calc(h + 180deg))`);
-
-    // Example 20.
-    test_valid_value(`color`, `lch(from var(--mycolor) l 0 h)`);
-    test_valid_value(`color`, `var(--mygray)`);
-    test_valid_value(`color`, `lch(from var(--mygray) l 30 h)`);
+    // Spec Examples: https://www.w3.org/TR/css-color-5/#relative-colors
+    fuzzy_test_valid_color(`rgb(from var(--bg-color) r g b / 80%)`);
+    fuzzy_test_valid_color(`lch(from var(--color) calc(l / 2) c h)`);
+    fuzzy_test_valid_color(`rgb(from var(--color) calc(r * .3 + g * .59 + b * .11) calc(r * .3 + g * .59 + b * .11) calc(r * .3 + g * .59 + b * .11))`);
+    fuzzy_test_valid_color(`lch(from var(--color) l 0 h)`);
+    // This particular test does a lot of math so a wider epsilon is needed.
+    fuzzy_test_valid_color(`rgb(from indianred 255 g b)`, `color(srgb 1 0.36 0.36)`, 0.02 /* epsilon */);
+    fuzzy_test_valid_color(`hsl(from var(--accent) calc(h + 180) s l)`);
+    fuzzy_test_valid_color(`lab(from var(--mycolor) l a b / 100%)`);
+    fuzzy_test_valid_color(`lab(from var(--mycolor) l a b / calc(alpha * 0.8))`);
+    fuzzy_test_valid_color(`lab(from var(--mycolor) l 0 0)`);
+    // This particular test does a lot of math so a wider epsilon is needed.
+    fuzzy_test_valid_color(`lch(from peru calc(l * 0.8) c h)`, `lch(49.80 54 63.68)`, 0.02 /* epsilon */);
+    fuzzy_test_valid_color(`LCH(from var(--accent) l c calc(h + 180))`);
+    fuzzy_test_valid_color(`lch(from var(--mycolor) l 0 h)`);
+    fuzzy_test_valid_color(`var(--mygray)`);
+    fuzzy_test_valid_color(`lch(from var(--mygray) l 30 h)`);
 </script>
 </body>
 </html>
diff --git a/tests/wpt/tests/css/css-color/parsing/color-valid-rgb.html b/tests/wpt/tests/css/css-color/parsing/color-valid-rgb.html
index 22054a18f90..a979dbc484f 100644
--- a/tests/wpt/tests/css/css-color/parsing/color-valid-rgb.html
+++ b/tests/wpt/tests/css/css-color/parsing/color-valid-rgb.html
@@ -41,23 +41,29 @@ test_valid_value("color", "rgba(-20% 20% 40% / 50%)", "rgba(0, 51, 102, 0.5)");
 test_valid_value("color", "rgba(257 30 40 / 50%)", "rgba(255, 30, 40, 0.5)");
 test_valid_value("color", "rgba(250% 20% 40% / .5)", "rgba(255, 51, 102, 0.5)");
 
-// Test non-finite values. See: https://github.com/w3c/csswg-drafts/issues/8629
-test_valid_value("color", "rgb(calc(infinity), 0, 0)", "rgb(calc(infinity), 0, 0)");
-test_valid_value("color", "rgb(0, calc(infinity), 0)", "rgb(0, calc(infinity), 0)");
-test_valid_value("color", "rgb(0, 0, calc(infinity))", "rgb(0, 0, calc(infinity))");
-test_valid_value("color", "rgba(0, 0, 0, calc(infinity))", "rgba(0, 0, 0, calc(infinity))");
-test_valid_value("color", "rgb(calc(-infinity), 0, 0)", "rgb(calc(-infinity), 0, 0)");
-test_valid_value("color", "rgb(0, calc(-infinity), 0)", "rgb(0, calc(-infinity), 0)");
-test_valid_value("color", "rgb(0, 0, calc(-infinity))", "rgb(0, 0, calc(-infinity))");
-test_valid_value("color", "rgba(0, 0, 0, calc(-infinity))", "rgba(0, 0, 0, calc(-infinity))");
-test_valid_value("color", "rgb(calc(NaN), 0, 0)", "rgb(calc(NaN), 0, 0)");
-test_valid_value("color", "rgb(0, calc(NaN), 0)", "rgb(0, calc(NaN), 0)");
-test_valid_value("color", "rgb(0, 0, calc(NaN))", "rgb(0, 0, calc(NaN))");
-test_valid_value("color", "rgba(0, 0, 0, calc(NaN))", "rgba(0, 0, 0, calc(NaN))");
-test_valid_value("color", "rgb(calc(0 / 0), 0, 0)", "rgb(calc(NaN), 0, 0)");
-test_valid_value("color", "rgb(0, calc(0 / 0), 0)", "rgb(0, calc(NaN), 0)");
-test_valid_value("color", "rgb(0, 0, calc(0 / 0))", "rgb(0, 0, calc(NaN))");
-test_valid_value("color", "rgba(0, 0, 0, calc(0 / 0))", "rgba(0, 0, 0, calc(NaN))");
+// rgb are in the range [0, 255], alpha is in the range [0, 1].
+// Values above or below these numbers should get resolved to the upper/lower bound.
+test_valid_value("color", "rgb(500, 0, 0)", "rgb(255, 0, 0)");
+test_valid_value("color", "rgb(-500, 64, 128)", "rgb(0, 64, 128)");
+
+// calc(infinity) resolves to the upper bound while calc(-infinity) and calc(NaN) resolves the lower bound.
+// See: https://github.com/w3c/csswg-drafts/issues/8629
+test_valid_value("color", "rgb(calc(infinity), 0, 0)", "rgb(255, 0, 0)");
+test_valid_value("color", "rgb(0, calc(infinity), 0)", "rgb(0, 255, 0)");
+test_valid_value("color", "rgb(0, 0, calc(infinity))", "rgb(0, 0, 255)");
+test_valid_value("color", "rgba(0, 0, 0, calc(infinity))", "rgb(0, 0, 0)");
+test_valid_value("color", "rgb(calc(-infinity), 0, 0)", "rgb(0, 0, 0)");
+test_valid_value("color", "rgb(0, calc(-infinity), 0)", "rgb(0, 0, 0)");
+test_valid_value("color", "rgb(0, 0, calc(-infinity))", "rgb(0, 0, 0)");
+test_valid_value("color", "rgba(0, 0, 0, calc(-infinity))", "rgba(0, 0, 0, 0)");
+test_valid_value("color", "rgb(calc(NaN), 0, 0)", "rgb(0, 0, 0)");
+test_valid_value("color", "rgb(0, calc(NaN), 0)", "rgb(0, 0, 0)");
+test_valid_value("color", "rgb(0, 0, calc(NaN))", "rgb(0, 0, 0)");
+test_valid_value("color", "rgba(0, 0, 0, calc(NaN))", "rgba(0, 0, 0, 0)");
+test_valid_value("color", "rgb(calc(0 / 0), 0, 0)", "rgb(0, 0, 0)");
+test_valid_value("color", "rgb(0, calc(0 / 0), 0)", "rgb(0, 0, 0)");
+test_valid_value("color", "rgb(0, 0, calc(0 / 0))", "rgb(0, 0, 0)");
+test_valid_value("color", "rgba(0, 0, 0, calc(0 / 0))", "rgba(0, 0, 0, 0)");
 </script>
 </body>
 </html>
diff --git a/tests/wpt/tests/css/css-color/parsing/opacity-valid.html b/tests/wpt/tests/css/css-color/parsing/opacity-valid.html
index 990ca1ca143..ad65ad6df2b 100644
--- a/tests/wpt/tests/css/css-color/parsing/opacity-valid.html
+++ b/tests/wpt/tests/css/css-color/parsing/opacity-valid.html
@@ -20,6 +20,14 @@ test_valid_value("opacity", "3");
 test_valid_value("opacity", "-100%", "-1");
 test_valid_value("opacity", "50%", "0.5");
 test_valid_value("opacity", "300%", "3");
+test_valid_value("opacity", "clamp(50%, 0%, 70%)", "calc(0.5)");
+test_valid_value("opacity", "clamp(50%, 80%, 70%)", "calc(0.7)");
+test_valid_value("opacity", "clamp(50%, 60%, 70%)", "calc(0.6)");
+test_valid_value("opacity", "min(50%, 0%)", "calc(0)");
+test_valid_value("opacity", "min(0%, 50%)", "calc(0)");
+test_valid_value("opacity", "max(50%, 0%)", "calc(0.5)");
+test_valid_value("opacity", "max(0%, 50%)", "calc(0.5)");
+test_valid_value("opacity", "min(-40%, 50%)", "calc(-0.4)");
 
 </script>
 </body>
diff --git a/tests/wpt/tests/css/css-color/parsing/relative-color-out-of-gamut.html b/tests/wpt/tests/css/css-color/parsing/relative-color-out-of-gamut.html
new file mode 100644
index 00000000000..745b21a0404
--- /dev/null
+++ b/tests/wpt/tests/css/css-color/parsing/relative-color-out-of-gamut.html
@@ -0,0 +1,54 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Color Level 5: Parsing and serialization of colors using relative color syntax that result in out-of-gamut sRGB colors</title>
+<link rel="author" title="Sam Weinig" href="mailto:weinig@apple.com">
+<link rel="author" title="Aaron Krajeski" href="mailto:aaronhk@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-color-5/#relative-colors">
+<link rel="help" href="https://drafts.csswg.org/css-color-5/#serial-relative-color">
+<meta name="assert" content="gamut mapping works for computed value of relative color syntax">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/computed-testcommon.js"></script>
+<script src="/css/support/color-testcommon.js"></script>
+</head>
+<body>
+  <div id="target"></div>
+</body>
+<script>
+  // The following tests produce colors that are outside of the srgb gamut.
+  // No gamut mapping should occur and the resulting colors should be of the
+  // format color(srgb ... )
+  // See: https://github.com/mozilla/wg-decisions/issues/1125
+  fuzzy_test_computed_color(`rgb(from color(display-p3 0 1 0) r g b / alpha)`, `color(srgb -0.511814 1.01832 -0.310726)`);
+  fuzzy_test_computed_color(`rgb(from lab(100 104.3 -50.9) r g b)`, `color(srgb 1.59343 0.58802 1.40564)`);
+  fuzzy_test_computed_color(`rgb(from lab(0 104.3 -50.9) r g b)`, `color(srgb 0.351376 -0.213938 0.299501)`);
+  fuzzy_test_computed_color(`rgb(from lch(100 116 334) r g b)`, `color(srgb 1.59328 0.58828 1.40527)`);
+  fuzzy_test_computed_color(`rgb(from lch(0 116 334) r g b)`, `color(srgb 0.351307 -0.213865 0.299236)`);
+  fuzzy_test_computed_color(`rgb(from oklab(1 0.365 -0.16) r g b)`, `color(srgb 1.59295 0.360371 1.38571)`);
+  fuzzy_test_computed_color(`rgb(from oklab(0 0.365 -0.16) r g b)`, `color(srgb 0.0763893 -0.0456266 0.0932598)`);
+  fuzzy_test_computed_color(`rgb(from oklch(1 0.399 336.3) r g b)`, `color(srgb 1.59328 0.358736 1.38663)`);
+  fuzzy_test_computed_color(`rgb(from oklch(0 0.399 336.3) r g b)`, `color(srgb 0.0765362 -0.045825 0.0937443)`);
+
+  fuzzy_test_computed_color(`hsl(from color(display-p3 0 1 0) h s l / alpha)`, `color(srgb -0.511814 1.01832 -0.310726)`);
+  fuzzy_test_computed_color(`hsl(from lab(100 104.3 -50.9) h s l)`, `color(srgb 1.59343 0.58802 1.40564)`);
+  fuzzy_test_computed_color(`hsl(from lab(0 104.3 -50.9) h s l)`, `color(srgb 0.351376 -0.213938 0.299502)`);
+  fuzzy_test_computed_color(`hsl(from lch(100 116 334) h s l)`, `color(srgb 1.59328 0.58828 1.40527)`);
+  fuzzy_test_computed_color(`hsl(from lch(0 116 334) h s l)`, `color(srgb 0.351307 -0.213865 0.299236)`);
+  fuzzy_test_computed_color(`hsl(from oklab(1 0.365 -0.16) h s l)`, `color(srgb 1.59295 0.360371 1.38571)`);
+  fuzzy_test_computed_color(`hsl(from oklab(0 0.365 -0.16) h s l)`, `color(srgb 0.0763893 -0.0456266 0.0932598)`);
+  fuzzy_test_computed_color(`hsl(from oklch(1 0.399 336.3) h s l)`, `color(srgb 1.59328 0.358736 1.38663)`);
+  fuzzy_test_computed_color(`hsl(from oklch(0 0.399 336.3) h s l)`, `color(srgb 0.0765362 -0.045825 0.0937443)`);
+
+  fuzzy_test_computed_color(`hwb(from color(display-p3 0 1 0) h w b / alpha)`, `color(srgb -0.511814 1.01832 -0.310726)`);
+  fuzzy_test_computed_color(`hwb(from lab(100 104.3 -50.9) h w b)`, `color(srgb 1.59343 0.58802 1.40564)`);
+  fuzzy_test_computed_color(`hwb(from lab(0 104.3 -50.9) h w b)`, `color(srgb 0.351376 -0.213938 0.299502)`);
+  fuzzy_test_computed_color(`hwb(from lch(100 116 334) h w b)`, `color(srgb 1.59328 0.58828 1.40527)`);
+  fuzzy_test_computed_color(`hwb(from lch(0 116 334) h w b)`, `color(srgb 0.351307 -0.213865 0.299236)`);
+  fuzzy_test_computed_color(`hwb(from oklab(1 0.365 -0.16) h w b)`, `color(srgb 1.59295 0.360371 1.38571)`);
+  fuzzy_test_computed_color(`hwb(from oklab(0 0.365 -0.16) h w b)`, `color(srgb 0.0763894 -0.0456266 0.0932598)`);
+  fuzzy_test_computed_color(`hwb(from oklch(1 0.399 336.3) h w b)`, `color(srgb 1.59328 0.358736 1.38664)`);
+  fuzzy_test_computed_color(`hwb(from oklch(0 0.399 336.3) h w b)`, `color(srgb 0.0765362 -0.045825 0.0937443)`);
+</script>
+</html>
diff --git a/tests/wpt/tests/css/css-color/relative-currentcolor-a98rgb-01.html b/tests/wpt/tests/css/css-color/relative-currentcolor-a98rgb-01.html
new file mode 100644
index 00000000000..b264aff7a4a
--- /dev/null
+++ b/tests/wpt/tests/css/css-color/relative-currentcolor-a98rgb-01.html
@@ -0,0 +1,22 @@
+<!doctype html>
+<meta charset=utf-8>
+<link rel="match" href="relative-green-ref.html">
+<title>currentColor is inherited correctly in a98-rgb RCS</title>
+<link rel="help" href="https://drafts.csswg.org/css-color-5/#resolving-rcs">
+<link rel="author" href="mailto:chris@w3.org" title="Chris Lilley">
+<style>
+div {
+  width: 100px;
+  height: 100px;
+  background-color: red;
+  color: red;
+  background-color: color(from currentColor a98-rgb r g b);
+}
+div div {
+  color: green;
+  background-color: inherit;
+}
+</style>
+<div>
+  <div></div>
+</div>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-color/relative-currentcolor-displayp3-01.html b/tests/wpt/tests/css/css-color/relative-currentcolor-displayp3-01.html
new file mode 100644
index 00000000000..d366da215fa
--- /dev/null
+++ b/tests/wpt/tests/css/css-color/relative-currentcolor-displayp3-01.html
@@ -0,0 +1,22 @@
+<!doctype html>
+<meta charset=utf-8>
+<link rel="match" href="relative-green-ref.html">
+<title>currentColor is inherited correctly in display-p3 RCS</title>
+<link rel="help" href="https://drafts.csswg.org/css-color-5/#resolving-rcs">
+<link rel="author" href="mailto:chris@w3.org" title="Chris Lilley">
+<style>
+div {
+  width: 100px;
+  height: 100px;
+  background-color: red;
+  color: red;
+  background-color: color(from currentColor display-p3 r g b);
+}
+div div {
+  color: green;
+  background-color: inherit;
+}
+</style>
+<div>
+  <div></div>
+</div>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-color/relative-currentcolor-hsl-01.html b/tests/wpt/tests/css/css-color/relative-currentcolor-hsl-01.html
new file mode 100644
index 00000000000..2b5e06322ac
--- /dev/null
+++ b/tests/wpt/tests/css/css-color/relative-currentcolor-hsl-01.html
@@ -0,0 +1,22 @@
+<!doctype html>
+<meta charset=utf-8>
+<link rel="match" href="relative-green-ref.html">
+<title>currentColor is inherited correctly in hsl RCS</title>
+<link rel="help" href="https://drafts.csswg.org/css-color-5/#resolving-rcs">
+<link rel="author" href="mailto:chris@w3.org" title="Chris Lilley">
+<style>
+div {
+  width: 100px;
+  height: 100px;
+  background-color: red;
+  color: red;
+  background-color: hsl(from currentColor h s l);
+}
+div div {
+  color: green;
+  background-color: inherit;
+}
+</style>
+<div>
+  <div></div>
+</div>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-color/relative-currentcolor-hsl-02.html b/tests/wpt/tests/css/css-color/relative-currentcolor-hsl-02.html
new file mode 100644
index 00000000000..dba5d493501
--- /dev/null
+++ b/tests/wpt/tests/css/css-color/relative-currentcolor-hsl-02.html
@@ -0,0 +1,22 @@
+<!doctype html>
+<meta charset=utf-8>
+<link rel="match" href="relative-green-ref.html">
+<title>currentColor is inherited correctly in hsl RCS</title>
+<link rel="help" href="https://drafts.csswg.org/css-color-5/#resolving-rcs">
+<link rel="author" href="mailto:chris@w3.org" title="Chris Lilley">
+<style>
+div {
+  width: 100px;
+  height: 100px;
+  background-color: red;
+  color: red;
+  background-color: hsl(from currentColor 120 s l);
+}
+div div {
+  color: hsl(none 100% 25%); /* hsl(120 100% 25%) is green */
+  background-color: inherit;
+}
+</style>
+<div>
+  <div></div>
+</div>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-color/relative-currentcolor-hwb-01.html b/tests/wpt/tests/css/css-color/relative-currentcolor-hwb-01.html
new file mode 100644
index 00000000000..7c757e1d0f0
--- /dev/null
+++ b/tests/wpt/tests/css/css-color/relative-currentcolor-hwb-01.html
@@ -0,0 +1,22 @@
+<!doctype html>
+<meta charset=utf-8>
+<link rel="match" href="relative-green-ref.html">
+<title>currentColor is inherited correctly in hwb RCS</title>
+<link rel="help" href="https://drafts.csswg.org/css-color-5/#resolving-rcs">
+<link rel="author" href="mailto:chris@w3.org" title="Chris Lilley">
+<style>
+div {
+  width: 100px;
+  height: 100px;
+  background-color: red;
+  color: red;
+  background-color: hwb(from currentColor h w b);
+}
+div div {
+  color: green;
+  background-color: inherit;
+}
+</style>
+<div>
+  <div></div>
+</div>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-color/relative-currentcolor-lab-01.html b/tests/wpt/tests/css/css-color/relative-currentcolor-lab-01.html
new file mode 100644
index 00000000000..da59cccec12
--- /dev/null
+++ b/tests/wpt/tests/css/css-color/relative-currentcolor-lab-01.html
@@ -0,0 +1,22 @@
+<!doctype html>
+<meta charset=utf-8>
+<link rel="match" href="relative-green-ref.html">
+<title>currentColor is inherited correctly in lab RCS</title>
+<link rel="help" href="https://drafts.csswg.org/css-color-5/#resolving-rcs">
+<link rel="author" href="mailto:chris@w3.org" title="Chris Lilley">
+<style>
+div {
+  width: 100px;
+  height: 100px;
+  background-color: red;
+  color: red;
+  background-color: lab(from currentColor l a b);
+}
+div div {
+  color: green;
+  background-color: inherit;
+}
+</style>
+<div>
+  <div></div>
+</div>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-color/relative-currentcolor-lch-01.html b/tests/wpt/tests/css/css-color/relative-currentcolor-lch-01.html
new file mode 100644
index 00000000000..be734812f63
--- /dev/null
+++ b/tests/wpt/tests/css/css-color/relative-currentcolor-lch-01.html
@@ -0,0 +1,22 @@
+<!doctype html>
+<meta charset=utf-8>
+<link rel="match" href="relative-green-ref.html">
+<title>currentColor is inherited correctly in lch RCS</title>
+<link rel="help" href="https://drafts.csswg.org/css-color-5/#resolving-rcs">
+<link rel="author" href="mailto:chris@w3.org" title="Chris Lilley">
+<style>
+div {
+  width: 100px;
+  height: 100px;
+  background-color: red;
+  color: red;
+  background-color: lch(from currentColor l c h);
+}
+div div {
+  color: green;
+  background-color: inherit;
+}
+</style>
+<div>
+  <div></div>
+</div>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-color/relative-currentcolor-oklab-01.html b/tests/wpt/tests/css/css-color/relative-currentcolor-oklab-01.html
new file mode 100644
index 00000000000..94d88d384c1
--- /dev/null
+++ b/tests/wpt/tests/css/css-color/relative-currentcolor-oklab-01.html
@@ -0,0 +1,22 @@
+<!doctype html>
+<meta charset=utf-8>
+<link rel="match" href="relative-green-ref.html">
+<title>currentColor is inherited correctly in oklab RCS</title>
+<link rel="help" href="https://drafts.csswg.org/css-color-5/#resolving-rcs">
+<link rel="author" href="mailto:chris@w3.org" title="Chris Lilley">
+<style>
+div {
+  width: 100px;
+  height: 100px;
+  background-color: red;
+  color: red;
+  background-color: oklab(from currentColor l a b);
+}
+div div {
+  color: green;
+  background-color: inherit;
+}
+</style>
+<div>
+  <div></div>
+</div>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-color/relative-currentcolor-oklch-01.html b/tests/wpt/tests/css/css-color/relative-currentcolor-oklch-01.html
new file mode 100644
index 00000000000..0582817c60b
--- /dev/null
+++ b/tests/wpt/tests/css/css-color/relative-currentcolor-oklch-01.html
@@ -0,0 +1,22 @@
+<!doctype html>
+<meta charset=utf-8>
+<link rel="match" href="relative-green-ref.html">
+<title>currentColor is inherited correctly in oklch RCS</title>
+<link rel="help" href="https://drafts.csswg.org/css-color-5/#resolving-rcs">
+<link rel="author" href="mailto:chris@w3.org" title="Chris Lilley">
+<style>
+div {
+  width: 100px;
+  height: 100px;
+  background-color: red;
+  color: red;
+  background-color: oklch(from currentColor l c h);
+}
+div div {
+  color: green;
+  background-color: inherit;
+}
+</style>
+<div>
+  <div></div>
+</div>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-color/relative-currentcolor-prophoto-01.html b/tests/wpt/tests/css/css-color/relative-currentcolor-prophoto-01.html
new file mode 100644
index 00000000000..973cd9c756f
--- /dev/null
+++ b/tests/wpt/tests/css/css-color/relative-currentcolor-prophoto-01.html
@@ -0,0 +1,22 @@
+<!doctype html>
+<meta charset=utf-8>
+<link rel="match" href="relative-green-ref.html">
+<title>currentColor is inherited correctly in prophoto-rgb RCS</title>
+<link rel="help" href="https://drafts.csswg.org/css-color-5/#resolving-rcs">
+<link rel="author" href="mailto:chris@w3.org" title="Chris Lilley">
+<style>
+div {
+  width: 100px;
+  height: 100px;
+  background-color: red;
+  color: red;
+  background-color: color(from currentColor prophoto-rgb r g b);
+}
+div div {
+  color: green;
+  background-color: inherit;
+}
+</style>
+<div>
+  <div></div>
+</div>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-color/relative-currentcolor-rec2020-01.html b/tests/wpt/tests/css/css-color/relative-currentcolor-rec2020-01.html
new file mode 100644
index 00000000000..820d9faf457
--- /dev/null
+++ b/tests/wpt/tests/css/css-color/relative-currentcolor-rec2020-01.html
@@ -0,0 +1,22 @@
+<!doctype html>
+<meta charset=utf-8>
+<link rel="match" href="relative-green-ref.html">
+<title>currentColor is inherited correctly in rec2020 RCS</title>
+<link rel="help" href="https://drafts.csswg.org/css-color-5/#resolving-rcs">
+<link rel="author" href="mailto:chris@w3.org" title="Chris Lilley">
+<style>
+div {
+  width: 100px;
+  height: 100px;
+  background-color: red;
+  color: red;
+  background-color: color(from currentColor rec2020 r g b);
+}
+div div {
+  color: green;
+  background-color: inherit;
+}
+</style>
+<div>
+  <div></div>
+</div>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-color/relative-currentcolor-rec2020-02.html b/tests/wpt/tests/css/css-color/relative-currentcolor-rec2020-02.html
new file mode 100644
index 00000000000..a323370012c
--- /dev/null
+++ b/tests/wpt/tests/css/css-color/relative-currentcolor-rec2020-02.html
@@ -0,0 +1,22 @@
+<!doctype html>
+<meta charset=utf-8>
+<link rel="match" href="relative-rec2020-ref.html">
+<title>currentColor is inherited correctly in rec2020 RCS</title>
+<link rel="help" href="https://drafts.csswg.org/css-color-5/#resolving-rcs">
+<link rel="author" href="mailto:chris@w3.org" title="Chris Lilley">
+<style>
+div {
+  width: 100px;
+  height: 100px;
+  background-color: red;
+  color: red;
+  background-color: color(from currentColor rec2020 r g b);
+}
+div div {
+  color: color(prophoto-rgb 0.23 0.43 0.13); /* a little outside sRGB */
+  background-color: inherit;
+}
+</style>
+<div>
+  <div></div>
+</div>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-color/relative-currentcolor-rgb-01.html b/tests/wpt/tests/css/css-color/relative-currentcolor-rgb-01.html
new file mode 100644
index 00000000000..5ad90529c88
--- /dev/null
+++ b/tests/wpt/tests/css/css-color/relative-currentcolor-rgb-01.html
@@ -0,0 +1,22 @@
+<!doctype html>
+<meta charset=utf-8>
+<link rel="match" href="relative-green-ref.html">
+<title>currentColor is inherited correctly in rgb RCS</title>
+<link rel="help" href="https://drafts.csswg.org/css-color-5/#resolving-rcs">
+<link rel="author" href="mailto:chris@w3.org" title="Chris Lilley">
+<style>
+div {
+  width: 100px;
+  height: 100px;
+  background-color: red;
+  color: red;
+  background-color: rgb(from currentColor r g b);
+}
+div div {
+  color: green;
+  background-color: inherit;
+}
+</style>
+<div>
+  <div></div>
+</div>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-color/relative-currentcolor-rgb-02.html b/tests/wpt/tests/css/css-color/relative-currentcolor-rgb-02.html
new file mode 100644
index 00000000000..603938d0dbd
--- /dev/null
+++ b/tests/wpt/tests/css/css-color/relative-currentcolor-rgb-02.html
@@ -0,0 +1,22 @@
+<!doctype html>
+<meta charset=utf-8>
+<link rel="match" href="relative-green-ref.html">
+<title>currentColor is inherited correctly in rgb RCS, permutation</title>
+<link rel="help" href="https://drafts.csswg.org/css-color-5/#resolving-rcs">
+<link rel="author" href="mailto:chris@w3.org" title="Chris Lilley">
+<style>
+div {
+  width: 100px;
+  height: 100px;
+  background-color: red;
+  color: yellow;
+  background-color: rgb(from currentColor g r b);
+}
+div div {
+  color: #7F0000;
+  background-color: inherit;
+}
+</style>
+<div>
+  <div></div>
+</div>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-color/relative-currentcolor-xyzd50-01.html b/tests/wpt/tests/css/css-color/relative-currentcolor-xyzd50-01.html
new file mode 100644
index 00000000000..3caa71c84b5
--- /dev/null
+++ b/tests/wpt/tests/css/css-color/relative-currentcolor-xyzd50-01.html
@@ -0,0 +1,22 @@
+<!doctype html>
+<meta charset=utf-8>
+<link rel="match" href="relative-green-ref.html">
+<title>currentColor is inherited correctly in xyz-d65 RCS</title>
+<link rel="help" href="https://drafts.csswg.org/css-color-5/#resolving-rcs">
+<link rel="author" href="mailto:chris@w3.org" title="Chris Lilley">
+<style>
+div {
+  width: 100px;
+  height: 100px;
+  background-color: red;
+  color: red;
+  background-color: color(from currentColor xyz-d50 x y z);
+}
+div div {
+  color: green;
+  background-color: inherit;
+}
+</style>
+<div>
+  <div></div>
+</div>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-color/relative-currentcolor-xyzd65-01.html b/tests/wpt/tests/css/css-color/relative-currentcolor-xyzd65-01.html
new file mode 100644
index 00000000000..7a857ce0cd8
--- /dev/null
+++ b/tests/wpt/tests/css/css-color/relative-currentcolor-xyzd65-01.html
@@ -0,0 +1,22 @@
+<!doctype html>
+<meta charset=utf-8>
+<link rel="match" href="relative-green-ref.html">
+<title>currentColor is inherited correctly in xyz-d65 RCS</title>
+<link rel="help" href="https://drafts.csswg.org/css-color-5/#resolving-rcs">
+<link rel="author" href="mailto:chris@w3.org" title="Chris Lilley">
+<style>
+div {
+  width: 100px;
+  height: 100px;
+  background-color: red;
+  color: red;
+  background-color: color(from currentColor xyz-d65 x y z);
+}
+div div {
+  color: green;
+  background-color: inherit;
+}
+</style>
+<div>
+  <div></div>
+</div>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-color/relative-green-ref.html b/tests/wpt/tests/css/css-color/relative-green-ref.html
new file mode 100644
index 00000000000..09428a288b2
--- /dev/null
+++ b/tests/wpt/tests/css/css-color/relative-green-ref.html
@@ -0,0 +1,15 @@
+<!doctype html>
+<meta charset=utf-8>
+<link rel="author" href="mailto:chris@w3.org" title="Chris Lilley">
+<style>
+div {
+  width: 100px;
+  height: 100px;
+}
+div div {
+  background-color: green;
+}
+</style>
+<div>
+  <div></div>
+</div>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-color/relative-rec2020-ref.html b/tests/wpt/tests/css/css-color/relative-rec2020-ref.html
new file mode 100644
index 00000000000..c2dbdccd85c
--- /dev/null
+++ b/tests/wpt/tests/css/css-color/relative-rec2020-ref.html
@@ -0,0 +1,16 @@
+<!doctype html>
+<meta charset=utf-8>
+<link rel="author" href="mailto:chris@w3.org" title="Chris Lilley">
+<style>
+div {
+  width: 100px;
+  height: 100px;
+}
+div div {
+  background-color: color(rec2020 0.23072 0.46956 0.08); /* rgb(-16.284% 54.0356% -5.7344%) */
+  /* https://colorjs.io/apps/convert/?color=color(prophoto-rgb%200.23%200.43%200.13)&precision=6 */
+}
+</style>
+<div>
+  <div></div>
+</div>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-contain/contain-style-counters-004.html b/tests/wpt/tests/css/css-contain/contain-style-counters-004.html
index 40d68b4641e..56e7e3d87e7 100644
--- a/tests/wpt/tests/css/css-contain/contain-style-counters-004.html
+++ b/tests/wpt/tests/css/css-contain/contain-style-counters-004.html
@@ -1,71 +1,32 @@
 <!DOCTYPE html>
+<meta charset="UTF-8">
+<title>CSS Containment Test: 'contain: style' for counters (span descendants of &lt;body&gt;)</title>
+<link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+<link rel="help" href="https://www.w3.org/TR/css-contain-1/#containment-style">
+<link rel="match" href="reference/contain-style-counters-004-ref.html">
+<style>
+body {
+  counter-reset: counter-of-span 13;
+  contain: style;
+}
+body span {
+  counter-increment: counter-of-span 5;
+}
+div {
+  font-size: 3em;
+}
+div::after {
+  content: counter(counter-of-span);
+}
+</style>
+<body>
+  <p><span></span> <span></span> <span></span> <span></span></p>
 
-  <meta charset="UTF-8">
-
-  <title>CSS Containment Test: 'contain: style' for counters (span descendants of &lt;body&gt;)</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
-  <link rel="help" href="https://www.w3.org/TR/css-contain-1/#containment-style">
-  <link rel="match" href="reference/contain-style-counters-004-ref.html">
-
-
-  <style>
-  body
-    {
-      counter-reset: counter-of-span 13;
-    }
-
-    /*
-    This creates a new counter identified as "counter-of-span"
-    and initially sets such counter to 13 (an entirely
-    arbitrary number)
-    */
-
-  body
-    {
-      contain: style;
-    }
-
-    /*
-    This will reset the counter to 0.
-    */
-
-  body span
-    {
-      counter-increment: counter-of-span 5;
-    }
-
-    /*
-    This increments the counter identified as "counter-of-span"
-    of the step value of 5 (an entirely arbitrary number) each
-    and every time there is a <span> descendant within the subtree
-    of body
-    */
-
-  div
-    {
-      font-size: 3em;
-    }
-
-  div::after
-    {
-      content: counter(counter-of-span);
-    }
-
-    /*
-    Now, the generated content after the span is set to the
-    current value of the counter identified as "counter-of-span"
-    */
-  </style>
-
-  <body>
-
-  <p> <span></span> <span></span> <span></span> <span></span>
-
-  <!-- 4 span inside the <p>. However, since div isn't a sibling of spans,
-       it creates a new counter.
-  -->
-
-  <p>Test passes if there is the number 0.
-
+<!-- The <span>s aren't allowed to modify the counter instantiated on the <body>,
+       so a new instance of the counter is created.
+       Since the <div> isn't a sibling of the <span>, it will not inherit this new instance,
+       and instead it will read the original counter from the <body>, with value 13.
+       This is per example at: https://drafts.csswg.org/css-contain/#containment-style  -->
+  <p>Test passes if there is the number 13.</p>
   <div></div>
+</body>
diff --git a/tests/wpt/tests/css/css-contain/contain-style-remove-element-crash.html b/tests/wpt/tests/css/css-contain/contain-style-remove-element-crash.html
new file mode 100644
index 00000000000..cbf079523ff
--- /dev/null
+++ b/tests/wpt/tests/css/css-contain/contain-style-remove-element-crash.html
@@ -0,0 +1,26 @@
+<style>
+* {
+  counter-reset: reversed(counter_3) reversed(counter_4) 64 reversed(counter_5) -8772;
+  contain: layout paint style inline-size !important;
+}
+</style>
+<script>
+window.addEventListener("load", () => {
+  let a = document.documentElement
+  let b = document.getElementById("o1")
+  let c = document.getElementById("o3")
+  let d = new Range()
+  document.documentElement.style.display = "none"
+  document.documentElement.getBoundingClientRect()
+  document.documentElement.style.display = ""
+  d.setStartAfter(document.getElementById("o2"))
+  try { document.prepend("", document.documentElement) } catch (e) {}
+  d.surroundContents(b)
+  try { b.prepend(a, c) } catch (e) {}
+  b.scrollIntoView({ })
+  a.style.display = "none"
+})
+</script>
+<br id="o1">
+<li id="o2">
+<input id="o3">
diff --git a/tests/wpt/tests/css/css-contain/container-queries/auto-scrollbars.html b/tests/wpt/tests/css/css-contain/container-queries/auto-scrollbars.html
index 9cf797186c5..44074ed2133 100644
--- a/tests/wpt/tests/css/css-contain/container-queries/auto-scrollbars.html
+++ b/tests/wpt/tests/css/css-contain/container-queries/auto-scrollbars.html
@@ -37,15 +37,15 @@
                                "Tests do not work with overlay scrollbars");
   });
 
+  let initialScrollerWidth = scroller.clientWidth;
   test(() => {
-    assert_less_than(scroller.clientWidth, 100, "Expects a vertical scrollbar");
     assert_equals(getComputedStyle(inner).height, "50px",
                   "Layout with a scrollbar means the container query applies");
   }, "Initial layout - expecting a scrollbar without overflowing content instead of overflowing content without a scrollbar");
 
   test(() => {
     inner.style.borderBottomWidth = "2px";
-    assert_less_than(scroller.clientWidth, 100, "Expects a vertical scrollbar");
+    assert_equals(scroller.clientWidth, initialScrollerWidth, "Scrollbar visibility is consistent after reflow.");
     assert_equals(getComputedStyle(inner).height, "50px",
                   "Layout with a scrollbar means the container query applies");
   }, "Same result after a reflow");
diff --git a/tests/wpt/tests/css/css-contain/container-queries/crashtests/chrome-custom-highlight-crash.html b/tests/wpt/tests/css/css-contain/container-queries/crashtests/chrome-custom-highlight-crash.html
new file mode 100644
index 00000000000..61e5075ed4e
--- /dev/null
+++ b/tests/wpt/tests/css/css-contain/container-queries/crashtests/chrome-custom-highlight-crash.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<title>Empty ::highlight styles inside @container causes crash</title>
+<link rel="help" href="https://crbug.com/1486352">
+<style>
+  @container (width) {
+    section::highlight(custom-highlight) {
+      --foo: bar;
+    }
+  }
+</style>
+<section style="container-type:inline-size"></section>
diff --git a/tests/wpt/tests/css/css-contain/container-queries/dialog-backdrop-create.html b/tests/wpt/tests/css/css-contain/container-queries/dialog-backdrop-create.html
index f72bb69f682..ef74973addc 100644
--- a/tests/wpt/tests/css/css-contain/container-queries/dialog-backdrop-create.html
+++ b/tests/wpt/tests/css/css-contain/container-queries/dialog-backdrop-create.html
@@ -15,6 +15,7 @@
     visibility: hidden;
   }
   dialog::backdrop {
+    visibility: visible;
     display: none;
     background-color: green;
   }
diff --git a/tests/wpt/tests/css/css-contain/container-queries/pseudo-elements-009-ref.html b/tests/wpt/tests/css/css-contain/container-queries/pseudo-elements-009-ref.html
new file mode 100644
index 00000000000..fe6fbb140b3
--- /dev/null
+++ b/tests/wpt/tests/css/css-contain/container-queries/pseudo-elements-009-ref.html
@@ -0,0 +1,4 @@
+<!DOCTYPE html>
+<title>CSS Test Reference</title>
+<span style="color: green">Selection</span>
+<span style="color: green">Highlight</span>
diff --git a/tests/wpt/tests/css/css-contain/container-queries/pseudo-elements-009.html b/tests/wpt/tests/css/css-contain/container-queries/pseudo-elements-009.html
new file mode 100644
index 00000000000..769a5962ff7
--- /dev/null
+++ b/tests/wpt/tests/css/css-contain/container-queries/pseudo-elements-009.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<title>CSS Container Queries Test: Container for highlight pseudo elements</title>
+<link rel="help" href="https://drafts.csswg.org/css-contain-3/#query-container">
+<link rel="match" href="pseudo-elements-009-ref.html">
+<style>
+  #container {
+    container-type: inline-size;
+    width: 500px;
+  }
+
+  ::selection { color: red; background: transparent; }
+  ::highlight(hi) { color: red; background: transparent; }
+
+  @container (width >= 400px) {
+    ::selection { color: green }
+    ::highlight(hi) { color: green }
+  }
+</style>
+<div id="container">
+  <span id="sel">Selection</span>
+  <span id="hi">Highlight</span>
+</div>
+<script>
+  getSelection().selectAllChildren(sel);
+  let highlight_range = document.createRange();
+  highlight_range.selectNode(hi);
+  CSS.highlights.set("hi", new Highlight(highlight_range));
+</script>
diff --git a/tests/wpt/tests/css/css-contain/container-queries/pseudo-elements-010-ref.html b/tests/wpt/tests/css/css-contain/container-queries/pseudo-elements-010-ref.html
new file mode 100644
index 00000000000..a98a4023284
--- /dev/null
+++ b/tests/wpt/tests/css/css-contain/container-queries/pseudo-elements-010-ref.html
@@ -0,0 +1,3 @@
+<!DOCTYPE html>
+<title>CSS Test Reference</title>
+<span style="color: green">Highlight</span>
diff --git a/tests/wpt/tests/css/css-contain/container-queries/pseudo-elements-010.html b/tests/wpt/tests/css/css-contain/container-queries/pseudo-elements-010.html
new file mode 100644
index 00000000000..e2e8f8659c5
--- /dev/null
+++ b/tests/wpt/tests/css/css-contain/container-queries/pseudo-elements-010.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<title>CSS Container Queries Test: Container for highlight pseudo elements</title>
+<link rel="help" href="https://drafts.csswg.org/css-contain-3/#query-container">
+<link rel="match" href="pseudo-elements-010-ref.html">
+<script src="/common/reftest-wait.js"></script>
+<style>
+  .container { container-type: inline-size; }
+  #outer { width: 300px; }
+  #inner { width: 500px; }
+
+  #inner::highlight(hi) {
+    color: red;
+    background: transparent;
+  }
+  @container (width >= 400px) {
+    #inner.green::highlight(hi) {
+      color: green;
+      background: transparent;
+    }
+  }
+</style>
+<div id="outer" class="container">
+  <div id="inner" class="container">
+    <span id="hi">Highlight</span>
+  </div>
+</div>
+<script>
+  let highlight_range = document.createRange();
+  highlight_range.selectNode(hi);
+  CSS.highlights.set("hi", new Highlight(highlight_range));
+
+  requestAnimationFrame(() => {
+    requestAnimationFrame(() => {
+      inner.classList.add("green");
+      takeScreenshot();
+    });
+  });
+</script>
diff --git a/tests/wpt/tests/css/css-contain/container-queries/pseudo-elements-011.html b/tests/wpt/tests/css/css-contain/container-queries/pseudo-elements-011.html
new file mode 100644
index 00000000000..26dabbe1dfe
--- /dev/null
+++ b/tests/wpt/tests/css/css-contain/container-queries/pseudo-elements-011.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<title>CSS Container Queries Test: ::highlight pseudo element on size container</title>
+<link rel="help" href="https://drafts.csswg.org/css-contain-3/#query-container">
+<link rel="match" href="pseudo-elements-010-ref.html">
+<style>
+  #container {
+    width: 500px;
+    container-type: inline-size;
+  }
+  #container::highlight(hi) {
+    color: red;
+    background: transparent;
+  }
+  @container (width >= 400px) {
+    #container::highlight(hi) {
+      color: green;
+      background: transparent;
+    }
+  }
+</style>
+<div id="container">Highlight</div>
+<script>
+  let highlight_range = document.createRange();
+  highlight_range.selectNode(container);
+  CSS.highlights.set("hi", new Highlight(highlight_range));
+</script>
diff --git a/tests/wpt/tests/css/css-contain/container-queries/pseudo-elements-012.html b/tests/wpt/tests/css/css-contain/container-queries/pseudo-elements-012.html
new file mode 100644
index 00000000000..7c36d9270d9
--- /dev/null
+++ b/tests/wpt/tests/css/css-contain/container-queries/pseudo-elements-012.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<title>CSS Container Queries Test: ::highlight pseudo size container change</title>
+<link rel="help" href="https://drafts.csswg.org/css-contain-3/#query-container">
+<link rel="match" href="pseudo-elements-010-ref.html">
+<script src="/common/reftest-wait.js"></script>
+<style>
+  #container {
+    width: 300px;
+    container-type: inline-size;
+  }
+  #container::highlight(hi) {
+    color: red;
+    background: transparent;
+  }
+  @container (width >= 400px) {
+    #container::highlight(hi) {
+      color: green;
+      background: transparent;
+    }
+  }
+</style>
+<div id="container">Highlight</div>
+<script>
+  let highlight_range = document.createRange();
+  highlight_range.selectNode(container);
+  CSS.highlights.set("hi", new Highlight(highlight_range));
+
+  requestAnimationFrame(() => {
+    requestAnimationFrame(() => {
+      container.style.width = "500px";
+      takeScreenshot();
+    });
+  });
+</script>
diff --git a/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-086.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-086.html
new file mode 100644
index 00000000000..51c1586098e
--- /dev/null
+++ b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-086.html
@@ -0,0 +1,43 @@
+<!doctype HTML>
+<html>
+<meta charset="utf8">
+<title>Content Visibility: innerText</title>
+<link rel="author" title="Rob Buis" href="mailto:rbuis@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-contain/#content-visibility">
+<meta name="assert" content="innerText is empty for skipped content due to content-visibility auto">
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/utils.js"></script>
+
+<div id="container">
+This text should be visible.
+<div style="content-visibility: auto">
+  This text should be visible.
+  <div id="inner">This text is also visible.<br/>
+  </div>
+</div>
+<div id=spacer style="height: 300vh"></div>
+<div style="content-visibility: auto">
+  This text should not be visible.
+  <div id="inner2">
+    This text is also not visible.
+  </div>
+</div>
+</div>
+
+<script>
+async_test((t) => {
+  function step1() {
+    t.step(() => {
+      assert_equals(document.getElementById("container").innerText, "This text should be visible.\nThis text should be visible.\nThis text is also visible.\n");
+      assert_equals(document.getElementById("inner").innerText, "This text is also visible.\n");
+      assert_equals(document.getElementById("inner2").innerText, "");
+    });
+    t.done();
+  }
+
+  requestAnimationFrame(() => requestAnimationFrame(step1));
+});
+</script>
+</html>
diff --git a/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-087.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-087.html
new file mode 100644
index 00000000000..f2faa45774c
--- /dev/null
+++ b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-087.html
@@ -0,0 +1,26 @@
+<!doctype HTML>
+<html>
+<meta charset="utf8">
+<title>Content visibility: focus does not target nested c-v: hidden/auto subtree"</title>
+<link rel="author" title="Rob Buis" href="mailto:rbuis@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-contain/#content-visibility">
+<meta name="assert" content="focus does not target nested c-v: hidden/auto subtree">
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<div style="content-visibility: hidden">
+  <div style="content-visibility: auto">
+    <div id="focusable" tabIndex="0">
+      focusable thing
+    </div>
+  </div>
+</div>
+
+<script>
+test(() => {
+  focusable.focus();
+  assert_not_equals(document.activeElement, focusable);
+}, "Trying to focus on an element in a nested hidden/auto subtree will not work");
+</script>
+</html>
diff --git a/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-088.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-088.html
new file mode 100644
index 00000000000..1d1b549594c
--- /dev/null
+++ b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-088.html
@@ -0,0 +1,46 @@
+<!doctype HTML>
+<html>
+<meta charset="utf8">
+<title>Content Visibility: getClientRects measures correctly</title>
+<link rel="author" title="Rob Buis" href="mailto:rbuis@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-contain/#content-visibility">
+<meta name="assert" content="getClientRects measures correctly in content-visibility hidden subtree">
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<style>
+body {
+  margin: 0;
+  padding: 0;
+}
+#outer {
+  width: 100px;
+  background: lightblue;
+
+  content-visibility: hidden;
+}
+#inner {
+  margin: 25px;
+  width: 50px;
+  height: 50px;
+  background: lightgreen;
+}
+</style>
+
+<body>
+<div id="outer"><div id="inner"></div></div>
+</body>
+
+<script>
+test(() => {
+  const outer = document.getElementById("outer");
+  assert_equals(outer.getClientRects()[0].height, 0, "outer height");
+
+  const inner = document.getElementById("inner");
+  assert_equals(inner.getClientRects()[0].width, 50, "inner width");
+  assert_equals(inner.getClientRects()[0].height, 50, "inner height");
+});
+
+</script>
+</html>
diff --git a/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-089.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-089.html
new file mode 100644
index 00000000000..b7e4d90299b
--- /dev/null
+++ b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-089.html
@@ -0,0 +1,48 @@
+<!doctype HTML>
+<html>
+<meta charset="utf8">
+<title>Content Visibility: clientLeft/clientTop/clientWidth/clientHeight measure correctly</title>
+<link rel="author" title="Rob Buis" href="mailto:rbuis@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-contain/#content-visibility">
+<meta name="assert" content="clientLeft/clientTop/clientWidth/clientHeight measure correctly in content-visibility hidden subtree">
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<style>
+body {
+  margin: 0;
+  padding: 0;
+}
+#outer {
+  width: 100px;
+  height: 100px;
+  background: lightblue;
+
+  content-visibility: hidden;
+}
+#inner {
+  border-left: 25px black solid;
+  border-top: 25px black solid;
+  margin: 25px;
+  width: 50px;
+  height: 50px;
+  background: lightgreen;
+}
+</style>
+
+<body>
+<div id="outer"><div id="inner"></div></div>
+</body>
+
+<script>
+test(() => {
+  const inner = document.getElementById("inner");
+  assert_equals(inner.clientLeft, 25, "left");
+  assert_equals(inner.clientTop, 25, "top");
+  assert_equals(inner.clientWidth, 50, "width");
+  assert_equals(inner.clientHeight, 50, "height");
+});
+
+</script>
+</html>
diff --git a/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-090.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-090.html
new file mode 100644
index 00000000000..4d90d0611c4
--- /dev/null
+++ b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-090.html
@@ -0,0 +1,51 @@
+<!doctype HTML>
+<html>
+<meta charset="utf8">
+<title>Content Visibility: scrollLeft/scrollTop/scrollWidth/scrollHeight measure correctly</title>
+<link rel="author" title="Rob Buis" href="mailto:rbuis@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-contain/#content-visibility">
+<meta name="assert" content="scrollLeft/scrollTop/scrollWidth/scrollHeight measure correctly in content-visibility hidden subtree">
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<style>
+body {
+  margin: 0;
+  padding: 0;
+}
+#outer {
+  width: 100px;
+  height: 100px;
+  background: lightblue;
+  overflow: scroll;
+
+  content-visibility: hidden;
+}
+#inner {
+  margin: 25px;
+  width: 250px;
+  height: 250px;
+  background: lightgreen;
+}
+</style>
+
+<body>
+<div id="outer"><div id="inner"></div></div>
+</body>
+
+<script>
+test(() => {
+  const outer = document.getElementById("outer");
+
+  outer.scrollLeft = 25;
+  assert_equals(outer.scrollLeft, 25, "left");
+  assert_equals(outer.scrollWidth, 275, "width");
+
+  outer.scrollTop = 25;
+  assert_equals(outer.scrollTop, 25, "top");
+  assert_equals(outer.scrollHeight, 300, "height");
+});
+
+</script>
+</html>
diff --git a/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-091.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-091.html
new file mode 100644
index 00000000000..f6799693eba
--- /dev/null
+++ b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-091.html
@@ -0,0 +1,24 @@
+<!doctype HTML>
+<meta charset="utf8">
+<title>CSS Content Visibility: getComputedStyle works in hidden c-v subtree</title>
+<link rel="author" title="Rob Buis" href="mailto:rbuis@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-contain/#content-visibility">
+<meta name="assert" content="getComputedStyle works in hidden c-v subtree">
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<style>
+#container { content-visibility: hidden }
+</style>
+
+<div id=container style="width:200px">
+<div id=target style="width:50%"></div>
+</div>
+
+<script>
+test(() => {
+  const computedStyle = getComputedStyle(target);
+  assert_equals(computedStyle.width, "100px");
+}, "getComputedStyle works in hidden c-v subtree");
+</script>
diff --git a/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-animation-and-scroll-ref.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-animation-and-scroll-ref.html
new file mode 100644
index 00000000000..548970812b6
--- /dev/null
+++ b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-animation-and-scroll-ref.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+<title>Test that scrolling to a content-visibility: auto subtree restarts animations in it</title>
+<link rel="author" title="Rob Buis" href="mailto:rbuis@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-contain-2/">
+
+<style>
+#target {
+  position: relative;
+  background: green;
+  height: 100px;
+  width: 100px;
+  left: 100px;
+}
+</style>
+<body>
+  <div id="container">
+    <div id="target"></div>
+  </div>
+</body>
diff --git a/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-animation-and-scroll.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-animation-and-scroll.html
new file mode 100644
index 00000000000..3c4fd9c4faf
--- /dev/null
+++ b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-animation-and-scroll.html
@@ -0,0 +1,61 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<title>Test that scrolling to a content-visibility: auto subtree restarts animations in it</title>
+<link rel="author" title="Rob Buis" href="mailto:rbuis@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-contain-2/">
+<link rel="match" href="content-visibility-animation-and-scroll-ref.html">
+<meta name="assert" content="animations in content-visibility: auto subtree should restart when scrolled to">
+
+<script src="/common/reftest-wait.js"></script>
+<script src="../resources/utils.js"></script>
+
+<style>
+#container {
+  content-visibility: auto;
+  contain-intrinsic-size: 100px 100px;
+}
+@keyframes unfade {
+  from { opacity: 0; transform: none; }
+  to { opacity: 1; transform: translate(100px); }
+}
+#target {
+  background: green;
+  height: 100px;
+  width: 100px;
+}
+.animate {
+  animation: unfade 1s linear 1 alternate;
+  animation-fill-mode: forwards;
+}
+#spacer {
+  height: 300vh;
+}
+</style>
+<body>
+  <div id="spacer"></div>
+  <div id="container"></div>
+</body>
+
+<script>
+function createAnimatingElement(name) {
+  const container = document.getElementById('container');
+  const target = document.createElement('div');
+  container.appendChild(target);
+  target.id = 'target';
+  target.className = name;
+  return target;
+}
+
+function runTest() {
+  const container = document.getElementById('container');
+  const target = createAnimatingElement('animate');
+  container.scrollIntoView(true /* alignToTop */);
+  const listener = (e) => {
+    spacer.style.height = "0px";
+    takeScreenshot();
+  };
+
+  target.addEventListener("animationend", listener);
+}
+window.onload = () => requestAnimationFrame(() => requestAnimationFrame(runTest));
+</script>
diff --git a/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-animation-becomes-visible-ref.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-animation-becomes-visible-ref.html
new file mode 100644
index 00000000000..f927a02ca8c
--- /dev/null
+++ b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-animation-becomes-visible-ref.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+<title>Test that making a content-visibility: hidden subtree visible restarts animations in it</title>
+<link rel="author" title="Rob Buis" href="mailto:rbuis@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-contain-2/">
+
+<style>
+#target {
+  position: relative;
+  background: green;
+  height: 100px;
+  width: 100px;
+  left: 100px;
+}
+</style>
+<body>
+  <div id="target"</div>
+</body>
diff --git a/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-animation-becomes-visible.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-animation-becomes-visible.html
new file mode 100644
index 00000000000..c81aa70bc2b
--- /dev/null
+++ b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-animation-becomes-visible.html
@@ -0,0 +1,55 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<title>Test that making a content-visibility: hidden subtree visible restarts animations in it</title>
+<link rel="author" title="Rob Buis" href="mailto:rbuis@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-contain-2/">
+<link rel="match" href="content-visibility-animation-becomes-visible-ref.html">
+<meta name="assert" content="animations in content-visibility: hidden subtree should restart once visible">
+
+<script src="/common/reftest-wait.js"></script>
+<script src="../resources/utils.js"></script>
+
+<style>
+#container {
+  content-visibility: hidden;
+}
+@keyframes fade {
+  from { opacity: 0; transform: none; }
+  to { opacity: 1; transform: translate(100px); }
+}
+#target {
+  background: green;
+  height: 100px;
+  width: 100px;
+}
+.animate {
+  animation: fade 1s linear 1 alternate;
+  animation-fill-mode: forwards;
+}
+</style>
+<body>
+  <div id="container"></div>
+</body>
+
+<script>
+function createAnimatingElement(name) {
+  const container = document.getElementById('container');
+  const target = document.createElement('div');
+  container.appendChild(target);
+  target.id = 'target';
+  target.className = name;
+  return target;
+}
+
+function runTest() {
+  const container = document.getElementById('container');
+  const target = createAnimatingElement('animate');
+  container.style.contentVisibility = "visible";
+  const listener = (e) => {
+    takeScreenshot();
+  };
+
+  target.addEventListener("animationend", listener);
+}
+window.onload = () => requestAnimationFrame(() => requestAnimationFrame(runTest));
+</script>
diff --git a/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-animation-in-auto-subtree.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-animation-in-auto-subtree.html
new file mode 100644
index 00000000000..50f04f94f3f
--- /dev/null
+++ b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-animation-in-auto-subtree.html
@@ -0,0 +1,188 @@
+<!DOCTYPE html>
+<meta charset=utf8>
+<title>Test getComputedStyle on a CSS animation in a content visibility subtree using content-visibility: auto</title>
+<link rel="help" href="https://drafts.csswg.org/css-contain-2/">
+<script src="/web-animations/testcommon.js"></script>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+#container {
+  content-visibility: auto;
+}
+@keyframes fade {
+  from { opacity: 1; }
+  to { opacity: 0;  }
+}
+#target {
+  background: 'green';
+  height: 100px;
+  width: 100px;
+}
+.animate {
+  animation: fade 1s linear 2 alternate;
+}
+.transition {
+  transition: opacity 1s linear;
+}
+</style>
+<body>
+  <div id="spacer"></div>
+  <div id="container"></div>
+</body>
+<script>
+"use strict";
+
+function reset() {
+  const container = document.getElementById('container');
+  const target = document.getElementById('target');
+  container.style = '';
+  container.removeChild(target);
+}
+
+function createAnimatingElement(test, name) {
+  const container = document.getElementById('container');
+  const target = document.createElement('div');
+  container.appendChild(target);
+  target.id = 'target';
+  target.className = name;
+  test.add_cleanup(() => {
+    reset();
+  });
+  return target;
+}
+
+promise_test(async t => {
+  const container = document.getElementById('container');
+  const target = createAnimatingElement(t, 'animate');
+  let animationIterationEvent = false;
+  const animation = target.getAnimations()[0];
+  await animation.ready;
+  await waitForAnimationFrames(1);
+  document.getElementById("spacer").style.height = "300vh";
+  await waitForAnimationFrames(1);
+  target.addEventListener('animationiteration', () => {
+    animationIterationEvent = true;
+  });
+  animation.currentTime = 1500;
+  assert_approx_equals(
+      parseFloat(getComputedStyle(target).opacity), 0.5, 1e-6,
+      'Computed style is updated even when the animation is running in a ' +
+      'content visibility subtree');
+  await waitForAnimationFrames(2);
+  assert_false(animationIterationEvent,
+               'Animation events do not fire while the animation is ' +
+               'running in a content visibility subtree');
+  document.getElementById("spacer").style.height = "0vh";
+  await waitForAnimationFrames(2);
+  assert_true(animationIterationEvent,
+              'The animationiteration event fires once the animation is ' +
+              'no longer content visibility');
+}, 'Animation events do not fire for a CSS animation running in a content ' +
+   'visibility subtree');
+
+promise_test(async t => {
+  const container = document.getElementById('container');
+  const target = createAnimatingElement(t, 'animate');
+  const animation = target.getAnimations()[0];
+  await animation.ready;
+  let finishedWhileDisplayLocked = false;
+  animation.finished.then(() => {
+    finishedWhileDisplayLocked =
+        getComputedStyle(target).height == '0px';
+  });
+  await waitForAnimationFrames(1);
+  document.getElementById("spacer").style.height = "300vh";
+  // Advance to just shy of the effect end.
+  animation.currentTime = 1999;
+  assert_approx_equals(
+      parseFloat(getComputedStyle(target).opacity), 0.999, 1e-6,
+                'Computed style is updated even when the animation is ' +
+                'running in a content visibility subtree');
+  // Advancing frames should not resolve the finished promise.
+  await waitForAnimationFrames(3);
+  document.getElementById("spacer").style.height = "0vh";
+  // Now we can resolve the finished promise.
+  await animation.finished;
+  assert_equals(finishedWhileDisplayLocked, false);
+}, 'The finished promise does not resolve due to the normal passage of time  ' +
+   'for a CSS animation in a content visibility subtree');
+
+promise_test(async t => {
+  const container = document.getElementById('container');
+  await waitForAnimationFrames(1);
+  const target = createAnimatingElement(t, 'transition');
+  await waitForAnimationFrames(1);
+  target.style.opacity = 0;
+  const animation = target.getAnimations()[0];
+  await animation.ready;
+  let finishedWhileDisplayLocked = false;
+  animation.finished.then(() => {
+    finishedWhileDisplayLocked =
+        getComputedStyle(target).height == '0px';
+  });
+  await waitForAnimationFrames(1);
+  document.getElementById("spacer").style.height = "300vh";
+  // Advance to just shy of the effect end.
+  animation.currentTime = 999;
+  assert_approx_equals(
+      parseFloat(getComputedStyle(target).opacity), 0.001, 1e-6,
+                'Computed style is updated even when the animation is ' +
+                'running in a content visibility subtree');
+  // Advancing frames should not resolve the finished promise.
+  await waitForAnimationFrames(3);
+  document.getElementById("spacer").style.height = "0vh";
+  // Now we can resolve the finished promise.
+  await animation.finished;
+  assert_equals(finishedWhileDisplayLocked, false);
+}, 'The finished promise does not resolve due to the normal passage of time  ' +
+   'for a CSS transition in a content visibility subtree');
+
+promise_test(async t => {
+  const container = document.getElementById('container');
+  const target = createAnimatingElement(t, 'animate');
+  const animation = target.getAnimations()[0];
+  target.className = '';
+  document.getElementById("spacer").style.height = "300vh";
+  assert_equals(target.getAnimations().length, 0);
+
+  // Though originally a CSS animation, it is no longer associated with
+  // CSS rules and no longer has an owning element. It now behaves like a
+  // programmatic web animation. Animation playback events (but not CSS
+  // animation events) should be dispatched and promises resolved despite
+  // being in a content visibility subtree.
+
+  let cssAnimationEndEvent = false;
+  target.addEventListener('animationend', () => {
+    cssAnimationEndEvent = true;
+  });
+
+  let animationFinishEvent = false;
+  animation.addEventListener('finish', () => {
+    animationFinishEvent = true;
+  });
+
+  let animationFinished = false;
+  animation.finished.then(() => {
+    animationFinished = true;
+  });
+
+  animation.play();
+  assert_equals(target.getAnimations().length, 1);
+
+  animation.currentTime = 1999;
+  await animation.ready;
+  await waitForAnimationFrames(2);
+
+  assert_true(animationFinishEvent,
+              'Animation event not blocked on content visibility subtree if ' +
+              'no owning element');
+  assert_true(animationFinished,
+              'Finished promise not blocked on content visibility subtree if ' +
+              'no owning element');
+  assert_false(cssAnimationEndEvent,
+              'CSS animation events should not be dispatched if there is no ' +
+              'owning element');
+}, 'Events and promises are handled normally for animations without an ' +
+   'owning element');
+
+</script>
diff --git a/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-svg-path.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-svg-path.html
new file mode 100644
index 00000000000..a91f5817fdd
--- /dev/null
+++ b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-svg-path.html
@@ -0,0 +1,101 @@
+<!DOCTYPE html>
+<link rel="author" href="mailto:rbuis@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-contain/#content-visibility">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<style>
+body {
+  margin: 0;
+  padding: 0;
+}
+div {
+  content-visibility:hidden;
+}
+path {
+  stroke-width: 5px;
+  stroke:green;
+}
+</style>
+
+<div>
+  <svg xmlns="http://www.w3.org/2000/svg">
+    <path id="path" d="M5 5 L 10 5 L 10 10 L 5 10 Z"/>
+  </svg>
+</div>
+
+<script>
+  test(() => {
+    const pathElement = document.getElementById('path');
+    const length = pathElement.getTotalLength();
+    assert_greater_than(length, 0, 'length');
+  }, `getTotalLength() should return nonzero value in a c-v:hidden subtree.`);
+
+  test(() => {
+    const pathElement = document.getElementById('path');
+    const point = pathElement.getPointAtLength(0);
+    assert_greater_than(point.x, 0, 'point.x');
+    assert_greater_than(point.y, 0, 'point.y');
+  }, `getPointAtLength() should return nonzero values in a c-v:hidden subtree.`);
+
+  test(() => {
+    const pathElement = document.getElementById('path');
+    const inFill = pathElement.isPointInFill({ x: 7, y: 7});
+    assert_true(inFill, 'fill');
+  }, `isPointInFill() should return true in a c-v:hidden subtree.`);
+
+  test(() => {
+    const pathElement = document.getElementById('path');
+    const inStroke = pathElement.isPointInStroke({ x: 7, y: 7});
+    assert_true(inStroke, 'stroke');
+  }, `isPointInStroke() should return true in a c-v:hidden subtree.`);
+
+  test(() => {
+    const pathElement = document.getElementById('path');
+    var rect = pathElement.ownerSVGElement.createSVGRect();
+    rect.x = 10;
+    rect.y = 10;
+    rect.width = 50;
+    rect.height = 50;
+    const intersection = pathElement.ownerSVGElement.checkIntersection(pathElement, rect);
+    assert_true(intersection, 'intersection');
+  }, `checkIntersection() should return true in a c-v:hidden subtree.`);
+
+  test(() => {
+    const pathElement = document.getElementById('path');
+    var rect = pathElement.ownerSVGElement.createSVGRect();
+    rect.width = 50;
+    rect.height = 50;
+    const enclosed = pathElement.ownerSVGElement.checkEnclosure(pathElement, rect);
+    assert_true(enclosed, 'enclosure');
+  }, `checkEnclosure() should return true in a c-v:hidden subtree.`);
+
+  test(() => {
+    const pathElement = document.getElementById('path');
+    var rect = pathElement.ownerSVGElement.createSVGRect();
+    rect.x = 10;
+    rect.y = 10;
+    rect.width = 50;
+    rect.height = 50;
+    const intersectionList = pathElement.ownerSVGElement.getIntersectionList(rect, null);
+    assert_greater_than(intersectionList.length, 0, 'intersection');
+  }, `getIntersectionList() should return items in a c-v:hidden subtree.`);
+
+  test(() => {
+    const pathElement = document.getElementById('path');
+    var rect = pathElement.ownerSVGElement.createSVGRect();
+    rect.width = 50;
+    rect.height = 50;
+    const enclusureList = pathElement.ownerSVGElement.getEnclosureList(rect, null);
+    assert_greater_than(enclusureList.length, 0, 'intersection');
+  }, `getEnclosureList() should return items in a c-v:hidden subtree.`);
+
+  test(() => {
+    const pathElement = document.getElementById('path');
+    const bbox = pathElement.getBBox();
+    assert_not_equals(bbox.x, 0, 'x');
+    assert_not_equals(bbox.y, 0, 'y');
+    assert_not_equals(bbox.width, 0, 'width');
+    assert_not_equals(bbox.height, 0, 'height');
+  }, `path getBBox() should return nonzero values in a c-v:hidden subtree.`);
+</script>
diff --git a/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-svg-rect.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-svg-rect.html
new file mode 100644
index 00000000000..be0abe57674
--- /dev/null
+++ b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-svg-rect.html
@@ -0,0 +1,52 @@
+<!DOCTYPE html>
+<link rel="author" href="mailto:rbuis@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-contain/#content-visibility">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<style>
+body {
+  margin: 0;
+  padding: 0;
+}
+div {
+  content-visibility:hidden;
+}
+rect {
+  stroke-width: 5px;
+  stroke:green;
+}
+</style>
+
+<div>
+  <svg xmlns="http://www.w3.org/2000/svg">
+    <rect id="rect" x="5" y="5" width="10" height="10"/>
+  </svg>
+</div>
+
+<script>
+  test(() => {
+    const rectElement = document.getElementById('rect');
+    const length = rectElement.getTotalLength();
+    assert_greater_than(length, 0, 'length');
+  }, `getTotalLength() should return nonzero value in a c-v:hidden subtree.`);
+
+  test(() => {
+    const rectElement = document.getElementById('rect');
+    const point = rectElement.getPointAtLength(0);
+    assert_greater_than(point.x, 0, 'point.x');
+    assert_greater_than(point.y, 0, 'point.y');
+  }, `getPointAtLength() should return nonzero values in a c-v:hidden subtree.`);
+
+  test(() => {
+    const rectElement = document.getElementById('rect');
+    const inFill = rectElement.isPointInFill({ x: 7, y: 7});
+    assert_true(inFill, 'fill');
+  }, `isPointInFill() should return true in a c-v:hidden subtree.`);
+
+  test(() => {
+    const rectElement = document.getElementById('rect');
+    const inStroke = rectElement.isPointInStroke({ x: 7, y: 7});
+    assert_true(inStroke, 'stroke');
+  }, `isPointInStroke() should return true in a c-v:hidden subtree.`);
+</script>
diff --git a/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-svg-text.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-svg-text.html
new file mode 100644
index 00000000000..7f12a944889
--- /dev/null
+++ b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-svg-text.html
@@ -0,0 +1,60 @@
+<!DOCTYPE html>
+<link rel="author" href="mailto:rbuis@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-contain/#content-visibility">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<style>
+body {
+  margin: 0;
+  padding: 0;
+}
+div {
+  content-visibility:hidden;
+}
+</style>
+
+<div>
+  <svg xmlns="http://www.w3.org/2000/svg">
+    <text><tspan id="tspan1" x="50 150 100" y="100" transform="scale(2, 2)">abc</tspan></text>
+  </svg>
+</div>
+
+<script>
+  test(() => {
+    const element = document.querySelector('#tspan1');
+    assert_greater_than(element.getComputedTextLength(), 0);
+  }, `getComputedTextLength() should return nonzero values in a c-v:hidden subtree.`);
+
+  test(() => {
+    const element = document.querySelector('#tspan1');
+    assert_greater_than(element.getCharNumAtPosition(new DOMPoint(51, 101), 0), -1, "position");
+  }, `getCharNumAtPosition() should return nonzero values in a c-v:hidden subtree.`);
+
+  test(() => {
+    const element = document.querySelector('#tspan1');
+    assert_equals(element.getNumberOfChars(), 3);
+  }, `getNumberOfChars() should return nonzero values in a c-v:hidden subtree.`);
+
+  test(() => {
+    const element = document.querySelector('#tspan1');
+    const ctm = element.getCTM();
+    assert_equals(ctm.a, 2, 'a');
+    assert_equals(ctm.b, 0, 'b');
+    assert_equals(ctm.c, 0, 'c');
+    assert_equals(ctm.d, 2, 'd');
+    assert_equals(ctm.e, 0, 'e');
+    assert_equals(ctm.f, 0, 'f');
+  }, `getCTM() should return nonzero values in a c-v:hidden subtree.`);
+
+  test(() => {
+    const element = document.querySelector('#tspan1');
+    const ctm = element.getScreenCTM();
+    assert_equals(ctm.a, 2, 'a');
+    assert_equals(ctm.b, 0, 'b');
+    assert_equals(ctm.c, 0, 'c');
+    assert_equals(ctm.d, 2, 'd');
+    assert_equals(ctm.e, 0, 'e');
+    assert_equals(ctm.f, 0, 'f');
+  }, `getScreenCTM() should return nonzero values in a c-v:hidden subtree.`);
+</script>
diff --git a/tests/wpt/tests/css/css-contain/content-visibility/crashtests/grid-dynamic.html b/tests/wpt/tests/css/css-contain/content-visibility/crashtests/grid-dynamic.html
new file mode 100644
index 00000000000..efc65859611
--- /dev/null
+++ b/tests/wpt/tests/css/css-contain/content-visibility/crashtests/grid-dynamic.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<div id="target" style="display:grid;">
+  text
+</div>
+<script>
+const target = document.getElementById('target');
+document.body.offsetTop;
+target.style.contentVisibility = 'hidden';
+document.body.offsetTop;
+target.style.contentVisibility = '';
+</script>
diff --git a/tests/wpt/tests/css/css-contain/counter-scoping-001.html b/tests/wpt/tests/css/css-contain/counter-scoping-001.html
index f7d40dc5a08..ab948e19081 100644
--- a/tests/wpt/tests/css/css-contain/counter-scoping-001.html
+++ b/tests/wpt/tests/css/css-contain/counter-scoping-001.html
@@ -11,7 +11,7 @@
 <style>
 div {
   contain: style;
-   counter-increment: n;
+  counter-increment: n;
 }
 div::before, div::after {
   content: counters(n, '.') " ";
diff --git a/tests/wpt/tests/css/css-contain/reference/contain-style-counters-004-ref.html b/tests/wpt/tests/css/css-contain/reference/contain-style-counters-004-ref.html
index afe60666c02..c362dbbf533 100644
--- a/tests/wpt/tests/css/css-contain/reference/contain-style-counters-004-ref.html
+++ b/tests/wpt/tests/css/css-contain/reference/contain-style-counters-004-ref.html
@@ -13,6 +13,6 @@
     }
   </style>
 
-  <p>Test passes if there is the number 0.
+  <p>Test passes if there is the number 13.
 
-  <div>0</div>
+  <div>13</div>
diff --git a/tests/wpt/tests/css/css-contain/reference/contain-style-counters-005-ref.html b/tests/wpt/tests/css/css-contain/reference/contain-style-counters-005-ref.html
index 1ea1ae3f08a..9b2868b62d0 100644
--- a/tests/wpt/tests/css/css-contain/reference/contain-style-counters-005-ref.html
+++ b/tests/wpt/tests/css/css-contain/reference/contain-style-counters-005-ref.html
@@ -11,12 +11,12 @@
 <body>
 <div>1</div>
 <div class="contain">
-    <div>1</div>
-    <div>1</div>
+    <div>11</div>
+    <div>11</div>
 </div>
 <div>2</div>
 <div class="contain">
-    <div>1</div>
-    <div>2</div>
+    <div>21</div>
+    <div>22</div>
 </div>
-<div>3</div>
\ No newline at end of file
+<div>3</div>
diff --git a/tests/wpt/tests/css/css-fill-stroke/animation/fill-interpolation.html b/tests/wpt/tests/css/css-fill-stroke/animation/fill-interpolation.html
new file mode 100644
index 00000000000..aef91eb79c1
--- /dev/null
+++ b/tests/wpt/tests/css/css-fill-stroke/animation/fill-interpolation.html
@@ -0,0 +1,130 @@
+<!DOCTYPE html>
+<meta charset="UTF-8">
+<title>'fill' interpolation</title>
+<link rel="help" href="https://drafts.csswg.org/css-color/#interpolation">
+<link rel="help" href="https://drafts.fxtf.org/fill-stroke/#fill-shorthand">
+<meta name="assert" content="'fill' supports animation by computed value type">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/interpolation-testcommon.js"></script>
+<style>
+.parent {
+  fill: blue;
+}
+.target {
+  display: inline-block;
+  font-size: 60pt;
+  fill: yellow;
+}
+.expected {
+  margin-right: 15px;
+}
+</style>
+<body>
+  <template id="target-template">T</template>
+</body>
+<script>
+test_interpolation({
+  property: 'fill',
+  from: neutralKeyframe,
+  to: 'green',
+}, [
+  {at: -0.3, expect: 'rgb(255, 255, 0)'},
+  {at: 0, expect: 'rgb(255, 255, 0)'},
+  {at: 0.3, expect: 'rgb(179, 217, 0)'},
+  {at: 0.6, expect: 'rgb(102, 179, 0)'},
+  {at: 1, expect: 'rgb(0, 128, 0)'},
+  {at: 1.5, expect: 'rgb(0, 65, 0)'},
+]);
+
+test_interpolation({
+  property: 'fill',
+  from: 'initial',
+  to: 'green',
+}, [
+  {at: -0.3, expect: 'rgb(0, 0, 0)'},
+  {at: 0, expect: 'rgb(0, 0, 0)'},
+  {at: 0.3, expect: 'rgb(0, 38, 0)'},
+  {at: 0.6, expect: 'rgb(0, 77, 0)'},
+  {at: 1, expect: 'rgb(0, 128, 0)'},
+  {at: 1.5, expect: 'rgb(0, 192, 0)'},
+]);
+
+test_interpolation({
+  property: 'fill',
+  from: 'inherit',
+  to: 'green',
+}, [
+  {at: -0.3, expect: 'rgb(0, 0, 255)'},
+  {at: 0, expect: 'rgb(0, 0, 255)'},
+  {at: 0.3, expect: 'rgb(0, 38, 179)'},
+  {at: 0.6, expect: 'rgb(0, 77, 102)'},
+  {at: 1, expect: 'rgb(0, 128, 0)'},
+  {at: 1.5, expect: 'rgb(0, 192, 0)'},
+]);
+
+test_interpolation({
+  property: 'fill',
+  from: 'unset',
+  to: 'green',
+}, [
+  {at: -0.3, expect: 'rgb(0, 0, 255)'},
+  {at: 0, expect: 'rgb(0, 0, 255)'},
+  {at: 0.3, expect: 'rgb(0, 38, 179)'},
+  {at: 0.6, expect: 'rgb(0, 77, 102)'},
+  {at: 1, expect: 'rgb(0, 128, 0)'},
+  {at: 1.5, expect: 'rgb(0, 192, 0)'},
+]);
+
+test_interpolation({
+  property: 'fill',
+  from: 'black',
+  to: 'orange',
+}, [
+  {at: -0.3, expect: 'rgb(0, 0, 0)'},
+  {at: 0, expect: 'rgb(0, 0, 0)'},
+  {at: 0.3, expect: 'rgb(77, 50, 0)'},
+  {at: 0.6, expect: 'rgb(153, 99, 0)'},
+  {at: 1, expect: 'rgb(255, 165, 0)'},
+  {at: 1.5, expect: 'rgb(255, 248, 0)'},
+]);
+
+test_interpolation({
+  property: 'fill',
+  from: 'rgb(0 0 0)',
+  to: 'color(srgb 1 1 1)',
+}, [
+  {at: -0.3, expect: 'oklab(0 0 0)'},
+  {at: 0, expect: 'oklab(0 0 0)'},
+  {at: 0.3, expect: 'oklab(0.3 0 0)'},
+  {at: 0.6, expect: 'oklab(0.6 0 0)'},
+  {at: 1, expect: 'oklab(1 0 0)'},
+  {at: 1.5, expect: 'oklab(1 0 0)'},
+]);
+
+test_interpolation({
+  property: 'fill',
+  from: 'color(srgb 0 0 0)',
+  to: 'rgb(255 255 255)',
+}, [
+  {at: -0.3, expect: 'oklab(0 0 0)'},
+  {at: 0, expect: 'oklab(0 0 0)'},
+  {at: 0.3, expect: 'oklab(0.3 0 0)'},
+  {at: 0.6, expect: 'oklab(0.6 0 0)'},
+  {at: 1, expect: 'oklab(1 0 0)'},
+  {at: 1.5, expect: 'oklab(1 0 0)'},
+]);
+
+test_interpolation({
+  property: 'fill',
+  from: 'color(srgb 0 0 0)',
+  to: 'color(srgb 1 1 1)',
+}, [
+  {at: -0.3, expect: 'oklab(0 0 0)'},
+  {at: 0, expect: 'oklab(0 0 0)'},
+  {at: 0.3, expect: 'oklab(0.3 0 0)'},
+  {at: 0.6, expect: 'oklab(0.6 0 0)'},
+  {at: 1, expect: 'oklab(1 0 0)'},
+  {at: 1.5, expect: 'oklab(1 0 0)'},
+]);
+</script>
diff --git a/tests/wpt/tests/css/css-flexbox/flexbox-align-self-baseline-horiz-006-ref.xhtml b/tests/wpt/tests/css/css-flexbox/flexbox-align-self-baseline-horiz-006-ref.xhtml
index 248ca88a2f2..9b38d0955b6 100644
--- a/tests/wpt/tests/css/css-flexbox/flexbox-align-self-baseline-horiz-006-ref.xhtml
+++ b/tests/wpt/tests/css/css-flexbox/flexbox-align-self-baseline-horiz-006-ref.xhtml
@@ -11,16 +11,28 @@
     <title>CSS Reftest Reference</title>
     <link rel="author" title="Brad Werth" href="mailto:bwerth@mozilla.com"/>
     <style>
-      .container {
+      .container,
+      .containerEndAlign {
         border: 1px dashed blue;
         font: 14px sans-serif;
         height: 50px;
       }
 
-      .container > div {
+      .container > div,
+      .wrapper > div{
         display: inline-block;
       }
 
+      .containerEndAlign {
+        display: flex;
+        align-items: end;
+      }
+      .wrapper {
+        /* This accounts for the 'margin-bottom: 3px' on the 'offset' element
+           in the last-baseline-aligned part of the testcase: */
+        margin-bottom: 3px;
+      }
+
       .ortho  {
         writing-mode: vertical-rl;
         width: 17px;
@@ -40,11 +52,21 @@
       ><div class="orange" style="display: inline-flex;">two<br/>lines</div
       ><div class="pink">offset</div>
     </div>
-    <div class="container">
-      <div class="lime ortho" style="margin-top: 4px;">ortho</div
-      ><div class="yellow">one line</div
-      ><div class="orange">two<br/>lines</div
-      ><div class="pink">offset</div>
+
+    <!-- Note: in the testcase, there's a flex container here, whose flex items
+         are 'last baseline'-aligned and collectively snapped to the end
+         (bottom) edge.  To mock that up, we use a simple flex container with a
+         single end-aligned 'display:block' flex item; and that item has
+         inline-block children, which are mockups of the testcase's flex items.
+         (These inline-blocks get automatically 'last-baseline' aligned to each
+         other, as part of regular inline-block layout behavior.) -->
+    <div class="containerEndAlign">
+      <div class="wrapper">
+        <div class="lime ortho">ortho</div
+        ><div class="yellow">one line</div
+        ><div class="orange">two<br/>lines</div
+        ><div class="pink">offset</div>
+      </div>
     </div>
   </body>
 </html>
diff --git a/tests/wpt/tests/css/css-flexbox/percentage-heights-013.html b/tests/wpt/tests/css/css-flexbox/percentage-heights-013.html
index 2410e0a5fdf..f39e83c19f9 100644
--- a/tests/wpt/tests/css/css-flexbox/percentage-heights-013.html
+++ b/tests/wpt/tests/css/css-flexbox/percentage-heights-013.html
@@ -34,6 +34,6 @@
 
 <div class="flexbox" style="width: 100px; height: 150px; outline: 5px solid black;">
   <div style="background: red;">
-    <embed style="height: 100%; width: 100%;" type="application/x-webkit-test-webplugin" data-expected-height="150"></embed>
+    <embed style="display:inline-block; height: 100%; width: 100%;" type="application/x-webkit-test-webplugin" data-expected-height="150"></embed>
   </div>
 </div>
diff --git a/tests/wpt/tests/css/css-fonts/animations/font-palette-interpolation.html b/tests/wpt/tests/css/css-fonts/animations/font-palette-interpolation.html
new file mode 100644
index 00000000000..66b0f00ebf0
--- /dev/null
+++ b/tests/wpt/tests/css/css-fonts/animations/font-palette-interpolation.html
@@ -0,0 +1,142 @@
+<!DOCTYPE html>
+<meta charset="UTF-8">
+<title>font-palette interpolation</title>
+<link rel="help" href="https://www.w3.org/TR/css-fonts-4/#propdef-font-palette">
+<meta name="assert" content="Font-palette should be animated smoothly.">
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/interpolation-testcommon.js"></script>
+<style>
+@font-palette-values --custom-palette {
+  font-family: "Color font";
+  base-palette: 0;
+  override-colors: 1 #000000;
+}
+
+.container {
+  font-palette: light;
+}
+.container2 {
+  font-palette: dark;
+}
+.target {
+  display: inline-block;
+  font: 100px sans-serif;
+  font-palette: normal;
+}
+.expected {
+  color: green;
+  margin-right: 30px;
+}
+</style>
+
+<body>
+<template id="target-template">
+  <span class="container">
+    <div class="target">TT</div>
+  </span>
+</template>
+
+<span id="inv-container" class="container">
+  <div id="inv-target" class="target">TT</div>
+</span>
+</body>
+
+<script>
+
+test_interpolation({
+  property: 'font-palette',
+  from: 'light',
+  to: 'dark'
+}, [
+  {at: -2, expect: 'light'},
+  {at: -0.25, expect: 'light'},
+  {at: 0, expect: 'light'},
+  {at: 0.3, expect: 'palette-mix(in oklab, light, dark 30%)'},
+  {at: 0.6, expect: 'palette-mix(in oklab, light, dark 60%)'},
+  {at: 1, expect: 'dark'},
+  {at: 1.5, expect: 'dark'},
+]);
+
+test_interpolation({
+  property: 'font-palette',
+  from: 'initial',
+  to: 'inherit'
+}, [
+  {at: -2, expect: 'normal'},
+  {at: -0.25, expect: 'normal'},
+  {at: 0, expect: 'normal'},
+  {at: 0.3, expect: 'palette-mix(in oklab, normal, light 30%)'},
+  {at: 0.6, expect: 'palette-mix(in oklab, normal, light 60%)'},
+  {at: 1, expect: 'light'},
+  {at: 1.5, expect: 'light'},
+]);
+
+test_interpolation({
+  property: 'font-palette',
+  from: '--custom-palette',
+  to: 'normal'
+}, [
+  {at: -2, expect: '--custom-palette'},
+  {at: -0.25, expect: '--custom-palette'},
+  {at: 0, expect: '--custom-palette'},
+  {at: 0.3, expect: 'palette-mix(in oklab, --custom-palette, normal 30%)'},
+  {at: 0.6, expect: 'palette-mix(in oklab, --custom-palette, normal 60%)'},
+  {at: 1, expect: 'normal'},
+  {at: 1.5, expect: 'normal'},
+]);
+
+/* palette-mix function for the equal endpoints should be simplified. */
+test_interpolation({
+  property: 'font-palette',
+  from: 'initial',
+  to: 'normal'
+}, [
+  {at: -2, expect: 'normal'},
+  {at: -0.25, expect: 'normal'},
+  {at: 0, expect: 'normal'},
+  {at: 0.3, expect: 'normal'},
+  {at: 0.6, expect: 'normal'},
+  {at: 1, expect: 'normal'},
+  {at: 1.5, expect: 'normal'},
+]);
+
+test(t => {
+  var container = document.getElementById('inv-container');
+  var target = document.getElementById('inv-target');
+  var anim = target.animate({ fontPalette: ['normal', 'inherit'] }, 1000);
+  anim.pause();
+  anim.currentTime = 500;
+  assert_equals(getComputedStyle(target).fontPalette, 'palette-mix(in oklab, normal, light)');
+
+  container.setAttribute('class', 'container2');
+  assert_equals(getComputedStyle(target).fontPalette, 'palette-mix(in oklab, normal, dark)');
+}, "An interpolation to inherit updates correctly on a parent style change.");
+
+test(t => {
+  var target = document.getElementById('inv-target');
+  target.animate(
+    { fontPalette: ['light', 'normal'] },
+    {
+      duration: 1000
+    }
+  );
+  target.animate(
+    { fontPalette: ['normal', 'dark'] },
+    {
+      duration: 1000,
+      /* Should not affect anything, since <Color> type is not additive,
+         compare: https://drafts.csswg.org/css-values-4/#combine-colors. */
+      composite: "add"
+    }
+  );
+  document.getAnimations().forEach((animation) => {
+    animation.pause();
+    animation.currentTime = 500;
+  });
+  assert_equals(getComputedStyle(target).fontPalette,
+                "palette-mix(in oklab, light, normal)");
+}, "Test additive animations");
+
+</script>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-fonts/discrete-no-interpolation.html b/tests/wpt/tests/css/css-fonts/discrete-no-interpolation.html
index 28760f6a528..327e463accb 100644
--- a/tests/wpt/tests/css/css-fonts/discrete-no-interpolation.html
+++ b/tests/wpt/tests/css/css-fonts/discrete-no-interpolation.html
@@ -26,12 +26,6 @@
     to: 'none'
   });
 
-  test_no_interpolation({
-    property: 'font-palette',
-    from: 'initial',
-    to: 'dark'
-  });
-
   test_no_interpolation({
     property: 'font-feature-settings',
     from: 'initial',
diff --git a/tests/wpt/tests/css/css-fonts/font-palette-36-ref.html b/tests/wpt/tests/css/css-fonts/font-palette-36-ref.html
new file mode 100644
index 00000000000..a82be2072ae
--- /dev/null
+++ b/tests/wpt/tests/css/css-fonts/font-palette-36-ref.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<style>
+@font-face {
+    font-family: "COLR-test-font";
+    src: url("resources/COLR-palettes-test-font.ttf") format("truetype");
+}
+
+@font-palette-values --MyPalette {
+    font-family: "COLR-test-font";
+    base-palette: 2;
+}
+</style>
+</head>
+<body>
+<div style="font: 48px 'COLR-test-font'; font-palette: --MyPalette">A</div>
+<div style="font: 48px 'COLR-test-font'; font-palette: --MyPalette">A</div>
+<div style="font: 48px 'COLR-test-font'; font-palette: --MyPalette">A</div>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-fonts/font-palette-36.html b/tests/wpt/tests/css/css-fonts/font-palette-36.html
new file mode 100644
index 00000000000..8a0fd7f6b51
--- /dev/null
+++ b/tests/wpt/tests/css/css-fonts/font-palette-36.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>font-palette multiple family-name and @font-palette-values</title>
+<link rel="help" href="https://drafts.csswg.org/css-fonts/#font-palette-prop">
+<link rel="help" href="https://drafts.csswg.org/css-fonts-4/#font-palette-values">
+<link rel="match" href="font-palette-36-ref.html">
+<meta name="assert" content="A single @font-palette-values can be applied to multiple font-families">
+<style>
+@font-face {
+    font-family: "COLR-test-font";
+    src: url("resources/COLR-palettes-test-font.ttf") format("truetype");
+}
+@font-face {
+    font-family: "foo bar";
+    src: url("resources/COLR-palettes-test-font.ttf") format("truetype");
+}
+@font-face {
+    font-family: foo;
+    src: url("resources/COLR-palettes-test-font.ttf") format("truetype");
+}
+@font-palette-values --MyPalette {
+    font-family: "COLR-test-font", "foo bar", foo;
+    base-palette: light;
+}
+</style>
+</head>
+<body>
+<div style="font: 48px 'COLR-test-font'; font-palette: --MyPalette;">A</div>
+<div style="font: 48px foo; font-palette: --MyPalette;">A</div>
+<div style="font: 48px 'foo bar'; font-palette: --MyPalette;">A</div>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-fonts/palette-mix-computed.html b/tests/wpt/tests/css/css-fonts/palette-mix-computed.html
new file mode 100644
index 00000000000..bade68111bd
--- /dev/null
+++ b/tests/wpt/tests/css/css-fonts/palette-mix-computed.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>Serializing of palette-mix() function</title>
+<link rel="help" href="https://www.w3.org/TR/css-fonts-4/#propdef-font-palette">
+<meta name="assert" content="Check serialization of palette-mix() value in computed style">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/computed-testcommon.js"></script>
+</head>
+<body>
+<div id="target"></div>
+<script>
+    test_computed_value(`font-palette`, `palette-mix(in oklab, light 30%, dark)`);
+    test_computed_value(`font-palette`, `palette-mix(in oklab, light 30%, light)`, `light`);
+    test_computed_value(`font-palette`, `palette-mix(in oklab, light 30%, normal)`);
+    test_computed_value(`font-palette`, `palette-mix(in oklab, --custom-palette 30%, normal)`);
+
+    // Percentage value serialization
+    test_computed_value(`font-palette`, `palette-mix(in oklab, light 50%, dark 50%)`, `palette-mix(in oklab, light, dark)`);
+    test_computed_value(`font-palette`, `palette-mix(in oklab, light, dark 50%)`, `palette-mix(in oklab, light, dark)`);
+    test_computed_value(`font-palette`, `palette-mix(in oklab, light 50%, dark)`, `palette-mix(in oklab, light, dark)`);
+    test_computed_value(`font-palette`, `palette-mix(in oklab, light, dark)`, `palette-mix(in oklab, light, dark)`);
+    test_computed_value(`font-palette`, `palette-mix(in oklab, light 50%, dark 70%)`, `palette-mix(in oklab, light 50%, dark 70%)`);
+    test_computed_value(`font-palette`, `palette-mix(in oklab, light 70%, dark 70%)`, `palette-mix(in oklab, light 70%, dark 70%)`);
+    test_computed_value(`font-palette`, `palette-mix(in oklab, light, dark 70%)`, `palette-mix(in oklab, light 30%, dark)`);
+    test_computed_value(`font-palette`, `palette-mix(in oklab, light 30%, dark 70%)`, `palette-mix(in oklab, light 30%, dark)`);
+    test_computed_value(`font-palette`, `palette-mix(in oklab, light 60%, dark)`, `palette-mix(in oklab, light 60%, dark)`);
+    test_computed_value(`font-palette`, `palette-mix(in oklab, light 10%, dark 40%)`, `palette-mix(in oklab, light 10%, dark 40%)`);
+
+    // Color spaces parsing
+    for (const colorSpace of [ "hsl", "hwb", "lch", "oklch", "lab", "oklab", "srgb", "srgb-linear", "xyz", "xyz-d50", "xyz-d65" ]) {
+        const resultColorSpace = colorSpace == "xyz" ? "xyz-d65" : colorSpace;
+        test_computed_value(`font-palette`, `palette-mix(in ${colorSpace}, light 10%, dark)`, `palette-mix(in ${resultColorSpace}, light 10%, dark)`);
+    }
+
+    // Nested palette-mix()
+    test_computed_value(`font-palette`, `palette-mix(in oklab, palette-mix(in srgb, light 30%, normal) 20%, dark)`);
+    test_computed_value(`font-palette`, `palette-mix(in oklab, palette-mix(in srgb, light 30%, normal) 30%, palette-mix(in srgb, --custom-palette 30%, dark))`);
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-fonts/rcap-in-monospace-ref.html b/tests/wpt/tests/css/css-fonts/rcap-in-monospace-ref.html
new file mode 100644
index 00000000000..1dcb4ac010a
--- /dev/null
+++ b/tests/wpt/tests/css/css-fonts/rcap-in-monospace-ref.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+
+<link rel="stylesheet" href="/fonts/ahem.css">
+
+<style>
+  :root {
+    font-family: Ahem;
+    font-size: 16px;
+  }
+</style>
+
+<p style="font-family: sans-serif">The following two lines should look exactly the same.</p>
+
+<div style="font-size: 1cap;">
+  <div style="font-family: sans-serif;">
+    Text.
+  </div>
+
+  <div style="font-family: sans-serif;">
+    Text.
+  </div>
+</div>
diff --git a/tests/wpt/tests/css/css-fonts/rcap-in-monospace.html b/tests/wpt/tests/css/css-fonts/rcap-in-monospace.html
new file mode 100644
index 00000000000..def59b074f0
--- /dev/null
+++ b/tests/wpt/tests/css/css-fonts/rcap-in-monospace.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-fonts-4/#font-size-prop">
+<link rel="author" title="Tim Nguyen" href="https://github.com/nt1m">
+<link rel="match" href="rcap-in-monospace-ref.html">
+
+<link rel="stylesheet" href="/fonts/ahem.css">
+
+<style>
+  :root {
+    font-family: Ahem;
+    font-size: 16px;
+  }
+</style>
+
+<p style="font-family: sans-serif">The following two lines should look exactly the same.</p>
+
+<div style="font-family: monospace; font-size: 1.5em">
+  <div style="font-family: sans-serif; font-size: 1rcap">
+    Text.
+  </div>
+</div>
+
+<div style="font-family: sans-serif; font-size: 1rcap">
+  Text.
+</div>
diff --git a/tests/wpt/tests/css/css-fonts/rch-in-monospace-ref.html b/tests/wpt/tests/css/css-fonts/rch-in-monospace-ref.html
new file mode 100644
index 00000000000..1bea172a0eb
--- /dev/null
+++ b/tests/wpt/tests/css/css-fonts/rch-in-monospace-ref.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<p>The following two lines should look exactly the same.</p>
+
+<div style="font-family: sans-serif; font-size: 1rch">
+  Text.
+</div>
+
+<div style="font-family: sans-serif; font-size: 1rch">
+  Text.
+</div>
diff --git a/tests/wpt/tests/css/css-fonts/rch-in-monospace.html b/tests/wpt/tests/css/css-fonts/rch-in-monospace.html
new file mode 100644
index 00000000000..86ad1d87326
--- /dev/null
+++ b/tests/wpt/tests/css/css-fonts/rch-in-monospace.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-fonts-4/#font-size-prop">
+<link rel="author" title="Tim Nguyen" href="https://github.com/nt1m">
+<link rel="match" href="rch-in-monospace-ref.html">
+
+<p>The following two lines should look exactly the same.</p>
+
+<div style="font-family: monospace; font-size: 1.5em">
+  <div style="font-family: sans-serif; font-size: 1rch">
+    Text.
+  </div>
+</div>
+
+<div style="font-family: sans-serif; font-size: 1rch">
+  Text.
+</div>
diff --git a/tests/wpt/tests/css/css-fonts/rex-in-monospace-ref.html b/tests/wpt/tests/css/css-fonts/rex-in-monospace-ref.html
new file mode 100644
index 00000000000..27972869e6c
--- /dev/null
+++ b/tests/wpt/tests/css/css-fonts/rex-in-monospace-ref.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+
+<style>
+  @font-face {
+    font-family: ExTest;
+    src: url(../css-values/resources/ExTest.woff);
+  }
+  :root {
+    font-family: ExTest;
+    font-size: 20px;
+  }
+</style>
+
+<p style="font-family: sans-serif">The following two lines should look exactly the same.</p>
+
+<div style="font-size: 1ex;">
+  <div style="font-family: sans-serif;">
+    Text.
+  </div>
+
+  <div style="font-family: sans-serif;">
+    Text.
+  </div>
+</div>
diff --git a/tests/wpt/tests/css/css-fonts/rex-in-monospace.html b/tests/wpt/tests/css/css-fonts/rex-in-monospace.html
new file mode 100644
index 00000000000..89fc9ff9cca
--- /dev/null
+++ b/tests/wpt/tests/css/css-fonts/rex-in-monospace.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-fonts-4/#font-size-prop">
+<link rel="author" title="Tim Nguyen" href="https://github.com/nt1m">
+<link rel="match" href="rex-in-monospace-ref.html">
+
+<style>
+  @font-face {
+    font-family: ExTest;
+    src: url(../css-values/resources/ExTest.woff);
+  }
+  :root {
+    font-family: ExTest;
+    font-size: 20px;
+  }
+</style>
+
+<p style="font-family: sans-serif">The following two lines should look exactly the same.</p>
+
+<div style="font-family: monospace; font-size: 1.5em">
+  <div style="font-family: sans-serif; font-size: 1rex">
+    Text.
+  </div>
+</div>
+
+<div style="font-family: sans-serif; font-size: 1rex">
+  Text.
+</div>
diff --git a/tests/wpt/tests/css/css-fonts/ric-in-monospace-ref.html b/tests/wpt/tests/css/css-fonts/ric-in-monospace-ref.html
new file mode 100644
index 00000000000..4871e3baeaf
--- /dev/null
+++ b/tests/wpt/tests/css/css-fonts/ric-in-monospace-ref.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+
+<style>
+  @font-face {
+    font-family: IcTestFullWidth;
+    src: url(../css-values/resources/IcTestFullWidth.woff2);
+  }
+  :root {
+    font-family: IcTestFullWidth;
+  }
+</style>
+
+<p style="font-family: sans-serif">The following two lines should look exactly the same.</p>
+
+<div style="font-size: 1ic">
+  <div style="font-family: sans-serif;">
+    Text.
+  </div>
+
+  <div style="font-family: sans-serif;">
+    Text.
+  </div>
+</div>
diff --git a/tests/wpt/tests/css/css-fonts/ric-in-monospace.html b/tests/wpt/tests/css/css-fonts/ric-in-monospace.html
new file mode 100644
index 00000000000..1ad6dac924c
--- /dev/null
+++ b/tests/wpt/tests/css/css-fonts/ric-in-monospace.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-fonts-4/#font-size-prop">
+<link rel="author" title="Tim Nguyen" href="https://github.com/nt1m">
+<link rel="match" href="ric-in-monospace-ref.html">
+
+<style>
+  @font-face {
+    font-family: IcTestFullWidth;
+    src: url(../css-values/resources/IcTestFullWidth.woff2);
+  }
+  :root {
+    font-family: IcTestFullWidth;
+  }
+</style>
+
+<p style="font-family: sans-serif">The following two lines should look exactly the same.</p>
+
+<div style="font-family: monospace; font-size: 1.5em">
+  <div style="font-family: sans-serif; font-size: 1ric">
+    Text.
+  </div>
+</div>
+
+<div style="font-family: sans-serif; font-size: 1ric">
+  Text.
+</div>
diff --git a/tests/wpt/tests/css/css-fonts/size-adjust-unicode-range-system-fallback-ref.html b/tests/wpt/tests/css/css-fonts/size-adjust-unicode-range-system-fallback-ref.html
new file mode 100644
index 00000000000..46586c6f538
--- /dev/null
+++ b/tests/wpt/tests/css/css-fonts/size-adjust-unicode-range-system-fallback-ref.html
@@ -0,0 +1,21 @@
+<!DOCTYPE HTML>
+<meta charset="utf-8">
+<link rel="author" href="mailto:changseok@webkit.org">
+<title>Tests that the size-adjust descriptor does not affect system fallback font size.</title>
+<style>
+@font-face {
+  font-family: large-font;
+  src: local(Ahem), url(/fonts/ahem.ttf);
+  size-adjust: 1000%;
+  unicode-range: U+0020;
+}
+
+.space {
+  font-family: large-font;
+}
+
+.ref {
+  font-family: sans-serif;
+}
+</style>
+<span class="space"> </span><span class="ref">あ</span>
diff --git a/tests/wpt/tests/css/css-fonts/size-adjust-unicode-range-system-fallback.html b/tests/wpt/tests/css/css-fonts/size-adjust-unicode-range-system-fallback.html
new file mode 100644
index 00000000000..9e1a65d0fe7
--- /dev/null
+++ b/tests/wpt/tests/css/css-fonts/size-adjust-unicode-range-system-fallback.html
@@ -0,0 +1,20 @@
+<!DOCTYPE HTML>
+<meta charset="utf-8">
+<link rel="author" title="ChangSeok Oh" href="mailto:changseok@webkit.org">
+<link rel="help" href="https://crbug.com/1441723">
+<link rel="match" href="size-adjust-unicode-range-system-fallback-ref.html">
+<link rel="assert" title="Tests that the size-adjust descriptor does not affect system fallback font size.">
+<title>Tests that the size-adjust descriptor does not affect system fallback font size.</title>
+<style>
+@font-face {
+  font-family: large-font;
+  src: local(Ahem), url(/fonts/ahem.ttf);
+  size-adjust: 1000%;
+  unicode-range: U+0020;
+}
+
+.test {
+  font-family: large-font;
+}
+</style>
+<span class="test"> あ</span>
diff --git a/tests/wpt/tests/css/css-grid/grid-model/grid-first-letter-003.html b/tests/wpt/tests/css/css-grid/grid-model/grid-first-letter-003.html
index 9d9a0c7589d..12b88c3115b 100644
--- a/tests/wpt/tests/css/css-grid/grid-model/grid-first-letter-003.html
+++ b/tests/wpt/tests/css/css-grid/grid-model/grid-first-letter-003.html
@@ -16,10 +16,8 @@
   }
 </style>
 <div class="grid">
-  <div class="item">
-    <p>
-      The <strong>first letter</strong> of this paragraph, and only that one, should be <strong>green</strong>.
-      In addition, body and paragraph margins should <strong>not collapse</strong>.
-    </p>
-  </div>
+  <p class="item">
+    The <strong>first letter</strong> of this paragraph, and only that one, should be <strong>green</strong>.
+    In addition, body and paragraph margins should <strong>not collapse</strong>.
+  </p>
 </div>
diff --git a/tests/wpt/tests/css/css-grid/grid-model/grid-first-line-003.html b/tests/wpt/tests/css/css-grid/grid-model/grid-first-line-003.html
index ede9901e8c9..47f727de150 100644
--- a/tests/wpt/tests/css/css-grid/grid-model/grid-first-line-003.html
+++ b/tests/wpt/tests/css/css-grid/grid-model/grid-first-line-003.html
@@ -17,7 +17,7 @@
   }
 </style>
 <div class="grid">
-  <div class="item">
-    <p>This text should be <strong>green</strong> and body and paragraph margins should <strong>not collapse</strong>.</p>
-  </div>
+  <p class="item">
+    This text should be <strong>green</strong> and body and paragraph margins should <strong>not collapse</strong>.
+  </p>
 </div>
diff --git a/tests/wpt/tests/css/css-grid/grid-model/grid-inline-first-letter-003.html b/tests/wpt/tests/css/css-grid/grid-model/grid-inline-first-letter-003.html
index e3efd51007a..eea15ab585c 100644
--- a/tests/wpt/tests/css/css-grid/grid-model/grid-inline-first-letter-003.html
+++ b/tests/wpt/tests/css/css-grid/grid-model/grid-inline-first-letter-003.html
@@ -16,10 +16,8 @@
   }
 </style>
 <div class="inline-grid">
-  <div class="item">
-    <p>
-      The <strong>first letter</strong> of this paragraph, and only that one, should be <strong>green</strong>.
-      In addition, body and paragraph margins should <strong>not collapse</strong>.
-    </p>
-  </div>
+  <p class="item">
+    The <strong>first letter</strong> of this paragraph, and only that one, should be <strong>green</strong>.
+    In addition, body and paragraph margins should <strong>not collapse</strong>.
+  </p>
 </div>
diff --git a/tests/wpt/tests/css/css-grid/grid-model/grid-inline-first-line-003.html b/tests/wpt/tests/css/css-grid/grid-model/grid-inline-first-line-003.html
index 2b9c3ca0f63..c76a7f430f9 100644
--- a/tests/wpt/tests/css/css-grid/grid-model/grid-inline-first-line-003.html
+++ b/tests/wpt/tests/css/css-grid/grid-model/grid-inline-first-line-003.html
@@ -17,7 +17,7 @@
   }
 </style>
 <div class="inline-grid">
-  <div class="item">
-    <p>This text should be <strong>green</strong> and body and paragraph margins should <strong>not collapse</strong>.</p>
-  </div>
+  <p class="item">
+    This text should be <strong>green</strong> and body and paragraph margins should <strong>not collapse</strong>.
+  </p>
 </div>
diff --git a/tests/wpt/tests/css/css-grid/parsing/grid-column-invalid.html b/tests/wpt/tests/css/css-grid/parsing/grid-column-invalid.html
new file mode 100644
index 00000000000..d1f4dce1723
--- /dev/null
+++ b/tests/wpt/tests/css/css-grid/parsing/grid-column-invalid.html
@@ -0,0 +1,54 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<link rel="author" title="Sammy Gill" href="mailto:sammy.gill@apple.com">
+<link rel="help" href="https://drafts.csswg.org/css-grid-2/#placement-shorthands">
+<meta name="assert" content="Tests invalid values for grid-column"/>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+</head>
+<body>
+<div id="target"></div>
+<script>
+test_invalid_value("grid-column", "4 5");
+test_invalid_value("grid-column", "4 /");
+test_invalid_value("grid-column", "5 5");
+test_invalid_value("grid-column", "5 / /");
+
+test_invalid_value("grid-column", "0 / 5");
+test_invalid_value("grid-column", "6 / 0");
+test_invalid_value("grid-column", "0");
+
+test_invalid_value("grid-column", "span");
+test_invalid_value("grid-column", "span / span");
+
+test_invalid_value("grid-column", "span span / span span");
+
+test_invalid_value("grid-column", "5 5 / span 2");
+test_invalid_value("grid-column", "5 first last / span 2");
+test_invalid_value("grid-column", "5 / first last 2");
+test_invalid_value("grid-column", "first last / span 2");
+test_invalid_value("grid-column", "5 / first last");
+test_invalid_value("grid-column", "5 5 span / 2", "span 4 4 / 3");
+test_invalid_value("grid-column", "span 3 5 / 1", "5 span 4 / 3");
+test_invalid_value("grid-column", "span last first / 1", "span first last / 3");
+test_invalid_value("grid-column", "2 / span last first", "3 / span first last");
+test_invalid_value("grid-column", "span 1 last first / 1", "span first last 7 / 3");
+test_invalid_value("grid-column", "2 / span last 3 first", "3 / span first 5 last");
+test_invalid_value("grid-column", "1 span 2 first / 1", "1 span last 7 / 3");
+test_invalid_value("grid-column", "2 / 3 span 3 first", "3 / 5 span first 5");
+
+test_invalid_value("grid-column", "span -1 / -2");
+test_invalid_value("grid-column", "-1 / -2 span");
+test_invalid_value("grid-column", "0 span / 0");
+test_invalid_value("grid-column", "0 / span 0");
+test_invalid_value("grid-column", "span -3 'first' / 3 last");
+
+test_invalid_value("grid-column", "first span 1 / last");
+test_invalid_value("grid-column", "3 first / 2 span last");
+test_invalid_value("grid-column", "3 / 1 span 2");
+</script>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-grid/parsing/grid-column-shortest-serialization.html b/tests/wpt/tests/css/css-grid/parsing/grid-column-shortest-serialization.html
new file mode 100644
index 00000000000..868de54c35c
--- /dev/null
+++ b/tests/wpt/tests/css/css-grid/parsing/grid-column-shortest-serialization.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<link rel="author" title="Sammy Gill" href="mailto:sammy.gill@apple.com">
+<link rel="help" href="https://drafts.csswg.org/css-grid-2/#placement-shorthands"/>
+<meta name="assert" content="grid-column computed value should be the shortest serialization possible"/>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/computed-testcommon.js"></script>
+</head>
+<body>
+<div id="target"></div>
+<script>
+test_computed_value("grid-column", "auto / auto", "auto");
+test_computed_value("grid-column", "auto", "auto");
+test_computed_value("grid-column", "10 / auto", "10");
+test_computed_value("grid-column", "10", "10");
+test_computed_value("grid-column", "-10 / auto", "-10");
+test_computed_value("grid-column", "-10", "-10");
+test_computed_value("grid-column", "first / first", "first");
+test_computed_value("grid-column", "first", "first");
+test_computed_value("grid-column", "span 2 / auto", "span 2");
+test_computed_value("grid-column", "span 2", "span 2");
+test_computed_value("grid-column", "2 first / auto", "2 first");
+test_computed_value("grid-column", "2 first", "2 first");
+test_computed_value("grid-column", "span first / auto", "span first");
+test_computed_value("grid-column", "span first", "span first");
+test_computed_value("grid-column", "span 2 first / auto", "span 2 first");
+test_computed_value("grid-column", "span 2 first", "span 2 first");
+</script>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-grid/parsing/grid-column-shorthand.html b/tests/wpt/tests/css/css-grid/parsing/grid-column-shorthand.html
new file mode 100644
index 00000000000..b60db55dc3e
--- /dev/null
+++ b/tests/wpt/tests/css/css-grid/parsing/grid-column-shorthand.html
@@ -0,0 +1,87 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<link rel="author" title="Sammy Gill" href="mailto:sammy.gill@apple.com">
+<link rel="help" href="https://drafts.csswg.org/css-grid-2/#placement-shorthands">
+<meta name="assert" content="grid-column should set values for grid-column-start and grid-column-end">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/shorthand-testcommon.js"></script>
+</head>
+<body>
+<script>
+test_shorthand_value("grid-column", "auto / auto", {
+    "grid-column-start": "auto",
+    "grid-column-end": "auto"
+});
+test_shorthand_value("grid-column", "auto", {
+    "grid-column-start": "auto",
+    "grid-column-end": "auto"
+});
+
+test_shorthand_value("grid-column", "10 / auto", {
+    "grid-column-start": "10",
+    "grid-column-end": "auto"
+});
+test_shorthand_value("grid-column", "10", {
+    "grid-column-start": "10",
+    "grid-column-end": "auto"
+});
+
+test_shorthand_value("grid-column", "-10 / auto", {
+    "grid-column-start": "-10",
+    "grid-column-end": "auto"
+});
+test_shorthand_value("grid-column", "-10", {
+    "grid-column-start": "-10",
+    "grid-column-end": "auto"
+});
+
+test_shorthand_value("grid-column", "span 2 / auto", {
+    "grid-column-start": "span 2",
+    "grid-column-end": "auto"
+});
+test_shorthand_value("grid-column", "span 2", {
+    "grid-column-start": "span 2",
+    "grid-column-end": "auto"
+});
+
+test_shorthand_value("grid-column", "3 last / auto", {
+    "grid-column-start": "3 last",
+    "grid-column-end": "auto"
+});
+test_shorthand_value("grid-column", "3 last", {
+    "grid-column-start": "3 last",
+    "grid-column-end": "auto"
+});
+
+test_shorthand_value("grid-column", "span first / auto", {
+    "grid-column-start": "span first",
+    "grid-column-end": "auto"
+});
+test_shorthand_value("grid-column", "span first", {
+    "grid-column-start": "span first",
+    "grid-column-end": "auto"
+});
+test_shorthand_value("grid-column", "span 2 first / auto", {
+    "grid-column-start": "span 2 first",
+    "grid-column-end": "auto"
+});
+test_shorthand_value("grid-column", "span 2 first", {
+    "grid-column-start": "span 2 first",
+    "grid-column-end": "auto"
+});
+
+test_shorthand_value("grid-column", "last / last", {
+    "grid-column-start": "last",
+    "grid-column-end": "last"
+});
+test_shorthand_value("grid-column", "last", {
+    "grid-column-start": "last",
+    "grid-column-end": "last"
+});
+
+</script>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-grid/parsing/grid-row-invalid.html b/tests/wpt/tests/css/css-grid/parsing/grid-row-invalid.html
new file mode 100644
index 00000000000..ca7b1d681a9
--- /dev/null
+++ b/tests/wpt/tests/css/css-grid/parsing/grid-row-invalid.html
@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<link rel="author" title="Sammy Gill" href="mailto:sammy.gill@apple.com">
+<link rel="help" href="https://drafts.csswg.org/css-grid-2/#placement-shorthands">
+<meta name="assert" content="Tests invalid values for grid-row"/>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+</head>
+<body>
+<div id="target"></div>
+<script>
+    test_invalid_value("grid-row", "5 8");
+    test_invalid_value("grid-row", "5 /");
+    test_invalid_value("grid-row", "8 auto");
+    test_invalid_value("grid-row", "8 / /");
+    test_invalid_value("grid-row", "0 / 6");
+    test_invalid_value("grid-row", "8 / 0");
+    test_invalid_value("grid-row", "0");
+    test_invalid_value("grid-row", "span");
+    test_invalid_value("grid-row", "span / span");
+    test_invalid_value("grid-row", "span span / span span");
+    test_invalid_value("grid-row", "4 4 / 3 span");
+    test_invalid_value("grid-row", "first 4 last / 3 span");
+    test_invalid_value("grid-row", "4 / first 3 last");
+    test_invalid_value("grid-row", "first last / 3 span");
+    test_invalid_value("grid-row", "4 / first last");
+    test_invalid_value("grid-row", "span 4 4 / 3");
+    test_invalid_value("grid-row", "5 span 4 / 3");
+    test_invalid_value("grid-row", "span first last / 3");
+    test_invalid_value("grid-row", "3 / span first last");
+    test_invalid_value("grid-row", "span first last 7 / 3");
+    test_invalid_value("grid-row", "3 / span first 5 last");
+    test_invalid_value("grid-row", "1 span last 7 / 3");
+    test_invalid_value("grid-row", "3 / 5 span first 5");
+    test_invalid_value("grid-row", "-3 span / -4");
+    test_invalid_value("grid-row", "-3 / span -4");
+    test_invalid_value("grid-row", "span 0 / 0");
+    test_invalid_value("grid-row", "0 / 0 span");
+    test_invalid_value("grid-row", "last -2 span / 1 nav");
+    test_invalid_value("grid-row", "2 span first / last");
+    test_invalid_value("grid-row", "5 nav / last span 7");
+    test_invalid_value("grid-row", "5 / 3 span 3");
+</script>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-grid/parsing/grid-row-shortest-serialization.html b/tests/wpt/tests/css/css-grid/parsing/grid-row-shortest-serialization.html
new file mode 100644
index 00000000000..59558c0ac35
--- /dev/null
+++ b/tests/wpt/tests/css/css-grid/parsing/grid-row-shortest-serialization.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<link rel="author" title="Sammy Gill" href="mailto:sammy.gill@apple.com">
+<link rel="help" href="https://drafts.csswg.org/css-grid-2/#placement-shorthands"/>
+<meta name="assert" content="grid-row computed value should be the shortest serialization possible"/>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/computed-testcommon.js"></script>
+</head>
+<body>
+<div id="target"></div>
+<script>
+    test_computed_value("grid-row", "auto / auto", "auto");
+    test_computed_value("grid-row", "auto", "auto");
+    test_computed_value("grid-row", "10 / auto", "10");
+    test_computed_value("grid-row", "10");
+    test_computed_value("grid-row", "-10 / auto", "-10");
+    test_computed_value("grid-row", "-10");
+    test_computed_value("grid-row", "span 2 / auto", "span 2");
+    test_computed_value("grid-row", "span 2");
+    test_computed_value("grid-row", "3 last / auto", "3 last");
+    test_computed_value("grid-row", "3 last");
+    test_computed_value("grid-row", "span first / auto", "span first");
+    test_computed_value("grid-row", "span first");
+    test_computed_value("grid-row", "span 2 first / auto", "span 2 first");
+    test_computed_value("grid-row", "span 2 first");
+    test_computed_value("grid-row", "last / last", "last");
+</script>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-grid/parsing/grid-row-shorthand.html b/tests/wpt/tests/css/css-grid/parsing/grid-row-shorthand.html
new file mode 100644
index 00000000000..505fdb97759
--- /dev/null
+++ b/tests/wpt/tests/css/css-grid/parsing/grid-row-shorthand.html
@@ -0,0 +1,87 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<link rel="author" title="Sammy Gill" href="mailto:sammy.gill@apple.com">
+<link rel="help" href="https://drafts.csswg.org/css-grid-2/#placement-shorthands">
+<meta name="assert" content="grid-row should set values for grid-row-start and grid-row-end">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/shorthand-testcommon.js"></script>
+</head>
+<body>
+<script>
+test_shorthand_value("grid-row", "auto / auto", {
+    "grid-row-start": "auto",
+    "grid-row-end": "auto"
+});
+test_shorthand_value("grid-row", "auto", {
+    "grid-row-start": "auto",
+    "grid-row-end": "auto"
+});
+
+test_shorthand_value("grid-row", "10 / auto", {
+    "grid-row-start": "10",
+    "grid-row-end": "auto"
+});
+test_shorthand_value("grid-row", "10", {
+    "grid-row-start": "10",
+    "grid-row-end": "auto"
+});
+
+test_shorthand_value("grid-row", "-10 / auto", {
+    "grid-row-start": "-10",
+    "grid-row-end": "auto"
+});
+test_shorthand_value("grid-row", "-10", {
+    "grid-row-start": "-10",
+    "grid-row-end": "auto"
+});
+
+test_shorthand_value("grid-row", "span 2 / auto", {
+    "grid-row-start": "span 2",
+    "grid-row-end": "auto"
+});
+test_shorthand_value("grid-row", "span 2", {
+    "grid-row-start": "span 2",
+    "grid-row-end": "auto"
+});
+
+test_shorthand_value("grid-row", "3 last / auto", {
+    "grid-row-start": "3 last",
+    "grid-row-end": "auto"
+});
+test_shorthand_value("grid-row", "3 last", {
+    "grid-row-start": "3 last",
+    "grid-row-end": "auto"
+});
+
+test_shorthand_value("grid-row", "span first / auto", {
+    "grid-row-start": "span first",
+    "grid-row-end": "auto"
+});
+test_shorthand_value("grid-row", "span first", {
+    "grid-row-start": "span first",
+    "grid-row-end": "auto"
+});
+test_shorthand_value("grid-row", "span 2 first / auto", {
+    "grid-row-start": "span 2 first",
+    "grid-row-end": "auto"
+});
+test_shorthand_value("grid-row", "span 2 first", {
+    "grid-row-start": "span 2 first",
+    "grid-row-end": "auto"
+});
+
+test_shorthand_value("grid-row", "last / last", {
+    "grid-row-start": "last",
+    "grid-row-end": "last"
+});
+test_shorthand_value("grid-row", "last", {
+    "grid-row-start": "last",
+    "grid-row-end": "last"
+});
+
+</script>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-grid/parsing/grid-shorthand-serialization.html b/tests/wpt/tests/css/css-grid/parsing/grid-shorthand-serialization.html
index 20ba330c03e..7751fd883b2 100644
--- a/tests/wpt/tests/css/css-grid/parsing/grid-shorthand-serialization.html
+++ b/tests/wpt/tests/css/css-grid/parsing/grid-shorthand-serialization.html
@@ -78,11 +78,13 @@
 
   test_shorthand_roundtrip('grid: auto-flow 1px / 2px; grid-auto-flow: inherit', { 'grid': '' });
   test_shorthand_roundtrip('grid: 1px / 2px; grid-auto-flow: row', { 'grid': '1px / 2px' });
+  test_shorthand_roundtrip('grid: none / 2px; grid-auto-flow: row', { 'grid': 'none / 2px' });
   test_shorthand_roundtrip('grid: 1px / 2px; grid-auto-columns: auto', { 'grid': '1px / 2px' });
   test_shorthand_roundtrip('grid: 1px / 2px; grid-auto-rows: auto', { 'grid': '1px / 2px' });
   test_shorthand_roundtrip('grid: 1px / auto-flow 2px; grid-auto-rows: auto', { 'grid': '1px / auto-flow 2px' });
   test_shorthand_roundtrip('grid: 1px / auto-flow; grid-auto-columns: auto', { 'grid': '1px / auto-flow' });
   test_shorthand_roundtrip('grid: auto-flow 1px / 2px; grid-auto-columns: auto', { 'grid': 'auto-flow 1px / 2px' });
+  test_shorthand_roundtrip('grid: auto-flow 1px / none; grid-auto-columns: auto', { 'grid': 'auto-flow 1px / none' });
   test_shorthand_roundtrip('grid: auto-flow dense / 2px; grid-auto-rows: auto', { 'grid': 'auto-flow dense / 2px' });
 
   test_shorthand_roundtrip('grid: auto-flow 1px / 2px; grid-auto-columns: 3px',
diff --git a/tests/wpt/tests/css/css-grid/parsing/grid-template-node-not-connected.html b/tests/wpt/tests/css/css-grid/parsing/grid-template-node-not-connected.html
new file mode 100644
index 00000000000..89bee03a11b
--- /dev/null
+++ b/tests/wpt/tests/css/css-grid/parsing/grid-template-node-not-connected.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+<head>
+<link rel="help" href="https://bugs.webkit.org/show_bug.cgi?id=261421">
+<link rel="author" title="Sammy Gill" href="mailto:sammy.gill@apple.com">
+<meta name="assert" content="test should not crash and grid-template for child should be the empty string after disconnecting the element">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<style>
+#child {
+  grid-template: 10px / 10px;
+}
+</style>
+<div>
+  <div id="child"></div>
+</div>
+<script>
+test(() => {
+  let styleDeclaration = window.getComputedStyle(document.getElementById("child"));
+  document.querySelector("body > div:nth-child(1)").textContent = "";
+  assert_equals(styleDeclaration.gridTemplate, "");
+});
+</script>
+</html>
diff --git a/tests/wpt/tests/css/css-grid/parsing/grid-template-shorthand-valid.html b/tests/wpt/tests/css/css-grid/parsing/grid-template-shorthand-valid.html
index d5ae75e74e5..f26ef330671 100644
--- a/tests/wpt/tests/css/css-grid/parsing/grid-template-shorthand-valid.html
+++ b/tests/wpt/tests/css/css-grid/parsing/grid-template-shorthand-valid.html
@@ -41,6 +41,7 @@ test_valid_value("grid-template", '"a" [a] [b] "b"', '"a" [a b] "b"');
 test_valid_value("grid-template", '"a" [a] "b"');
 test_valid_value("grid-template", '"a" / 0', '"a" / 0px');
 test_valid_value("grid-template", '"a" 10px / 10px');
+test_valid_value("grid-template", '"a" calc(100% - 10px) / calc(10px)');
 test_valid_value("grid-template", '"a" [a] "b" 10px');
 test_valid_value("grid-template", '"a" [a] "b" 10px [a]');
 test_valid_value("grid-template", '"a" [a] [a] "b" 10px', '"a" [a a] "b" 10px');
@@ -51,7 +52,7 @@ test_valid_value("grid-template", '[a] "a" [a] "b" [a]');
 test_valid_value("grid-template", '"a" "a" [a] "b" [a]');
 test_valid_value("grid-template", '"a" [a] "b" [a] / 0', '"a" [a] "b" [a] / 0px');
 test_valid_value("grid-template", '"a" "a" [a] [a] "b" / auto', '"a" "a" [a a] "b" / auto');
-test_valid_value("grid-template", '"a" auto [a] "b" auto [b] / 10px');
+test_valid_value("grid-template", '"a" auto [a] "b" auto [b] / 10px', '"a" [a] "b" [b] / 10px');
 
 // FIXME: add more values to test full syntax
 
diff --git a/tests/wpt/tests/css/css-grid/subgrid/standalone-axis-size-001.html b/tests/wpt/tests/css/css-grid/subgrid/standalone-axis-size-001.html
new file mode 100644
index 00000000000..aaa71ddbef2
--- /dev/null
+++ b/tests/wpt/tests/css/css-grid/subgrid/standalone-axis-size-001.html
@@ -0,0 +1,28 @@
+<!DOCTYPE HTML>
+<meta charset="utf-8">
+<title>CSS Grid Test: Subgrid specified size on standalone axis</title>
+<link rel="author" title="Ethan Jimenez" href="mailto:ethavar@microsoft.com">
+<link rel="help" href="https://drafts.csswg.org/css-grid-2/#subgrid-box-alignment">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
+<style>
+.grid {
+  display: grid;
+  grid-template-rows: 100px;
+}
+.subgrid {
+  display: grid;
+  background: red;
+  width: min-content;
+  grid-template-rows: subgrid;
+}
+.item {
+  background: green;
+  width: 100px;
+}
+</style>
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div class="grid">
+  <div class="subgrid">
+    <div class="item"></div>
+  </div>
+</div>
diff --git a/tests/wpt/tests/css/css-highlight-api/highlight-pseudo-from-font-computed.html b/tests/wpt/tests/css/css-highlight-api/highlight-pseudo-from-font-computed.html
new file mode 100644
index 00000000000..7c436d95d12
--- /dev/null
+++ b/tests/wpt/tests/css/css-highlight-api/highlight-pseudo-from-font-computed.html
@@ -0,0 +1,59 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSS ::highlight Pseudo-Element Test: ::highlight selector getComputedStyle</title>
+<link rel="help" href="https://drafts.csswg.org/css-highlight-api-1/">
+<meta name="assert" value="Font relative units are correctly reported in getComputedStyle">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+  :root {
+    font-size: 16px;
+  }
+  div {
+    margin: 40px;
+    font-size: 20px;
+  }
+  ::highlight(highlight1) {
+    text-underline-offset: 0.5em;
+    text-decoration-line: underline;
+    text-decoration-color: green;
+    text-decoration-thickness: 0.25rem;
+  }
+  #h2::highlight(highlight1) {
+    text-underline-offset: 1.0em;
+    text-decoration-line: underline;
+    text-decoration-color: blue;
+    text-decoration-thickness: 0.125rem;
+  }
+</style>
+<div id="h1">A green 10px offset underline 4px thick</div>
+<div id="h2">A blue 20px offset underline 2px thick</div>
+<script>
+  let r1 = new Range();
+  r1.setStart(h1, 0);
+  r1.setEnd(h1, 1);
+  let r2 = new Range();
+  r2.setStart(h2, 0);
+  r2.setEnd(h2, 1);
+  CSS.highlights.set("highlight1", new Highlight(r1, r2));
+
+  let highlightPseudo = "::highlight(highlight1)";
+  test(() => {
+    let style = getComputedStyle(document.documentElement, highlightPseudo);
+    assert_equals(style.textUnderlineOffset, "8px", "Text underline offset is 8px.");
+    assert_equals(style.textDecorationThickness, "4px", "Text decoration thickness is 4px.");
+  }, `getComputedStyle() for root element`);
+
+  test(() => {
+    let style = getComputedStyle(h1, highlightPseudo);
+    assert_equals(style.textUnderlineOffset, "10px", "Text underline offset is 10px.");
+    assert_equals(style.textDecorationThickness, "4px", "Text decoration thickness is 4px.");
+  }, `getComputedStyle() for root highlight applied to div`);
+
+  test(() => {
+    let style = getComputedStyle(h2, highlightPseudo);
+    assert_equals(style.textUnderlineOffset, "20px", "Text underline offset is 20px.");
+    assert_equals(style.textDecorationThickness, "2px", "Text decoration thickness is 2px.");
+  }, `getComputedStyle() for div specific highlight`);
+
+</script>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-font-metrics-001-ref.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-font-metrics-001-ref.html
new file mode 100644
index 00000000000..76b7317caab
--- /dev/null
+++ b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-font-metrics-001-ref.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<meta charset="UTF-8">
+<title>CSS Highlight API Test: </title>
+<head>
+  <style>
+    div {
+      margin: 50px;
+      font-size: 40px;
+      text-underline-offset: 0.5em;
+      text-decoration-line: underline;
+      text-decoration-color: green;
+      text-decoration-thickness: 0.25rem;
+    }
+    #h2 {
+      font-size: 20px;
+    }
+  </style>
+</head>
+<body>
+  <div id="h1">Font relative units with 40px font</div>
+  <div id="h2">Font relative units with 20px font</div>
+</body>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-font-metrics-001.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-font-metrics-001.html
new file mode 100644
index 00000000000..755409c6b18
--- /dev/null
+++ b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-font-metrics-001.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<meta charset="UTF-8">
+<title>CSS Highlight API Test: </title>
+<link rel="help" href="https://drafts.csswg.org/css-highlight-api-1/">
+<link rel="help" href="https://drafts.csswg.org/css-pseudo/#highlight-styling">
+<link rel="match" href="custom-highlight-font-metrics-001-ref.html">
+<meta name="assert" value="lengths depending on fonts take the correct values in a universal highlight">
+<meta name="fuzzy" content="0-80;0-4">
+<head>
+  <style>
+    :root {
+      font-size: 16px;
+    }
+    div {
+      margin: 50px;
+      font-size: 40px;
+    }
+    #h2 {
+      font-size: 20px;
+    }
+    ::highlight(highlight1) {
+      text-underline-offset: 0.5em;
+      text-decoration-line: underline;
+      text-decoration-color: green;
+      text-decoration-thickness: 0.25rem;
+    }
+  </style>
+</head>
+<body>
+  <div id="h1">Font relative units with 40px font</div>
+  <div id="h2">Font relative units with 20px font</div>
+  <script>
+    let r1 = new Range();
+    r1.setStart(h1, 0);
+    r1.setEnd(h1, 1);
+    let r2 = new Range();
+    r2.setStart(h2, 0);
+    r2.setEnd(h2, 1);
+    CSS.highlights.set("highlight1", new Highlight(r1, r2));
+  </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-font-metrics-002-ref.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-font-metrics-002-ref.html
new file mode 100644
index 00000000000..13b38d8bbf8
--- /dev/null
+++ b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-font-metrics-002-ref.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<meta charset="UTF-8">
+<title>CSS Highlight API Test: </title>
+<head>
+  <style>
+    div {
+      margin: 40px;
+      font-size: 20px;
+    }
+    #h1 {
+      text-underline-offset: 10px;
+      text-decoration-line: underline;
+      text-decoration-color: green;
+      text-decoration-thickness: 4px;
+    }
+    #h2 {
+      text-underline-offset: 20px;
+      text-decoration-line: underline;
+      text-decoration-color: blue;
+      text-decoration-thickness: 2px;
+    }
+  </style>
+</head>
+<body>
+  <div id="h1">A green 10px offset underline 4px thick</div>
+  <div id="h2">A blue 20px offset underline 2px thick</div>
+</body>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-font-metrics-002.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-font-metrics-002.html
new file mode 100644
index 00000000000..48ca92feef0
--- /dev/null
+++ b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-font-metrics-002.html
@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<meta charset="UTF-8">
+<title>CSS Highlight API Test: </title>
+<link rel="help" href="https://drafts.csswg.org/css-highlight-api-1/">
+<link rel="help" href="https://drafts.csswg.org/css-pseudo/#highlight-styling">
+<link rel="match" href="custom-highlight-font-metrics-002-ref.html">
+<meta name="assert" value="fonts relative units take the correct values, with correct cascade">
+<meta name="fuzzy" content="0-120;0-8">
+<head>
+  <style>
+    :root {
+      font-size: 16px;
+    }
+    div {
+      margin: 40px;
+      font-size: 20px;
+    }
+    ::highlight(highlight1) {
+      text-underline-offset: 0.5em;
+      text-decoration-line: underline;
+      text-decoration-color: green;
+      text-decoration-thickness: 0.25rem;
+    }
+    #h2::highlight(highlight1) {
+      text-underline-offset: 1.0em;
+      text-decoration-line: underline;
+      text-decoration-color: blue;
+      text-decoration-thickness: 0.125rem;
+    }
+  </style>
+</head>
+<body>
+  <div id="h1">A green 10px offset underline 4px thick</div>
+  <div id="h2">A blue 20px offset underline 2px thick</div>
+  <script>
+    let r1 = new Range();
+    r1.setStart(h1, 0);
+    r1.setEnd(h1, 1);
+    let r2 = new Range();
+    r2.setStart(h2, 0);
+    r2.setEnd(h2, 1);
+    CSS.highlights.set("highlight1", new Highlight(r1, r2));
+  </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-font-metrics-003-ref.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-font-metrics-003-ref.html
new file mode 100644
index 00000000000..c1a04b0803a
--- /dev/null
+++ b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-font-metrics-003-ref.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<meta charset="UTF-8">
+<title>CSS Highlight API Test: </title>
+<head>
+  <style>
+    div {
+      margin: 40px;
+      font-size: 20px;
+      text-underline-offset: 10px;
+      text-decoration-line: underline overline;
+      text-decoration-color: green;
+      text-decoration-thickness: 4px;
+    }
+  </style>
+</head>
+<body>
+  <div id="h1">A green 10px offset underline 4px thick and green overline 4px thick</div>
+</body>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-font-metrics-003.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-font-metrics-003.html
new file mode 100644
index 00000000000..d1035ed130e
--- /dev/null
+++ b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-font-metrics-003.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<meta charset="UTF-8">
+<title>CSS Highlight API Test: </title>
+<link rel="help" href="https://drafts.csswg.org/css-highlight-api-1/">
+<link rel="help" href="https://drafts.csswg.org/css-pseudo/#highlight-styling">
+<link rel="match" href="custom-highlight-font-metrics-003-ref.html">
+<meta name="assert" value="combining a font relative highlight with another highlight">
+<meta name="fuzzy" content="0-120;0-8">
+<head>
+  <style>
+    :root {
+      font-size: 16px;
+    }
+    div {
+      margin: 40px;
+      font-size: 20px;
+    }
+    ::selection {
+      background-color: transparent;
+      text-underline-offset: 0.5em;
+      text-decoration-line: underline;
+      text-decoration-color: green;
+      text-decoration-thickness: 0.25rem;
+    }
+    ::highlight(highlight1) {
+      text-decoration-line: overline;
+      text-decoration-color: green;
+      text-decoration-thickness: 4px;
+    }
+  </style>
+</head>
+<body>
+  <div id="h1">A green 10px offset underline 4px thick and green overline 4px thick</div>
+  <script>
+    getSelection().selectAllChildren(h1);
+    let r1 = new Range();
+    r1.setStart(h1, 0);
+    r1.setEnd(h1, 1);
+    CSS.highlights.set("highlight1", new Highlight(r1));
+  </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-font-metrics-004-ref.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-font-metrics-004-ref.html
new file mode 100644
index 00000000000..c1a04b0803a
--- /dev/null
+++ b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-font-metrics-004-ref.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<meta charset="UTF-8">
+<title>CSS Highlight API Test: </title>
+<head>
+  <style>
+    div {
+      margin: 40px;
+      font-size: 20px;
+      text-underline-offset: 10px;
+      text-decoration-line: underline overline;
+      text-decoration-color: green;
+      text-decoration-thickness: 4px;
+    }
+  </style>
+</head>
+<body>
+  <div id="h1">A green 10px offset underline 4px thick and green overline 4px thick</div>
+</body>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-font-metrics-004.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-font-metrics-004.html
new file mode 100644
index 00000000000..fec70e97d31
--- /dev/null
+++ b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-font-metrics-004.html
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<meta charset="UTF-8">
+<title>CSS Highlight API Test: </title>
+<link rel="help" href="https://drafts.csswg.org/css-highlight-api-1/">
+<link rel="help" href="https://drafts.csswg.org/css-pseudo/#highlight-styling">
+<link rel="match" href="custom-highlight-font-metrics-003-ref.html">
+<meta name="assert" value="combining a font relative highlight with another highlight">
+<meta name="fuzzy" content="0-120;0-8">
+<head>
+  <style>
+    div {
+      margin: 40px;
+      font-size: 20px;
+    }
+    ::highlight(highlight1) {
+      text-underline-offset: 0.5em;
+      text-decoration-line: underline;
+      text-decoration-color: green;
+      text-decoration-thickness: 0.25rem;
+    }
+    ::highlight(highlight2) {
+      text-decoration-line: overline;
+      text-decoration-color: green;
+      text-decoration-thickness: 4px;
+    }
+  </style>
+</head>
+<body>
+  <div id="h1">A green 10px offset underline 4px thick and green overline 4px thick</div>
+  <script>
+    let r1 = new Range();
+    r1.setStart(h1, 0);
+    r1.setEnd(h1, 1);
+    CSS.highlights.set("highlight1", new Highlight(r1));
+    CSS.highlights.set("highlight2", new Highlight(r1));
+  </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-font-metrics-005-ref.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-font-metrics-005-ref.html
new file mode 100644
index 00000000000..bbfc952116f
--- /dev/null
+++ b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-font-metrics-005-ref.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<meta charset="UTF-8">
+<title>CSS Highlight API Test: </title>
+<head>
+  <style>
+    div {
+      margin: 50px;
+      font-size: 20px;
+      text-underline-offset: 0.5em;
+      text-decoration-line: underline;
+      text-decoration-color: green;
+      text-decoration-thickness: 0.25rem;
+    }
+  </style>
+</head>
+<body>
+  <div id="h1">Font relative units with 20px font</div>
+  <div id="h2">Font relative units with 20px font</div>
+</body>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-font-metrics-005.html b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-font-metrics-005.html
new file mode 100644
index 00000000000..5b2eb657730
--- /dev/null
+++ b/tests/wpt/tests/css/css-highlight-api/painting/custom-highlight-font-metrics-005.html
@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<meta charset="UTF-8">
+<title>CSS Highlight API Test: </title>
+<link rel="help" href="https://drafts.csswg.org/css-highlight-api-1/">
+<link rel="help" href="https://drafts.csswg.org/css-pseudo/#highlight-styling">
+<link rel="match" href="custom-highlight-font-metrics-005-ref.html">
+<meta name="assert" value="dynmamic font size changes with highlights and font relative metrics">
+<meta name="fuzzy" content="0-80;0-10">
+<script src="/common/reftest-wait.js"></script>
+<head>
+  <style>
+    :root {
+      font-size: 16px;
+    }
+    div {
+      margin: 50px;
+      font-size: 40px;
+    }
+    #h2 {
+      font-size: 20px;
+    }
+    ::highlight(highlight1) {
+      text-underline-offset: 0.5em;
+      text-decoration-line: underline;
+      text-decoration-color: green;
+      text-decoration-thickness: 0.25rem;
+    }
+  </style>
+</head>
+<body>
+  <div id="h1">Font relative units with 20px font</div>
+  <div id="h2">Font relative units with 20px font</div>
+  <script>
+    let r1 = new Range();
+    r1.setStart(h1, 0);
+    r1.setEnd(h1, 1);
+    let r2 = new Range();
+    r2.setStart(h2, 0);
+    r2.setEnd(h2, 1);
+    CSS.highlights.set("highlight1", new Highlight(r1, r2));
+
+    requestAnimationFrame(() => {
+      h1.style.fontSize = "20px";
+      requestAnimationFrame(() => { takeScreenshot() }
+    )});
+  </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-images/gradient/gradient-none-interpolation-ref.html b/tests/wpt/tests/css/css-images/gradient/gradient-none-interpolation-ref.html
index e1503d3f122..89a1929e275 100644
--- a/tests/wpt/tests/css/css-images/gradient/gradient-none-interpolation-ref.html
+++ b/tests/wpt/tests/css/css-images/gradient/gradient-none-interpolation-ref.html
@@ -1,47 +1,41 @@
 <!DOCTYPE html>
 <html>
  <head>
- <style>
+  <style>
     div {
       height: 100px;
     }
-    #red {
-      background: linear-gradient(to right in srgb, color(srgb 0 0 0), color(srgb 0.5 0.5 0.5), color(srgb 1 1 1));
+    #basic {
+      /* "none" should split into two and take each neighboring value. */
+      background: linear-gradient(to right in srgb, color(srgb 0.5 0 0), color(srgb 0.5 0.5 0.5) 50%, color(srgb 1 0.5 0.5) 50%, color(srgb 1 1 1));
     }
-    #green {
-      background: linear-gradient(to right in srgb, color(srgb 0 0 0), color(srgb 0.5 0.5 0.5), color(srgb 1 1 1));
-    }
-    #blue {
-      background: linear-gradient(to right in srgb, color(srgb 0 0 0), color(srgb 0.5 0.5 0.5), color(srgb 1 1 1));
-    }
-    #redAndGreen {
-      background: linear-gradient(to right in srgb, color(srgb 0 0.5 0), color(srgb 0.5 0.5 0.5), color(srgb 1 1 1));
-    }
-    #multiple {
-      background: linear-gradient(to right in srgb, color(srgb 0 0 0), color(srgb 0.25 0.25 0.25),
-        color(srgb 0.5 0.5 0.5), color(srgb 0.75 0.75 0.75), color(srgb 1 1 1));
-    }
-    #noneOnLeft {
-      background: linear-gradient(to right in srgb, color(srgb 0.5 0 0), color(srgb 0.5 0.25 0.25),
-        color(srgb 0.5 0.5 0.5), color(srgb 0.75 0.75 0.75), color(srgb 1 1 1));
-    }
-    #noneOnRight {
-      background: linear-gradient(to right in srgb, color(srgb 0 0 0), color(srgb 0.25 0.25 0.25),
-        color(srgb 0.5 0.5 0.5), color(srgb 0.75 0.75 0.5), color(srgb 1 1 0.5));
+    #multipleNone {
+      /* "none" and "none" gives zero. */
+      background: linear-gradient(to right in srgb, color(srgb 0 0 0), color(srgb 0.0 0.5 0.5) 50%, color(srgb 1 0.5 0.5) 50%, color(srgb 1 1 1));
     }
     #allNone {
+      /* "none" and "none" gives zero. */
       background: linear-gradient(to right in srgb, color(srgb 0 0 0), color(srgb 0 1 1));
     }
+    #noneHue {
+      background: linear-gradient(to right in oklch, oklch(0.2 0.1 90), oklch(0.8 0.4 90) 50%, oklch(0.8 0.4 180) 50%, oklch(0.3 0.2 180));
+    }
+    #noneHueLonger {
+      background: linear-gradient(to right in oklch longer hue, oklch(0.2 0.1 90), oklch(0.5 0.3 90) 50%, oklch(0.5 0.3 180) 50%, oklch(0.8 0.4 180));
+    }
+    #transparentHueIsPowerless {
+      /* oklch(0.627966 0.257704 29.2346) = "red"
+         oklch(0.451981 0.31321 264.051) = "blue" */
+      background: linear-gradient(to right in oklch, oklch(0.627966 0.257704 29.2346), oklch(0 0 29.2346 / 0) 50%, oklch(0 0 264.051 / 0) 50%, oklch(0.451981 0.31321 264.051));
+    }
  </style>
  </head>
  <body>
-  <div id="red"></div>
-  <div id="green"></div>
-  <div id="blue"></div>
-  <div id="redAndGreen"></div>
-  <div id="multiple"></div>
-  <div id="noneOnLeft"></div>
-  <div id="noneOnRight"></div>
+  <div id="basic"></div>
+  <div id="multipleNone"></div>
   <div id="allNone"></div>
+  <div id="noneHue"></div>
+  <div id="noneHueLonger"></div>
+  <div id="transparentHueIsPowerless"></div>
  </body>
 </html>
diff --git a/tests/wpt/tests/css/css-images/gradient/gradient-none-interpolation.html b/tests/wpt/tests/css/css-images/gradient/gradient-none-interpolation.html
index a3905b07cee..06d7be6e66b 100644
--- a/tests/wpt/tests/css/css-images/gradient/gradient-none-interpolation.html
+++ b/tests/wpt/tests/css/css-images/gradient/gradient-none-interpolation.html
@@ -4,49 +4,43 @@
   <title>Gradient interpolation</title>
   <link rel="author" title="Aaron Krajeski" href="mailto:aaronhk@chromium.org">
   <link rel="help" href="https://www.w3.org/TR/css-color-4/#interpolation">
-  <meta name="assert" content="Channel values of 'none' should not affect the gradient.">
+  <meta name="assert" content="Color stops with missing components should split into two stops and take their neighboring values.">
   <link rel="match" href="gradient-none-interpolation-ref.html">
+  <meta name="fuzzy" content="maxDifference=1; totalPixels=0-5000">
   <style>
     div {
       height: 100px;
     }
-    #red {
-      background: linear-gradient(to right in srgb, color(srgb 0 0 0), color(srgb none 0.5 0.5), color(srgb 1 1 1));
+    #basic {
+      /* "none" should split into two and take each neighboring value. */
+      background: linear-gradient(to right in srgb, color(srgb 0.5 0 0), color(srgb none 0.5 0.5), color(srgb 1 1 1));
     }
-    #green {
-      background: linear-gradient(to right in srgb, color(srgb 0 0 0), color(srgb 0.5 none 0.5), color(srgb 1 1 1));
-    }
-    #blue {
-      background: linear-gradient(to right in srgb, color(srgb 0 0 0), color(srgb 0.5 0.5 none), color(srgb 1 1 1));
-    }
-    #redAndGreen {
-      background: linear-gradient(to right in srgb, color(srgb 0 none 0), color(srgb 0.5 0.5 none), color(srgb 1 1 1));
-    }
-    #multiple {
-      background: linear-gradient(to right in srgb, color(srgb 0 0 0), color(srgb 0.25 0.25 none),
-        color(srgb 0.5 0.5 none), color(srgb 0.75 0.75 none), color(srgb 1 1 1));
-    }
-    #noneOnLeft {
-      background: linear-gradient(to right in srgb, color(srgb none 0 0), color(srgb none 0.25 0.25),
-        color(srgb 0.5 0.5 0.5), color(srgb 0.75 0.75 0.75), color(srgb 1 1 1));
-    }
-    #noneOnRight {
-      background: linear-gradient(to right in srgb, color(srgb 0 0 0), color(srgb 0.25 0.25 0.25),
-        color(srgb 0.5 0.5 0.5), color(srgb 0.75 0.75 none), color(srgb 1 1 none));
+    #multipleNone {
+      /* "none" and "none" gives zero. */
+      background: linear-gradient(to right in srgb, color(srgb none 0 0), color(srgb none 0.5 0.5), color(srgb 1 1 1));
     }
     #allNone {
+      /* "none" and "none" gives zero. */
       background: linear-gradient(to right in srgb, color(srgb none 0 0), color(srgb none 1 1));
     }
+    #noneHue {
+      background: linear-gradient(to right in oklch, oklch(0.2 0.1 90), oklch(0.8 0.4 none), oklch(0.3 0.2 180));
+    }
+    #noneHueLonger {
+      background: linear-gradient(to right in oklch longer hue, oklch(0.2 0.1 90), oklch(0.5 0.3 none), oklch(0.8 0.4 180));
+    }
+    #transparentHueIsPowerless {
+      /* When "transparent" is converted to oklch, the hue of the resulting stop should act as if it were missing. */
+      background: linear-gradient(to right in oklch, red, transparent, blue);
+    }
  </style>
  </head>
  <body>
-  <div id="red"></div>
-  <div id="green"></div>
-  <div id="blue"></div>
-  <div id="redAndGreen"></div>
-  <div id="multiple"></div>
-  <div id="noneOnLeft"></div>
-  <div id="noneOnRight"></div>
+  <div id="basic"></div>
+  <div id="multipleNone"></div>
   <div id="allNone"></div>
+  <div id="noneHue"></div>
+  <div id="noneHueLonger"></div>
+  <div id="transparentHueIsPowerless"></div>
  </body>
 </html>
diff --git a/tests/wpt/tests/css/css-images/normalization-radial-3.html b/tests/wpt/tests/css/css-images/normalization-radial-3.html
new file mode 100644
index 00000000000..927917ced60
--- /dev/null
+++ b/tests/wpt/tests/css/css-images/normalization-radial-3.html
@@ -0,0 +1,14 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>Radial gradient stop normalization</title>
+<link rel="help" href="https://drafts.csswg.org/css-images-3/#radial-gradients">
+<meta name="assert" content="Rendering of radial-gradient with normalized color stops">
+<link rel="match" href="reference/100x100-blue.html">
+<style>
+  #gradient {
+    width: 100px;
+    height: 100px;
+    background-image: radial-gradient(50px, blue 1000%, red 1000%);
+  }
+</style>
+<div id="gradient"></div>
diff --git a/tests/wpt/tests/css/css-images/normalization-radial-4.html b/tests/wpt/tests/css/css-images/normalization-radial-4.html
new file mode 100644
index 00000000000..e9d948f062e
--- /dev/null
+++ b/tests/wpt/tests/css/css-images/normalization-radial-4.html
@@ -0,0 +1,14 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>Radial gradient stop normalization</title>
+<link rel="help" href="https://drafts.csswg.org/css-images-3/#repeating-gradients">
+<meta name="assert" content="Rendering of repeating-radial-gradient with normalized color stops">
+<link rel="match" href="reference/100x100-blue.html">
+<style>
+  #gradient {
+    width: 100px;
+    height: 100px;
+    background-image: repeating-radial-gradient(50px, red 1000%, blue 1000%);
+  }
+</style>
+<div id="gradient"></div>
diff --git a/tests/wpt/tests/css/css-lists/counter-001-ref.html b/tests/wpt/tests/css/css-lists/counter-001-ref.html
new file mode 100644
index 00000000000..2dd80aa3a47
--- /dev/null
+++ b/tests/wpt/tests/css/css-lists/counter-001-ref.html
@@ -0,0 +1,37 @@
+<!doctype html>
+<title>CSS Lists and Counters test reference: counter(c, &quot;.", decimal-leading-zero)</title>
+<p>The following two lines should look the same:</p>
+<div>
+  01
+  02
+  03
+  04
+  05
+  06
+  07
+  08
+  09
+  10
+  11
+  12
+  99
+  13
+  14
+</div>
+<div>
+  01
+  02
+  03
+  04
+  05
+  06
+  07
+  08
+  09
+  10
+  11
+  12
+  99
+  13
+  14
+</div>
diff --git a/tests/wpt/tests/css/css-lists/counter-001.html b/tests/wpt/tests/css/css-lists/counter-001.html
new file mode 100644
index 00000000000..46d7eb81df0
--- /dev/null
+++ b/tests/wpt/tests/css/css-lists/counter-001.html
@@ -0,0 +1,45 @@
+<!doctype html>
+<title>CSS Lists and Counters: counter(c, &quot;.", decimal-leading-zero)</title>
+<link rel="help" href="https://drafts.csswg.org/css-lists/#inheriting-counters">
+<link rel="match" href="counter-001-ref.html">
+<meta name="assert" content="counters are not inherited from the previous sibling, when can be inherited from the ancestor">
+<style type="text/css">
+#test { counter-reset: c; }
+#test span { counter-increment: c; }
+#test span::before { content: counter(c, decimal-leading-zero); }
+</style>
+<p>The following two lines should look the same:</p>
+<div id="test">
+  <span></span>
+  <span></span>
+  <span></span>
+  <span></span>
+  <span></span>
+  <span></span>
+  <span></span>
+  <span></span>
+  <span></span>
+  <span></span>
+  <span></span>
+  <span></span>
+  <span style="counter-reset: c 98"></span>
+  <span></span>
+  <span></span>
+</div>
+<div>
+  01
+  02
+  03
+  04
+  05
+  06
+  07
+  08
+  09
+  10
+  11
+  12
+  99
+  13
+  14
+</div>
diff --git a/tests/wpt/tests/css/css-lists/counter-002-ref.html b/tests/wpt/tests/css/css-lists/counter-002-ref.html
new file mode 100644
index 00000000000..621e42e26ea
--- /dev/null
+++ b/tests/wpt/tests/css/css-lists/counter-002-ref.html
@@ -0,0 +1,45 @@
+<!doctype html>
+<title>CSS Lists and Counters test reference: counter(c, &quot;.", lower-roman)</title>
+<p>The following two lines should look the same:</p>
+<div>
+  i
+  ii
+  iii
+  iv
+  v
+  vi
+  vii
+  viii
+  ix
+  x
+  xi
+  xii
+  xlix
+  xiii
+  ccclxxxix
+  xiv
+  mmmcdlxxxix
+  xv
+  xvi
+</div>
+<div>
+  i
+  ii
+  iii
+  iv
+  v
+  vi
+  vii
+  viii
+  ix
+  x
+  xi
+  xii
+  xlix
+  xiii
+  ccclxxxix
+  xiv
+  mmmcdlxxxix
+  xv
+  xvi
+</div>
diff --git a/tests/wpt/tests/css/css-lists/counter-002.html b/tests/wpt/tests/css/css-lists/counter-002.html
new file mode 100644
index 00000000000..5994802c452
--- /dev/null
+++ b/tests/wpt/tests/css/css-lists/counter-002.html
@@ -0,0 +1,53 @@
+<!doctype html>
+<title>CSS Lists and Counters: counter(c, &quot;.", lower-roman)</title>
+<link rel="help" href="https://drafts.csswg.org/css-lists/#inheriting-counters">
+<link rel="match" href="counter-002-ref.html">
+<meta name="assert" content="counters are not inherited from the previous sibling, when can be inherited from the ancestor">
+<style type="text/css">
+#test { counter-reset: c; }
+#test span { counter-increment: c; }
+#test span::before { content: counter(c, lower-roman); }
+</style>
+<p>The following two lines should look the same:</p>
+<div id="test">
+  <span></span>
+  <span></span>
+  <span></span>
+  <span></span>
+  <span></span>
+  <span></span>
+  <span></span>
+  <span></span>
+  <span></span>
+  <span></span>
+  <span></span>
+  <span></span>
+  <span style="counter-reset: c 48"></span>
+  <span></span>
+  <span style="counter-reset: c 388"></span>
+  <span></span>
+  <span style="counter-reset: c 3488"></span>
+  <span></span>
+  <span></span>
+</div>
+<div>
+  i
+  ii
+  iii
+  iv
+  v
+  vi
+  vii
+  viii
+  ix
+  x
+  xi
+  xii
+  xlix
+  xiii
+  ccclxxxix
+  xiv
+  mmmcdlxxxix
+  xv
+  xvi
+</div>
diff --git a/tests/wpt/tests/css/css-lists/counter-003-ref.html b/tests/wpt/tests/css/css-lists/counter-003-ref.html
new file mode 100644
index 00000000000..39d0bb3d143
--- /dev/null
+++ b/tests/wpt/tests/css/css-lists/counter-003-ref.html
@@ -0,0 +1,45 @@
+<!doctype html>
+<title>CSS Lists and Counters test reference: counter(c, &quot;.", upper-roman)</title>
+<p>The following two lines should look the same:</p>
+<div>
+  <span>I</span>
+  <span>II</span>
+  <span>III</span>
+  <span>IV</span>
+  <span>V</span>
+  <span>VI</span>
+  <span>VII</span>
+  <span>VIII</span>
+  <span>IX</span>
+  <span>X</span>
+  <span>XI</span>
+  <span>XII</span>
+  <span>XLIX</span>
+  <span>XIII</span>
+  <span>CCCLXXXIX</span>
+  <span>XIV</span>
+  <span>MMMCDLXXXIX</span>
+  <span>XV</span>
+  <span>XVI</span>
+</div>
+<div>
+  <span>I</span>
+  <span>II</span>
+  <span>III</span>
+  <span>IV</span>
+  <span>V</span>
+  <span>VI</span>
+  <span>VII</span>
+  <span>VIII</span>
+  <span>IX</span>
+  <span>X</span>
+  <span>XI</span>
+  <span>XII</span>
+  <span>XLIX</span>
+  <span>XIII</span>
+  <span>CCCLXXXIX</span>
+  <span>XIV</span>
+  <span>MMMCDLXXXIX</span>
+  <span>XV</span>
+  <span>XVI</span>
+</div>
diff --git a/tests/wpt/tests/css/css-lists/counter-003.html b/tests/wpt/tests/css/css-lists/counter-003.html
new file mode 100644
index 00000000000..60164c1c7eb
--- /dev/null
+++ b/tests/wpt/tests/css/css-lists/counter-003.html
@@ -0,0 +1,53 @@
+<!doctype html>
+<title>CSS Lists and Counters: counter(c, &quot;.", upper-roman)</title>
+<link rel="help" href="https://drafts.csswg.org/css-lists/#inheriting-counters">
+<link rel="match" href="counter-003-ref.html">
+<meta name="assert" content="counters are not inherited from the previous sibling, when can be inherited from the ancestor">
+<style type="text/css">
+#test { counter-reset: c; }
+#test span { counter-increment: c; }
+#test span::before { content: counter(c, upper-roman); }
+</style>
+<p>The following two lines should look the same:</p>
+<div id="test">
+  <span></span>
+  <span></span>
+  <span></span>
+  <span></span>
+  <span></span>
+  <span></span>
+  <span></span>
+  <span></span>
+  <span></span>
+  <span></span>
+  <span></span>
+  <span></span>
+  <span style="counter-reset: c 48"></span>
+  <span></span>
+  <span style="counter-reset: c 388"></span>
+  <span></span>
+  <span style="counter-reset: c 3488"></span>
+  <span></span>
+  <span></span>
+</div>
+<div>
+  <span>I</span>
+  <span>II</span>
+  <span>III</span>
+  <span>IV</span>
+  <span>V</span>
+  <span>VI</span>
+  <span>VII</span>
+  <span>VIII</span>
+  <span>IX</span>
+  <span>X</span>
+  <span>XI</span>
+  <span>XII</span>
+  <span>XLIX</span>
+  <span>XIII</span>
+  <span>CCCLXXXIX</span>
+  <span>XIV</span>
+  <span>MMMCDLXXXIX</span>
+  <span>XV</span>
+  <span>XVI</span>
+</div>
diff --git a/tests/wpt/tests/css/css-lists/counter-004-ref.html b/tests/wpt/tests/css/css-lists/counter-004-ref.html
new file mode 100644
index 00000000000..a0e65d480c9
--- /dev/null
+++ b/tests/wpt/tests/css/css-lists/counter-004-ref.html
@@ -0,0 +1,89 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSS Lists and Counters test reference: counter(c, &quot;.", georgian)</title>
+<p>The following two lines should look the same:</p>
+<div id="test">
+  <span>ა</span>
+  <span>ბ</span>
+  <span>გ</span>
+  <span>დ</span>
+  <span>ე</span>
+  <span>ვ</span>
+  <span>ზ</span>
+  <span>ჱ</span>
+  <span>თ</span>
+  <span>ი</span>
+  <span>ია</span>
+  <span>იბ</span>
+  <span>კ</span>
+  <span>ლ</span>
+  <span>მ</span>
+  <span>ნ</span>
+  <span>ჲ</span>
+  <span>ო</span>
+  <span>პ</span>
+  <span>ჟ</span>
+  <span>რ</span>
+  <span>ს</span>
+  <span>ტ</span>
+  <span>ჳ</span>
+  <span>ფ</span>
+  <span>ქ</span>
+  <span>ღ</span>
+  <span>ყ</span>
+  <span>შ</span>
+  <span>ჩ</span>
+  <span>ც</span>
+  <span>ძ</span>
+  <span>წ</span>
+  <span>ჭ</span>
+  <span>ხ</span>
+  <span>ჴ</span>
+  <span>ჯ</span>
+  <span>ჰ</span>
+  <span>ჵ</span>
+  <span>ჵჰშჟთ</span>
+</div>
+
+<div>
+  <span>ა</span>
+  <span>ბ</span>
+  <span>გ</span>
+  <span>დ</span>
+  <span>ე</span>
+  <span>ვ</span>
+  <span>ზ</span>
+  <span>ჱ</span>
+  <span>თ</span>
+  <span>ი</span>
+  <span>ია</span>
+  <span>იბ</span>
+  <span>კ</span>
+  <span>ლ</span>
+  <span>მ</span>
+  <span>ნ</span>
+  <span>ჲ</span>
+  <span>ო</span>
+  <span>პ</span>
+  <span>ჟ</span>
+  <span>რ</span>
+  <span>ს</span>
+  <span>ტ</span>
+  <span>ჳ</span>
+  <span>ფ</span>
+  <span>ქ</span>
+  <span>ღ</span>
+  <span>ყ</span>
+  <span>შ</span>
+  <span>ჩ</span>
+  <span>ც</span>
+  <span>ძ</span>
+  <span>წ</span>
+  <span>ჭ</span>
+  <span>ხ</span>
+  <span>ჴ</span>
+  <span>ჯ</span>
+  <span>ჰ</span>
+  <span>ჵ</span>
+  <span>ჵჰშჟთ</span>
+</div>
diff --git a/tests/wpt/tests/css/css-lists/counter-004.html b/tests/wpt/tests/css/css-lists/counter-004.html
new file mode 100644
index 00000000000..4ef2ced3ae9
--- /dev/null
+++ b/tests/wpt/tests/css/css-lists/counter-004.html
@@ -0,0 +1,96 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSS Lists and Counters: counter(c, &quot;.", georgian)</title>
+<link rel="help" href="https://drafts.csswg.org/css-lists/#inheriting-counters">
+<link rel="match" href="counter-004-ref.html">
+<meta name="assert" content="counters are not inherited from the previous sibling, when can be inherited from the ancestor">
+<style type="text/css">
+#test { counter-reset: c; }
+#test span { counter-increment: c; }
+#test span::before { content: counter(c, georgian); }
+</style>
+<p>The following two lines should look the same:</p>
+<div id="test">
+  <span></span>
+  <span></span>
+  <span></span>
+  <span></span>
+  <span></span>
+  <span></span>
+  <span></span>
+  <span></span>
+  <span></span>
+  <span></span>
+  <span></span>
+  <span></span>
+  <span style="counter-reset: c 19"></span>
+  <span style="counter-reset: c 29"></span>
+  <span style="counter-reset: c 39"></span>
+  <span style="counter-reset: c 49"></span>
+  <span style="counter-reset: c 59"></span>
+  <span style="counter-reset: c 69"></span>
+  <span style="counter-reset: c 79"></span>
+  <span style="counter-reset: c 89"></span>
+  <span style="counter-reset: c 99"></span>
+  <span style="counter-reset: c 199"></span>
+  <span style="counter-reset: c 299"></span>
+  <span style="counter-reset: c 399"></span>
+  <span style="counter-reset: c 499"></span>
+  <span style="counter-reset: c 599"></span>
+  <span style="counter-reset: c 699"></span>
+  <span style="counter-reset: c 799"></span>
+  <span style="counter-reset: c 899"></span>
+  <span style="counter-reset: c 999"></span>
+  <span style="counter-reset: c 1999"></span>
+  <span style="counter-reset: c 2999"></span>
+  <span style="counter-reset: c 3999"></span>
+  <span style="counter-reset: c 4999"></span>
+  <span style="counter-reset: c 5999"></span>
+  <span style="counter-reset: c 6999"></span>
+  <span style="counter-reset: c 7999"></span>
+  <span style="counter-reset: c 8999"></span>
+  <span style="counter-reset: c 9999"></span>
+  <span style="counter-reset: c 19998"></span>
+</div>
+<div>
+  <span>ა</span>
+  <span>ბ</span>
+  <span>გ</span>
+  <span>დ</span>
+  <span>ე</span>
+  <span>ვ</span>
+  <span>ზ</span>
+  <span>ჱ</span>
+  <span>თ</span>
+  <span>ი</span>
+  <span>ია</span>
+  <span>იბ</span>
+  <span>კ</span>
+  <span>ლ</span>
+  <span>მ</span>
+  <span>ნ</span>
+  <span>ჲ</span>
+  <span>ო</span>
+  <span>პ</span>
+  <span>ჟ</span>
+  <span>რ</span>
+  <span>ს</span>
+  <span>ტ</span>
+  <span>ჳ</span>
+  <span>ფ</span>
+  <span>ქ</span>
+  <span>ღ</span>
+  <span>ყ</span>
+  <span>შ</span>
+  <span>ჩ</span>
+  <span>ც</span>
+  <span>ძ</span>
+  <span>წ</span>
+  <span>ჭ</span>
+  <span>ხ</span>
+  <span>ჴ</span>
+  <span>ჯ</span>
+  <span>ჰ</span>
+  <span>ჵ</span>
+  <span>ჵჰშჟთ</span>
+</div>
diff --git a/tests/wpt/tests/css/css-lists/counter-reset-increment-overflow-underflow-ref.html b/tests/wpt/tests/css/css-lists/counter-reset-increment-overflow-underflow-ref.html
new file mode 100644
index 00000000000..cb86d5713a1
--- /dev/null
+++ b/tests/wpt/tests/css/css-lists/counter-reset-increment-overflow-underflow-ref.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML>
+<link rel="author" title="Vitor Roriz" href="https://github.com/vitorroriz">
+<link rel="help" href="https://drafts.csswg.org/css-lists-3/#auto-numbering">
+<div>
+<h3>2050000000</h3>
+<h3>2100000000</h3>
+<h3>2100000000</h3>
+</div>
+<div>
+<h3>-2050000000</h3>
+<h3>-2100000000</h3>
+<h3>-2100000000</h3>
+</div>
diff --git a/tests/wpt/tests/css/css-lists/counter-reset-increment-overflow-underflow.html b/tests/wpt/tests/css/css-lists/counter-reset-increment-overflow-underflow.html
new file mode 100644
index 00000000000..6dc16e25ee7
--- /dev/null
+++ b/tests/wpt/tests/css/css-lists/counter-reset-increment-overflow-underflow.html
@@ -0,0 +1,35 @@
+<!DOCTYPE HTML>
+<link rel="author" title="Vitor Roriz" href="https://github.com/vitorroriz">
+<link rel="help" href="https://drafts.csswg.org/css-lists-3/#auto-numbering">
+<link rel="match" href="counter-reset-increment-overflow-underflow-ref.html">
+<style>
+.overflow {
+  counter-reset: over-counter 2000000000;
+}
+.overflow h3:before {
+  counter-increment: over-counter 50000000;
+}
+.overflow h3::before {
+  content: counter(over-counter);
+}
+
+.underflow {
+  counter-reset: under-counter -2000000000;
+}
+.underflow h3:before {
+  counter-increment: under-counter -50000000;
+}
+.underflow h3::before {
+  content: counter(under-counter);
+}
+</style>
+<div class="overflow">
+<h3></h3>
+<h3></h3>
+<h3></h3>
+</div>
+<div class="underflow">
+<h3></h3>
+<h3></h3>
+<h3></h3>
+</div>
diff --git a/tests/wpt/tests/css/css-lists/counters-001-ref.html b/tests/wpt/tests/css/css-lists/counters-001-ref.html
new file mode 100644
index 00000000000..7084485013b
--- /dev/null
+++ b/tests/wpt/tests/css/css-lists/counters-001-ref.html
@@ -0,0 +1,37 @@
+<!doctype html>
+<title>CSS Lists and Counters test reference: counters(c, &quot;.", decimal-leading-zero)</title>
+<p>The following two lines should look the same:</p>
+<div>
+  01.01
+  02
+  03
+  04
+  05
+  06
+  07
+  08
+  09
+  10
+  11
+  12
+  12.99
+  13
+  14
+</div>
+<div>
+  01.01
+  02
+  03
+  04
+  05
+  06
+  07
+  08
+  09
+  10
+  11
+  12
+  12.99
+  13
+  14
+</div>
diff --git a/tests/wpt/tests/css/css-lists/counters-001.html b/tests/wpt/tests/css/css-lists/counters-001.html
new file mode 100644
index 00000000000..a6d85fe4d5b
--- /dev/null
+++ b/tests/wpt/tests/css/css-lists/counters-001.html
@@ -0,0 +1,46 @@
+<!doctype html>
+<title>CSS Lists and Counters: counters(c, &quot;.", decimal-leading-zero)</title>
+<link rel="help" href="https://drafts.csswg.org/css-lists/#inheriting-counters">
+<link rel="match" href="counters-001-ref.html">
+<meta name="assert" content="counters are not inherited from the previous sibling, when can be inherited from the ancestor">
+<style type="text/css">
+body, #test span:first-child { counter-reset: c; }
+p, #test span { counter-increment: c; }
+#test span::before { content: counters(c, ".", decimal-leading-zero); }
+</style>
+<p>The following two lines should look the same:</p>
+<div id="test">
+  <span></span>
+  <span></span>
+  <span></span>
+  <span></span>
+  <span></span>
+  <span></span>
+  <span></span>
+  <span></span>
+  <span></span>
+  <span></span>
+  <span></span>
+  <span></span>
+  <span style="counter-reset: c 98"></span>
+  <span></span>
+  <span></span>
+</div>
+<div>
+  01.01
+  02
+  03
+  04
+  05
+  06
+  07
+  08
+  09
+  10
+  11
+  12
+  12.99
+  13
+  14
+</div>
+
diff --git a/tests/wpt/tests/css/css-lists/counters-002-ref.html b/tests/wpt/tests/css/css-lists/counters-002-ref.html
new file mode 100644
index 00000000000..25b542f3e5a
--- /dev/null
+++ b/tests/wpt/tests/css/css-lists/counters-002-ref.html
@@ -0,0 +1,45 @@
+<!doctype html>
+<title>CSS Lists and Counters test reference: counters(c, &quot;.", lower-roman)</title>
+<p>The following two lines should look the same:</p>
+<div>
+  <span>i.i</span>
+  <span>ii</span>
+  <span>iii</span>
+  <span>iv</span>
+  <span>v</span>
+  <span>vi</span>
+  <span>vii</span>
+  <span>viii</span>
+  <span>ix</span>
+  <span>x</span>
+  <span>xi</span>
+  <span>xii</span>
+  <span>xii.xlix</span>
+  <span>xiii</span>
+  <span>xiii.ccclxxxix</span>
+  <span>xiv</span>
+  <span>xiv.mmmcdlxxxix</span>
+  <span>xv</span>
+  <span>xvi</span>
+</div>
+<div>
+  <span>i.i</span>
+  <span>ii</span>
+  <span>iii</span>
+  <span>iv</span>
+  <span>v</span>
+  <span>vi</span>
+  <span>vii</span>
+  <span>viii</span>
+  <span>ix</span>
+  <span>x</span>
+  <span>xi</span>
+  <span>xii</span>
+  <span>xii.xlix</span>
+  <span>xiii</span>
+  <span>xiii.ccclxxxix</span>
+  <span>xiv</span>
+  <span>xiv.mmmcdlxxxix</span>
+  <span>xv</span>
+  <span>xvi</span>
+</div>
diff --git a/tests/wpt/tests/css/css-lists/counters-002.html b/tests/wpt/tests/css/css-lists/counters-002.html
new file mode 100644
index 00000000000..9b3618d3bfe
--- /dev/null
+++ b/tests/wpt/tests/css/css-lists/counters-002.html
@@ -0,0 +1,52 @@
+<!doctype html>
+<title>CSS Lists and Counters: counters(c, &quot;.", lower-roman)</title>
+<link rel="help" href="https://drafts.csswg.org/css-lists/#inheriting-counters">
+<link rel="match" href="counters-002-ref.html">
+<meta name="assert" content="counters are not inherited from the previous sibling, when can be inherited from the ancestor">
+<style type="text/css">
+body, #test span:first-child { counter-reset: c; }
+p, #test span { counter-increment: c; }
+#test span::before { content: counters(c, ".", lower-roman); }
+</style>
+<p>The following two lines should look the same:</p>
+<div id="test">
+  <span></span>
+  <span></span>
+  <span></span>
+  <span></span>
+  <span></span>
+  <span></span>
+  <span></span>
+  <span></span>
+  <span></span>
+  <span></span>
+  <span></span>
+  <span></span>
+  <span style="counter-reset: c 48"></span>
+  <span></span>
+  <span style="counter-reset: c 388"></span>
+  <span></span>
+  <span style="counter-reset: c 3488"></span>
+  <span></span>
+  <span></span></div>
+<div>
+  <span>i.i</span>
+  <span>ii</span>
+  <span>iii</span>
+  <span>iv</span>
+  <span>v</span>
+  <span>vi</span>
+  <span>vii</span>
+  <span>viii</span>
+  <span>ix</span>
+  <span>x</span>
+  <span>xi</span>
+  <span>xii</span>
+  <span>xii.xlix</span>
+  <span>xiii</span>
+  <span>xiii.ccclxxxix</span>
+  <span>xiv</span>
+  <span>xiv.mmmcdlxxxix</span>
+  <span>xv</span>
+  <span>xvi</span>
+</div>
diff --git a/tests/wpt/tests/css/css-lists/counters-003-ref.html b/tests/wpt/tests/css/css-lists/counters-003-ref.html
new file mode 100644
index 00000000000..75655e2dfb1
--- /dev/null
+++ b/tests/wpt/tests/css/css-lists/counters-003-ref.html
@@ -0,0 +1,45 @@
+<!doctype html>
+<title>CSS Lists and Counters test reference: counters(c, &quot;.", upper-roman)</title>
+<p>The following two lines should look the same:</p>
+<div>
+  <span>I.I</span>
+  <span>II</span>
+  <span>III</span>
+  <span>IV</span>
+  <span>V</span>
+  <span>VI</span>
+  <span>VII</span>
+  <span>VIII</span>
+  <span>IX</span>
+  <span>X</span>
+  <span>XI</span>
+  <span>XII</span>
+  <span>XII.XLIX</span>
+  <span>XIII</span>
+  <span>XIII.CCCLXXXIX</span>
+  <span>XIV</span>
+  <span>XIV.MMMCDLXXXIX</span>
+  <span>XV</span>
+  <span>XVI</span>
+</div>
+<div>
+  <span>I.I</span>
+  <span>II</span>
+  <span>III</span>
+  <span>IV</span>
+  <span>V</span>
+  <span>VI</span>
+  <span>VII</span>
+  <span>VIII</span>
+  <span>IX</span>
+  <span>X</span>
+  <span>XI</span>
+  <span>XII</span>
+  <span>XII.XLIX</span>
+  <span>XIII</span>
+  <span>XIII.CCCLXXXIX</span>
+  <span>XIV</span>
+  <span>XIV.MMMCDLXXXIX</span>
+  <span>XV</span>
+  <span>XVI</span>
+</div>
diff --git a/tests/wpt/tests/css/css-lists/counters-003.html b/tests/wpt/tests/css/css-lists/counters-003.html
new file mode 100644
index 00000000000..1648081a4d3
--- /dev/null
+++ b/tests/wpt/tests/css/css-lists/counters-003.html
@@ -0,0 +1,54 @@
+<!doctype html>
+<title>CSS Lists and Counters: counters(c, &quot;.", upper-roman)</title>
+<link rel="help" href="https://drafts.csswg.org/css-lists/#inheriting-counters">
+<link rel="match" href="counters-003-ref.html">
+<meta name="assert" content="counters are not inherited from the previous sibling, when can be inherited from the ancestor">
+<style type="text/css">
+body, #test span:first-child { counter-reset: c; }
+p, #test span { counter-increment: c; }
+#test span::before { content: counters(c, ".", upper-roman); }
+</style>
+<p>The following two lines should look the same:</p>
+<div id="test">
+  <span></span>
+  <span></span>
+  <span></span>
+  <span></span>
+  <span></span>
+  <span></span>
+  <span></span>
+  <span></span>
+  <span></span>
+  <span></span>
+  <span></span>
+  <span></span>
+  <span style="counter-reset: c 48"></span>
+  <span></span>
+  <span style="counter-reset: c 388"></span>
+  <span></span>
+  <span style="counter-reset: c 3488"></span>
+  <span></span>
+  <span></span>
+</div>
+<div>
+  <span>I.I</span>
+  <span>II</span>
+  <span>III</span>
+  <span>IV</span>
+  <span>V</span>
+  <span>VI</span>
+  <span>VII</span>
+  <span>VIII</span>
+  <span>IX</span>
+  <span>X</span>
+  <span>XI</span>
+  <span>XII</span>
+  <span>XII.XLIX</span>
+  <span>XIII</span>
+  <span>XIII.CCCLXXXIX</span>
+  <span>XIV</span>
+  <span>XIV.MMMCDLXXXIX</span>
+  <span>XV</span>
+  <span>XVI</span>
+</div>
+
diff --git a/tests/wpt/tests/css/css-lists/counters-004-ref.html b/tests/wpt/tests/css/css-lists/counters-004-ref.html
new file mode 100644
index 00000000000..070c7047386
--- /dev/null
+++ b/tests/wpt/tests/css/css-lists/counters-004-ref.html
@@ -0,0 +1,88 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSS Lists and Counters test reference: counters(c, &quot;.", georgian)</title>
+<p>The following two lines should look the same:</p>
+<div>
+  <span>ა.ა</span>
+  <span>ბ</span>
+  <span>გ</span>
+  <span>დ</span>
+  <span>ე</span>
+  <span>ვ</span>
+  <span>ზ</span>
+  <span>ჱ</span>
+  <span>თ</span>
+  <span>ი</span>
+  <span>ია</span>
+  <span>იბ</span>
+  <span>იბ.კ</span>
+  <span>იბ.ლ</span>
+  <span>იბ.მ</span>
+  <span>იბ.ნ</span>
+  <span>იბ.ჲ</span>
+  <span>იბ.ო</span>
+  <span>იბ.პ</span>
+  <span>იბ.ჟ</span>
+  <span>იბ.რ</span>
+  <span>იბ.ს</span>
+  <span>იბ.ტ</span>
+  <span>იბ.ჳ</span>
+  <span>იბ.ფ</span>
+  <span>იბ.ქ</span>
+  <span>იბ.ღ</span>
+  <span>იბ.ყ</span>
+  <span>იბ.შ</span>
+  <span>იბ.ჩ</span>
+  <span>იბ.ც</span>
+  <span>იბ.ძ</span>
+  <span>იბ.წ</span>
+  <span>იბ.ჭ</span>
+  <span>იბ.ხ</span>
+  <span>იბ.ჴ</span>
+  <span>იბ.ჯ</span>
+  <span>იბ.ჰ</span>
+  <span>იბ.ჵ</span>
+  <span>იბ.ჵჰშჟთ</span>
+</div>
+<div>
+  <span>ა.ა</span>
+  <span>ბ</span>
+  <span>გ</span>
+  <span>დ</span>
+  <span>ე</span>
+  <span>ვ</span>
+  <span>ზ</span>
+  <span>ჱ</span>
+  <span>თ</span>
+  <span>ი</span>
+  <span>ია</span>
+  <span>იბ</span>
+  <span>იბ.კ</span>
+  <span>იბ.ლ</span>
+  <span>იბ.მ</span>
+  <span>იბ.ნ</span>
+  <span>იბ.ჲ</span>
+  <span>იბ.ო</span>
+  <span>იბ.პ</span>
+  <span>იბ.ჟ</span>
+  <span>იბ.რ</span>
+  <span>იბ.ს</span>
+  <span>იბ.ტ</span>
+  <span>იბ.ჳ</span>
+  <span>იბ.ფ</span>
+  <span>იბ.ქ</span>
+  <span>იბ.ღ</span>
+  <span>იბ.ყ</span>
+  <span>იბ.შ</span>
+  <span>იბ.ჩ</span>
+  <span>იბ.ც</span>
+  <span>იბ.ძ</span>
+  <span>იბ.წ</span>
+  <span>იბ.ჭ</span>
+  <span>იბ.ხ</span>
+  <span>იბ.ჴ</span>
+  <span>იბ.ჯ</span>
+  <span>იბ.ჰ</span>
+  <span>იბ.ჵ</span>
+  <span>იბ.ჵჰშჟთ</span>
+</div>
diff --git a/tests/wpt/tests/css/css-lists/counters-004.html b/tests/wpt/tests/css/css-lists/counters-004.html
new file mode 100644
index 00000000000..6b1b1c850d7
--- /dev/null
+++ b/tests/wpt/tests/css/css-lists/counters-004.html
@@ -0,0 +1,95 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSS Lists and Counters: counters(c, &quot;.", georgian)</title>
+<link rel="help" href="https://drafts.csswg.org/css-lists/#inheriting-counters">
+<link rel="match" href="counters-004-ref.html">
+<meta name="assert" content="counters are not inherited from the previous sibling, when can be inherited from the ancestor">
+<style type="text/css">
+body, #test span:first-child { counter-reset: c; }
+p, #test span { counter-increment: c; }
+#test span::before { content: counters(c, ".", georgian); }</style>
+<p>The following two lines should look the same:</p>
+<div id="test">
+  <span></span>
+  <span></span>
+  <span></span>
+  <span></span>
+  <span></span>
+  <span></span>
+  <span></span>
+  <span></span>
+  <span></span>
+  <span></span>
+  <span></span>
+  <span></span>
+  <span style="counter-reset: c 19"></span>
+  <span style="counter-reset: c 29"></span>
+  <span style="counter-reset: c 39"></span>
+  <span style="counter-reset: c 49"></span>
+  <span style="counter-reset: c 59"></span>
+  <span style="counter-reset: c 69"></span>
+  <span style="counter-reset: c 79"></span>
+  <span style="counter-reset: c 89"></span>
+  <span style="counter-reset: c 99"></span>
+  <span style="counter-reset: c 199"></span>
+  <span style="counter-reset: c 299"></span>
+  <span style="counter-reset: c 399"></span>
+  <span style="counter-reset: c 499"></span>
+  <span style="counter-reset: c 599"></span>
+  <span style="counter-reset: c 699"></span>
+  <span style="counter-reset: c 799"></span>
+  <span style="counter-reset: c 899"></span>
+  <span style="counter-reset: c 999"></span>
+  <span style="counter-reset: c 1999"></span>
+  <span style="counter-reset: c 2999"></span>
+  <span style="counter-reset: c 3999"></span>
+  <span style="counter-reset: c 4999"></span>
+  <span style="counter-reset: c 5999"></span>
+  <span style="counter-reset: c 6999"></span>
+  <span style="counter-reset: c 7999"></span>
+  <span style="counter-reset: c 8999"></span>
+  <span style="counter-reset: c 9999"></span>
+  <span style="counter-reset: c 19998"></span>
+</div>
+<div>
+  <span>ა.ა</span>
+  <span>ბ</span>
+  <span>გ</span>
+  <span>დ</span>
+  <span>ე</span>
+  <span>ვ</span>
+  <span>ზ</span>
+  <span>ჱ</span>
+  <span>თ</span>
+  <span>ი</span>
+  <span>ია</span>
+  <span>იბ</span>
+  <span>იბ.კ</span>
+  <span>იბ.ლ</span>
+  <span>იბ.მ</span>
+  <span>იბ.ნ</span>
+  <span>იბ.ჲ</span>
+  <span>იბ.ო</span>
+  <span>იბ.პ</span>
+  <span>იბ.ჟ</span>
+  <span>იბ.რ</span>
+  <span>იბ.ს</span>
+  <span>იბ.ტ</span>
+  <span>იბ.ჳ</span>
+  <span>იბ.ფ</span>
+  <span>იბ.ქ</span>
+  <span>იბ.ღ</span>
+  <span>იბ.ყ</span>
+  <span>იბ.შ</span>
+  <span>იბ.ჩ</span>
+  <span>იბ.ც</span>
+  <span>იბ.ძ</span>
+  <span>იბ.წ</span>
+  <span>იბ.ჭ</span>
+  <span>იბ.ხ</span>
+  <span>იბ.ჴ</span>
+  <span>იბ.ჯ</span>
+  <span>იბ.ჰ</span>
+  <span>იბ.ჵ</span>
+  <span>იბ.ჵჰშჟთ</span>
+</div>
diff --git a/tests/wpt/tests/css/css-lists/counters-scope-001-ref.html b/tests/wpt/tests/css/css-lists/counters-scope-001-ref.html
new file mode 100644
index 00000000000..e7c3abf5101
--- /dev/null
+++ b/tests/wpt/tests/css/css-lists/counters-scope-001-ref.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<title>CSS Lists and Counters test reference: counters scope</title>
+<p>The following two lines should be the same:</p>
+<div>
+  1 2 1 1 1 1
+  1 3 3 1 1 1
+</div>
+<div>
+  1 2 1 1 1 1
+  1 3 3 1 1 1
+</div>
diff --git a/tests/wpt/tests/css/css-lists/counters-scope-001.html b/tests/wpt/tests/css/css-lists/counters-scope-001.html
new file mode 100644
index 00000000000..2ea72753bd9
--- /dev/null
+++ b/tests/wpt/tests/css/css-lists/counters-scope-001.html
@@ -0,0 +1,34 @@
+<!doctype html>
+<title>CSS Lists and Counters: counters scope</title>
+<link rel="help" href="https://drafts.csswg.org/css-lists/#inheriting-counters">
+<link rel="match" href="counters-scope-001-ref.html">
+<meta name="assert" content="counters are not inherited from the previous sibling, when can be inherited from the ancestor">
+<style type="text/css">
+.scope { counter-reset: c 1; }
+.scope::before, .scope::after { content: counter(c); }
+.c::before { content: counter(c); }
+.one::before { counter-reset: c 2; }
+.two { counter-reset: c 3; }
+</style>
+<p>The following two lines should be the same:</p>
+<!-- counter on the first span with class "c" is 1, as it inherits the counter from class="scope", as a direct ancestor -->
+<div>
+  <span class="scope">
+    <span class="one c">
+      <span class="c"></span>
+    </span>
+    <span class="c"></span>
+  </span>
+  <span class="c"></span>
+  <span class="scope">
+    <span class="two c">
+      <span class="c"></span>
+    </span>
+    <span class="c"></span>
+  </span>
+  <span class="c"></span>
+</div>
+<div>
+  1 2 1 1 1 1
+  1 3 3 1 1 1
+</div>
diff --git a/tests/wpt/tests/css/css-lists/counters-scope-002-ref.html b/tests/wpt/tests/css/css-lists/counters-scope-002-ref.html
new file mode 100644
index 00000000000..5d3b3bdefdb
--- /dev/null
+++ b/tests/wpt/tests/css/css-lists/counters-scope-002-ref.html
@@ -0,0 +1,5 @@
+<!doctype html>
+<title>CSS Lists and Counters test reference: counters scope</title>
+<p>The following two lines should be the same:</p>
+<div>B1- B2- B2.1- B2.2-A2.3- B2.4-A2.5- A2.6- B3- B4-A5- A6- A7- A8-</div>
+<div>B1- B2- B2.1- B2.2-A2.3- B2.4-A2.5- A2.6- B3- B4-A5- A6- A7- A8-</div>
diff --git a/tests/wpt/tests/css/css-lists/counters-scope-002.html b/tests/wpt/tests/css/css-lists/counters-scope-002.html
new file mode 100644
index 00000000000..8261d55971d
--- /dev/null
+++ b/tests/wpt/tests/css/css-lists/counters-scope-002.html
@@ -0,0 +1,25 @@
+<!doctype html>
+<title>CSS Lists and Counters: counters scope</title>
+<link rel="help" href="https://drafts.csswg.org/css-lists/#inheriting-counters">
+<link rel="match" href="counters-scope-002-ref.html">
+<meta name="assert" content="counters are not inherited from the previous sibling, when can be inherited from the ancestor">
+<style type="text/css">
+#scope, span#reset { counter-reset: c 0; }
+span::before { counter-increment: c 1; content: "B" counters(c,".") "-" }
+span::after  { counter-increment: c 1; content: "A" counters(c,".") "-" }
+</style>
+<p>The following two lines should be the same:</p>
+<div id="scope">
+  <span>
+    <span>
+      <span id="reset">
+        <span></span>
+        <span></span>
+      </span>
+      <span>
+        <span></span>
+      </span>
+    </span>
+  </span>
+</div>
+<div>B1- B2- B2.1- B2.2-A2.3- B2.4-A2.5- A2.6- B3- B4-A5- A6- A7- A8-</div>
diff --git a/tests/wpt/tests/css/css-lists/counters-scope-003-ref.html b/tests/wpt/tests/css/css-lists/counters-scope-003-ref.html
new file mode 100644
index 00000000000..d391da8c729
--- /dev/null
+++ b/tests/wpt/tests/css/css-lists/counters-scope-003-ref.html
@@ -0,0 +1,5 @@
+<!doctype html>
+<title>CSS Lists and Counters test reference: counters scope</title>
+<p>The following two lines should be the same:</p>
+<div>B1- B1.1- B2-A3- A4- A5-</div>
+<div>B1- B1.1- B2-A3- A4- A5-</div>
diff --git a/tests/wpt/tests/css/css-lists/counters-scope-003.html b/tests/wpt/tests/css/css-lists/counters-scope-003.html
new file mode 100644
index 00000000000..f7b94e28635
--- /dev/null
+++ b/tests/wpt/tests/css/css-lists/counters-scope-003.html
@@ -0,0 +1,19 @@
+<!doctype html>
+<title>CSS Lists and Counters: counters scope</title>
+<link rel="help" href="https://drafts.csswg.org/css-lists/#inheriting-counters">
+<link rel="match" href="counters-scope-003-ref.html">
+<meta name="assert" content="counters are not inherited from the previous sibling, when can be inherited from the ancestor">
+<style type="text/css">
+body, span#reset:before { counter-reset: c 0; }
+span::before { counter-increment: c 1; content: "B" counters(c,".") "-" }
+span::after  { counter-increment: c 1; content: "A" counters(c,".") "-" }
+</style>
+<p>The following two lines should be the same:</p>
+<div>
+  <span>
+    <span id="reset">
+      <span></span>
+    </span>
+  </span>
+</div>
+<div>B1- B1.1- B2-A3- A4- A5-</div>
diff --git a/tests/wpt/tests/css/css-lists/counters-scope-004-ref.html b/tests/wpt/tests/css/css-lists/counters-scope-004-ref.html
new file mode 100644
index 00000000000..468739cfcb3
--- /dev/null
+++ b/tests/wpt/tests/css/css-lists/counters-scope-004-ref.html
@@ -0,0 +1,5 @@
+<!doctype html>
+<title>CSS Lists and Counters test reference: counters scope</title>
+<p>The following two lines should be the same:</p>
+<div>1 1 R 2 3</div>
+<div>1 1 R 2 3</div>
diff --git a/tests/wpt/tests/css/css-lists/counters-scope-004.html b/tests/wpt/tests/css/css-lists/counters-scope-004.html
new file mode 100644
index 00000000000..4a60c4ca0bd
--- /dev/null
+++ b/tests/wpt/tests/css/css-lists/counters-scope-004.html
@@ -0,0 +1,27 @@
+<!doctype html>
+<title>CSS Lists and Counters: counters scope</title>
+<link rel="help" href="https://drafts.csswg.org/css-lists/#inheriting-counters">
+<link rel="match" href="counters-scope-004-ref.html">
+<meta name="assert" content="counters are not inherited from the previous sibling, when can be inherited from the ancestor">
+<style type="text/css">
+.reset { counter-reset: c; }
+.rb::before { counter-reset: c; content: "R"; }
+.use { counter-increment: c; }
+.use::before { content: counters(c, ".") " "; }
+</style>
+<p>The following two lines should be the same:</p>
+<!-- As rb creates counter only on ::before, the first span with class "use" -->
+<!-- inside the "rb" will inherit its counter from second "reset" as span "rb" -->
+<!-- will inherit it from previous sibling which is second "reset" -->
+<div>
+  <span class="reset"></span>
+  <span class="use"></span>
+  <span class="reset"></span>
+  <span class="use"></span>
+  <span class="rb">
+    <span class="use"></span>
+    <span class="reset"></span>
+    <span class="use"></span>
+  </span>
+</div>
+<div>1 1 R 2 3</div>
diff --git a/tests/wpt/tests/css/css-lists/list-item-counter-crash.html b/tests/wpt/tests/css/css-lists/list-item-counter-crash.html
new file mode 100644
index 00000000000..fc8a38c6280
--- /dev/null
+++ b/tests/wpt/tests/css/css-lists/list-item-counter-crash.html
@@ -0,0 +1,15 @@
+<!doctype html>
+<html class="reftest-wait">
+<link rel="help" href="http://crbug.com/1487174">
+<style>
+* { counter-increment: c; }
+</style>
+<script>
+  function error_fn() {
+    test.style.setProperty("text-orientation", "upright");
+    document.documentElement.classList.remove("reftest-wait");
+  }
+</script>
+<li id="test"></li>
+<image onerror="error_fn()" srcset="error" ></image>
+</html>
diff --git a/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-shape-circle-004.svg b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-shape-circle-004.svg
index be5ad144e51..83f7eec4fec 100644
--- a/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-shape-circle-004.svg
+++ b/tests/wpt/tests/css/css-masking/clip-path-svg-content/clip-path-shape-circle-004.svg
@@ -5,7 +5,7 @@
 	<html:link rel="help" href="http://www.w3.org/TR/css-masking-1/#svg-clipping-paths"/>
 	<html:link rel="help" href="http://www.w3.org/TR/css-masking-1/#the-clip-path"/>
 	<html:link rel="match" href="reference/clip-path-circle-001-ref.svg" />
-	<html:meta name="fuzzy" content="maxDifference=0-64; totalPixels=0-78"/>
+	<html:meta name="fuzzy" content="maxDifference=0-64; totalPixels=0-376"/>
 	<metadata class="flags">svg</metadata>
 	<desc class="assert">A basic shape function circle() applied to an SVG
 	rectangle. The specified keyword stroke-box defines the reference box
diff --git a/tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-custom-timing-function-reverse.html b/tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-custom-timing-function-reverse.html
index d42b2fe5a32..5346a4c2242 100644
--- a/tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-custom-timing-function-reverse.html
+++ b/tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-animation-custom-timing-function-reverse.html
@@ -2,7 +2,7 @@
 <html class="reftest-wait">
 <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#basic-shape-interpolation">
 <link rel="match" href="clip-path-animation-custom-timing-function-reverse-ref.html">
-<meta name=fuzzy content="0-1;0-350">
+<meta name="fuzzy" content="maxDifference=0-20; totalPixels=0-692" />
 <!--
   Test that ensures that the bounding rect for a clip path animation is not
   limited to the size of the largest keyframe.a.
diff --git a/tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-transition-custom-timing-function.html b/tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-transition-custom-timing-function.html
index 47b0cd6e751..f8bf6e08fe8 100644
--- a/tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-transition-custom-timing-function.html
+++ b/tests/wpt/tests/css/css-masking/clip-path/animations/clip-path-transition-custom-timing-function.html
@@ -2,6 +2,7 @@
 <html class="reftest-wait">
 <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#basic-shape-interpolation">
 <link rel="match" href="clip-path-animation-custom-timing-function-ref.html">
+<meta name="fuzzy" content="maxDifference=0-4; totalPixels=0-628">
 <style>
   .green {
     background-color: green;
diff --git a/tests/wpt/tests/css/css-masking/clip-path/clip-path-borderBox-1a.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-borderBox-1a.html
index a15ef09b3bd..c0304a59bb8 100644
--- a/tests/wpt/tests/css/css-masking/clip-path/clip-path-borderBox-1a.html
+++ b/tests/wpt/tests/css/css-masking/clip-path/clip-path-borderBox-1a.html
@@ -7,7 +7,7 @@
     <link rel="author" title="Mozilla" href="https://www.mozilla.org">
     <link rel="help" href="https://www.w3.org/TR/css-masking-1/#the-clip-path">
     <link rel="match" href="clip-path-geometryBox-1-ref.html">
-    <meta name="fuzzy" content="maxDifference=0-96; totalPixels=0-400">
+    <meta name="fuzzy" content="maxDifference=0-100; totalPixels=0-400">
     <meta name="assert" content="Test checks whether clip-path border-box works correctly or not. This test is for clip-path applied to an HTML element.">
     <style>
       div {
diff --git a/tests/wpt/tests/css/css-masking/clip-path/clip-path-borderBox-1c.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-borderBox-1c.html
index 91f3c9da6b7..99f6bb0fc97 100644
--- a/tests/wpt/tests/css/css-masking/clip-path/clip-path-borderBox-1c.html
+++ b/tests/wpt/tests/css/css-masking/clip-path/clip-path-borderBox-1c.html
@@ -7,7 +7,7 @@
     <link rel="author" title="Mozilla" href="https://www.mozilla.org">
     <link rel="help" href="https://www.w3.org/TR/css-masking-1/#the-clip-path">
     <link rel="match" href="clip-path-geometryBox-1-ref.html">
-    <meta name="fuzzy" content="maxDifference=0-64; totalPixels=0-368">
+    <meta name="fuzzy" content="maxDifference=0-65; totalPixels=0-368">
     <meta name="assert" content="Test checks whether clip-path border-box works correctly or not. This test is for clip-path applied to an SVG  SVG element.">
     <style>
       svg {
diff --git a/tests/wpt/tests/css/css-masking/clip-path/clip-path-borderBox-1d.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-borderBox-1d.html
new file mode 100644
index 00000000000..3b63d9251f8
--- /dev/null
+++ b/tests/wpt/tests/css/css-masking/clip-path/clip-path-borderBox-1d.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<title>CSS Masking: clip path with border-box</title>
+<link rel="help" href="https://drafts.fxtf.org/css-masking-1/#the-clip-path">
+<link rel="match" href="reference/green-100x100.html">
+<meta name="assert" content="Check that the 'clip-path' property supports border-box.">
+
+<style>
+  .clipped {
+    width: 50px;
+    height: 50px;
+    background-color: green;
+    clip-path: border-box;
+    border: 25px solid green;
+    /* This outline draws outside the border box and should be clipped. */
+    outline: 8px solid red;
+  }
+</style>
+<div class="clipped"></div>
diff --git a/tests/wpt/tests/css/css-masking/clip-path/clip-path-borderBox-1e.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-borderBox-1e.html
new file mode 100644
index 00000000000..17ac0b0d72c
--- /dev/null
+++ b/tests/wpt/tests/css/css-masking/clip-path/clip-path-borderBox-1e.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<title>CSS Masking: clip path with border-box and border-radius</title>
+<link rel="help" href="https://drafts.fxtf.org/css-masking-1/#the-clip-path">
+<link rel="help" href="https://drafts.csswg.org/css-shapes-1/#valdef-shape-box-border-box">
+<link rel="match" href="reference/green-circle-100x100.html">
+<meta name="fuzzy" content="maxDifference=0-126; totalPixels=0-400">
+<meta name="assert" content="Check that the 'clip-path' property supports border-box with border-radius.">
+
+<style>
+  .clipped {
+    width: 50px;
+    height: 50px;
+    background-color: green;
+    clip-path: border-box;
+    border: 25px solid green;
+    border-radius: 50px;
+    /* This outline draws outside the border box and should be clipped. */
+    outline: 8px solid red;
+  }
+</style>
+<div class="clipped"></div>
diff --git a/tests/wpt/tests/css/css-masking/clip-path/clip-path-contentBox-1c.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-contentBox-1c.html
index a04aaa21e5a..e1b653aaf7f 100644
--- a/tests/wpt/tests/css/css-masking/clip-path/clip-path-contentBox-1c.html
+++ b/tests/wpt/tests/css/css-masking/clip-path/clip-path-contentBox-1c.html
@@ -7,7 +7,7 @@
     <link rel="author" title="Mozilla" href="https://www.mozilla.org">
     <link rel="help" href="https://www.w3.org/TR/css-masking-1/#the-clip-path">
     <link rel="match" href="clip-path-geometryBox-1-ref.html">
-    <meta name="fuzzy" content="maxDifference=0-52; totalPixels=0-355">
+    <meta name="fuzzy" content="maxDifference=0-52; totalPixels=0-376">
     <meta name="assert" content="Test checks whether clip-path content-box works correctly or not.">
   </head>
   <style>
diff --git a/tests/wpt/tests/css/css-masking/clip-path/clip-path-contentBox-1d.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-contentBox-1d.html
new file mode 100644
index 00000000000..1968fc80441
--- /dev/null
+++ b/tests/wpt/tests/css/css-masking/clip-path/clip-path-contentBox-1d.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<title>CSS Masking: clip path with content-box</title>
+<link rel="help" href="https://drafts.fxtf.org/css-masking-1/#the-clip-path">
+<link rel="match" href="reference/green-100x100.html">
+<meta name="assert" content="Check that the 'clip-path' property supports content-box.">
+
+<style>
+  body { margin: 0; }
+  .clipped {
+    display: inline-block;
+    clip-path: content-box;
+    /* This background draws in the padding and should be clipped. */
+    background-color: red;
+    padding: 4px;
+    /* This border draws outside the content box and should be clipped. */
+    border: 4px solid darkred;
+    /* This outline draws outside the content box and should be clipped. */
+    outline: 100px solid maroon;
+  }
+  .content {
+    width: 100px;
+    height: 100px;
+    background: green;
+  }
+</style>
+<div class="clipped">
+  <div class="content"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-masking/clip-path/clip-path-contentBox-1e.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-contentBox-1e.html
new file mode 100644
index 00000000000..aa2f961f668
--- /dev/null
+++ b/tests/wpt/tests/css/css-masking/clip-path/clip-path-contentBox-1e.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<title>CSS Masking: clip path with content-box and border-radius</title>
+<link rel="help" href="https://drafts.fxtf.org/css-masking-1/#the-clip-path">
+<link rel="help" href="https://drafts.csswg.org/css-shapes-1/#valdef-shape-box-content-box">
+<link rel="match" href="reference/green-circle-100x100.html">
+<meta name="fuzzy" content="maxDifference=0-64; totalPixels=0-400">
+<meta name="assert" content="Check that the 'clip-path' property supports content-box with border-radius.">
+
+<style>
+  body { margin: 0; }
+  .clipped {
+    display: inline-block;
+    clip-path: content-box;
+    /* This background draws in the padding and should be clipped. */
+    background-color: red;
+    padding: 4px;
+    border-radius: 58px;
+    /* This border draws outside the content box and should be clipped. */
+    border: 4px solid darkred;
+    /* This outline draws outside the content box and should be clipped. */
+    outline: 100px solid maroon;
+  }
+  .content {
+    width: 100px;
+    height: 100px;
+    background: green;
+  }
+</style>
+<div class="clipped">
+  <div class="content"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-masking/clip-path/clip-path-fillBox-1a.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-fillBox-1a.html
index d3733d4332a..c14890e9673 100644
--- a/tests/wpt/tests/css/css-masking/clip-path/clip-path-fillBox-1a.html
+++ b/tests/wpt/tests/css/css-masking/clip-path/clip-path-fillBox-1a.html
@@ -7,16 +7,16 @@
     <link rel="author" title="Mozilla" href="https://www.mozilla.org">
     <link rel="help" href="https://www.w3.org/TR/css-masking-1/#the-clip-path">
     <link rel="match" href="clip-path-geometryBox-1-ref.html">
-    <meta name="fuzzy" content="maxDifference=0-52; totalPixels=0-355">
+    <meta name="fuzzy" content="maxDifference=0-79; totalPixels=0-392">
     <meta name="assert" content="Test checks whether clip-path fill-box works correctly or not. This test is for clip-path applied to an SVG  SVG element.">
     <style>
       svg {
         position: absolute;
-        left: 40px;
-        top: 40px;
+        left: 5px;
+        top: 5px;
         background-color: blue;
-        width: 30px;
-        height: 30px;
+        width: 100px;
+        height: 100px;
         margin: 10px;
         padding: 10px;
         border: solid blue 25px;
diff --git a/tests/wpt/tests/css/css-masking/clip-path/clip-path-inline-007-ref.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-inline-007-ref.html
new file mode 100644
index 00000000000..981482ff723
--- /dev/null
+++ b/tests/wpt/tests/css/css-masking/clip-path/clip-path-inline-007-ref.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<meta content="ahem" name="flags">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+  .container {
+    font: 100px/1 Ahem;
+    line-height: 100px;
+  }
+  .container > span {
+    clip-path: circle(50%);
+    color: green;
+  }
+</style>
+<p>Test passes if there is a filled green circle with radius 50px.
+<div class="container">
+  <span>X</span>
+</div>
diff --git a/tests/wpt/tests/css/css-masking/clip-path/clip-path-inline-007.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-inline-007.html
new file mode 100644
index 00000000000..ffbc8310802
--- /dev/null
+++ b/tests/wpt/tests/css/css-masking/clip-path/clip-path-inline-007.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<title>clip-path on inline with border-box and border-radius</title>
+<link rel="help" href="https://drafts.csswg.org/css-shapes-1/#valdef-shape-box-border-box">
+<link rel="help" href="https://drafts.csswg.org/css-shapes-1/#typedef-shape-box">
+<link rel="match" href="clip-path-inline-007-ref.html">
+<meta name="fuzzy" content="maxDifference=0-62; totalPixels=0-325">
+<meta content="ahem" name="flags">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+  .container {
+    font: 100px/1 Ahem;
+    line-height: 100px;
+  }
+  .container > span {
+    border-radius: 50px;
+    clip-path: border-box;
+    color: green;
+    /* This outline draws outside the border box and should be clipped. */
+    outline: 8px solid red;
+  }
+</style>
+<p>Test passes if there is a filled green circle with radius 50px.
+<div class="container">
+  <span>X</span>
+</div>
diff --git a/tests/wpt/tests/css/css-masking/clip-path/clip-path-inline-008-ref.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-inline-008-ref.html
new file mode 100644
index 00000000000..981482ff723
--- /dev/null
+++ b/tests/wpt/tests/css/css-masking/clip-path/clip-path-inline-008-ref.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<meta content="ahem" name="flags">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+  .container {
+    font: 100px/1 Ahem;
+    line-height: 100px;
+  }
+  .container > span {
+    clip-path: circle(50%);
+    color: green;
+  }
+</style>
+<p>Test passes if there is a filled green circle with radius 50px.
+<div class="container">
+  <span>X</span>
+</div>
diff --git a/tests/wpt/tests/css/css-masking/clip-path/clip-path-inline-008.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-inline-008.html
new file mode 100644
index 00000000000..911f9cac4dd
--- /dev/null
+++ b/tests/wpt/tests/css/css-masking/clip-path/clip-path-inline-008.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<title>clip-path on inline with margin-box and border-radius</title>
+<link rel="help" href="https://drafts.csswg.org/css-shapes-1/#valdef-shape-box-margin-box">
+<link rel="help" href="https://drafts.csswg.org/css-shapes-1/#typedef-shape-box">
+<link rel="match" href="clip-path-inline-008-ref.html">
+<meta name="fuzzy" content="maxDifference=0-14; totalPixels=0-240">
+<meta content="ahem" name="flags">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+  .container {
+    font: 50px/1 Ahem;
+    line-height: 50px;
+  }
+  .container > span {
+    margin: 25px;
+    border-radius: 50px;
+    clip-path: margin-box;
+    color: green;
+    /* This outline draws far outside the margin box and should be partially clipped. */
+    outline: 200px solid green;
+    /* Disables margin collapsing. */
+    float: left;
+  }
+</style>
+<p>Test passes if there is a filled green circle with radius 50px.
+<div class="container">
+  <span>X</span>
+</div>
diff --git a/tests/wpt/tests/css/css-masking/clip-path/clip-path-inline-009-ref.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-inline-009-ref.html
new file mode 100644
index 00000000000..26da94d8f3b
--- /dev/null
+++ b/tests/wpt/tests/css/css-masking/clip-path/clip-path-inline-009-ref.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<meta content="ahem" name="flags">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+  .container {
+    font: 100px/1 Ahem;
+    line-height: 100px;
+  }
+  .container > span {
+    margin-left: 50px;
+    clip-path: circle(50%);
+    color: green;
+  }
+</style>
+<p>Test passes if there is a filled green circle with radius 50px.
+<div class="container">
+  <span>X</span>
+</div>
diff --git a/tests/wpt/tests/css/css-masking/clip-path/clip-path-inline-009.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-inline-009.html
new file mode 100644
index 00000000000..6a7fbb54988
--- /dev/null
+++ b/tests/wpt/tests/css/css-masking/clip-path/clip-path-inline-009.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<title>clip-path on inline with content-box and border-radius</title>
+<link rel="help" href="https://drafts.csswg.org/css-shapes-1/#valdef-shape-box-content-box">
+<link rel="help" href="https://drafts.csswg.org/css-shapes-1/#typedef-shape-box">
+<link rel="match" href="clip-path-inline-009-ref.html">
+<meta content="ahem" name="flags">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+  .container {
+    font: 100px/1 Ahem;
+    line-height: 100px;
+  }
+  .container > span {
+    padding: 50px;
+    border-radius: 100px;
+    clip-path: content-box;
+    color: green;
+  }
+</style>
+<p>Test passes if there is a filled green circle with radius 50px.
+<div class="container">
+  <span>X</span>
+</div>
diff --git a/tests/wpt/tests/css/css-masking/clip-path/clip-path-inline-010-ref.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-inline-010-ref.html
new file mode 100644
index 00000000000..981482ff723
--- /dev/null
+++ b/tests/wpt/tests/css/css-masking/clip-path/clip-path-inline-010-ref.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<meta content="ahem" name="flags">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+  .container {
+    font: 100px/1 Ahem;
+    line-height: 100px;
+  }
+  .container > span {
+    clip-path: circle(50%);
+    color: green;
+  }
+</style>
+<p>Test passes if there is a filled green circle with radius 50px.
+<div class="container">
+  <span>X</span>
+</div>
diff --git a/tests/wpt/tests/css/css-masking/clip-path/clip-path-inline-010.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-inline-010.html
new file mode 100644
index 00000000000..dea78b6347f
--- /dev/null
+++ b/tests/wpt/tests/css/css-masking/clip-path/clip-path-inline-010.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<title>clip-path on inline with padding-box and border-radius</title>
+<link rel="help" href="https://drafts.csswg.org/css-shapes-1/#valdef-shape-box-padding-box">
+<link rel="help" href="https://drafts.csswg.org/css-shapes-1/#typedef-shape-box">
+<link rel="match" href="clip-path-inline-010-ref.html">
+<meta name="fuzzy" content="maxDifference=0-43; totalPixels=0-319">
+<meta content="ahem" name="flags">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+  .container {
+    font: 100px/1 Ahem;
+    line-height: 100px;
+  }
+  .container > span {
+    margin-left: -8px;
+    border-radius: 58px;
+    clip-path: padding-box;
+    color: green;
+    /* This border draws outside the padding box and should be clipped. */
+    border: 8px solid red;
+  }
+</style>
+<p>Test passes if there is a filled green circle with radius 50px.
+<div class="container">
+  <span>X</span>
+</div>
diff --git a/tests/wpt/tests/css/css-masking/clip-path/clip-path-marginBox-1b.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-marginBox-1b.html
new file mode 100644
index 00000000000..04f22e84d5c
--- /dev/null
+++ b/tests/wpt/tests/css/css-masking/clip-path/clip-path-marginBox-1b.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<title>CSS Masking: clip path with margin-box</title>
+<link rel="help" href="https://drafts.fxtf.org/css-masking-1/#the-clip-path">
+<link rel="match" href="reference/green-100x100.html">
+<meta name="assert" content="Check that the 'clip-path' property supports margin-box.">
+
+<style>
+  .clipped {
+    width: 50px;
+    height: 50px;
+    background-color: green;
+    clip-path: margin-box;
+    /* This outline draws far outside the margin box and should be partially clipped. */
+    outline: 200px solid green;
+    margin: 25px;
+    /* Disables margin collapsing. */
+    float: left;
+  }
+</style>
+<div class="clipped"></div>
diff --git a/tests/wpt/tests/css/css-masking/clip-path/clip-path-marginBox-1c.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-marginBox-1c.html
new file mode 100644
index 00000000000..cfeebeedf38
--- /dev/null
+++ b/tests/wpt/tests/css/css-masking/clip-path/clip-path-marginBox-1c.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<title>CSS Masking: clip path with margin-box and border-radius</title>
+<link rel="help" href="https://drafts.fxtf.org/css-masking-1/#the-clip-path">
+<link rel="help" href="https://drafts.csswg.org/css-shapes-1/#valdef-shape-box-margin-box">
+<link rel="match" href="reference/green-circle-100x100.html">
+<meta name="fuzzy" content="maxDifference=0-98; totalPixels=0-287">
+<meta name="assert" content="Check that the 'clip-path' property supports margin-box with border-radius.">
+
+<style>
+  .clipped {
+    width: 50px;
+    height: 50px;
+    background-color: green;
+    clip-path: margin-box;
+    border-radius: 50px;
+    /* This outline draws far outside the margin box and should be partially clipped. */
+    outline: 200px solid green;
+    margin: 25px;
+    /* Disables margin collapsing. */
+    float: left;
+  }
+</style>
+<div class="clipped"></div>
diff --git a/tests/wpt/tests/css/css-masking/clip-path/clip-path-marginBox-1d-ref.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-marginBox-1d-ref.html
new file mode 100644
index 00000000000..cd78d2009a3
--- /dev/null
+++ b/tests/wpt/tests/css/css-masking/clip-path/clip-path-marginBox-1d-ref.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<style>
+  div {
+    width: 100px;
+    height: 100px;
+    background-color: green;
+    border-radius: 34.4px;
+    border: 25px solid green;
+  }
+</style>
+<div></div>
diff --git a/tests/wpt/tests/css/css-masking/clip-path/clip-path-marginBox-1d.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-marginBox-1d.html
new file mode 100644
index 00000000000..39d3c9db5af
--- /dev/null
+++ b/tests/wpt/tests/css/css-masking/clip-path/clip-path-marginBox-1d.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<title>CSS Masking: clip path with margin-box and border-radius when the ratio of border-radius/margin is less than 1</title>
+<link rel="help" href="https://drafts.fxtf.org/css-masking-1/#the-clip-path">
+<link rel="help" href="https://drafts.csswg.org/css-shapes-1/#valdef-shape-box-margin-box">
+<link rel="match" href="clip-path-marginBox-1d-ref.html">
+<meta name="fuzzy" content="maxDifference=0-146; totalPixels=0-500">
+<meta name="assert" content="Check that the 'clip-path' property supports margin-box with border-radius.">
+
+<style>
+  .clipped {
+    width: 50px;
+    height: 50px;
+    background-color: green;
+    clip-path: margin-box;
+    border-radius: 10px;
+    /* This outline draws far outside the margin box and should be partially clipped. */
+    outline: 200px solid green;
+    margin: 50px;
+    /* Disables margin collapsing. */
+    float: left;
+  }
+</style>
+<!--
+  Spec: If the ratio of border-radius/margin is less than 1, and margin is
+        positive, then the margin box corner radius is
+        border-radius + margin * (1 + (ratio-1)^3).
+
+  This test has a border-radius of 10 and a margin of 50, and should use a
+  margin box corner radius of: 10 + 50 * (1 + (10/50-1)^3) = 34.4
+-->
+<div class="clipped"></div>
diff --git a/tests/wpt/tests/css/css-masking/clip-path/clip-path-paddingBox-1c.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-paddingBox-1c.html
index bf7b098dbda..c3fc5a90af2 100644
--- a/tests/wpt/tests/css/css-masking/clip-path/clip-path-paddingBox-1c.html
+++ b/tests/wpt/tests/css/css-masking/clip-path/clip-path-paddingBox-1c.html
@@ -7,7 +7,7 @@
     <link rel="author" title="Mozilla" href="https://www.mozilla.org">
     <link rel="help" href="https://www.w3.org/TR/css-masking-1/#the-clip-path">
     <link rel="match" href="clip-path-geometryBox-1-ref.html">
-    <meta name="fuzzy" content="maxDifference=0-52; totalPixels=0-355">
+    <meta name="fuzzy" content="maxDifference=0-52; totalPixels=0-376">
     <meta name="assert" content="Test checks whether clip-path padding-box works correctly or not. This test is for clip-path applied to an SVG  SVG element.">
     <style>
       svg {
diff --git a/tests/wpt/tests/css/css-masking/clip-path/clip-path-paddingBox-1d.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-paddingBox-1d.html
new file mode 100644
index 00000000000..3425c3d2d65
--- /dev/null
+++ b/tests/wpt/tests/css/css-masking/clip-path/clip-path-paddingBox-1d.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<title>CSS Masking: clip path with padding-box</title>
+<link rel="help" href="https://drafts.fxtf.org/css-masking-1/#the-clip-path">
+<link rel="match" href="reference/green-100x100.html">
+<meta name="assert" content="Check that the 'clip-path' property supports padding-box.">
+
+<style>
+  body { margin: 0; }
+  .clipped {
+    width: 100px;
+    height: 100px;
+    background-color: green;
+    clip-path: padding-box;
+    /* This border draws outside the padding box and should be clipped. */
+    border: 8px solid red;
+  }
+</style>
+<div class="clipped"></div>
diff --git a/tests/wpt/tests/css/css-masking/clip-path/clip-path-paddingBox-1e.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-paddingBox-1e.html
new file mode 100644
index 00000000000..cd0d3987d9f
--- /dev/null
+++ b/tests/wpt/tests/css/css-masking/clip-path/clip-path-paddingBox-1e.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<title>CSS Masking: clip path with padding-box and border-radius</title>
+<link rel="help" href="https://drafts.fxtf.org/css-masking-1/#the-clip-path">
+<link rel="help" href="https://drafts.csswg.org/css-shapes-1/#valdef-shape-box-padding-box">
+<link rel="match" href="reference/green-circle-100x100.html">
+<meta name="fuzzy" content="maxDifference=0-70; totalPixels=0-400">
+<meta name="assert" content="Check that the 'clip-path' property supports padding-box with border-radius.">
+
+<style>
+  body { margin: 0; }
+  .clipped {
+    width: 100px;
+    height: 100px;
+    background-color: green;
+    clip-path: padding-box;
+    /* This border draws outside the padding box and should be clipped. */
+    border: 8px solid red;
+    border-radius: 58px;
+  }
+</style>
+<div class="clipped"></div>
diff --git a/tests/wpt/tests/css/css-masking/clip-path/clip-path-polygon-010.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-polygon-010.html
index c60aba2979a..e74a134082e 100644
--- a/tests/wpt/tests/css/css-masking/clip-path/clip-path-polygon-010.html
+++ b/tests/wpt/tests/css/css-masking/clip-path/clip-path-polygon-010.html
@@ -9,9 +9,9 @@
 	<meta name="assert" content="The clip-path property allows specifying
 	basic shapes and reference boxes. This test checks the usage of the correct
 	reference box. 'fill-box' was specified but is not supported for HTML
-	elements. The used value should be 'border-box' for the polygon() function
+	elements. The used value should be 'content-box' for the polygon() function
 	instead. By mixing percentage and absolute values as coordinates we check
-	the correct used reference box. On sucess you should see a green
+	the correct used reference box. On success you should see a green
 	vertical stripe next to a lime green vertical stripe. Both should be of equal
 	size.">
 <style>
@@ -27,6 +27,6 @@ div {
 </style>
 <body>
 	<p>The test passes if you see a green vertical stripe next to a lime green vertical stripe, both stripes should be of equal size and there should be no red.</p>
-	<div style="clip-path: polygon(0% 25%, 50% 50px, 100px 75%, 0 150px) fill-box"></div>
+	<div style="clip-path: polygon(-75px -50%, 50% -25px, 25px 150%, -75px 75px) fill-box"></div>
 </body>
 </html>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-masking/clip-path/clip-path-rect-003.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-rect-003.html
index d61dce8c233..a2d201c1b0f 100644
--- a/tests/wpt/tests/css/css-masking/clip-path/clip-path-rect-003.html
+++ b/tests/wpt/tests/css/css-masking/clip-path/clip-path-rect-003.html
@@ -4,7 +4,7 @@
   <title>CSS Masking: Test clip-path property and rect function</title>
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#funcdef-basic-shape-rect">
   <link rel="match" href="reference/clip-path-xywh-003-ref.html">
-  <meta name=fuzzy content="maxDifference=0-2;totalPixels=0-30">
+  <meta name="fuzzy" content="maxDifference=0-50; totalPixels=0-250">
   <meta name="assert" content="The clip-path property takes the basic shape
 	'rect()' for clipping. On pass you should see a green rect with round.">
 </head>
diff --git a/tests/wpt/tests/css/css-masking/clip-path/clip-path-round-zero-size.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-round-zero-size.html
index 32396fa8d24..59404f81c9d 100644
--- a/tests/wpt/tests/css/css-masking/clip-path/clip-path-round-zero-size.html
+++ b/tests/wpt/tests/css/css-masking/clip-path/clip-path-round-zero-size.html
@@ -7,7 +7,7 @@
 <link rel="author" title="Mozilla" href="https://mozilla.org">
 <link rel="match" href="clip-path-round-zero-size-ref.html">
 <!-- Allow differences of antialised pixels along rounded edges -->
-<meta name="fuzzy" content="0-64;0-28">
+<meta name="fuzzy" content="maxDifference=0-64;totalPixels=0-100">
 <style>
 #target {
   margin: 50px;
diff --git a/tests/wpt/tests/css/css-masking/clip-path/clip-path-strokeBox-1a.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-strokeBox-1a.html
index de6d907a78f..487f5363b69 100644
--- a/tests/wpt/tests/css/css-masking/clip-path/clip-path-strokeBox-1a.html
+++ b/tests/wpt/tests/css/css-masking/clip-path/clip-path-strokeBox-1a.html
@@ -7,7 +7,7 @@
     <link rel="author" title="Mozilla" href="https://www.mozilla.org">
     <link rel="help" href="https://www.w3.org/TR/css-masking-1/#the-clip-path">
     <link rel="match" href="clip-path-geometryBox-1-ref.html">
-    <meta name="fuzzy" content="maxDifference=0-64; totalPixels=0-368">
+    <meta name="fuzzy" content="maxDifference=0-65; totalPixels=0-368">
     <meta name="assert" content="Test checks whether clip-path stroke-box works correctly or not. This test is for clip-path applied to an SVG  SVG element.">
     <style>
       svg {
diff --git a/tests/wpt/tests/css/css-masking/clip-path/clip-path-strokeBox-1b.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-strokeBox-1b.html
index 3ac1a834fb0..33956e3d478 100644
--- a/tests/wpt/tests/css/css-masking/clip-path/clip-path-strokeBox-1b.html
+++ b/tests/wpt/tests/css/css-masking/clip-path/clip-path-strokeBox-1b.html
@@ -7,7 +7,7 @@
     <link rel="author" title="Mozilla" href="https://www.mozilla.org">
     <link rel="help" href="https://www.w3.org/TR/css-masking-1/#the-clip-path">
     <link rel="match" href="clip-path-geometryBox-1-ref.html">
-    <meta name="fuzzy" content="maxDifference=0-64; totalPixels=0-194">
+    <meta name="fuzzy" content="maxDifference=0-64; totalPixels=0-260">
     <meta name="assert" content="Test checks whether clip-path stroke-box works correctly or not.">
   </head>
   <body>
diff --git a/tests/wpt/tests/css/css-masking/clip-path/clip-path-viewBox-1b.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-viewBox-1b.html
index 81bfcb87982..7d44efb81ea 100644
--- a/tests/wpt/tests/css/css-masking/clip-path/clip-path-viewBox-1b.html
+++ b/tests/wpt/tests/css/css-masking/clip-path/clip-path-viewBox-1b.html
@@ -7,13 +7,13 @@
     <link rel="author" title="Mozilla" href="https://www.mozilla.org">
     <link rel="help" href="https://www.w3.org/TR/css-masking-1/#the-clip-path">
     <link rel="match" href="clip-path-geometryBox-1-ref.html">
-    <meta name="fuzzy" content="maxDifference=0-7; totalPixels=0-150">
+    <meta name="fuzzy" content="maxDifference=0-36; totalPixels=0-376">
     <meta name="assert" content="Test checks whether clip-path view-box with viewbox works correctly or not.">
   </head>
   <body>
     <svg width="200" height="200" viewBox="50 50 100 100" preserveAspectRatio="none" style="position: absolute; left: 10px; top: 10px;">
       <rect x="0" y="0" width="200" height="200" fill="blue"
-            clip-path="circle(25% at calc(50% - 5px) calc(50% - 5px)) view-box"/>
+            clip-path="circle(25% at calc(100% - 5px) calc(100% - 5px)) view-box"/>
     </svg>
   </body>
 </html>
diff --git a/tests/wpt/tests/css/css-masking/clip-path/clip-path-viewBox-1c.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-viewBox-1c.html
index adc00493c5e..d46c6d2f03e 100644
--- a/tests/wpt/tests/css/css-masking/clip-path/clip-path-viewBox-1c.html
+++ b/tests/wpt/tests/css/css-masking/clip-path/clip-path-viewBox-1c.html
@@ -7,7 +7,7 @@
     <link rel="author" title="Mozilla" href="https://www.mozilla.org">
     <link rel="help" href="https://www.w3.org/TR/css-masking-1/#the-clip-path">
     <link rel="match" href="clip-path-geometryBox-1-ref.html">
-    <meta name="fuzzy" content="maxDifference=0-64; totalPixels=0-368">
+    <meta name="fuzzy" content="maxDifference=0-65; totalPixels=0-368">
     <meta name="assert" content="Test checks whether clip-path view-box works correctly or not. This test is for clip-path applied to an SVG  SVG element.">
     <style>
       svg {
diff --git a/tests/wpt/tests/css/css-masking/clip-path/clip-path-xywh-003.html b/tests/wpt/tests/css/css-masking/clip-path/clip-path-xywh-003.html
index eb87c8ac36e..370e1af9757 100644
--- a/tests/wpt/tests/css/css-masking/clip-path/clip-path-xywh-003.html
+++ b/tests/wpt/tests/css/css-masking/clip-path/clip-path-xywh-003.html
@@ -4,7 +4,7 @@
   <title>CSS Masking: Test clip-path property and xywh function</title>
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#funcdef-basic-shape-xywh">
   <link rel="match" href="reference/clip-path-xywh-003-ref.html">
-  <meta name=fuzzy content="maxDifference=0-2;totalPixels=0-30">
+  <meta name=fuzzy content="maxDifference=0-2;totalPixels=0-32">
   <meta name="assert" content="The clip-path property takes the basic shape
 	'xywh()' for clipping. On pass you should see a green rect with round.">
 </head>
diff --git a/tests/wpt/tests/css/css-masking/clip-path/reference/green-circle-100x100.html b/tests/wpt/tests/css/css-masking/clip-path/reference/green-circle-100x100.html
new file mode 100644
index 00000000000..e1bd7e5f2f2
--- /dev/null
+++ b/tests/wpt/tests/css/css-masking/clip-path/reference/green-circle-100x100.html
@@ -0,0 +1,2 @@
+<!DOCTYPE html>
+<div style="width: 100px; height: 100px; background-color: green; border-radius: 50px;"></div>
diff --git a/tests/wpt/tests/css/css-masking/hit-test/clip-path-svg-geometry-box.html b/tests/wpt/tests/css/css-masking/hit-test/clip-path-svg-geometry-box.html
new file mode 100644
index 00000000000..13ad624be2b
--- /dev/null
+++ b/tests/wpt/tests/css/css-masking/hit-test/clip-path-svg-geometry-box.html
@@ -0,0 +1,86 @@
+<!DOCTYPE html>
+<title>Hit-tests of clip-path with geometry-box</title>
+<link rel="help" href="https://drafts.fxtf.org/css-masking/#the-clip-path">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+body {
+  margin: 0;
+}
+rect {
+  width: 100px;
+  height: 100px;
+  stroke-width: 50px;
+  stroke: rgba(0, 0, 255, 0.5);
+  fill: lightblue;
+}
+</style>
+<svg id="svg" height="400" width="600">
+  <rect id="rect_a" x="50" y="50" style="clip-path: inset(0px) fill-box;"></rect>
+  <rect id="rect_b" x="250" y="50" style="clip-path: inset(10px) stroke-box;"></rect>
+  <rect id="rect_c" x="450" y="50" style="clip-path: inset(35px 35px 235px 435px) view-box;"></rect>
+
+  <g style="clip-path: inset(0px) fill-box;">
+    <rect id="g_rect_a" x="50" y="250"></rect>
+  </g>
+  <g style="clip-path: inset(10px) stroke-box;">
+    <rect id="g_rect_b" x="250" y="250"></rect>
+  </g>
+  <g style="clip-path: inset(235px 35px 35px 435px) view-box;">
+    <rect id="g_rect_c" x="450" y="250"></rect>
+  </g>
+</svg>
+<script>
+function assert_element_at(element, point_list) {
+  for (let point of point_list) {
+    let result = document.elementFromPoint(point[0], point[1]);
+    assert_equals(result, element, point.join(','));
+  }
+}
+
+function points_inside_rect(x, y, width, height) {
+  return [
+    [x + 1, y + 1],
+    [x + width - 1, y + 1],
+    [x + 1, y + height - 1],
+    [x + width - 1, y + height - 1]
+  ];
+}
+
+function points_outside_rect(x, y, width, height) {
+  return [
+    [x + 1, y - 1],
+    [x + width - 1, y - 1],
+    [x + 1, y + height + 1],
+    [x + width - 1, y - 1],
+    [x - 1, y + 1],
+    [x + width + 1, y + 1],
+    [x - 1, y + height - 1],
+    [x + width + 1, y + height - 1]
+  ];
+}
+
+test(function() {
+  assert_element_at(rect_a, points_inside_rect(50, 50, 100, 100));
+  assert_element_at(svg, points_outside_rect(50, 50, 100, 100));
+
+  // 225,25 150x150 inset by 10px on all sides is 235,35 130x130
+  assert_element_at(rect_b, points_inside_rect(235, 35, 130, 130));
+  assert_element_at(svg, points_outside_rect(235, 35, 130, 130));
+
+  // 425,25 150x150, inset by 10px on all sides is 435,35 130x130
+  assert_element_at(rect_c, points_inside_rect(435, 35, 130, 130));
+  assert_element_at(svg, points_outside_rect(435, 35, 130, 130));
+
+  assert_element_at(g_rect_a, points_inside_rect(50, 250, 100, 100));
+  assert_element_at(svg, points_outside_rect(50, 250, 100, 100));
+
+  // 225,225 150x150 inset by 10px on all sides is 235,235 130x130
+  assert_element_at(g_rect_b, points_inside_rect(235, 235, 130, 130));
+  assert_element_at(svg, points_outside_rect(235, 235, 130, 130));
+
+  // 425,225 150x150 inset by 10px on all sides is 435,235 130x130
+  assert_element_at(g_rect_c, points_inside_rect(435, 235, 130, 130));
+  assert_element_at(svg, points_outside_rect(435, 235, 130, 130));
+});
+</script>
diff --git a/tests/wpt/tests/css/css-masking/mask-image/mask-image-2.html b/tests/wpt/tests/css/css-masking/mask-image/mask-image-2.html
index ba6eb37ef6d..673f55a7e36 100644
--- a/tests/wpt/tests/css/css-masking/mask-image/mask-image-2.html
+++ b/tests/wpt/tests/css/css-masking/mask-image/mask-image-2.html
@@ -7,7 +7,7 @@
     <link rel="author" title="Mozilla" href="https://www.mozilla.org">
     <link rel="help" href="https://www.w3.org/TR/css-masking-1/#the-mask-image">
     <link rel="match" href="mask-image-2-ref.html">
-    <meta name="fuzzy" content="maxDifference=0-1; totalPixels=0-2400">
+    <meta name="fuzzy" content="maxDifference=0-3; totalPixels=0-14000">
     <meta name="assert" content="Test checks whether gradient CSS image as mask layer works correctly or not.">
     <style type="text/css">
       div {
diff --git a/tests/wpt/tests/css/css-masking/mask-image/mask-image-3h.html b/tests/wpt/tests/css/css-masking/mask-image/mask-image-3h.html
index c7197f45811..7d33be43814 100644
--- a/tests/wpt/tests/css/css-masking/mask-image/mask-image-3h.html
+++ b/tests/wpt/tests/css/css-masking/mask-image/mask-image-3h.html
@@ -7,7 +7,7 @@
     <link rel="author" title="Mozilla" href="https://www.mozilla.org">
     <link rel="help" href="https://www.w3.org/TR/css-masking-1/#the-mask-image">
     <link rel="match" href="mask-image-3-ref.html">
-    <meta name="fuzzy" content="maxDifference=0-6; totalPixels=0-49">
+    <meta name="fuzzy" content="maxDifference=0-10; totalPixels=0-80">
     <meta name="assert" content="Test checks whether clip-path in SVG mask works correctly or not.">
     <svg height="0">
       <mask id="mask1" x="0" y="0" width="1" height="1" >
diff --git a/tests/wpt/tests/css/css-masking/mask-image/mask-image-6.html b/tests/wpt/tests/css/css-masking/mask-image/mask-image-6.html
index ac31e4cf4ef..3132efb0475 100644
--- a/tests/wpt/tests/css/css-masking/mask-image/mask-image-6.html
+++ b/tests/wpt/tests/css/css-masking/mask-image/mask-image-6.html
@@ -8,6 +8,7 @@
     <link rel="help" href="https://www.w3.org/TR/css-masking-1/#the-mask-image">
     <link rel="match" href="mask-image-6-ref.html">
     <meta name="assert" content="Test checks whether mask on inline elemnt works correctly or not.">
+    <meta name="fuzzy" content="maxDifference=0-255; totalPixels=0-70">
     <style type="text/css">
       div {
         width: 100px;
diff --git a/tests/wpt/tests/css/css-masking/mask-image/mask-image-inline-sliced-1.html b/tests/wpt/tests/css/css-masking/mask-image/mask-image-inline-sliced-1.html
new file mode 100644
index 00000000000..9d09cc00a1f
--- /dev/null
+++ b/tests/wpt/tests/css/css-masking/mask-image/mask-image-inline-sliced-1.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<title>'box-decoration-break: slice' and 'mask-image'</title>
+<meta name="flags" content="ahem">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
+<link rel="help" href="https://www.w3.org/TR/css-break-3/#break-decoration">
+<link rel="help" href="https://drafts.fxtf.org/css-masking/#the-mask-image">
+<link rel="match" href="reference/mask-image-inline-sliced-1-ref.html">
+<style>
+  .mask-image {
+    font: 100px/1 Ahem;
+    color: green;
+    -webkit-mask-image: linear-gradient(to right, white 50%, transparent 50%);
+    mask-image: linear-gradient(to right, white 50%, transparent 50%);
+  }
+</style>
+<p>There should be a green square below.</p>
+<div style="width: 100px">
+  <span class="mask-image">A A</span>
+</div>
diff --git a/tests/wpt/tests/css/css-masking/mask-image/mask-opacity-1d.html b/tests/wpt/tests/css/css-masking/mask-image/mask-opacity-1d.html
index 6f50b8f6f52..77eab966cbf 100644
--- a/tests/wpt/tests/css/css-masking/mask-image/mask-opacity-1d.html
+++ b/tests/wpt/tests/css/css-masking/mask-image/mask-opacity-1d.html
@@ -8,6 +8,7 @@
     <link rel="help" href="https://www.w3.org/TR/css-masking-1/#the-mask-image">
     <link rel="match" href="mask-opacity-1-ref.html">
     <meta name="assert" content="Test checks whether apply opacity to masked element correctly or not.">
+    <meta name="fuzzy" content="maxDifference=0-5; totalPixels=0-5000" />
     <svg height="0">
       <mask id="myMask" x="0" y="0" width="100" height="100" >
         <rect x="0" y="50" width="100" height="50" style="stroke:none; fill: #ffffff"/>
diff --git a/tests/wpt/tests/css/css-masking/mask-image/reference/mask-image-inline-sliced-1-ref.html b/tests/wpt/tests/css/css-masking/mask-image/reference/mask-image-inline-sliced-1-ref.html
new file mode 100644
index 00000000000..4e540c2011a
--- /dev/null
+++ b/tests/wpt/tests/css/css-masking/mask-image/reference/mask-image-inline-sliced-1-ref.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<title>'box-decoration-break: slice' and 'mask-image' (reference)</title>
+<meta name="flags" content="ahem">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
+<style>
+  .mask-image {
+    font: 100px/1 Ahem;
+    color: green;
+  }
+</style>
+<p>There should be a green square below.</p>
+<div style="width: 100px">
+  <span class="mask-image">A</span>
+</div>
diff --git a/tests/wpt/tests/css/css-masking/mask-shorthand-subproperties-reset.html b/tests/wpt/tests/css/css-masking/mask-shorthand-subproperties-reset.html
new file mode 100644
index 00000000000..9ea20cbb8b1
--- /dev/null
+++ b/tests/wpt/tests/css/css-masking/mask-shorthand-subproperties-reset.html
@@ -0,0 +1,52 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>Resetting mask shorthand subproperties</title>
+<link rel="author" title="Tim Nguyen" href="https://github.com/nt1m">
+<link rel="help" href="https://drafts.fxtf.org/css-masking/#the-mask">
+<meta name="assert" content="All subproperties of the masking property are first reset to their initial values.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<div id="test"></div>
+<script>
+
+function set_subproperty(property, value) {
+  const element = document.getElementById('test')
+  element.style = ''
+  element.style[property] = value
+}
+
+function test_shorthand_resetting_subproperty(property, newValue) {
+  if (!CSS.supports(property, newValue))
+    return
+  test(() => {
+    let testElem = document.getElementById('test');
+    let computed = window.getComputedStyle(testElem);
+    let initialValue = computed[property];
+    set_subproperty(property, newValue);
+    document.getElementById('test').style.mask = 'url("#mask")';
+    assert_equals(computed[property], initialValue);
+    assert_not_equals(computed.mask, "");
+  }, 'Property ' + property + ' should be reset to its initial value.')
+}
+
+test_shorthand_resetting_subproperty('mask-border-mode', 'luminance');
+test_shorthand_resetting_subproperty('mask-border-outset', '10px 20px 30px 40px');
+test_shorthand_resetting_subproperty('mask-border-repeat', 'round space');
+test_shorthand_resetting_subproperty('mask-border-slice', '1 2 3 4 fill');
+test_shorthand_resetting_subproperty('mask-border-source', 'url("#mask-border")');
+test_shorthand_resetting_subproperty('mask-border-width', '10px 20px 30px 40px');
+test_shorthand_resetting_subproperty('mask-clip', 'no-clip')
+test_shorthand_resetting_subproperty('mask-composite', 'subtract')
+test_shorthand_resetting_subproperty('mask-image', 'url("#mask-image")')
+test_shorthand_resetting_subproperty('mask-mode', 'luminance')
+test_shorthand_resetting_subproperty('mask-origin', 'content-box')
+test_shorthand_resetting_subproperty('mask-position', '10px 10px')
+test_shorthand_resetting_subproperty('mask-repeat', 'no-repeat')
+test_shorthand_resetting_subproperty('mask-size', '10px')
+</script>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-masking/mask-svg-content/mask-with-filter.svg b/tests/wpt/tests/css/css-masking/mask-svg-content/mask-with-filter.svg
new file mode 100644
index 00000000000..a6028a398ea
--- /dev/null
+++ b/tests/wpt/tests/css/css-masking/mask-svg-content/mask-with-filter.svg
@@ -0,0 +1,23 @@
+<svg id="svg-root"
+  width="200" height="200"
+  xmlns="http://www.w3.org/2000/svg"
+  xmlns:html="http://www.w3.org/1999/xhtml">
+  <g id="testmeta">
+    <title>'filters applied to masked elements</title>
+    <html:link rel="help" href="https://www.w3.org/TR/css-masking-1"/>
+    <html:link rel="match" href="reference/mask-green-square-001-ref.svg" />
+  </g>
+  <defs>
+    <filter id="filter"><feGaussianBlur stdDeviation="0.001"/></filter>
+
+    <mask id="maskFill" maskContentUnits="userSpaceOnUse">
+      <rect width="100%" height="100%" fill="white"/>
+      <rect x="49" y="49" width="2" height="2" stroke-width="100" fill="none" stroke="black" filter="url(#filter)"/>
+    </mask>
+  </defs>
+
+  <g transform="translate(50, 50)">
+    <rect width="100" height="100" fill="green" />
+    <rect width="100" height="100" mask="url(#maskFill)" fill="red"/>
+  </g>
+</svg>
diff --git a/tests/wpt/tests/css/css-masking/parsing/clip-path-valid.html b/tests/wpt/tests/css/css-masking/parsing/clip-path-valid.html
index 2fb0c6248a2..84555fd2d16 100644
--- a/tests/wpt/tests/css/css-masking/parsing/clip-path-valid.html
+++ b/tests/wpt/tests/css/css-masking/parsing/clip-path-valid.html
@@ -73,10 +73,10 @@ test_valid_value("clip-path", "stroke-box");
 test_valid_value("clip-path", "view-box");
 
 // <basic-shape> <geometry-box>
-test_valid_value("clip-path", "circle(7% at 8% 9%) border-box");
+test_valid_value("clip-path", "circle(7% at 8% 9%) border-box", "circle(7% at 8% 9%)");
 
 // <geometry-box> <basic-shape>
-test_valid_value("clip-path", "border-box circle(7% at 8% 9%)", ["border-box circle(7% at 8% 9%)", "circle(7% at 8% 9%) border-box"]);
+test_valid_value("clip-path", "border-box circle(7% at 8% 9%)", "circle(7% at 8% 9%)");
 
 // <clip-source>
 test_valid_value("clip-path", "url(https://example.com/)", ["url(https://example.com/)", "url(\"https://example.com/\")"]);
diff --git a/tests/wpt/tests/css/css-masking/parsing/mask-position-valid.html b/tests/wpt/tests/css/css-masking/parsing/mask-position-valid.html
index c70e18c47a3..858bb4b68ac 100644
--- a/tests/wpt/tests/css/css-masking/parsing/mask-position-valid.html
+++ b/tests/wpt/tests/css/css-masking/parsing/mask-position-valid.html
@@ -11,28 +11,28 @@
 </head>
 <body>
 <script>
-test_valid_value("mask-position", "10%");
+test_valid_value("mask-position", "10%", "10% center");
 test_valid_value("mask-position", "right 30% top 60px");
 test_valid_value("mask-position", "-20% -30px");
-test_valid_value("mask-position", "30px center", "30px");
+test_valid_value("mask-position", "30px center", "30px center");
 test_valid_value("mask-position", "40px top");
 test_valid_value("mask-position", "bottom 10% right 20%", "right 20% bottom 10%");
 test_valid_value("mask-position", "bottom right", "right bottom");
 test_valid_value("mask-position", "center 50px");
-test_valid_value("mask-position", "center bottom", "bottom");
-test_valid_value("mask-position", "center left", "left");
-test_valid_value("mask-position", "left");
+test_valid_value("mask-position", "center bottom", "center bottom");
+test_valid_value("mask-position", "center left", "left center");
+test_valid_value("mask-position", "left", "left center");
 test_valid_value("mask-position", "left bottom");
 test_valid_value("mask-position", "right 40%");
-test_valid_value("mask-position", "top");
-test_valid_value("mask-position", "top center", "top");
-test_valid_value("mask-position", "center", "center");
+test_valid_value("mask-position", "top", "center top");
+test_valid_value("mask-position", "top center", "center top");
+test_valid_value("mask-position", "center", "center center");
 test_valid_value("mask-position", "bottom left, right 20%", "left bottom, right 20%");
-test_valid_value("mask-position", "top, center, left");
+test_valid_value("mask-position", "top, center, left", "center top, center center, left center");
 test_valid_value("mask-position", "20% 0%");
 test_valid_value("mask-position", "0% 0%");
-test_valid_value("mask-position", "0%", ["0%", "0% center"]);
-test_valid_value("mask-position", "0% center", ["0%", "0% center"]);
+test_valid_value("mask-position", "0%", "0% center");
+test_valid_value("mask-position", "0% center");
 test_valid_value("mask-position", "center 0%");
 </script>
 </body>
diff --git a/tests/wpt/tests/css/css-masking/parsing/mask-valid.sub.html b/tests/wpt/tests/css/css-masking/parsing/mask-valid.sub.html
index 6b6d712d175..a377060ded8 100644
--- a/tests/wpt/tests/css/css-masking/parsing/mask-valid.sub.html
+++ b/tests/wpt/tests/css/css-masking/parsing/mask-valid.sub.html
@@ -53,8 +53,12 @@ test_valid_value('mask', 'url("https://{{host}}/") alpha');
 
 // <mask-layer> = <mask-reference> || <position> [ / <bg-size> ]? || <repeat-style> ||
 // <geometry-box> || [ <geometry-box> | no-clip ] || <compositing-operator> || <masking-mode>
-test_valid_value('mask', 'intersect no-clip space round 1px 2px / contain stroke-box linear-gradient(to left bottom, red, blue) luminance', 'linear-gradient(to left bottom, red, blue) luminance 1px 2px / contain space round stroke-box no-clip intersect');
-test_valid_value('mask', 'intersect no-clip space round 1px 2px / contain view-box, stroke-box linear-gradient(to left bottom, red, blue) luminance', '1px 2px / contain space round view-box no-clip intersect, linear-gradient(to left bottom, red, blue) luminance stroke-box');
+test_valid_value('mask',
+    'intersect no-clip space round 1px 2px / contain stroke-box linear-gradient(to left bottom, red, blue) luminance',
+    'linear-gradient(to left bottom, red, blue) 1px 2px / contain space round stroke-box no-clip intersect luminance');
+test_valid_value('mask',
+    'intersect no-clip space round 1px 2px / contain view-box, stroke-box linear-gradient(to left bottom, red, blue) luminance',
+    '1px 2px / contain space round view-box no-clip intersect, linear-gradient(to left bottom, red, blue) stroke-box luminance');
 
 // Earlier versions of the mask shorthand always required a <mask-reference>.
 // To avoid unnecessarily losing test coverage, keep one of the test cases from back then.
@@ -69,6 +73,11 @@ test_shorthand_value('mask', 'none', {
     'mask-clip': 'border-box',
     'mask-composite': 'add',
     'mask-mode': 'match-source',
+    'mask-border-source': 'none',
+    'mask-border-outset': '0',
+    'mask-border-repeat': 'stretch',
+    'mask-border-slice': '0',
+    'mask-border-width': 'auto'
 })
 test_shorthand_value('mask', 'none, linear-gradient(to left bottom, red, blue) padding-box', {
     'mask-image': 'none, linear-gradient(to left bottom, red, blue)',
@@ -79,6 +88,11 @@ test_shorthand_value('mask', 'none, linear-gradient(to left bottom, red, blue) p
     'mask-clip': 'border-box, padding-box',
     'mask-composite': 'add, add',
     'mask-mode': 'match-source, match-source',
+    'mask-border-source': 'none',
+    'mask-border-outset': '0',
+    'mask-border-repeat': 'stretch',
+    'mask-border-slice': '0',
+    'mask-border-width': 'auto'
 })
 
 </script>
diff --git a/tests/wpt/tests/css/css-multicol/balance-grid-001.html b/tests/wpt/tests/css/css-multicol/balance-grid-001.html
new file mode 100644
index 00000000000..5c81b56b4a5
--- /dev/null
+++ b/tests/wpt/tests/css/css-multicol/balance-grid-001.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1474979">
+<div id="container" data-expected-height="83" style="columns:2; width:10em; line-height:20px;">
+  1<br>2<br>
+  <div style="display:grid; break-inside:avoid;">
+    <div style="padding-bottom:3px;">3</div>
+    <div>4</div>
+  </div>
+  5
+  <div style="display:grid;">6</div>
+</div>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/check-layout-th.js"></script>
+<script>
+  checkLayout("#container");
+</script>
diff --git a/tests/wpt/tests/css/css-multicol/crashtests/oof-in-area-001.html b/tests/wpt/tests/css/css-multicol/crashtests/oof-in-area-001.html
new file mode 100644
index 00000000000..af270569db3
--- /dev/null
+++ b/tests/wpt/tests/css/css-multicol/crashtests/oof-in-area-001.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1480474">
+<div style="columns:2;">
+  <area id="elm">
+</div>
+<script>
+  var child = document.createElement('div');
+  child.style.position = "absolute";
+  elm.appendChild(child);
+</script>
diff --git a/tests/wpt/tests/css/css-multicol/crashtests/oof-in-area-002.html b/tests/wpt/tests/css/css-multicol/crashtests/oof-in-area-002.html
new file mode 100644
index 00000000000..2d0be3d694e
--- /dev/null
+++ b/tests/wpt/tests/css/css-multicol/crashtests/oof-in-area-002.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1480474">
+<div style="columns:2;">
+  <br><br><br><br>
+  <area id="elm">
+  <br><br><br><br>
+</div>
+<script>
+  var child = document.createElement('div');
+  child.style.position = "absolute";
+  elm.appendChild(child);
+</script>
diff --git a/tests/wpt/tests/css/css-multicol/crashtests/oof-in-area-003.html b/tests/wpt/tests/css/css-multicol/crashtests/oof-in-area-003.html
new file mode 100644
index 00000000000..c0c5891ec81
--- /dev/null
+++ b/tests/wpt/tests/css/css-multicol/crashtests/oof-in-area-003.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1480474">
+<div style="columns:4;">
+  <div style="position:relative;">
+    <br><br><br><br>
+    <area id="elm">
+    <br><br><br><br>
+  </div>
+</div>
+<script>
+  var child = document.createElement('div');
+  child.style.position = "absolute";
+  elm.appendChild(child);
+</script>
diff --git a/tests/wpt/tests/css/css-multicol/crashtests/oof-in-oof-multicol-in-multicol-spanner-in-multicol.html b/tests/wpt/tests/css/css-multicol/crashtests/oof-in-oof-multicol-in-multicol-spanner-in-multicol.html
new file mode 100644
index 00000000000..0331b43c6a1
--- /dev/null
+++ b/tests/wpt/tests/css/css-multicol/crashtests/oof-in-oof-multicol-in-multicol-spanner-in-multicol.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1482514">
+<div style="column-count:1;">
+  <div style="column-count:2; column-span:all;">
+    <div style="position:relative;">
+      <div style="position:absolute; column-count:1; border-style:dotted;">
+        <div style="position:relative; padding-top:100px;">
+          <div style="position:absolute;"></div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/tests/wpt/tests/css/css-multicol/crashtests/oof-in-oof-multicol-in-relpos-in-oof-in-multicol-in-multicol.html b/tests/wpt/tests/css/css-multicol/crashtests/oof-in-oof-multicol-in-relpos-in-oof-in-multicol-in-multicol.html
new file mode 100644
index 00000000000..0dd4479bafe
--- /dev/null
+++ b/tests/wpt/tests/css/css-multicol/crashtests/oof-in-oof-multicol-in-relpos-in-oof-in-multicol-in-multicol.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1459154">
+<div style="columns:2; column-fill:auto; height:500px;">
+  <div style="columns:2; column-fill:auto; height:200px; position:relative;">
+    <div style="position:absolute;">
+      <div style="position:relative;">
+        <div style="position:absolute; columns:2; column-fill:auto; height:100px;">
+          <div style="position:relative;">
+            <div style="position:absolute; height:150px;"></div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/tests/wpt/tests/css/css-multicol/crashtests/oof-in-oof-multicol-in-spanner-in-multicol-in-spanner-in-nested-multicol.html b/tests/wpt/tests/css/css-multicol/crashtests/oof-in-oof-multicol-in-spanner-in-multicol-in-spanner-in-nested-multicol.html
new file mode 100644
index 00000000000..0ee6ad4d01a
--- /dev/null
+++ b/tests/wpt/tests/css/css-multicol/crashtests/oof-in-oof-multicol-in-spanner-in-multicol-in-spanner-in-nested-multicol.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1479320">
+<div style="column-count:1;">
+    <div style="column-count:1;">
+        <div style="position:relative; column-span:all;">
+            <div style="column-count:1;">
+                <div style="column-span:all;">
+                    <div style="position:absolute; column-count:2;">
+                        <div style="position:relative;">
+                            <div style="position:absolute; height:100px;"></div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/tests/wpt/tests/css/css-multicol/crashtests/oof-in-oof-multicol-in-spanner-in-nested-multicol.html b/tests/wpt/tests/css/css-multicol/crashtests/oof-in-oof-multicol-in-spanner-in-nested-multicol.html
new file mode 100644
index 00000000000..fe44012518d
--- /dev/null
+++ b/tests/wpt/tests/css/css-multicol/crashtests/oof-in-oof-multicol-in-spanner-in-nested-multicol.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1479320">
+<div style="column-count:1;">
+  <div style="column-count:1;">
+      <div style="position:relative; column-span:all;">
+          <div style="position:absolute; column-count:2;">
+              <div style="position:relative;">
+                  <div style="position:absolute; height:100px;"></div>
+              </div>
+          </div>
+      </div>
+  </div>
+</div>
diff --git a/tests/wpt/tests/css/css-multicol/crashtests/oof-in-relpos-in-oof-multicol-in-oof-in-relpos-in-oof-multicol-in-multicol.html b/tests/wpt/tests/css/css-multicol/crashtests/oof-in-relpos-in-oof-multicol-in-oof-in-relpos-in-oof-multicol-in-multicol.html
new file mode 100644
index 00000000000..be73623b0b4
--- /dev/null
+++ b/tests/wpt/tests/css/css-multicol/crashtests/oof-in-relpos-in-oof-multicol-in-oof-in-relpos-in-oof-multicol-in-multicol.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1475385">
+<div style="columns:2;">
+  <div style="columns:2; position:absolute;">
+    <div style="position:relative;">
+      <div style="position:absolute;">
+        <div style="columns:2; position:absolute;">
+          <div style="position:relative;">
+            <div style="position:absolute; height:100px;"></div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/tests/wpt/tests/css/css-multicol/crashtests/oof-in-relpos-in-oof-multicol-in-relpos-in-oof-multicol-in-relpos-multicol.html b/tests/wpt/tests/css/css-multicol/crashtests/oof-in-relpos-in-oof-multicol-in-relpos-in-oof-multicol-in-relpos-multicol.html
new file mode 100644
index 00000000000..1e6845e70ce
--- /dev/null
+++ b/tests/wpt/tests/css/css-multicol/crashtests/oof-in-relpos-in-oof-multicol-in-relpos-in-oof-multicol-in-relpos-multicol.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1475385">
+<div style="position:relative; columns:2;">
+  <div style="position:absolute; columns:2;">
+    <div style="position:relative;">
+      <div style="position:absolute; columns:2;">
+        <div style="position:relative;">
+          <div style="position:absolute; height:200px;"></div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/tests/wpt/tests/css/css-multicol/multicol-fill-balance-027.html b/tests/wpt/tests/css/css-multicol/multicol-fill-balance-027.html
new file mode 100644
index 00000000000..9a189595047
--- /dev/null
+++ b/tests/wpt/tests/css/css-multicol/multicol-fill-balance-027.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://www.w3.org/TR/css-multicol-1/#cf">
+<div id="multicol" style="columns:2;">
+  <div style="height:60px;"></div>
+  <div style="float:left; width:100%; contain:size; height:40px;"></div>
+  <div style="clear:left; height:90px;"></div>
+</div>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+  test(()=> {
+    assert_equals(multicol.offsetHeight, 100);
+  }, "Make room for the float in the first column");
+</script>
diff --git a/tests/wpt/tests/css/css-multicol/multicol-fill-balance-028.html b/tests/wpt/tests/css/css-multicol/multicol-fill-balance-028.html
new file mode 100644
index 00000000000..f66c99869b3
--- /dev/null
+++ b/tests/wpt/tests/css/css-multicol/multicol-fill-balance-028.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://www.w3.org/TR/css-multicol-1/#cf">
+<div id="multicol" style="columns:2;">
+  <span>
+    <div style="float:left; width:100%; height:60px;"></div>
+    <div style="clear:left; float:left; width:100%; contain:size; height:40px;"></div>
+    <div style="clear:left; float:left; width:100%; height:90px;"></div>
+  </span>
+</div>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+  test(()=> {
+    assert_equals(multicol.offsetHeight, 100);
+  }, "Make room for the float in the first column");
+</script>
diff --git a/tests/wpt/tests/css/css-overflow/overflow-clip-margin-012.html b/tests/wpt/tests/css/css-overflow/overflow-clip-margin-012.html
new file mode 100644
index 00000000000..a1b0587a4d5
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/overflow-clip-margin-012.html
@@ -0,0 +1,36 @@
+<!doctype html>
+<html class="reftest">
+<meta charset="utf-8">
+<title>Overflow: visible + overflow-clip-margin is shown with content-visibility: auto</title>
+<link rel="help" href="https://www.w3.org/TR/css-overflow-3/#propdef-overflow-clip-margin">
+<link rel="match" href="overflow-clip-margin-007-ref.html">
+<style>
+    body {
+        height: 15000px;
+    }
+
+    .auto {
+        content-visibility: auto;
+        width: 100px;
+        height: 100px;
+        overflow-clip-margin: 10000px;
+        overflow: visible;
+        background: lightblue;
+    }
+
+    .big {
+        width: 10px;
+        height: 20000px;
+        position: relative;
+        top: -10000px;
+        background: green;
+    }
+</style>
+<div class=auto>
+    <div class=big></div>
+</div>
+<script>
+    onload = function () {
+        document.documentElement.scrollTop = window.innerHeight * 3;
+    }
+</script>
diff --git a/tests/wpt/tests/css/css-position/backdrop-inherit-computed.html b/tests/wpt/tests/css/css-position/backdrop-inherit-computed.html
new file mode 100644
index 00000000000..77c6f362640
--- /dev/null
+++ b/tests/wpt/tests/css/css-position/backdrop-inherit-computed.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<title>CSS Position Test: ::backdrop inherits from originating element - computed values</title>
+<link rel="help" href="https://drafts.csswg.org/css-position-4/#backdrop">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+  dialog {
+    --foo: bar;
+    --bg: green;
+    left: 100px;
+    color-scheme: dark;
+  }
+  dialog::backdrop {
+    background-color: var(--bg);
+    left: inherit;
+  }
+</style>
+<dialog></dialog>
+<script>
+  let dialog = document.querySelector("dialog");
+  setup(() => {
+    dialog.showModal();
+  });
+
+  test(() => {
+    let style = getComputedStyle(dialog, "::backdrop");
+    assert_equals(style.getPropertyValue("--foo"), "bar");
+    assert_equals(style.getPropertyValue("--bg"), "green");
+  }, "Inherit custom property");
+
+  test(() => {
+    assert_equals(getComputedStyle(dialog, "::backdrop").backgroundColor, "rgb(0, 128, 0)");
+  }, "Apply inherited custom property to background-color");
+
+  test(() => {
+    assert_equals(getComputedStyle(dialog, "::backdrop").colorScheme, "dark");
+  }, "Implicitly inherited color-scheme");
+
+  test(() => {
+    assert_equals(getComputedStyle(dialog, "::backdrop").left, "100px");
+  }, "Explicitly inherited left");
+</script>
diff --git a/tests/wpt/tests/css/css-position/backdrop-inherit-rendered-ref.html b/tests/wpt/tests/css/css-position/backdrop-inherit-rendered-ref.html
new file mode 100644
index 00000000000..6343f8d1410
--- /dev/null
+++ b/tests/wpt/tests/css/css-position/backdrop-inherit-rendered-ref.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<title>CSS Test Reference</title>
+<style>
+  dialog {
+    inset: 100px;
+  }
+  dialog::backdrop {
+    background-color: green;
+    inset: 100px;
+  }
+</style>
+<dialog>Green backdrop with 100px inset</dialog>
+<script>
+  document.querySelector("dialog").showModal();
+</script>
diff --git a/tests/wpt/tests/css/css-position/backdrop-inherit-rendered.html b/tests/wpt/tests/css/css-position/backdrop-inherit-rendered.html
new file mode 100644
index 00000000000..98dfe748ed5
--- /dev/null
+++ b/tests/wpt/tests/css/css-position/backdrop-inherit-rendered.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<title>CSS Position Test: ::backdrop inherits from originating element - rendering</title>
+<link rel="help" href="https://drafts.csswg.org/css-position-4/#backdrop">
+<link rel="match" href="backdrop-inherit-rendered-ref.html">
+<style>
+  dialog {
+    --bg: green;
+    inset: 100px;
+  }
+  dialog::backdrop {
+    background-color: var(--bg);
+    inset: inherit;
+  }
+</style>
+<dialog>Green backdrop with 100px inset</dialog>
+<script>
+  document.querySelector("dialog").showModal();
+</script>
diff --git a/tests/wpt/tests/css/css-position/overlay/overlay-transition-backdrop.html b/tests/wpt/tests/css/css-position/overlay/overlay-transition-backdrop.html
index 30d40e111f9..898b6b2e0f0 100644
--- a/tests/wpt/tests/css/css-position/overlay/overlay-transition-backdrop.html
+++ b/tests/wpt/tests/css/css-position/overlay/overlay-transition-backdrop.html
@@ -11,6 +11,7 @@
     transition-behavior: allow-discrete;
   }
   [popover]::backdrop {
+    visibility: visible;
     background-color: green;
   }
 </style>
diff --git a/tests/wpt/tests/css/css-position/sticky/position-sticky-hyperlink.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-hyperlink.html
index c8ef07edd17..cc8de9a822c 100644
--- a/tests/wpt/tests/css/css-position/sticky/position-sticky-hyperlink.html
+++ b/tests/wpt/tests/css/css-position/sticky/position-sticky-hyperlink.html
@@ -1,8 +1,9 @@
 <!DOCTYPE html>
 <title>Sticky element with hyperlink should work</title>
-<link rel="match" href="position-sticky-hyperlink-ref.html" />
-<link rel="help" href="https://www.w3.org/TR/css-position-3/#sticky-pos" />
-<meta name="assert" content="This test checks that sticky hyperlink works." />
+<link rel="match" href="position-sticky-hyperlink-ref.html">
+<link rel="help" href="https://www.w3.org/TR/css-position-3/#sticky-pos">
+<meta name="assert" content="This test checks that sticky hyperlink works.">
+<meta name="fuzzy" content="maxDifference=0-5; totalPixels=0-80">
 
 <style>
 body {
diff --git a/tests/wpt/tests/css/css-properties-values-api/var-reference-registered-properties.html b/tests/wpt/tests/css/css-properties-values-api/var-reference-registered-properties.html
index a6f26429e84..4fb1a866ea4 100644
--- a/tests/wpt/tests/css/css-properties-values-api/var-reference-registered-properties.html
+++ b/tests/wpt/tests/css/css-properties-values-api/var-reference-registered-properties.html
@@ -145,6 +145,14 @@ test(function(){
     element.style = '';
 }, 'Values are absolutized when substituting into properties with universal syntax');
 
+test(function(){
+    let name = generate_property('<length>');
+    let unregistered = '--unregistered'
+    element.style = `${name}: red; ${unregistered}: var(${name})`
+    let computedStyle = getComputedStyle(element);
+    assert_equals(computedStyle.getPropertyValue(unregistered), '');
+}, 'Invalid values for registered properties are serialized as the empty string')
+
 function test_valid_fallback(syntax, value, fallback) {
     test(function(){
         let name = generate_property(syntax);
@@ -179,4 +187,55 @@ test_invalid_fallback('<length>', '40px', 'red');
 test_invalid_fallback('<length> | none', '40px', 'nolength');
 test_invalid_fallback('<length>', '40px', 'var(--novar)');
 
+function test_using_valid_fallback(syntax, fallback, expected) {
+    test(function(){
+        let name = generate_property(syntax);
+        try {
+            element.style = `--x:var(${name},${fallback})`;
+            let computedStyle = getComputedStyle(element);
+            assert_equals(computedStyle.getPropertyValue('--x'), expected);
+        } finally {
+            element.style = '';
+        }
+    }, `Fallback must adhere to registered syntax [${syntax}, ${fallback}]`);
+}
+
+function test_using_invalid_fallback(syntax, fallback) {
+    test(function(){
+        let name = generate_property(syntax);
+        try {
+            element.style = `--x:var(${name},${fallback})`;
+            let computedStyle = getComputedStyle(element);
+            assert_equals(computedStyle.getPropertyValue('--x'), '');
+        } finally {
+            element.style = '';
+        }
+    }, `Invalid fallback is not used [${syntax}, ${fallback}]`);
+}
+
+test_using_valid_fallback('<length>', '10px', '10px');
+test_using_valid_fallback('<length> | none', 'none', 'none');
+test_using_valid_fallback('<length>', 'var(--length-1)', '20px');
+
+test_using_invalid_fallback('<length>', 'red');
+test_using_invalid_fallback('<length> | none', 'nolength');
+test_using_invalid_fallback('<color>', 'var(--length-1)');
+
+test(function(t){
+    CSS.registerProperty({
+        name: '--registered-universal-no-initial',
+        syntax: '*',
+        inherits: false
+    });
+    t.add_cleanup(() => {
+        element.style = '';
+    });
+    element.style = [
+        '--registered-universal-no-initial:;',
+        'background-color: var(--registered-universal-no-initial) green',
+    ].join(';');
+    let computedStyle = getComputedStyle(element);
+    assert_equals(computedStyle.getPropertyValue('background-color'), 'rgb(0, 128, 0)');
+}, 'Empty universal custom property can be substituted with var()');
+
 </script>
diff --git a/tests/wpt/tests/css/css-pseudo/first-letter-with-preceding-new-line.html b/tests/wpt/tests/css/css-pseudo/first-letter-with-preceding-new-line.html
new file mode 100644
index 00000000000..5243b042882
--- /dev/null
+++ b/tests/wpt/tests/css/css-pseudo/first-letter-with-preceding-new-line.html
@@ -0,0 +1,31 @@
+<!doctype html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>CSS Test: ::first-letter with preceding new line</title>
+  <link rel="author" title="Joonghun Park" href="mailto:pjh0718@gmail.com">
+  <link rel="match" href="reference/first-letter-with-preceding-new-line-ref.html">
+  <link rel="help" href="https://drafts.csswg.org/css-pseudo/#first-letter-pattern">
+  <meta name="assert" content="Test checks if preceding new line character is allowed or not">
+  <style>
+    body { font-size: 30px; }
+    #sample {
+      margin: 20px;
+      white-space: pre;
+    }
+    #sample::first-line {
+      color: red;
+    }
+    #sample::first-letter {
+      color: green;
+      border: solid 1px blue;
+    }
+  </style>
+</head>
+<body>
+  <div id="sample">
+  The second line.
+  The third line.
+  </div>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-pseudo/highlight-cascade-008-ref.html b/tests/wpt/tests/css/css-pseudo/highlight-cascade-008-ref.html
new file mode 100644
index 00000000000..c87ddcf93c9
--- /dev/null
+++ b/tests/wpt/tests/css/css-pseudo/highlight-cascade-008-ref.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<title>Custom property values from the root element</title>
+<script src="support/selections.js"></script>
+<style>
+  div::selection {
+    background-color: green;
+    text-decoration-line: underline;
+    text-decoration-style: line;
+    text-decoration-thickness: 1px;
+    text-decoration-color: yellow;
+  }
+  span::selection {
+    background-color: blue;
+  }
+</style>
+<div style="width: 300px">PASS if background-color is green when selected, <span>except this which is blue</span>, and underline is yellow.<script>
+  selectNodeContents(document.querySelector("div"));
+</script>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-pseudo/highlight-cascade-008.html b/tests/wpt/tests/css/css-pseudo/highlight-cascade-008.html
new file mode 100644
index 00000000000..10ca924b8fd
--- /dev/null
+++ b/tests/wpt/tests/css/css-pseudo/highlight-cascade-008.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<title>Custom property values from the root element</title>
+<link rel="author" title="Stephen Chenney" href="mailto:schenney@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-pseudo-4/#highlight-cascade">
+<link rel="match" href="highlight-cascade-008-ref.html">
+<meta name="assert" value="This test verifies that when a custom property is not found in highlight cascade, its value is taken from the root element.">
+<meta name="fuzzy" content="0-255;0-10">
+<script src="support/selections.js"></script>
+<style>
+  :root {
+    --background-color: green;
+    --decoration-color: purple;
+  }
+  ::selection {
+    --decoration-color: yellow;
+  }
+  div::selection {
+    background-color: var(--background-color, red);
+    text-decoration-line: underline;
+    text-decoration-style: line;
+    text-decoration-color: var(--decoration-color, red);
+  }
+  span::selection {
+    --background-color: blue;
+    background-color: var(--background-color, red);
+  }
+</style>
+<div style="width: 300px">PASS if background-color is green when selected, <span>except this which is blue</span>, and underline is yellow.</div>
+<script>
+  selectNodeContents(document.querySelector("div"));
+</script>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-pseudo/highlight-cascade-009.html b/tests/wpt/tests/css/css-pseudo/highlight-cascade-009.html
new file mode 100644
index 00000000000..acc48c7c364
--- /dev/null
+++ b/tests/wpt/tests/css/css-pseudo/highlight-cascade-009.html
@@ -0,0 +1,41 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSS Pseudo-Elements Test: highlight cascade: inheritance of custom properties</title>
+<link rel="author" title="Stephen Chenney" href="mailto:schenney@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-pseudo-4/#highlight-cascade">
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/6641">
+<meta name="assert" content="This test verifies that custom properties used in highlight pseudos are taken from the ::root if not found in the highlight inheritance chain.">
+<script src="support/selections.js"></script>
+<link rel="stylesheet" href="support/highlights.css">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+  :root {
+    --background-color: green;
+    --decoration-color: purple;
+  }
+  ::selection {
+    --decoration-color: green;
+  }
+  div::selection {
+    --background-color: blue;
+    background-color: var(--background-color, red);
+  }
+</style>
+<body>
+  <div>Some text</div>
+</body>
+<script>
+    selectNodeContents(document.querySelector("body"));
+
+    const body_selection = getComputedStyle(document.querySelector("body"), "::selection");
+    const div_selection = getComputedStyle(document.querySelector("div"), "::selection");
+    test(() => void assert_equals(body_selection.getPropertyValue("--background-color"), "green"),
+        "body ::selection has the root custom property");
+    test(() => void assert_equals(body_selection.getPropertyValue("--decoration-color"), "green"),
+        "body ::selection uses its own custom property");
+    test(() => void assert_equals(div_selection.getPropertyValue("--decoration-color"), "green"),
+        "div::selection inherits a custom property");
+    test(() => void assert_equals(div_selection.getPropertyValue("--background-color"), "blue"),
+        "div::selection uses its own custom property");
+</script>
diff --git a/tests/wpt/tests/css/css-pseudo/highlight-currentcolor-painting-properties-001.html b/tests/wpt/tests/css/css-pseudo/highlight-currentcolor-painting-properties-001.html
index 8f347f119e5..9fdf11e739c 100644
--- a/tests/wpt/tests/css/css-pseudo/highlight-currentcolor-painting-properties-001.html
+++ b/tests/wpt/tests/css/css-pseudo/highlight-currentcolor-painting-properties-001.html
@@ -6,6 +6,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-pseudo/#highlight-text">
 <link rel="match" href="highlight-currentcolor-painting-properties-001-ref.html">
 <link rel="stylesheet" href="support/highlights.css">
+<meta name="fuzzy" content="0-50;0-3">
 <style>
 div {
   color: lime;
diff --git a/tests/wpt/tests/css/css-pseudo/highlight-currentcolor-painting-properties-002.html b/tests/wpt/tests/css/css-pseudo/highlight-currentcolor-painting-properties-002.html
index bd5d5f4abb8..8f6673132f1 100644
--- a/tests/wpt/tests/css/css-pseudo/highlight-currentcolor-painting-properties-002.html
+++ b/tests/wpt/tests/css/css-pseudo/highlight-currentcolor-painting-properties-002.html
@@ -6,6 +6,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-pseudo/#highlight-text">
 <link rel="match" href="highlight-currentcolor-painting-properties-002-ref.html">
 <link rel="stylesheet" href="support/highlights.css">
+<meta name="fuzzy" content="0-50;0-3">
 <style>
 div {
   color: lime;
diff --git a/tests/wpt/tests/css/css-pseudo/highlight-painting-003.html b/tests/wpt/tests/css/css-pseudo/highlight-painting-003.html
index b09ef52dd73..f4794324037 100644
--- a/tests/wpt/tests/css/css-pseudo/highlight-painting-003.html
+++ b/tests/wpt/tests/css/css-pseudo/highlight-painting-003.html
@@ -9,6 +9,7 @@
 <meta name="assert" value="::selection overlay background and decorations are independent of those of the originating element, and originating element decorations lose their colour">
 <script src="support/selections.js"></script>
 <link rel="stylesheet" href="support/highlights.css">
+<meta name="fuzzy" content="0-50;0-50">
 <style>
     /*
         Topmost last:
diff --git a/tests/wpt/tests/css/css-pseudo/highlight-painting-004.html b/tests/wpt/tests/css/css-pseudo/highlight-painting-004.html
index 26ded65f871..cbf01e832af 100644
--- a/tests/wpt/tests/css/css-pseudo/highlight-painting-004.html
+++ b/tests/wpt/tests/css/css-pseudo/highlight-painting-004.html
@@ -11,6 +11,7 @@
 <meta name="assert" value="::selection overlay background and decorations are independent of those of the originating element, and originating element decorations lose their colour">
 <script src="support/selections.js"></script>
 <link rel="stylesheet" href="support/highlights.css">
+<meta name="fuzzy" content="0-50;0-20">
 <style>
     /*
         Topmost last:
diff --git a/tests/wpt/tests/css/css-pseudo/reference/first-letter-with-preceding-new-line-ref.html b/tests/wpt/tests/css/css-pseudo/reference/first-letter-with-preceding-new-line-ref.html
new file mode 100644
index 00000000000..e3d6b0aa285
--- /dev/null
+++ b/tests/wpt/tests/css/css-pseudo/reference/first-letter-with-preceding-new-line-ref.html
@@ -0,0 +1,20 @@
+<!doctype html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>CSS Test: ::first-letter with preceding new line</title>
+  <style>
+    body { font-size: 30px; }
+    #sample {
+      margin: 20px;
+      white-space: pre;
+    }
+  </style>
+</head>
+<body>
+  <div id="sample">
+  The second line.
+  The third line.
+  </div>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-scroll-anchoring/after-scrollable-range-shrinkage-001.html b/tests/wpt/tests/css/css-scroll-anchoring/after-scrollable-range-shrinkage-001.html
new file mode 100644
index 00000000000..e155c6625c3
--- /dev/null
+++ b/tests/wpt/tests/css/css-scroll-anchoring/after-scrollable-range-shrinkage-001.html
@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<html>
+<meta name="viewport" content="width=device-width">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<link rel="author" title="Mozilla" href="https://mozilla.org">
+<link rel="help" href="https://drafts.csswg.org/css-scroll-anchoring/">
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1852818">
+<style>
+div {
+  height: 100vh;
+}
+</style>
+<div></div>
+<div id="anchor" style="height: 10px; background-color: blue;"></div>
+<div></div>
+<script>
+promise_test(async t => {
+  assert_equals(window.scrollY, 0);
+
+  let anchorRect = anchor.getBoundingClientRect();
+  // Scroll to the anchor node.
+  window.scrollBy(0, anchorRect.y);
+  assert_equals(window.scrollY, anchorRect.y);
+
+  await new Promise(resolve => t.step_timeout(resolve, 0));
+
+  // Expand the first element so that scroll anchoring happens.
+  document.querySelectorAll("div")[0].style.height = "200vh";
+  // Flush the change.
+  document.querySelectorAll("div")[0].getBoundingClientRect();
+
+  await new Promise(resolve => window.addEventListener("scroll", resolve));
+
+  // Revert the height change in a scroll event handler.
+  document.querySelectorAll("div")[0].style.height = "";
+
+  await new Promise(resolve => requestAnimationFrame(resolve));
+  await new Promise(resolve => requestAnimationFrame(resolve));
+
+  assert_equals(window.scrollY, anchorRect.y);
+}, "Scroll anchoring properly works after scrollable range shrinkage");
+</script>
+</html>
diff --git a/tests/wpt/tests/css/css-scroll-anchoring/after-scrollable-range-shrinkage-002.html b/tests/wpt/tests/css/css-scroll-anchoring/after-scrollable-range-shrinkage-002.html
new file mode 100644
index 00000000000..d6399c5a6c5
--- /dev/null
+++ b/tests/wpt/tests/css/css-scroll-anchoring/after-scrollable-range-shrinkage-002.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<html>
+<meta name="viewport" content="width=device-width">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<link rel="author" title="Mozilla" href="https://mozilla.org">
+<link rel="help" href="https://drafts.csswg.org/css-scroll-anchoring/">
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1779404">
+<div style="height: 500vh;"></div>
+<div id="anchor" style="height: 10px; background-color: blue;"></div>
+<div style="height: 200vh;"></div>
+<script>
+promise_test(async t => {
+  assert_equals(window.scrollY, 0);
+
+  let anchorRect = anchor.getBoundingClientRect();
+  // Scroll to the anchor node.
+  window.scrollBy(0, anchorRect.y);
+  assert_equals(window.scrollY, anchorRect.y);
+
+  await new Promise(resolve => requestAnimationFrame(resolve));
+  await new Promise(resolve => t.step_timeout(resolve, 0));
+
+  // Shrink the first element so that scroll anchoring happens.
+  document.querySelectorAll("div")[0].style.height = "100vh";
+
+  await new Promise(resolve => requestAnimationFrame(resolve));
+  await new Promise(resolve => requestAnimationFrame(resolve));
+
+  const scrollAnchorPosition = window.scrollY;
+
+  // Scroll back to (0, 0) to calculate the expected scroll anchor element
+  // position.
+  window.scrollTo(0, 0);
+  anchorRect = anchor.getBoundingClientRect();
+  assert_equals(scrollAnchorPosition, anchorRect.y);
+}, "Scroll anchoring properly works after scrollable range shrinkage");
+</script>
+</html>
diff --git a/tests/wpt/tests/css/css-scroll-snap-2/scroll-start/scroll-start-with-scroll-snap.tentative.html b/tests/wpt/tests/css/css-scroll-snap-2/scroll-start/scroll-start-with-scroll-snap.tentative.html
index b813fcc750e..8bdac300ba3 100644
--- a/tests/wpt/tests/css/css-scroll-snap-2/scroll-start/scroll-start-with-scroll-snap.tentative.html
+++ b/tests/wpt/tests/css/css-scroll-snap-2/scroll-start/scroll-start-with-scroll-snap.tentative.html
@@ -17,21 +17,27 @@
     }
 
     .spacer {
-      height: 100px;
+      height: 200px;
       width: 100px;
     }
 
     .scroller {
-      height: 100px;
+      height: 220px;
       width: 100px;
       overflow: scroll;
-      scroll-start: 200px;
       scroll-snap-type: both mandatory;
     }
 
+    #single_snap_scroller {
+      scroll-start: 100%;
+    }
+    #multi_snap_scroller {
+      scroll-start: 350px;
+    }
+
     .snap_point {
       width: 100px;
-      height: 100px;
+      height: 200px;
       scroll-snap-align: start;
     }
   </style>
@@ -53,11 +59,11 @@
     }, "snap overrides scroll-start position");
 
     test((t) => {
-      // scroll-start sets the initial scroll offset to the top of the third
-      // snap_point, so the scroller snaps to the third snap_point.
+      // scroll-start sets the initial scroll offset to 350px which is closer to
+      // the third snap point than the second, so the scroller should snap to
+      // the third snap_point.
       assert_equals(multi_snap_scroller.scrollTop,
-        snap_point_1.getBoundingClientRect().height +
-        snap_point_2.getBoundingClientRect().height,
+        multi_snap_scroller.scrollHeight - multi_snap_scroller.clientHeight,
         "scroller snaps to snap point closer to start position.");
     }, "scroller snaps based on scroll-start position");
   </script>
diff --git a/tests/wpt/tests/css/css-scroll-snap/crashtests/fractional-covering-area-crash.html b/tests/wpt/tests/css/css-scroll-snap/crashtests/fractional-covering-area-crash.html
new file mode 100644
index 00000000000..6905b0fd394
--- /dev/null
+++ b/tests/wpt/tests/css/css-scroll-snap/crashtests/fractional-covering-area-crash.html
@@ -0,0 +1,25 @@
+<!DOCTYPE HTML>
+<html>
+<style>
+  #container {
+    scroll-snap-type: both mandatory;
+    overflow: overlay;
+    position: absolute;
+    height: 33554400px;
+    width: 33554400px;
+  }
+
+  #area {
+    scroll-snap-align: end;
+    position: absolute;
+    left: 33554400px;
+    top: -57971.9px;
+    width: 0px;
+    height: 33554400px;
+  }
+</style>
+<div id="container">
+  <div id="area"></div>
+</div>
+
+</html>
diff --git a/tests/wpt/tests/css/css-scroll-snap/input/keyboard.html b/tests/wpt/tests/css/css-scroll-snap/input/keyboard.html
index 6f225544614..79d0fc9f36d 100644
--- a/tests/wpt/tests/css/css-scroll-snap/input/keyboard.html
+++ b/tests/wpt/tests/css/css-scroll-snap/input/keyboard.html
@@ -14,6 +14,7 @@
 <script src="/resources/testdriver.js"></script>
 <script src="/resources/testdriver-vendor.js"></script>
 <script src="/resources/testdriver-actions.js"></script>
+<script src="/dom/events/scrolling/scroll_support.js"></script>
 <script src="../support/common.js"></script>
 
 
@@ -43,45 +44,60 @@ function ScrollCounter(test, eventTarget) {
   });
 }
 
+async function initializeScrollPosition(scroller, x, y) {
+  return new Promise(async (resolve) => {
+    if (scroller.scrollLeft != x || scroller.scrollTop != y) {
+      const scrollEndPromise = waitForScrollEnd(scroller);
+      scroller.scrollTo(x, y);
+      await scrollEndPromise;
+    }
+    resolve();
+  });
+}
+
 promise_test(async t => {
-  scroller.scrollTo(0, 0);
+  await initializeScrollPosition(scroller, 0, 0);
   assert_equals(scroller.scrollTop, 0, "verify test pre-condition");
   const scrollCounter = new ScrollCounter(t, scroller);
+  const scrollEndPromise = waitForScrollEnd(scroller);
   await keyPress(scroller, "ArrowDown");
-  await waitForScrollEnd(scroller);
+  await scrollEndPromise;
   assert_equals(scroller.scrollTop, 400);
   // Make sure we don't jump directly to the new snap position.
   assert_greater_than(scrollCounter.count, 1);
 }, "Snaps to bottom-left after pressing ArrowDown");
 
 promise_test(async t => {
-  scroller.scrollTo(0, 400);
+  await initializeScrollPosition(scroller, 0, 400);
   assert_equals(scroller.scrollTop, 400, "verify test pre-condition");
   const scrollCounter = new ScrollCounter(t, scroller);
+  const scrollEndPromise = waitForScrollEnd(scroller);
   await keyPress(scroller, "ArrowUp");
-  await waitForScrollEnd(scroller);
+  await scrollEndPromise;
   assert_equals(scroller.scrollTop, 0);
   // Make sure we don't jump directly to the new snap position.
   assert_greater_than(scrollCounter.count, 1);
 }, "Snaps to top-left after pressing ArrowUp");
 
 promise_test(async t => {
-  scroller.scrollTo(0, 0);
+  await initializeScrollPosition(scroller, 0, 0);
   assert_equals(scroller.scrollTop, 0, "verify test pre-condition");
   const scrollCounter = new ScrollCounter(t, scroller);
+  const scrollEndPromise = waitForScrollEnd(scroller);
   await keyPress(scroller, "ArrowRight");
-  await waitForScrollEnd(scroller);
+  await scrollEndPromise;
   assert_equals(scroller.scrollLeft, 400);
   // Make sure we don't jump directly to the new snap position.
   assert_greater_than(scrollCounter.count, 1);
 }, "Snaps to top-right after pressing ArrowRight");
 
 promise_test(async t => {
-  scroller.scrollTo(400, 0);
+  await initializeScrollPosition(scroller, 400, 0);
   assert_equals(scroller.scrollLeft, 400, "verify test pre-condition");
   const scrollCounter = new ScrollCounter(t, scroller);
+  const scrollEndPromise = waitForScrollEnd(scroller);
   await keyPress(scroller, "ArrowLeft");
-  await waitForScrollEnd(scroller);
+  await scrollEndPromise;
   assert_equals(scroller.scrollLeft, 0);
   // Make sure we don't jump directly to the new snap position.
   assert_greater_than(scrollCounter.count, 1);
@@ -98,10 +114,11 @@ promise_test(async t => {
   // Make the distance between the previous and the next snap position larger
   // than snapport.
   topRight.style.left = "500px";
-  scroller.scrollTo(0, 0);
+  await initializeScrollPosition(scroller, 0, 0);
   assert_equals(scroller.scrollLeft, 0, "verify test pre-condition");
+  const scrollEndPromise = waitForScrollEnd(scroller);
   await keyPress(scroller, "ArrowRight");
-  await waitForScrollEnd(scroller);
+  await scrollEndPromise;
   assert_between_exclusive(scroller.scrollLeft, 0, 500);
 }, "If the original intended offset is valid as making a snap area cover the"
 + "snapport, and there's no other snap offset in between, use the original"
@@ -119,19 +136,20 @@ promise_test(async t => {
   // Make the next snap offset closer than the original intended offset.
   topRight.style.left = "20px";
   topRight.style.scrollSnapStop = "always";
-  scroller.scrollTo(0, 0);
+  await initializeScrollPosition(scroller, 0, 0);
   assert_equals(scroller.scrollLeft, 0, "verify test pre-condition");
+  const scrollEndPromise = waitForScrollEnd(scroller);
   await keyPress(scroller, "ArrowRight");
-  await waitForScrollEnd(scroller);
+  await scrollEndPromise;
   assert_equals(scroller.scrollLeft, 20);
 }, "If the original intended offset is valid as making a snap area cover the "
 + "snapport, but there's a defined snap offset in between, use the defined snap"
 + " offset.");
 
 promise_test(async t => {
-  scroller.scrollTo(400, 0);
+  await initializeScrollPosition(scroller, 400, 0);
   await keyPress(scroller, "ArrowRight");
-  await waitForScrollEnd(scroller);
+  await waitForScrollStop(scroller);
   assert_equals(scroller.scrollLeft, 400);
 }, "If there is no valid snap offset on the arrow key's direction other than "
 + "the current offset, and the scroll-snap-type is mandatory, stay at the "
@@ -152,10 +170,11 @@ promise_test(async t => {
   scroller.style.width = "100px";
   topLeft.style.width = "80px";
 
-  scroller.scrollTo(400, 0);
+  await initializeScrollPosition(scroller, 400, 0);
   assert_equals(scroller.scrollLeft, 400, "verify test pre-condition");
+  const scrollEndPromise = waitForScrollEnd(scroller);
   await keyPress(scroller, "ArrowRight");
-  await waitForScrollEnd(scroller);
+  await scrollEndPromise;
   assert_greater_than(scroller.scrollLeft, 400);
 }, "If there is no valid snap offset on the arrow key's direction other than "
 + "the current offset, and the scroll-snap-type is proximity, go to the "
diff --git a/tests/wpt/tests/css/css-scroll-snap/input/snap-area-overflow-boundary.html b/tests/wpt/tests/css/css-scroll-snap/input/snap-area-overflow-boundary.html
index c497845263f..0978f127fa4 100644
--- a/tests/wpt/tests/css/css-scroll-snap/input/snap-area-overflow-boundary.html
+++ b/tests/wpt/tests/css/css-scroll-snap/input/snap-area-overflow-boundary.html
@@ -3,6 +3,9 @@
 <title></title>
 <meta name="assert" content="Test passes if snap is to the nearest edge">
 <style>
+  body {
+    margin: 0px;
+  }
   #scroller {
     scroll-snap-type: block mandatory;
     overflow-y: scroll;
@@ -35,6 +38,7 @@
 <script src="/resources/testdriver.js"></script>
 <script src="/resources/testdriver-vendor.js"></script>
 <script src="/resources/testdriver-actions.js"></script>
+<script src="/dom/events/scrolling/scroll_support.js"></script>
 <script src="../support/common.js"></script>
 
 <div id="scroller" tabindex="0">
@@ -78,10 +82,9 @@ promise_test(async t => {
   assert_equals(scroller.scrollTop, 0, "verify test pre-condition");
 
   // Ensure we can freely scroll in an oversized element.
-  const scrollPromise = waitForScrollEvent(scroller);
+  let scrollEndPromise = waitForScrollEnd(scroller);
   await keyPress(scroller, "ArrowDown");
-  await scrollPromise;
-  await waitForAnimationEnd(scrollTop);
+  await scrollEndPromise;
   assert_greater_than(scroller.scrollTop, 0,
                       'Arrowkey scroll moved scroll position');
   assert_less_than_equal(scroller.scrollTop, target.clientHeight,
@@ -92,20 +95,23 @@ promise_test(async t => {
   // Otherwise it is not possible to scroll to the last line of the snap-area
   // via keyboard.
   const scrollAmount = scroller.scrollTop;
-  target.style.height = `${scroller.clientHeight + scrollAmount - 1}px`;
-  assert_equals(scroller.scrollTop, 0, "Verify snap on relayout");
+  target.style.height = `${scroller.clientHeight + 2 * scrollAmount - 1}px`;
+  assert_equals(scroller.scrollTop, scrollAmount, "Verify container remains " +
+      "at the same covering snap offset.");
+  scrollEndPromise = waitForScrollEnd(scroller);
   await keyPress(scroller, "ArrowDown");
-  await waitForAnimationEnd(scrollTop);
+  await scrollEndPromise;
   assert_equals(scroller.scrollTop,
                 target.clientHeight - scroller.clientHeight,
                 'End boundary of snap-area is valid snap target');
 
   // Must not get stuck at a snap position. Since already at the end of the
   // snap area, we should advance to the next.
+  scrollEndPromise = waitForScrollEnd(scroller);
   await keyPress(scroller, "ArrowDown");
-  await waitForAnimationEnd(scrollTop);
+  await scrollEndPromise;
   assert_equals(scroller.scrollTop,
-                next.clientTop,
+                next.offsetTop,
                 'Advance to next snap-area');
 
 }, "Keyboard scrolling with vertical snap-area overflow");
@@ -115,35 +121,37 @@ promise_test(async t => {
   assert_equals(scroller.scrollTop, 0, "verify test pre-condition");
 
   // Ensure we can freely scroll in an oversized element.
-  const scrollPromise = waitForScrollEvent(scroller);
+  let scrollEndPromise = waitForScrollEnd(scroller);
   await new test_driver.Actions()
-       .scroll(50, 50, 0, 50, {origin: scroller})
-       .send();
-  await scrollPromise;
-  await waitForAnimationEnd(scrollTop);
+  .scroll(50, 50, 0, 50, {origin: scroller})
+  .send();
+  await scrollEndPromise;
   assert_equals(scroller.scrollTop, 50,
                       'Wheel-scroll moved scroll position');
 
   // Target position for wheel scroll overshoots the boundary of the snap-area.
   // Ensure that we stop at the boundary.
-  const scrollAmount =
+  let scrollAmount =
       target.clientHeight - scroller.clientHeight - scroller.scrollTop + 1;
 
+  scrollEndPromise = waitForScrollEnd(scroller);
   await new test_driver.Actions()
-       .scroll(50, 50, 0, scrollAmount, {origin: scroller})
-       .send();
-  await waitForAnimationEnd(scrollTop);
+  .scroll(50, 50, 0, scrollAmount, {origin: scroller})
+  .send();
+  await scrollEndPromise;
   assert_equals(scroller.scrollTop, 100,
                       'End boundary of snap-area is valid snap target');
 
   // Must not get stuck at a snap position. Since already at the end of the
-  // snap area, we should advance to the next.
+  // snap area, we should advance to the next. scrollAmount must be enough to
+  // advance to next snap position.
+  scrollAmount = next.clientHeight / 2 + 10 /* margin-bottom */;
+  scrollEndPromise = waitForScrollEnd(scroller);
   await new test_driver.Actions()
-       .scroll(50, 50, 0, 50, {origin: scroller})
-       .send();
-  await waitForAnimationEnd(scrollTop);
-  assert_equals(scroller.scrollTop,
-                next.clientTop,
+  .scroll(50, 50, 0, scrollAmount, {origin: scroller})
+  .send();
+  await scrollEndPromise;
+  assert_equals(scroller.scrollTop, next.offsetTop,
                 'Advance to next snap-area');
 
 }, "Mouse-wheel scrolling with vertical snap-area overflow");
diff --git a/tests/wpt/tests/css/css-scroll-snap/overflowing-snap-areas.html b/tests/wpt/tests/css/css-scroll-snap/overflowing-snap-areas.html
index a35799517fe..38002c3edda 100644
--- a/tests/wpt/tests/css/css-scroll-snap/overflowing-snap-areas.html
+++ b/tests/wpt/tests/css/css-scroll-snap/overflowing-snap-areas.html
@@ -115,48 +115,46 @@ test(() => {
 }, "Snaps to the snap position if the snap area covers the snapport on x on the left border.");
 
 test(() => {
-  scroller_x.scrollTo(500, 0);
+  scroller_x.scrollTo(450, 0);
   assert_equals(scroller_x.scrollLeft, 400);
   assert_equals(scroller_x.scrollTop, 0);
-}, "Snaps if the distance between the previous(400) and next(800) " +
-   "snap positions is smaller than snapport(500) on x.");
+}, "Snaps to a snap area (400) that is closer than the position that reveals " +
+   "the space between snap areas (600) within the larger snap area on x.");
 
 test(() => {
-  scroller_y.scrollTo(0, 500);
+  scroller_y.scrollTo(0, 450);
   assert_equals(scroller_y.scrollLeft, 0);
   assert_equals(scroller_y.scrollTop, 400);
-}, "Snaps if the distance between the previous(400) and next(800) " +
-   "snap positions is smaller than snapport(500) on y.");
+}, "Snaps to a snap area (400) that is closer than the position that reveals " +
+   "the space between snap areas (600) within the larger snap area on y.");
 
 test(() => {
-  scroller_x.scrollTo(900, 0);
-  assert_equals(scroller_x.scrollLeft, 900);
+  scroller_x.scrollTo(950, 0);
+  assert_equals(scroller_x.scrollLeft, 1000);
   assert_equals(scroller_x.scrollTop, 0);
-}, "Snap to current scroll position which is a valid snap position, " +
-   "as the snap area covers snapport on x and the distance between the " +
-   "previous(800) and next(1400) is larger than snapport(500).");
+}, "Snap within a snap area which covers snapport on x selects a valid snap " +
+   "position that avoids the overlapping areas at 800-1000 and 1400-1600.");
 
 test(() => {
-  scroller_y.scrollTo(0, 900);
+  scroller_y.scrollTo(0, 950);
   assert_equals(scroller_y.scrollLeft, 0);
-  assert_equals(scroller_y.scrollTop, 900);
-}, "Snap to current scroll position which is a valid snap position, " +
-   "as the snap area covers snapport on y and the distance between the " +
-   "previous(800) and next(1400) is larger than snapport(500).");
+  assert_equals(scroller_y.scrollTop, 1000);
+}, "Snap within a snap area which covers snapport on y selects a valid snap " +
+   "position that avoids the overlapping areas at 800-1000 and 1400-1600.");
 
 test(() => {
-  scroller_x.scrollTo(1500, 0);
-  assert_equals(scroller_x.scrollLeft, 1500);
+  scroller_x.scrollTo(1650, 0);
+  assert_equals(scroller_x.scrollLeft, 1650);
   assert_equals(scroller_x.scrollTop, 0);
 }, "Snap to current scroll position which is a valid snap position, as the " +
-   "snap area covers snapport on x and there is no subsequent snap positions.");
+   "snap area covers snapport on x and there is no intruding snap area.");
 
 test(() => {
-  scroller_y.scrollTo(0, 1500);
+  scroller_y.scrollTo(0, 1650);
   assert_equals(scroller_y.scrollLeft, 0);
-  assert_equals(scroller_y.scrollTop, 1500);
+  assert_equals(scroller_y.scrollTop, 1650);
 }, "Snap to current scroll position which is a valid snap position, as the " +
-   "snap area covers snapport on y and there is no subsequent snap positions.");
+   "snap area covers snapport on y and there is no intruding snap area.");
 
 test(() => {
   const maxScrollTop = scroller_y.scrollHeight - scroller_y.clientHeight;
diff --git a/tests/wpt/tests/css/css-scroll-snap/scroll-on-large-element-not-covering-snapport.tentative.html b/tests/wpt/tests/css/css-scroll-snap/scroll-on-large-element-not-covering-snapport.tentative.html
index 2db00d414ac..df4fc20ec8c 100644
--- a/tests/wpt/tests/css/css-scroll-snap/scroll-on-large-element-not-covering-snapport.tentative.html
+++ b/tests/wpt/tests/css/css-scroll-snap/scroll-on-large-element-not-covering-snapport.tentative.html
@@ -80,12 +80,9 @@ test(() => {
 
   // Scroll back a bit.
   scroller.scrollBy(0, -10);
-  // Now, snap back to the third snap point because at the moment when scrolling
-  // up by 10px, the large third snap target element isn't covering over the
-  // snapport, i.e. only bottom 10px of the large element is in the snapport.
-  // See https://github.com/w3c/csswg-drafts/issues/7262
+  // This should snap to the bottom of the 3rd snap area and not all the way
+  // back up to its top.
   assert_equals(scroller.scrollLeft, 0);
-  assert_equals(scroller.scrollTop, 80);
-}, 'There\'s no valid snap positions on large element if it doesn\'t cover ' +
-   'the snapport');
+  assert_equals(scroller.scrollTop, 880);
+}, "snaps to bottom edge of large snap area that doesn't cover the snap port.");
 </script>
diff --git a/tests/wpt/tests/css/css-scroll-snap/scroll-snap-nested-snap-area-layout-changed.html b/tests/wpt/tests/css/css-scroll-snap/scroll-snap-nested-snap-area-layout-changed.html
new file mode 100644
index 00000000000..be0bd5c4a57
--- /dev/null
+++ b/tests/wpt/tests/css/css-scroll-snap/scroll-snap-nested-snap-area-layout-changed.html
@@ -0,0 +1,105 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+  <link rel="help" href="https://drafts.csswg.org/css-scroll-snap-1/#scroll-snap-type" />
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <script src="/resources/testdriver.js"></script>
+  <script src="/resources/testdriver-actions.js"></script>
+  <script src="/resources/testdriver-vendor.js"></script>
+  <script src="/dom/events/scrolling/scroll_support.js"></script>
+</head>
+<body>
+  <style>
+    #scroller {
+      overflow: scroll;
+      scroll-snap-type: y mandatory;
+      height: 200px;
+      width: 200px;
+      border: solid 1px;
+      position:absolute;
+    }
+    .snap_area {
+      position: absolute;
+      width: 100px;
+      left: calc(50% - 50px);
+    }
+    #outer_snap_area {
+      scroll-snap-align: start;
+      height: 1000px;
+      background-color: blue;
+    }
+    #inner_snap_area {
+      scroll-snap-align: start;
+      height: 100px;
+      top: 100px;
+      background-color: yellow;
+    }
+  </style>
+  <div id="scroller">
+    <div id="outer_snap_area" class="snap_area"></div>
+    <div id="inner_snap_area" class="snap_area"></div>
+  </div>
+  <script>
+    async function reset() {
+      inner_snap_area.style.height = "100px";
+      await waitForCompositorCommit();
+    }
+
+    let scroller = document.getElementById("scroller");
+    promise_test(async (t) => {
+      await reset();
+      await resetTargetScrollState(t, scroller);
+      assert_equals(scroller.scrollTop, 0, "test precondition: scroller is " +
+      "not scrolled");
+      let scrollend_promise = waitForScrollendEventNoTimeout(scroller);
+      let target_snap_position = inner_snap_area.offsetTop +
+          inner_snap_area.offsetHeight;
+      // Scroll to an offset close to the bottom of the inner snap area and
+      // expect to snap to an offset just below this snap area.
+      scroller.scrollTo(0, target_snap_position - 10);
+      await scrollend_promise;
+      assert_equals(scroller.scrollTop, target_snap_position,
+          "scroller snaps to just below the inner snap area.");
+      // We are just below the inner snap area. Increase its height so that it
+      // is larger than the snapport and straddled by the snapport. Verify
+      // that we snap to its bottom.
+      inner_snap_area.style.height =
+               `${scroller.clientHeight + inner_snap_area.clientHeight - 10}px`;
+      await waitForCompositorCommit();
+      target_snap_position = inner_snap_area.offsetTop +
+          inner_snap_area.offsetHeight - scroller.clientHeight;
+      assert_equals(scroller.scrollTop, target_snap_position,
+          "scroller snaps to the bottom of the smaller snap area (which is now " +
+          "covering).");
+    }, "newly larger-than-snapport area is snapped to when straddled close " +
+       "to bottom.");
+
+    promise_test(async (t) => {
+      await reset();
+      await resetTargetScrollState(t, scroller);
+      assert_equals(scroller.scrollTop, 0, "test precondition: scroller is " +
+      "not scrolled");
+      let scrollend_promise = waitForScrollendEventNoTimeout(scroller);
+      let target_snap_position = inner_snap_area.offsetTop +
+          inner_snap_area.offsetHeight;
+      // Scroll to an offset close to the bottom of the inner snap area and
+      // expect to snap to an offset just below this snap area.
+      scroller.scrollTo(0, target_snap_position - 10);
+      await scrollend_promise;
+      assert_equals(scroller.scrollTop, target_snap_position,
+          "scroller snaps to just below the inner snap area.");
+      // We are just below the inner snap area. Increase its height so that it
+      // is larger than the snapport and covers the snapport. Verify that we
+      // remain in the covering position.
+      inner_snap_area.style.height =
+               `${scroller.clientHeight + inner_snap_area.clientHeight + 10}px`;
+      await waitForCompositorCommit();
+      assert_equals(scroller.scrollTop, target_snap_position,
+          "scroller snaps to the bottom of the smaller snap area (which is now " +
+          "covering).");
+    }, "snapport remains within newly covering snap area when already in " +
+       "covering position.");
+  </script>
+</body>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-scroll-snap/scroll-snap-stop-002.html b/tests/wpt/tests/css/css-scroll-snap/scroll-snap-stop-002.html
index cadafe2a82d..0951604a74b 100644
--- a/tests/wpt/tests/css/css-scroll-snap/scroll-snap-stop-002.html
+++ b/tests/wpt/tests/css/css-scroll-snap/scroll-snap-stop-002.html
@@ -229,8 +229,15 @@ test(() => {
   //   0                        400              700   900
 
   // Scoll on the element whose snap area is larger than the snapport.
-  scroller7.scrollBy(700, 0);
-  assert_equals(scroller7.scrollLeft, 700);
+  scroller7.scrollBy(600, 0);
+  // Stops before the smaller snap area @ 900px enters the snapport.
+  assert_equals(scroller7.scrollLeft + scroller7.clientWidth, 900);
+  assert_equals(scroller7.scrollTop, 0);
+
+  scroller7.scrollTo(0, 0);
+  scroller7.scrollBy(800, 0);
+  // Now the smaller snap area is closer, so we snap to it.
+  assert_equals(scroller7.scrollLeft, 900);
   assert_equals(scroller7.scrollTop, 0);
 }, "`scroll-snap-stop: always` snap point is further than the scroll " +
    "destination and a snap area covers the snapport");
diff --git a/tests/wpt/tests/css/css-scroll-snap/scroll-snap-stop-dynamic-crash.html b/tests/wpt/tests/css/css-scroll-snap/scroll-snap-stop-dynamic-crash.html
new file mode 100644
index 00000000000..0039a0168e8
--- /dev/null
+++ b/tests/wpt/tests/css/css-scroll-snap/scroll-snap-stop-dynamic-crash.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1472537">
+<style>
+div { overflow-y: scroll; }
+::-webkit-scrollbar { width: 10px; }
+::-webkit-scrollbar-corner { }
+.crash::-webkit-scrollbar-corner {
+  scroll-snap-stop: always;
+}
+</style>
+<div id="target"></div>
+<script>
+document.body.offsetTop;
+document.getElementById('target').className = 'crash';
+</script>
diff --git a/tests/wpt/tests/css/css-scroll-snap/scroll-snap-type-on-root-element.html b/tests/wpt/tests/css/css-scroll-snap/scroll-snap-type-on-root-element.html
index 2556ed99def..a45ac92e5ac 100644
--- a/tests/wpt/tests/css/css-scroll-snap/scroll-snap-type-on-root-element.html
+++ b/tests/wpt/tests/css/css-scroll-snap/scroll-snap-type-on-root-element.html
@@ -4,12 +4,13 @@
 <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+<body>
 <style>
-html {
+body {
   height: 8000px;
   width: 3000px;
+  margin: 0px;
 }
-
 #target {
   position: absolute;
   background-color: blue;
@@ -68,7 +69,13 @@ test(t => {
 
   window.scrollTo(200, 1800);
 
-  assert_equals(document.scrollingElement.scrollLeft, 100, "inline should snap");
+  // Though the target's width is 100vw, there may be room to scroll the window
+  // within the target because of the scrollbar width and the browser may snap
+  // to the right edge (instead of the left edge of the target, since it is
+  // closer to the offset of 200 and still a valid snap point) within this room.
+  const scrollbar_width = window.innerWidth - document.documentElement.clientWidth;
+  assert_approx_equals(document.scrollingElement.scrollLeft, 100, scrollbar_width, "inline should snap");
   assert_equals(document.scrollingElement.scrollTop, 1800, "block should not snap");
 }, "The writing-mode (horizontal-tb) on the body is used ");
 </script>
+</body>
diff --git a/tests/wpt/tests/css/css-scroll-snap/snap-after-initial-layout/scroll-snap-writing-mode-000-ref.html b/tests/wpt/tests/css/css-scroll-snap/snap-after-initial-layout/scroll-snap-writing-mode-000-ref.html
index 26b622e718c..428eb3facb5 100644
--- a/tests/wpt/tests/css/css-scroll-snap/snap-after-initial-layout/scroll-snap-writing-mode-000-ref.html
+++ b/tests/wpt/tests/css/css-scroll-snap/snap-after-initial-layout/scroll-snap-writing-mode-000-ref.html
@@ -35,17 +35,6 @@
 .ltr { direction: ltr; }
 .rtl { direction: rtl; }
 
-.TB.large.invert .target { top: auto; }
-.LR.large.invert .target { left: auto; }
-.RL.large.invert .target { right: auto; }
-
-.TB.ltr.large.invert .target { left:   auto; }
-.TB.rtl.large.invert .target { right:  auto; }
-.LR.ltr.large.invert .target { top:    auto; }
-.LR.rtl.large.invert .target { bottom: auto; }
-.RL.ltr.large.invert .target { top:    auto; }
-.RL.rtl.large.invert .target { bottom: auto; }
-
 /* not absolutizing the border colors, so that the test passes even if css-logical is not supported; */
 .large.invert {
   border: solid silver;
@@ -53,10 +42,40 @@
   border-inline-end-color: blue;
 }
 
+.TB.large.invert .target::before { top: auto; }
+.LR.large.invert .target::before { left: auto; }
+.RL.large.invert .target::before { right: auto; }
+
+.TB.ltr.large.invert .target::before { left:   auto; }
+.TB.rtl.large.invert .target::before { right:  auto; }
+.LR.ltr.large.invert .target::before { top:    auto; }
+.LR.rtl.large.invert .target::before { bottom: auto; }
+.RL.ltr.large.invert .target::before { top:    auto; }
+.RL.rtl.large.invert .target::before { bottom: auto; }
+
+.large.invert .target::before {
+  width: 9px;
+  height: 9px;
+  background: orange;
+  top: 0; left: 0; right: 0; bottom: 0;
+  position: absolute;
+  content: '';
+}
+
+.large.invert .target {
+  display: block;
+  background: none;
+  width: 30px;
+  height: 30px;
+  border-block-start: 20px solid red;
+  border-inline-start: 20px solid red;
+}
+
 </style>
 
 <p>Test passes if there is an orange square tucked into each blue corner without gaps,
-and there is no red.
+and there is no red, except for the large inverted cases which should have red
+in the silver corner and smaller orange boxes in the blue corner.
 
 <div class="wrapper">
 <!-- Simple Small Cases -->
@@ -87,6 +106,7 @@ and there is no red.
 
 <!-- Target-inverted Small Cases
      This row should be identical to the previous. -->
+
 <div class="scroller TB ltr small invert">
   <div class="target"></div>
 </div>
@@ -165,3 +185,4 @@ and there is no red.
 </div>
 
 </div> <!-- wrapper -->
+
diff --git a/tests/wpt/tests/css/css-scroll-snap/snap-after-initial-layout/scroll-snap-writing-mode-000.html b/tests/wpt/tests/css/css-scroll-snap/snap-after-initial-layout/scroll-snap-writing-mode-000.html
index e5d3dd9358b..f44317c8585 100644
--- a/tests/wpt/tests/css/css-scroll-snap/snap-after-initial-layout/scroll-snap-writing-mode-000.html
+++ b/tests/wpt/tests/css/css-scroll-snap/snap-after-initial-layout/scroll-snap-writing-mode-000.html
@@ -78,7 +78,8 @@
 </style>
 
 <p>Test passes if there is an orange square tucked into each blue corner without gaps,
-and there is no red.
+  and there is no red, except for the large inverted cases which should have red
+  in the silver corner and smaller orange boxes in the blue corner.
 
 <div class="wrapper">
 <!-- Simple Small Cases -->
diff --git a/tests/wpt/tests/css/css-scroll-snap/snap-after-relayout/changing-scroll-snap-align.html b/tests/wpt/tests/css/css-scroll-snap/snap-after-relayout/changing-scroll-snap-align.html
index 3be68fe841a..c4bb2e9ff42 100644
--- a/tests/wpt/tests/css/css-scroll-snap/snap-after-relayout/changing-scroll-snap-align.html
+++ b/tests/wpt/tests/css/css-scroll-snap/snap-after-relayout/changing-scroll-snap-align.html
@@ -71,11 +71,51 @@ test(t => {
   assert_equals(scroller.scrollLeft, 100);
 
   initial_target.style.setProperty("scroll-snap-align", "end");
-  // target.top + target.height - scroller.height
-  assert_equals(scroller.scrollTop, 200);
-  assert_equals(scroller.scrollLeft, 200);
-}, "Changing the current target's snap alignment should make the scroller"
-+ " resnap to it even if another snap position is closer to the current offset");
+  // scroller maintains scroll position which is still valid as the target's
+  // snap area covers the snap port.
+  assert_equals(scroller.scrollTop, 100);
+  assert_equals(scroller.scrollLeft, 100);
+}, "Changing a large target's snap alignment shouldn't make the scroller" +
+   " resnap if the scroller is already in a valid snap position.");
+
+// Similar to above test case except targets are too small to cover snap port,
+// so scroller must snap in response to change in scroll-snap-align.
+test(t => {
+  t.add_cleanup(cleanup);
+  const initial_target_height = initial_target.offsetHeight;
+  const initial_target_width = initial_target.offsetWidth;
+  const other_target_height = initial_target.offsetHeight;
+  const other_target_width = initial_target.offsetWidth;
+  t.add_cleanup(() => {
+    initial_target.style.setProperty("height", `${initial_target_height}px`);
+    initial_target.style.setProperty("width", `${initial_target_width}px`);
+    other_target.style.setProperty("height", `${other_target_height}px`);
+    other_target.style.setProperty("width", `${other_target_width}px`);
+  })
+  scroller.scrollTo(0,0);
+  assert_equals(scroller.scrollTop, 100);
+  assert_equals(scroller.scrollLeft, 100);
+
+  initial_target.style.setProperty("height", `${scroller.clientHeight * 2/3 }px`);
+  initial_target.style.setProperty("width", `${scroller.clientWidth * 2/3 }px`);
+  other_target.style.setProperty("height", `${scroller.clientHeight * 2/3 }px`);
+  other_target.style.setProperty("width", `${scroller.clientWidth * 2/3 }px`);
+
+  // scroll (and snap) to top left of other target.
+  scroller.scrollTo(other_target.offsetTop,
+                    other_target.offsetLeft);
+  assert_equals(scroller.scrollTop, other_target.offsetTop,);
+  assert_equals(scroller.scrollLeft, other_target.offsetLeft);
+
+  other_target.style.setProperty("scroll-snap-align", "end");
+  // should be scrolled so as to align scroller's bottom-right with
+  // other_target's bottom-right.
+  assert_equals(scroller.scrollTop,
+    other_target.offsetTop + other_target.offsetHeight - scroller.clientHeight);
+  assert_equals(scroller.scrollLeft,
+     other_target.offsetLeft + other_target.offsetWidth - scroller.clientWidth);
+}, "Changing the current (non-covering) target's snap alignment should make " +
+   "the scroller snap according to the new alignment.");
 
 test(t => {
   t.add_cleanup(cleanup);
diff --git a/tests/wpt/tests/css/css-scroll-snap/snap-into-covering-area.html b/tests/wpt/tests/css/css-scroll-snap/snap-into-covering-area.html
new file mode 100644
index 00000000000..2cc8741f5ef
--- /dev/null
+++ b/tests/wpt/tests/css/css-scroll-snap/snap-into-covering-area.html
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+  <link rel="help" href="https://drafts.csswg.org/css-scroll-snap-1/#scroll-snap-type" />
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <script src="/resources/testdriver.js"></script>
+  <script src="/resources/testdriver-actions.js"></script>
+  <script src="/resources/testdriver-vendor.js"></script>
+  <script src="/dom/events/scrolling/scroll_support.js"></script>
+</head>
+
+<body>
+  <style>
+    #scroller {
+      overflow: scroll;
+      height: 500px;
+      width: 500px;
+      background-color: blue;
+      scroll-snap-type: y mandatory;
+      position: absolute;
+    }
+
+    .snap_point {
+      scroll-snap-align: start;
+      width: 40%;
+      position: relative;
+      left: 30%;
+    }
+
+    .big {
+      height: 1000%;
+      background-color: pink;
+      border: solid 1px red;
+    }
+
+    .small {
+      height: 50%;
+      background-color: purple;
+      border: solid 1px black;
+    }
+  </style>
+  <div id="scroller">
+    <div class="big snap_point" id="big_snap_point"></div>
+    <div class="small snap_point">
+    <button id="scrollerButton">scrollerButton</button>
+    </div>
+  </div>
+  <script>
+    promise_test(async(t) => {
+      const x = scroller.clientWidth / 2;
+      const y = scroller.clientHeight / 2;
+
+      // Scroll all the way down to the smaller snap area which doesn't cover
+      // the snapport.
+      let scrollend_promise = new Promise((resolve) => {
+        scroller.addEventListener("scrollend", resolve);
+      });
+      scroller.scrollTop = scroller.scrollHeight;
+      await scrollend_promise;
+
+      // Scroll up with one press of the arrow-up button.
+      scrollend_promise = new Promise((resolve) => {
+        scroller.addEventListener("scrollend", resolve);
+      });
+      const arrowUp = '\uE013';
+      await test_driver.send_keys(scrollerButton, arrowUp);
+
+      await scrollend_promise;
+      assert_equals(scroller.scrollTop, big_snap_point.offsetHeight - scroller.clientHeight,
+          "scroller is snapped to the bottom of the larger snap area, not the top");
+    });
+  </script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-scroll-snap/snap-to-combination-of-two-elements-1.html b/tests/wpt/tests/css/css-scroll-snap/snap-to-combination-of-two-elements-1.html
new file mode 100644
index 00000000000..985227bb53c
--- /dev/null
+++ b/tests/wpt/tests/css/css-scroll-snap/snap-to-combination-of-two-elements-1.html
@@ -0,0 +1,79 @@
+<!DOCTYPE html>
+<meta name="viewport" content="width=device-width">
+<title>
+  Snap to points of combinations of two different elements
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-scroll-snap-1/"/>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+div {
+  position: absolute;
+  margin: 0px;
+}
+
+#scroller {
+  height: 600px;
+  width: 600px;
+  overflow: hidden;
+  scroll-snap-type: both mandatory;
+}
+
+#space {
+  width: 2000px;
+  height: 2000px;
+}
+
+#left-top {
+  /*
+   * the scroll position of this `scroll-snap-align: start start` is (200, 200)
+   */
+  left: 200px;
+  top: 200px;
+  height: 450px;
+  width: 450px;
+  background-color: rgb(255, 0, 0);
+  opacity: 0.5;
+  scroll-snap-align: start start;
+}
+
+#right-bottom {
+  /*
+   * the scroll position of this `scroll-snap-align: end end` is (50, 50),
+   * i.e, (`left` - scroll container's `width`  + this element's `width,
+           `top`  - scroll container's `height` + this element's `height)
+   */
+  left: 600px;
+  top: 600px;
+  width: 50px;
+  height: 50px;
+  background-color: rgb(0, 255, 0);
+  opacity: 0.5;
+  scroll-snap-align: end end;
+}
+
+</style>
+<div id="scroller">
+  <div id="space"></div>
+  <div id="left-top"></div>
+  <div id="right-bottom"></div>
+</div>
+<script>
+test(t => {
+  const scroller = document.getElementById("scroller");
+  assert_equals(scroller.scrollLeft, 50);
+  assert_equals(scroller.scrollTop, 50);
+
+  scroller.scrollTo(100, 150);
+  assert_equals(scroller.scrollLeft, 50);
+  assert_equals(scroller.scrollTop, 200);
+
+  scroller.scrollTo(300, 300);
+  assert_equals(scroller.scrollLeft, 200);
+  assert_equals(scroller.scrollTop, 200);
+
+  scroller.scrollTo(150, 100);
+  assert_equals(scroller.scrollLeft, 200);
+  assert_equals(scroller.scrollTop, 50);
+}, 'Snap to points of combinations of two different elements');
+</script>
diff --git a/tests/wpt/tests/css/css-scroll-snap/snap-to-combination-of-two-elements-2.tentative.html b/tests/wpt/tests/css/css-scroll-snap/snap-to-combination-of-two-elements-2.tentative.html
new file mode 100644
index 00000000000..8d06eb91d0d
--- /dev/null
+++ b/tests/wpt/tests/css/css-scroll-snap/snap-to-combination-of-two-elements-2.tentative.html
@@ -0,0 +1,87 @@
+<!DOCTYPE html>
+<meta name="viewport" content="width=device-width">
+<title>
+  Snap to points of combinations of two different elements
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-scroll-snap-1/"/>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+div {
+  position: absolute;
+  margin: 0px;
+}
+
+#scroller {
+  height: 600px;
+  width: 600px;
+  overflow: hidden;
+  scroll-snap-type: both mandatory;
+}
+
+#space {
+  width: 2000px;
+  height: 2000px;
+}
+
+#left-top {
+  /*
+   * the scroll position of this `scroll-snap-align: start start` is (200, 200)
+   */
+  left: 200px;
+  top: 200px;
+  height: 450px;
+  width: 450px;
+  background-color: rgb(255, 0, 0);
+  opacity: 0.5;
+  scroll-snap-align: start start;
+}
+
+#right-bottom {
+  /*
+   * the scroll position of this `scroll-snap-align: end end` is (50, 250),
+   * i.e, (`left` - scroll container's `width`  + this element's `width,
+           `top`  - scroll container's `height` + this element's `height)
+   */
+  left: 600px;
+  top: 800px;
+  width: 50px;
+  height: 50px;
+  background-color: rgb(0, 255, 0);
+  opacity: 0.5;
+  scroll-snap-align: end end;
+}
+
+</style>
+<div id="scroller">
+  <div id="space"></div>
+  <div id="left-top"></div>
+  <div id="right-bottom"></div>
+</div>
+<script>
+test(t => {
+  // There are four combinations of snap positions defined by #top-left and
+  // #right-bottom elements.
+  // (200, 200), (50, 250), (200, 250) and (50, 200).
+  // But snapping to (50, 200) leaves the snap area of #right-bottom element
+  // outside of the snapport, thus it won't be a valid snap position.
+  const scroller = document.getElementById("scroller");
+
+  // The nearest valid snap position from (0, 0) is (50, 250).
+  assert_equals(scroller.scrollLeft, 50);
+  assert_equals(scroller.scrollTop, 250);
+
+  // (50, 200) is not valid, thus the nearest one from (100, 150) is (200, 200).
+  scroller.scrollTo(100, 150);
+  assert_equals(scroller.scrollLeft, 200);
+  assert_equals(scroller.scrollTop, 200);
+
+  scroller.scrollTo(300, 300);
+  assert_equals(scroller.scrollLeft, 200);
+  assert_equals(scroller.scrollTop, 250);
+
+  scroller.scrollTo(200, 100);
+  assert_equals(scroller.scrollLeft, 200);
+  assert_equals(scroller.scrollTop, 200);
+}, 'Snap to points of combinations of two different elements');
+</script>
diff --git a/tests/wpt/tests/css/css-scroll-snap/snap-to-visible-areas-margin-both.html b/tests/wpt/tests/css/css-scroll-snap/snap-to-visible-areas-margin-both.html
index f148036a1d5..4c3c3c11a64 100644
--- a/tests/wpt/tests/css/css-scroll-snap/snap-to-visible-areas-margin-both.html
+++ b/tests/wpt/tests/css/css-scroll-snap/snap-to-visible-areas-margin-both.html
@@ -65,10 +65,14 @@ test(() => {
   scroller.scrollTo(0, 0);
   assert_equals(scroller.scrollLeft, 0);
   assert_equals(scroller.scrollTop, 0);
-  scroller.scrollTo(500, 600);
+  // 750 and 650 are picked as those are closer to top left of the intersection
+  // (800, 800) of the snap areas where the browser should snap. This makes the
+  // intersection a closer snap option than a covering option that the browser
+  // might choose where the snapport is aligned on the bottom and right.
+  scroller.scrollTo(650, 750);
   assert_equals(scroller.scrollLeft, 800);
   assert_equals(scroller.scrollTop, 800);
-  scroller.scrollTo(600, 500);
+  scroller.scrollTo(750, 650);
   assert_equals(scroller.scrollLeft, 800);
   assert_equals(scroller.scrollTop, 800);
 }, 'Snap to area such that only the scroll margin from both axes\' areas are \
diff --git a/tests/wpt/tests/css/css-scroll-snap/support/common.js b/tests/wpt/tests/css/css-scroll-snap/support/common.js
index 2eb7f3c3a84..c7800b95f14 100644
--- a/tests/wpt/tests/css/css-scroll-snap/support/common.js
+++ b/tests/wpt/tests/css/css-scroll-snap/support/common.js
@@ -70,33 +70,35 @@ function waitForWheelEvent(eventTarget) {
   return waitForEvent(eventTarget, 'wheel');
 }
 
-// Return a Promise which will be resolved where there's no scroll event
-// observed during 15 frames.
-//
-// TODO: This function should be written with `scrollend` event.
-function waitForScrollEnd(eventTarget) {
-  const MAX_UNCHANGED_FRAMES = 15;
+function waitForScrollStop(eventTarget) {
+  const TIMEOUT_IN_MS = 200;
 
   return new Promise(resolve => {
-    let unchanged_frames = 0;
-    let lastScrollEventTime;
+    let lastScrollEventTime = performance.now();
 
     const scrollListener = () => {
-      lastScrollEventTime = document.timeline.currentTime;
+      lastScrollEventTime = performance.now();
     };
     eventTarget.addEventListener('scroll', scrollListener);
 
-    const animationFrame = () => {
-      if (lastScrollEventTime == document.timeline.currentTime) {
-        unchanged_frames = 0;
-      } else if (++unchanged_frames >= MAX_UNCHANGED_FRAMES) {
+    const tick = () => {
+      if (performance.now() - lastScrollEventTime > TIMEOUT_IN_MS) {
         eventTarget.removeEventListener('scroll', scrollListener);
         resolve();
         return;
       }
-      requestAnimationFrame(animationFrame); // wait another frame
+      requestAnimationFrame(tick); // wait another frame
     }
-    requestAnimationFrame(animationFrame);
+    requestAnimationFrame(tick);
+  });
+}
+
+function waitForScrollEnd(eventTarget) {
+  if (window.onscrollend !== undefined) {
+    return waitForScrollendEventNoTimeout(eventTarget);
+  }
+  return waitForScrollEvent(eventTarget).then(() => {
+    return waitForScrollStop(eventTarget);
   });
 }
 
diff --git a/tests/wpt/tests/css/css-scrollbars/scrollbar-color-dynamic-7-ref.html b/tests/wpt/tests/css/css-scrollbars/scrollbar-color-dynamic-7-ref.html
new file mode 100644
index 00000000000..b431edf4240
--- /dev/null
+++ b/tests/wpt/tests/css/css-scrollbars/scrollbar-color-dynamic-7-ref.html
@@ -0,0 +1,34 @@
+<!doctype html>
+<style>
+  :root {
+    scrollbar-color: blue green;
+  }
+  body {
+    display: flex;
+    flex-wrap: wrap;
+    width: 200vw;
+    height: 200vh;
+  }
+
+  .container {
+    scrollbar-gutter: stable;
+    flex: 0 0;
+    overflow: auto;
+    height: 200px;
+    min-width: 200px;
+    margin: 1px;
+    padding: 0px;
+    border: none;
+    background: deepskyblue;
+  }
+
+  .content {
+    height: 300px;
+    width: 300px;
+    background: red;
+  }
+</style>
+
+<div class="container">
+  <div class="content"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-scrollbars/scrollbar-color-dynamic-7.html b/tests/wpt/tests/css/css-scrollbars/scrollbar-color-dynamic-7.html
new file mode 100644
index 00000000000..894db93d6a1
--- /dev/null
+++ b/tests/wpt/tests/css/css-scrollbars/scrollbar-color-dynamic-7.html
@@ -0,0 +1,46 @@
+<!doctype html>
+<html class="reftest-wait">
+<title>Dynamically set scrollbar-colors when starts auto and ensure scrollbars update</title>
+<link rel="author" title="Luke Warlow" href="mailto:luke@warlow.dev" />
+<link rel="help" href="https://drafts.csswg.org/css-scrollbars" />
+<link rel="match" href="scrollbar-color-dynamic-7-ref.html" />
+<script src="/common/reftest-wait.js"></script>
+<style>
+  :root {
+    scrollbar-color: auto;
+  }
+  body {
+    display: flex;
+    flex-wrap: wrap;
+    width: 200vw;
+    height: 200vh;
+  }
+
+  .container {
+    scrollbar-gutter: stable;
+    overflow: auto;
+    flex: 0 0;
+    height: 200px;
+    min-width: 200px;
+    margin: 1px;
+    padding: 0px;
+    border: none;
+    background: deepskyblue;
+  }
+
+  .content {
+    height: 300px;
+    width: 300px;
+    background: red;
+  }
+</style>
+<div class="container">
+  <div class="content"></div>
+</div>
+<script>
+  requestAnimationFrame(() => requestAnimationFrame(() => {
+    document.documentElement.style.scrollbarColor = 'blue green';
+
+    takeScreenshot();
+  }));
+</script>
diff --git a/tests/wpt/tests/css/css-shadow-parts/animation-part-ref.html b/tests/wpt/tests/css/css-shadow-parts/animation-part-ref.html
new file mode 100644
index 00000000000..c0c8ff040c9
--- /dev/null
+++ b/tests/wpt/tests/css/css-shadow-parts/animation-part-ref.html
@@ -0,0 +1,5 @@
+<!doctype html>
+<title>CSS Test reference</title>
+<p>
+  <div style="width: 16px; height: 16px; background: green;"></div>
+</p>
diff --git a/tests/wpt/tests/css/css-shadow-parts/animation-part.html b/tests/wpt/tests/css/css-shadow-parts/animation-part.html
new file mode 100644
index 00000000000..333785fe628
--- /dev/null
+++ b/tests/wpt/tests/css/css-shadow-parts/animation-part.html
@@ -0,0 +1,46 @@
+<!doctype html>
+<title>Animation name and ::part()</title>
+<link rel="author" title="Emilio Cobos Álvarez" href="mailto:emilio@crisal.io">
+<link rel="author" title="Mozilla" href="https://mozilla.org">
+<link rel="match" href="animation-part-ref.html">
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1852834">
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/1995">
+<wrapper-el></wrapper-el>
+<script>
+class WrapperEl extends HTMLElement {
+  constructor() {
+    super();
+    this.attachShadow({ mode: "open" });
+    this.shadowRoot.innerHTML = `
+      <style>
+        @keyframes green {
+          from { background: green; }
+          to { background: green; }
+        }
+
+        display-el::part(icon) {
+          animation: green 1s linear infinite;
+        }
+      </style>
+      <display-el></display-el>
+    `;
+  }
+}
+customElements.define("wrapper-el", WrapperEl);
+
+class DisplayEl extends HTMLElement {
+  constructor() {
+    super();
+    this.attachShadow({ mode: "open" });
+    this.shadowRoot.innerHTML = `
+      <style>
+        div {
+          width: 16px; height: 16px; background: red;
+        }
+      </style>
+      <p><div part="icon"></div></p>
+    `;
+  }
+}
+customElements.define("display-el", DisplayEl);
+</script>
diff --git a/tests/wpt/tests/css/css-shadow-parts/exportparts-different-scope-ref.html b/tests/wpt/tests/css/css-shadow-parts/exportparts-different-scope-ref.html
new file mode 100644
index 00000000000..d497566c45c
--- /dev/null
+++ b/tests/wpt/tests/css/css-shadow-parts/exportparts-different-scope-ref.html
@@ -0,0 +1,3 @@
+<!doctype html>
+<title>CSS Test Reference</title>
+<span style="color: green">Should be green</span>
diff --git a/tests/wpt/tests/css/css-shadow-parts/exportparts-different-scope.html b/tests/wpt/tests/css/css-shadow-parts/exportparts-different-scope.html
new file mode 100644
index 00000000000..94fce0d3ad5
--- /dev/null
+++ b/tests/wpt/tests/css/css-shadow-parts/exportparts-different-scope.html
@@ -0,0 +1,31 @@
+<!doctype html>
+<meta charset="utf-8">
+<link rel="author" href="mailto:emilio@crisal.io" title="Emilio Cobos Álvarez">
+<link rel="author" href="https://mozilla.org" title="Mozilla">
+<link rel="help" href="https://drafts.csswg.org/css-shadow-parts/">
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1854658">
+<link rel="match" href="exportparts-different-scope-ref.html">
+<style>
+my-foo::part(text) { color: green; }
+my-bar::part(text) { color: red; background-color: red; }
+</style>
+<my-foo></my-foo>
+<script>
+customElements.define('my-foo', class extends HTMLElement {
+  constructor(){
+    super()
+    this.attachShadow({mode: 'closed'}).innerHTML = `
+      <my-bar exportparts="text"></my-bar>
+    `;
+  }
+})
+
+customElements.define('my-bar', class extends HTMLElement {
+  constructor(){
+    super()
+    this.attachShadow({mode: 'closed'}).innerHTML = `
+      <span part="text">Should be green</span>
+    `;
+  }
+})
+</script>
diff --git a/tests/wpt/tests/css/css-shapes/basic-shape-circle-ellipse-serialization.html b/tests/wpt/tests/css/css-shapes/basic-shape-circle-ellipse-serialization.html
index 715593d47b1..0b7a7bb3ccd 100644
--- a/tests/wpt/tests/css/css-shapes/basic-shape-circle-ellipse-serialization.html
+++ b/tests/wpt/tests/css/css-shapes/basic-shape-circle-ellipse-serialization.html
@@ -35,8 +35,8 @@ checkEquals("ellipse(closest-side farthest-side)",
             "ellipse(closest-side farthest-side)");
 
 
-checkEquals("circle(at top 0% right 5px)", "circle(at right 5px top 0%)");
-checkEquals("ellipse(at top 0% right 10px)", "ellipse(at right 10px top 0%)");
+checkEquals("circle(at top 0% right 5px)", "circle(at calc(100% - 5px) 0%)");
+checkEquals("ellipse(at top 0% right 10px)", "ellipse(at calc(100% - 10px) 0%)");
 // Remove defaults like closest-side
 checkEquals("circle(closest-side at center)",
             "circle(at 50% 50%)");
@@ -57,20 +57,19 @@ checkEquals("ellipse(closest-side farthest-side at 50% 50%)",
 checkEquals("ellipse(closest-side 10% at 50% 50%)",
             "ellipse(closest-side 10% at 50% 50%)");
 
-// Don't transform nonzero lengths
+  // Transform to <length-percentage>.
 checkEquals("circle(at right 5px bottom 10px)",
-            "circle(at right 5px bottom 10px)");
+            "circle(at calc(100% - 5px) calc(100% - 10px))");
 checkEquals("ellipse(at right 5px bottom 10px)",
-            "ellipse(at right 5px bottom 10px)");
+            "ellipse(at calc(100% - 5px) calc(100% - 10px))");
 
-// Convert keyword-percentage pairs to plain percentages
-// Convert zero lengths to 0%
-checkEquals("circle(at right 5% top 0px)", "circle(at 95% 0%)");
-checkEquals("ellipse(at right 5% top 0px)", "ellipse(at 95% 0%)");
+// Don't convert zero lengths to 0%
+checkEquals("circle(at right 5% top 0px)", "circle(at calc(95%) 0px)");
+checkEquals("ellipse(at right 5% top 0px)", "ellipse(at calc(95%) 0px)");
 
-// Don't transform calcs
+// Transform calcs
 checkEquals("circle(at right calc(10% + 5px) bottom calc(10% + 5px))",
-            "circle(at right calc(10% + 5px) bottom calc(10% + 5px))");
+            "circle(at calc(90% - 5px) calc(90% - 5px))");
 checkEquals("ellipse(at right calc(10% + 5px) bottom calc(10% + 5px))",
-            "ellipse(at right calc(10% + 5px) bottom calc(10% + 5px))");
+            "ellipse(at calc(90% - 5px) calc(90% - 5px))");
 </script>
diff --git a/tests/wpt/tests/css/css-shapes/parsing/shape-outside-valid-position.html b/tests/wpt/tests/css/css-shapes/parsing/shape-outside-valid-position.html
index cd13c25ba38..07b82ddda64 100644
--- a/tests/wpt/tests/css/css-shapes/parsing/shape-outside-valid-position.html
+++ b/tests/wpt/tests/css/css-shapes/parsing/shape-outside-valid-position.html
@@ -5,6 +5,7 @@
 <title>CSS Shapes Module Level 1: parsing shape-outside with valid position values</title>
 <link rel="author" title="Eric Willigers" href="mailto:ericwilligers@chromium.org">
 <link rel="help" href="https://drafts.csswg.org/css-values-4/#typedef-position">
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/8695">
 <meta name="assert" content="shape-outside positions support the full '<position>' grammar.">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
@@ -12,25 +13,24 @@
 </head>
 <body>
 <script>
-// First serialization is being returned by Firefox/Edge, second by Blink/WebKit.
-test_valid_value("shape-outside", "circle(at 10%)", ["circle(at 10%)", "circle(at 10% 50%)"]);
+test_valid_value("shape-outside", "circle(at 10%)", "circle(at 10% 50%)");
 test_valid_value("shape-outside", "circle(at 20% 30px)");
-test_valid_value("shape-outside", "circle(at 30px center)", ["circle(at 30px center)", "circle(at 30px 50%)"]);
-test_valid_value("shape-outside", "circle(at 40px top)", ["circle(at 40px top)", "circle(at 40px 0%)"]);
-test_valid_value("shape-outside", "circle(at bottom 10% right 20%)", ["circle(at bottom 10% right 20%)", "circle(at 80% 90%)"]);
-test_valid_value("shape-outside", "circle(at bottom right)", ["circle(at bottom right)", "circle(at 100% 100%)"]);
-test_valid_value("shape-outside", "circle(at center)", ["circle(at center)", "circle(at 50% 50%)"]);
-test_valid_value("shape-outside", "circle(at center 50px)", ["circle(at center 50px)", "circle(at 50% 50px)"]);
-test_valid_value("shape-outside", "circle(at center bottom)", ["circle(at center bottom)", "circle(at 50% 100%)"]);
-test_valid_value("shape-outside", "circle(at center center)", ["circle(at center center)", "circle(at 50% 50%)"]);
-test_valid_value("shape-outside", "circle(at center left)", ["circle(at center left)", "circle(at 0% 50%)"]);
-test_valid_value("shape-outside", "circle(at left)", ["circle(at left)", "circle(at 0% 50%)"]);
-test_valid_value("shape-outside", "circle(at left bottom)", ["circle(at left bottom)", "circle(at 0% 100%)"]);
-test_valid_value("shape-outside", "circle(at left center)", ["circle(at left center)", "circle(at 0% 50%)"]);
-test_valid_value("shape-outside", "circle(at right 40%)", ["circle(at right 40%)", "circle(at 100% 40%)"]);
-test_valid_value("shape-outside", "circle(at right 30% top 60px)", ["circle(at right 30% top 60px)",  "circle(at 70% 60px)"]);
-test_valid_value("shape-outside", "circle(at top)", ["circle(at top)", "circle(at 50% 0%)"]);
-test_valid_value("shape-outside", "circle(at top center)", ["circle(at top center)", "circle(at 50% 0%)"]);
+test_valid_value("shape-outside", "circle(at 30px center)", "circle(at 30px 50%)");
+test_valid_value("shape-outside", "circle(at 40px top)", "circle(at 40px 0%)");
+test_valid_value("shape-outside", "circle(at bottom 10% right 20%)", "circle(at calc(80%) calc(90%))");
+test_valid_value("shape-outside", "circle(at bottom right)", "circle(at 100% 100%)");
+test_valid_value("shape-outside", "circle(at center)", "circle(at 50% 50%)");
+test_valid_value("shape-outside", "circle(at center 50px)", "circle(at 50% 50px)");
+test_valid_value("shape-outside", "circle(at center bottom)", "circle(at 50% 100%)");
+test_valid_value("shape-outside", "circle(at center center)", "circle(at 50% 50%)");
+test_valid_value("shape-outside", "circle(at center left)", "circle(at 0% 50%)");
+test_valid_value("shape-outside", "circle(at left)", "circle(at 0% 50%)");
+test_valid_value("shape-outside", "circle(at left bottom)", "circle(at 0% 100%)");
+test_valid_value("shape-outside", "circle(at left center)", "circle(at 0% 50%)");
+test_valid_value("shape-outside", "circle(at right 40%)", "circle(at 100% 40%)");
+test_valid_value("shape-outside", "circle(at right 30% top 60px)", "circle(at calc(70%) 60px)");
+test_valid_value("shape-outside", "circle(at top)", "circle(at 50% 0%)");
+test_valid_value("shape-outside", "circle(at top center)","circle(at 50% 0%)");
 </script>
 </body>
 </html>
diff --git a/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-032.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-032.html
index 74e6fff2e57..d57bb5de4d6 100644
--- a/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-032.html
+++ b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-032.html
@@ -10,6 +10,7 @@
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
   <link rel="match" href="reference/shape-outside-circle-032-ref.html">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the basic shape circle(50% at left top) value.">
+  <meta name="fuzzy" content="maxDifference=0-6; totalPixels=0-6">
   <style>
   .container {
     width: 200px;
diff --git a/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-036.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-036.html
index 62e334079d0..75b8b85a86c 100644
--- a/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-036.html
+++ b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-036.html
@@ -10,6 +10,7 @@
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
   <link rel="match" href="reference/shape-outside-circle-036-ref.html">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the basic shape circle() value.">
+  <meta name="fuzzy" content="maxDifference=0-6; totalPixels=0-6">
   <style>
   .container {
     width: 200px;
diff --git a/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-037.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-037.html
index 53d8a5a7791..b868cacbe9b 100644
--- a/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-037.html
+++ b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-037.html
@@ -10,6 +10,7 @@
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
   <link rel="match" href="reference/shape-outside-circle-036-ref.html">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the basic shape circle(closest-side at center) border-box value.">
+  <meta name="fuzzy" content="maxDifference=0-6; totalPixels=0-6">
   <style>
   .container {
     width: 200px;
diff --git a/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-038.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-038.html
index 0c4adbf5e68..2c823219ff6 100644
--- a/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-038.html
+++ b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-038.html
@@ -10,6 +10,7 @@
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
   <link rel="match" href="reference/shape-outside-circle-036-ref.html">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the basic shape circle(farthest-side at center) value.">
+  <meta name="fuzzy" content="maxDifference=0-6; totalPixels=0-6">
   <style>
   .container {
     width: 200px;
diff --git a/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-042.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-042.html
index 4c0625acf6a..b2a3836d154 100644
--- a/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-042.html
+++ b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-042.html
@@ -10,6 +10,7 @@
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
   <link rel="match" href="reference/shape-outside-circle-042-ref.html">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by the basic shape circle() value.">
+  <meta name="fuzzy" content="maxDifference=0-6; totalPixels=0-6">
   <style>
   .container {
     direction: rtl;
diff --git a/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-043.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-043.html
index 06960c092c8..3d73f7e9679 100644
--- a/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-043.html
+++ b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-043.html
@@ -10,6 +10,7 @@
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
   <link rel="match" href="reference/shape-outside-circle-042-ref.html">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by the basic shape circle(closest-side at center) border-box value.">
+  <meta name="fuzzy" content="maxDifference=0-6; totalPixels=0-6">
   <style>
   .container {
     direction: rtl;
diff --git a/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-044.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-044.html
index 918c178cb01..a6f34cfa1f8 100644
--- a/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-044.html
+++ b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-044.html
@@ -10,6 +10,7 @@
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
   <link rel="match" href="reference/shape-outside-circle-042-ref.html">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by the basic shape circle(farthest-side at center) value.">
+  <meta name="fuzzy" content="maxDifference=0-6; totalPixels=0-6">
   <style>
   .container {
     direction: rtl;
diff --git a/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-048.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-048.html
index 38f5dd395c2..4e370a31adc 100644
--- a/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-048.html
+++ b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-048.html
@@ -10,6 +10,7 @@
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
   <link rel="match" href="reference/shape-outside-circle-048-ref.html">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by circle(50% at left 40px top 40px) value under vertical-rl writing-mode.">
+  <meta name="fuzzy" content="maxDifference=0-6; totalPixels=0-6">
   <style>
   .container {
     writing-mode: vertical-rl;
diff --git a/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-050.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-050.html
index 22e85d54922..c3f18190226 100644
--- a/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-050.html
+++ b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-050.html
@@ -10,6 +10,7 @@
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
   <link rel="match" href="reference/shape-outside-circle-050-ref.html">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by circle(50% at right 40px top 40px) value under vertical-lr writing-mode.">
+  <meta name="fuzzy" content="maxDifference=0-6; totalPixels=0-6">
   <style>
   .container {
     writing-mode: vertical-lr;
diff --git a/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-054.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-054.html
index 5894a800ee2..0ee6d036c0c 100644
--- a/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-054.html
+++ b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-054.html
@@ -10,6 +10,7 @@
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
   <link rel="match" href="reference/shape-outside-circle-054-ref.html">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by circle(50% at left 40px bottom 40px) value under horizontal-tb writing-mode.">
+  <meta name="fuzzy" content="maxDifference=0-6; totalPixels=0-6">
   <style>
   .container {
     writing-mode: horizontal-tb;
diff --git a/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-032.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-032.html
index 22f4a870521..f715148e2b5 100644
--- a/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-032.html
+++ b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-032.html
@@ -10,6 +10,7 @@
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
   <link rel="match" href="reference/shape-outside-ellipse-032-ref.html">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the basic shape ellipse(40px 60px at left top) value.">
+  <meta name="fuzzy" content="maxDifference=0-6; totalPixels=0-6">
   <style>
   .container {
     width: 200px;
diff --git a/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-036.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-036.html
index 11d0b39f741..dadfe858727 100644
--- a/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-036.html
+++ b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-036.html
@@ -10,6 +10,7 @@
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
   <link rel="match" href="reference/shape-outside-ellipse-036-ref.html">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the basic shape ellipse() value.">
+  <meta name="fuzzy" content="maxDifference=0-6; totalPixels=0-6">
   <style>
   .container {
     width: 200px;
diff --git a/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-037.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-037.html
index 6cb2fb2b6b3..c7ed856513b 100644
--- a/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-037.html
+++ b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-037.html
@@ -10,6 +10,7 @@
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
   <link rel="match" href="reference/shape-outside-ellipse-037-ref.html">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the basic shape ellipse(closest-side farthest-side at left 40px top 60px) border-box">
+  <meta name="fuzzy" content="maxDifference=0-6; totalPixels=0-6">
   <style>
   .container {
     width: 200px;
diff --git a/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-038.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-038.html
index 40d43c7e06f..82e8b177498 100644
--- a/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-038.html
+++ b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-038.html
@@ -10,6 +10,7 @@
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
   <link rel="match" href="reference/shape-outside-ellipse-038-ref.html">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by the basic shape ellipse() value.">
+  <meta name="fuzzy" content="maxDifference=0-6; totalPixels=0-6">
   <style>
   .container {
     direction: rtl;
diff --git a/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-039.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-039.html
index 852631b3e25..b6ea86c3253 100644
--- a/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-039.html
+++ b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-039.html
@@ -10,6 +10,7 @@
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
   <link rel="match" href="reference/shape-outside-ellipse-039-ref.html">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by the basic shape ellipse(closest-side farthest-side at right 40px top 60px) border-box">
+  <meta name="fuzzy" content="maxDifference=0-6; totalPixels=0-6">
   <style>
   .container {
     direction: rtl;
diff --git a/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-020.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-020.html
index d08b91e32ae..92988273337 100644
--- a/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-020.html
+++ b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-020.html
@@ -10,6 +10,7 @@
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
   <link rel="match" href="reference/shape-outside-inset-020-ref.html">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the inset(10px round 0 40px/ 0 60px) border-box value under horizontal-tb writing-mode.">
+  <meta name="fuzzy" content="maxDifference=0-6; totalPixels=0-6">
   <style>
   .container {
     writing-mode: horizontal-tb;
diff --git a/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-023.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-023.html
index 6e01d0fb4d0..3a97f8327eb 100644
--- a/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-023.html
+++ b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-023.html
@@ -10,6 +10,7 @@
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
   <link rel="match" href="reference/shape-outside-inset-023-ref.html">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by the inset(10px round 60px 0/ 40px 0) border-box value under vertical-rl writing-mode.">
+  <meta name="fuzzy" content="maxDifference=0-6; totalPixels=0-6">
   <style>
   .container {
     writing-mode: vertical-rl;
diff --git a/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-024.html b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-024.html
index ec02241e9b5..5de0dad9ebc 100644
--- a/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-024.html
+++ b/tests/wpt/tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-024.html
@@ -10,6 +10,7 @@
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
   <link rel="match" href="reference/shape-outside-inset-024-ref.html">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the inset(10px round 60px 0/ 40px 0) border-box value under vertical-lr writing-mode.">
+  <meta name="fuzzy" content="maxDifference=0-6; totalPixels=0-6">
   <style>
   .container {
     writing-mode: vertical-lr;
diff --git a/tests/wpt/tests/css/css-shapes/shape-outside/values/support/parsing-utils.js b/tests/wpt/tests/css/css-shapes/shape-outside/values/support/parsing-utils.js
index 354a64b53f5..9c13a213e96 100644
--- a/tests/wpt/tests/css/css-shapes/shape-outside/values/support/parsing-utils.js
+++ b/tests/wpt/tests/css/css-shapes/shape-outside/values/support/parsing-utils.js
@@ -129,10 +129,14 @@ function buildTestCases(testCases, testType) {
     return results;
 }
 
+function isAbsoluteLength(unit) {
+    return unit == "cm" || unit == "mm" || unit == "Q" || unit == "in" ||
+           unit == "pt" || unit == "pc" || unit == "px";
+}
 
 function buildPositionTests(shape, valid, type, units) {
     var results = new Array();
-    var convert = type.indexOf('computed') != -1 ? true : false;
+    var is_computed = type.indexOf('computed') != -1 ? true : false;
 
     if(Object.prototype.toString.call( units ) === '[object Array]') {
         units.forEach(function(unit) {
@@ -144,23 +148,47 @@ function buildPositionTests(shape, valid, type, units) {
             validPositions.forEach(function(test) {
                 var testCase = [], testName, actual, expected;
                 // skip if this isn't explicitly testing length units
-                if( !(type.indexOf('lengthUnit') != -1 && test[0].indexOf("u1") == -1)) {
+                if (!(type.indexOf('lengthUnit') != -1 && test[0].indexOf("u1") == -1)) {
                     // actual
                     actual = shape + '(at ' + setUnit(test[0], false, units) +')';
 
+                    let position = test[1];
+                    let convert = is_computed;
+                    if (!is_computed) {
+                      // For specified values.
+                      // Note: "[convert]" tag is used only for the specified
+                      // value.
+                      if (position.includes('[convert]')) {
+                        // We should convert the absolute length into the
+                        // canonical unit in calc(), for specified values.
+                        // e.g.
+                        // 1. "circle(at 1pt 50%)" serializes as
+                        //    "circle(at 1pt 50%)".
+                        // 2. "circle(at calc(1pt) 50%)" serializes as
+                        //    "circle(at calc(1.33px) 50%)".
+                        convert = isAbsoluteLength(units);
+                      }
+                    } else if (test.length == 3) {
+                      // Use the 3rd element as the expected computed value.
+                      position = test[2];
+                    }
+
+                    // Remove the tag if there is.
+                    position = position.replace('[convert] ', '');
+
                     // expected
-                  //  if(convert && shape == 'circle')
-                  //      expected = shape + '(at ' + setUnit(test[1], convert, units) +')';
-                  //  else if(convert && shape == 'ellipse')
-                  //      expected = shape + '(at ' + setUnit(test[1], convert, units) +')';
-                  //  else
-                   expected = shape + '(at ' + setUnit(test[1], convert, units) +')';
+                    //  if(convert && shape == 'circle')
+                    //      expected = shape + '(at ' + setUnit(test[1], convert, units) +')';
+                    //  else if(convert && shape == 'ellipse')
+                    //      expected = shape + '(at ' + setUnit(test[1], convert, units) +')';
+                    //  else
+                    expected = shape + '(at ' + setUnit(position, convert, units) +')';
 
                     // name
                     if (type == 'lengthUnit + inline')
                         testName = 'test unit (inline): ' + units +' - '+ actual;
                     else if (type == 'lengthUnit + computed')
-                         testName = 'test unit (computed): ' + units +' - '+ actual;
+                        testName = 'test unit (computed): ' + units +' - '+ actual;
                     else
                         testName = (actual + ' serializes as ' + expected +' - '+ type);
 
@@ -549,39 +577,35 @@ var validPositions = [
 ////// [ keyword length | keyword length],  [ keyword length | keyword percent] x 5 keywords
     ["left 50% top 50%", "50% 50%"],
     ["left 50% top 50u1", "50% 50u1"],
-    ["left 50% bottom 70%", "50% 30%"],
-    ["left 50% bottom 70u1", "left 50% bottom 70u1"],
+    ["left 50% bottom 70%", "50% calc(30%)", "50% 30%"],
+    ["left 50% bottom 70u1", "[convert] 50% calc(100% - 70u1)"],
     ["left 50u1 top 50%", "50u1 50%"],
     ["left 50u1 top 50u1", "50u1 50u1"],
-    ["left 50u1 bottom 70%", "50u1 30%"],
-    ["left 50u1 bottom 70u1", "left 50u1 bottom 70u1"],
+    ["left 50u1 bottom 70%", "50u1 calc(30%)", "50u1 30%"],
 
     ["top 50% left 50%", "50% 50%"],
     ["top 50% left 50u1", "50u1 50%"],
-    ["top 50% right 80%", "20% 50%"],
-    ["top 50% right 80u1", "right 80u1 top 50%"],
+    ["top 50% right 80%", "calc(20%) 50%", "20% 50%"],
+    ["top 50% right 80u1", "[convert] calc(100% - 80u1) 50%"],
     ["top 50u1 left 50%", "50% 50u1"],
     ["top 50u1 left 50u1", "50u1 50u1"],
-    ["top 50u1 right 80%", "20% 50u1"],
-    ["top 50u1 right 80u1", "right 80u1 top 50u1"],
+    ["top 50u1 right 80%", "calc(20%) 50u1", "20% 50u1"],
 
-    ["bottom 70% left 50%", "50% 30%"],
-    ["bottom 70% left 50u1", "50u1 30%"],
-    ["bottom 70% right 80%", "20% 30%"],
-    ["bottom 70% right 80u1", "right 80u1 top 30%"],
-    ["bottom 70u1 left 50%", "left 50% bottom 70u1"],
-    ["bottom 70u1 left 50u1", "left 50u1 bottom 70u1"],
-    ["bottom 70u1 right 80%", "left 20% bottom 70u1"],
-    ["bottom 70u1 right 80u1", "right 80u1 bottom 70u1"],
+    ["bottom 70% left 50%", "50% calc(30%)", "50% 30%"],
+    ["bottom 70% left 50u1", "50u1 calc(30%)", "50u1 30%"],
+    ["bottom 70% right 80%", "calc(20%) calc(30%)", "20% 30%"],
+    ["bottom 70% right 80u1", "[convert] calc(100% - 80u1) calc(30%)", "calc(100% - 80u1) 30%"],
+    ["bottom 70u1 left 50%", "[convert] 50% calc(100% - 70u1)"],
+    ["bottom 70u1 right 50%", "[convert] calc(50%) calc(100% - 70u1)", "50% calc(100% - 70u1)"],
+    ["bottom 70u1 right 80u1", "[convert] calc(100% - 80u1) calc(100% - 70u1)"],
 
-    ["right 80% top 50%", "20% 50%"],
-    ["right 80% top 50u1", "20% 50u1"],
-    ["right 80% bottom 70%", "20% 30%"],
-    ["right 80% bottom 70u1", "left 20% bottom 70u1"],
-    ["right 80u1 top 50%", "right 80u1 top 50%"],
-    ["right 80u1 top 50u1", "right 80u1 top 50u1"],
-    ["right 80u1 bottom 70%", "right 80u1 top 30%"],
-    ["right 80u1 bottom 70u1", "right 80u1 bottom 70u1"],
+    ["right 80% top 50%", "calc(20%) 50%", "20% 50%"],
+    ["right 80% top 50u1", "calc(20%) 50u1", "20% 50u1"],
+    ["right 80% bottom 70%", "calc(20%) calc(30%)", "20% 30%"],
+    ["right 80% bottom 70u1", "[convert] calc(20%) calc(100% - 70u1)", "20% calc(100% - 70u1)"],
+    ["right 80u1 top 50%", "[convert] calc(100% - 80u1) 50%"],
+    ["right 80u1 bottom 70%", "[convert] calc(100% - 80u1) calc(30%)", "calc(100% - 80u1) 30%"],
+    ["right 80u1 bottom 70u1", "[convert] calc(100% - 80u1) calc(100% - 70u1)"],
 ];
 
 var invalidPositions = [
diff --git a/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/parsing/contain-intrinsic-size-computed.html b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/parsing/contain-intrinsic-size-computed.html
index 305fe621cd5..489b9e1be2e 100644
--- a/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/parsing/contain-intrinsic-size-computed.html
+++ b/tests/wpt/tests/css/css-sizing/contain-intrinsic-size/parsing/contain-intrinsic-size-computed.html
@@ -32,6 +32,7 @@ test_computed_value("contain-intrinsic-size", "auto 1px auto 1px", "auto 1px");
 test_computed_value("contain-intrinsic-size", "1px auto 1px");
 test_computed_value("contain-intrinsic-size", "2vw 3px", length_ref("2vw") + " 3px");
 test_computed_value("contain-intrinsic-size", "2px 3vh", "2px " + length_ref("3vh"));
+test_computed_value("contain-intrinsic-size", "2px 3.3vh", "2px " + length_ref("3.3vh"));
 test_computed_value("contain-intrinsic-size", "5px 5px", "5px");
 test_computed_value("contain-intrinsic-size", "inherit", "5px");
 
diff --git a/tests/wpt/tests/css/css-tables/paint/row-background-paint-remove-last-cell-ref.html b/tests/wpt/tests/css/css-tables/paint/row-background-paint-remove-last-cell-ref.html
new file mode 100644
index 00000000000..57beaedd479
--- /dev/null
+++ b/tests/wpt/tests/css/css-tables/paint/row-background-paint-remove-last-cell-ref.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html lang="en">
+<style>
+tr { background-color: rgb(255, 0, 0); }
+td:not(#remove) { background-color: green; }
+</style>
+<title>CSS Test Reference</title>
+<p>Test passes if you see three green cells and no red below.</p>
+<table>
+    <tr>
+        <td>A1</td>
+        <td>A2</td>
+    </tr>
+    <tr>
+        <td>B1</td>
+    </tr>
+</table>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-tables/paint/row-background-paint-remove-last-cell.html b/tests/wpt/tests/css/css-tables/paint/row-background-paint-remove-last-cell.html
new file mode 100644
index 00000000000..e61b5d4fea0
--- /dev/null
+++ b/tests/wpt/tests/css/css-tables/paint/row-background-paint-remove-last-cell.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<script src="/common/reftest-wait.js"></script>
+<script src="/common/rendering-utils.js"></script>
+<link rel="author" title="Chenguang Shao" href="chenguangshao1@gmail.com">
+<link rel="help" href="https://drafts.csswg.org/css-tables-3/#drawing-cell-backgrounds">
+<link rel="match" href="row-background-paint-remove-last-cell-ref.html">
+<style>
+tr { background-color: rgb(255, 0, 0); }
+td:not(#remove) { background-color: green; }
+</style>
+<title>CSS Table Module Test: table-row repaint after removing last cell</title>
+<script>
+waitForAtLeastOneFrame().then(() => {
+    const remove = document.getElementById('remove');
+    remove.remove();
+    takeScreenshot();
+});
+</script>
+<p>Test passes if you see three green cells and no red below.</p>
+<table>
+    <tr>
+        <td>A1</td>
+        <td>A2</td>
+    </tr>
+    <tr>
+        <td>B1</td>
+        <td id="remove"> B2 </td>
+    </tr>
+</table>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-text-decor/invalidation/reference/selection-pseudo-with-decoration-invalidation-001-ref.html b/tests/wpt/tests/css/css-text-decor/invalidation/reference/selection-pseudo-with-decoration-invalidation-001-ref.html
new file mode 100644
index 00000000000..7bbe11da926
--- /dev/null
+++ b/tests/wpt/tests/css/css-text-decor/invalidation/reference/selection-pseudo-with-decoration-invalidation-001-ref.html
@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>CSS Text Decoration Test: Invalidation of text decorations in css-pseudo ::selection - reference</title>
+<link rel="help" href="https://drafts.csswg.org/css-text-decor-4/">
+<link rel="help" href="https://drafts.csswg.org/css-pseudo-4/">
+<link rel="author" title="Stephen Chenney" href="mailto:schenney@chromium.org">
+<style>
+    div {
+        display: block;
+        margin-top: 30px;
+        margin-bottom: 30px;
+        will-change: transform;
+    }
+
+    ::selection {
+        background: yellow;
+        color: currentColor;
+    }
+
+    .decorated {
+        text-decoration-line: underline overline;
+        text-decoration-style: wavy;
+        text-decoration-color: green;
+        text-decoration-thickness: 5px;
+    }
+</style>
+</head>
+<body>
+<div>
+There should be no sign of decorations when the test completes.
+</div>
+<div id="bottom-decorated-div" class="decorated">
+There should be decorations when the test completes.
+</div>
+</body>
+<script>
+function selectByID(id) {
+  const selection = window.getSelection();
+  const node = document.getElementById(id);
+  const range = document.createRange();
+  range.selectNodeContents(node);
+  selection.addRange(range);
+}
+
+selectByID("bottom-decorated-div");
+</script>
+</html>
diff --git a/tests/wpt/tests/css/css-text-decor/invalidation/reference/selection-pseudo-with-decoration-invalidation-002-ref.html b/tests/wpt/tests/css/css-text-decor/invalidation/reference/selection-pseudo-with-decoration-invalidation-002-ref.html
new file mode 100644
index 00000000000..59351f8bed4
--- /dev/null
+++ b/tests/wpt/tests/css/css-text-decor/invalidation/reference/selection-pseudo-with-decoration-invalidation-002-ref.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>CSS Text Decoration Test: Invalidation of text decorations in css-pseudo ::selection</title>
+<style>
+    div {
+        display: block;
+        margin-top: 10px;
+        margin-bottom: 10px;
+        line-height: 20px;
+        will-change: transform;
+        text-decoration-line: underline;
+        text-decoration-style: line;
+        text-decoration-thickness: 1px;
+        text-underline-offset: 10px;
+    }
+    ::selection {
+        background: yellow;
+        color: currentColor;
+    }
+</style>
+</head>
+<body>
+<div>
+This is one line of text, with an image underneath.
+</div>
+<image src="../../../support/60x60-green.png"/>
+<div>
+And another line of text.
+</div>
+</body>
+<script>
+  const selection = window.getSelection();
+  const node = document.getElementsByTagName("body")[0];
+  let range = document.createRange();
+  range.selectNodeContents(node);
+  selection.addRange(range);
+</script>
+</html>
diff --git a/tests/wpt/tests/css/css-text-decor/invalidation/selection-pseudo-with-decoration-invalidation-001.html b/tests/wpt/tests/css/css-text-decor/invalidation/selection-pseudo-with-decoration-invalidation-001.html
new file mode 100644
index 00000000000..a2dfbb3f77e
--- /dev/null
+++ b/tests/wpt/tests/css/css-text-decor/invalidation/selection-pseudo-with-decoration-invalidation-001.html
@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<head>
+<title>CSS Text Decoration Test: Invalidation of text decorations in css-pseudo ::selection</title>
+<link rel="help" href="https://drafts.csswg.org/css-text-decor-4/">
+<link rel="help" href="https://drafts.csswg.org/css-pseudo-4/">
+<meta name="assert" content="text-decorations should be correctly invalidated on selection change.">
+<link rel="author" title="Stephen Chenney" href="mailto:schenney@chromium.org">
+<link rel="match" href="reference/selection-pseudo-with-decoration-invalidation-001-ref.html">
+<style>
+    div {
+        display: block;
+        margin-top: 30px;
+        margin-bottom: 30px;
+        will-change: transform;
+    }
+    ::selection {
+        background: yellow;
+        color: currentColor;
+        text-decoration-line: underline overline;
+        text-decoration-style: wavy;
+        text-decoration-color: black;
+        text-decoration-thickness: 5px;
+    }
+</style>
+<script src="/common/reftest-wait.js"></script>
+<script src="/common/rendering-utils.js"></script>
+</head>
+<body>
+<div id="top-decorated-div">
+There should be no sign of decorations when the test completes.
+</div>
+<div id="bottom-decorated-div">
+There should be decorations when the test completes.
+</div>
+</body>
+<script>
+
+function selectByID(id) {
+  const selection = window.getSelection();
+  const node = document.getElementById(id);
+  const range = document.createRange();
+  range.selectNodeContents(node);
+  selection.addRange(range);
+}
+
+selectByID("top-decorated-div");
+
+async function runTest() {
+  const selection = window.getSelection();
+  selection.removeAllRanges();
+  selectByID("bottom-decorated-div");
+  takeScreenshot();
+}
+onload = () => {
+  waitForAtLeastOneFrame().then(() => { runTest() });
+}
+</script>
+</html>
diff --git a/tests/wpt/tests/css/css-text-decor/invalidation/selection-pseudo-with-decoration-invalidation-002.html b/tests/wpt/tests/css/css-text-decor/invalidation/selection-pseudo-with-decoration-invalidation-002.html
new file mode 100644
index 00000000000..2abe8c62140
--- /dev/null
+++ b/tests/wpt/tests/css/css-text-decor/invalidation/selection-pseudo-with-decoration-invalidation-002.html
@@ -0,0 +1,53 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<head>
+<title>CSS Text Decoration Test: Invalidation of text decorations in css-pseudo ::selection</title>
+<link rel="help" href="https://drafts.csswg.org/css-text-decor-4/">
+<link rel="help" href="https://drafts.csswg.org/css-pseudo-4/">
+<meta name="assert" content="text-decorations should be correctly invalidated on selection change.">
+<link rel="author" title="Stephen Chenney" href="mailto:schenney@chromium.org">
+<link rel="match" href="reference/selection-pseudo-with-decoration-invalidation-002-ref.html">
+<style>
+    div {
+        display: block;
+        margin-top: 10px;
+        margin-bottom: 10px;
+        line-height: 20px;
+        will-change: transform;
+    }
+    ::selection {
+        background: yellow;
+        color: currentColor;
+        text-decoration-line: underline;
+        text-decoration-style: line;
+        text-decoration-thickness: 1px;
+        text-underline-offset: 10px;
+    }
+</style>
+<script src="/common/reftest-wait.js"></script>
+<script src="/common/rendering-utils.js"></script>
+</head>
+<body>
+<div>
+This is one line of text, with an image underneath.
+</div>
+<image src="../../support/60x60-green.png"/>
+<div>
+And another line of text.
+</div>
+</body>
+<script>
+async function runTest() {
+  const selection = window.getSelection();
+  const node = document.getElementsByTagName("body")[0];
+  let range = document.createRange();
+  range.selectNodeContents(node);
+  selection.addRange(range);
+  waitForAtLeastOneFrame().then(() => { takeScreenshot() });
+}
+
+onload = () => {
+  waitForAtLeastOneFrame().then(() => { runTest() });
+}
+</script>
+</html>
diff --git a/tests/wpt/tests/css/css-text-decor/reference/text-decoration-thickness-non-inherit-ref.html b/tests/wpt/tests/css/css-text-decor/reference/text-decoration-thickness-non-inherit-ref.html
new file mode 100644
index 00000000000..ae383f9e514
--- /dev/null
+++ b/tests/wpt/tests/css/css-text-decor/reference/text-decoration-thickness-non-inherit-ref.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <title>Non-reference case for text-decoration-thickness inheritance</title>
+    <style>
+        span { text-decoration-line: underline; text-decoration-color: black; }
+    </style>
+</head>
+<body>
+    <p><span>Test passes if this text decoration underline is not 20px thick.</span></p>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-text-decor/text-decoration-thickness-non-inherit.html b/tests/wpt/tests/css/css-text-decor/text-decoration-thickness-non-inherit.html
new file mode 100644
index 00000000000..c0aabdfde2d
--- /dev/null
+++ b/tests/wpt/tests/css/css-text-decor/text-decoration-thickness-non-inherit.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <title>Test case for text-decoration-thickness inheritance</title>
+    <meta name="assert" content="text-decoration-thickness: should not be inherited">
+    <link rel="author" title="Joonghun Park" href="mailto:pjh0718@gmail.com">
+    <link rel="help" href="https://drafts.csswg.org/css-text-decor-4/#text-decoration-thickness-property">
+    <link rel="match" href="reference/text-decoration-thickness-non-inherit-ref.html">
+    <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
+    <style>
+        p { text-decoration-thickness: 20px; }
+        span { text-decoration-line: underline; text-decoration-color: black; }
+    </style>
+</head>
+<body>
+    <p><span>Test passes if this text decoration underline is not 20px thick.</span></p>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-text/hanging-punctuation/hanging-punctuation-first-002.html b/tests/wpt/tests/css/css-text/hanging-punctuation/hanging-punctuation-first-002.html
new file mode 100644
index 00000000000..a2dd69f3a47
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/hanging-punctuation/hanging-punctuation-first-002.html
@@ -0,0 +1,22 @@
+<!doctype html>
+<html lang=en>
+<meta charset="utf-8">
+<title>CSS Test: hanging-punctuation - first, U+3000</title>
+<link rel="author" title="Florian Rivoal" href="https://florian.rivoal.net">
+<link rel="match" href="reference/hanging-punctuation-first-002-ref.html"/>
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#hanging-punctuation-property">
+<meta name="assert" content="hanging-punctuation: first hangs U+300 IDEOGRAPHIC SPACE " >
+<style>
+.test {
+    hanging-punctuation: first;
+}
+div { /*not part of the test, just to make things more visually obvious*/
+    line-height: 1;
+    font-size: 40px;
+}
+</style>
+
+<p>Test passes if the up and down arrows below are aligned.
+
+<div class=test>　↓</div>
+<div class=ref>↑</div>
diff --git a/tests/wpt/tests/css/css-text/hanging-punctuation/reference/hanging-punctuation-first-002-ref.html b/tests/wpt/tests/css/css-text/hanging-punctuation/reference/hanging-punctuation-first-002-ref.html
new file mode 100644
index 00000000000..5f2070fdf50
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/hanging-punctuation/reference/hanging-punctuation-first-002-ref.html
@@ -0,0 +1,16 @@
+<!doctype html>
+<html lang=en>
+<meta charset="utf-8">
+<title>CSS Test reference</title>
+<link rel="author" title="Florian Rivoal" href="https://florian.rivoal.net">
+<style>
+div { /*not part of the test, just to make things more visually obvious*/
+    line-height: 1;
+    font-size: 40px;
+}
+</style>
+
+<p>Test passes if the up and down arrows below are aligned.
+
+<div>↓</div>
+<div>↑</div>
diff --git a/tests/wpt/tests/css/css-text/parsing/hyphenate-character-invalid.html b/tests/wpt/tests/css/css-text/parsing/hyphenate-character-invalid.html
index 52801e6eb15..29351085bb5 100644
--- a/tests/wpt/tests/css/css-text/parsing/hyphenate-character-invalid.html
+++ b/tests/wpt/tests/css/css-text/parsing/hyphenate-character-invalid.html
@@ -4,7 +4,7 @@
 <meta charset="utf-8">
 <title>CSS Text Module Test: parsing hyphenate-character with invalid values</title>
 <link rel="help" href="https://drafts.csswg.org/css-text-4/#hyphenate-character">
-<meta name="assert" content="hyphenate-character supports only the grammar 'none | manual | auto'.">
+<meta name="assert" content="hyphenate-character supports only the grammar 'auto | &lt;string&gt;'.">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/css/support/parsing-testcommon.js"></script>
@@ -12,6 +12,7 @@
 <body>
 <script>
 test_invalid_value("hyphenate-character", "normal");
+test_invalid_value("hyphenate-character", "manual");
 test_invalid_value("hyphenate-character", "none");
 test_invalid_value("hyphenate-character", "auto auto");
 test_invalid_value("hyphenate-character", "\"-\" \"=\"");
diff --git a/tests/wpt/tests/css/css-text/parsing/hyphenate-limit-chars-invalid.html b/tests/wpt/tests/css/css-text/parsing/hyphenate-limit-chars-invalid.html
index db68f403c11..5a25f747df8 100644
--- a/tests/wpt/tests/css/css-text/parsing/hyphenate-limit-chars-invalid.html
+++ b/tests/wpt/tests/css/css-text/parsing/hyphenate-limit-chars-invalid.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <title>CSS Text: parsing hyphenate-limit-chars with invalid values</title>
 <link rel="help" href="https://drafts.csswg.org/css-text-4/#propdef-hyphenate-limit-chars">
-<meta name="assert" content="hyphenate-character supports only the grammar 'none | manual | auto'.">
+<meta name="assert" content="hyphenate-character supports only the grammar '[ auto | &lt;integer&gt; ]{1,3}'.">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/css/support/parsing-testcommon.js"></script>
diff --git a/tests/wpt/tests/css/css-text/parsing/text-autospace-valid.html b/tests/wpt/tests/css/css-text/parsing/text-autospace-valid.html
index c40c0e0a4ce..903da683074 100644
--- a/tests/wpt/tests/css/css-text/parsing/text-autospace-valid.html
+++ b/tests/wpt/tests/css/css-text/parsing/text-autospace-valid.html
@@ -23,6 +23,40 @@ test_valid_value("text-autospace", "punctuation");
 test_valid_value("text-autospace", "punctuation normal");
 test_valid_value("text-autospace", "punctuation ideograph-alpha");
 test_valid_value("text-autospace", "punctuation ideograph-alpha ideograph-numeric");
+
+test_valid_value("text-autospace", "ideograph-alpha insert");
+test_valid_value("text-autospace", "ideograph-numeric insert");
+test_valid_value("text-autospace", "ideograph-alpha ideograph-numeric insert");
+
+test_valid_value("text-autospace", "punctuation insert");
+test_valid_value("text-autospace", "punctuation normal insert");
+test_valid_value("text-autospace", "punctuation ideograph-alpha insert");
+
+test_valid_value("text-autospace", "insert ideograph-alpha");
+test_valid_value("text-autospace", "insert ideograph-numeric");
+test_valid_value("text-autospace", "insert ideograph-alpha ideograph-numeric");
+
+test_valid_value("text-autospace", "insert punctuation");
+test_valid_value("text-autospace", "insert punctuation normal");
+test_valid_value("text-autospace", "insert punctuation ideograph-alpha");
+test_valid_value("text-autospace", "insert punctuation ideograph-alpha ideograph-numeric");
+
+test_valid_value("text-autospace", "ideograph-alpha replace");
+test_valid_value("text-autospace", "ideograph-numeric replace");
+test_valid_value("text-autospace", "ideograph-alpha ideograph-numeric replace");
+
+test_valid_value("text-autospace", "punctuation replace");
+test_valid_value("text-autospace", "punctuation normal replace");
+test_valid_value("text-autospace", "punctuation ideograph-alpha replace");
+
+test_valid_value("text-autospace", "replace ideograph-alpha");
+test_valid_value("text-autospace", "replace ideograph-numeric");
+test_valid_value("text-autospace", "replace ideograph-alpha ideograph-numeric");
+
+test_valid_value("text-autospace", "replace punctuation");
+test_valid_value("text-autospace", "replace punctuation normal");
+test_valid_value("text-autospace", "replace punctuation ideograph-alpha");
+test_valid_value("text-autospace", "replace punctuation ideograph-alpha ideograph-numeric");
 </script>
 </body>
 </html>
diff --git a/tests/wpt/tests/css/css-text/parsing/text-spacing-trim-computed.html b/tests/wpt/tests/css/css-text/parsing/text-spacing-trim-computed.html
new file mode 100644
index 00000000000..33a845fb9e7
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/parsing/text-spacing-trim-computed.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Text: getComputedStyle().textSpacingTrim</title>
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#text-spacing-trim-property">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/computed-testcommon.js"></script>
+</head>
+<body>
+<div id="target"></div>
+<script>
+test_computed_value("text-spacing-trim", "auto");
+test_computed_value("text-spacing-trim", "space-all");
+test_computed_value("text-spacing-trim", "trim-auto");
+test_computed_value("text-spacing-trim", "trim-all");
+test_computed_value("text-spacing-trim", "allow-end");
+test_computed_value("text-spacing-trim", "space-first");
+
+test_computed_value("text-spacing-trim", "allow-end space-first");
+test_computed_value("text-spacing-trim", "space-first allow-end", "allow-end space-first");
+</script>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-text/parsing/text-spacing-trim-invalid.html b/tests/wpt/tests/css/css-text/parsing/text-spacing-trim-invalid.html
new file mode 100644
index 00000000000..f63ae0df427
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/parsing/text-spacing-trim-invalid.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Text Module Test: parsing text-spacing-trim with invalid values</title>
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#text-spacing-trim-property">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+</head>
+<body>
+<script>
+test_invalid_value("text-spacing-trim", "normal");
+test_invalid_value("text-spacing-trim", "normal space-all");
+test_invalid_value("text-spacing-trim", "normal space-first");
+test_invalid_value("text-spacing-trim", "auto space-all");
+test_invalid_value("text-spacing-trim", "auto space-first");
+</script>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-text/parsing/text-spacing-trim-valid.html b/tests/wpt/tests/css/css-text/parsing/text-spacing-trim-valid.html
new file mode 100644
index 00000000000..2fc258adb6d
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/parsing/text-spacing-trim-valid.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Text Module Test: parsing text-spacing-trim with valid values</title>
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#text-spacing-trim-property">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+</head>
+<body>
+<script>
+test_valid_value("text-spacing-trim", "auto");
+test_valid_value("text-spacing-trim", "space-all");
+test_valid_value("text-spacing-trim", "trim-auto");
+test_valid_value("text-spacing-trim", "trim-all");
+test_valid_value("text-spacing-trim", "allow-end");
+test_valid_value("text-spacing-trim", "space-first");
+
+test_valid_value("text-spacing-trim", "allow-end space-first");
+test_valid_value("text-spacing-trim", "space-first allow-end");
+</script>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-text/parsing/text-wrap-invalid.html b/tests/wpt/tests/css/css-text/parsing/text-wrap-invalid.html
index 6e8a5808503..b67cecc1830 100644
--- a/tests/wpt/tests/css/css-text/parsing/text-wrap-invalid.html
+++ b/tests/wpt/tests/css/css-text/parsing/text-wrap-invalid.html
@@ -5,20 +5,19 @@
 <title>CSS Text Module Test: parsing text-wrap with invalid values</title>
 <link rel="author" title="Tim Nguyen" href="https://github.com/nt1m">
 <link rel="help" href="https://drafts.csswg.org/css-text-4/#text-wrap">
-<meta name="assert" content="text-wrap supports only the grammar 'wrap | nowrap | balance | stable | pretty'.">
+<meta name="assert" content="text-wrap supports only the grammar '<text-wrap-mode> || <text-wrap-style>'.">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/css/support/parsing-testcommon.js"></script>
 </head>
 <body>
 <script>
-test_invalid_value("text-wrap", "auto");
+test_invalid_value("text-wrap", "normal");
 test_invalid_value("text-wrap", "none");
 test_invalid_value("text-wrap", "wrap nowrap");
-test_invalid_value("text-wrap", "nowrap balance");
-test_invalid_value("text-wrap", "balance wrap");
-test_invalid_value("text-wrap", "stable wrap");
-test_invalid_value("text-wrap", "pretty wrap");
+test_invalid_value("text-wrap", "pretty balance");
+test_invalid_value("text-wrap", "balance stable");
+test_invalid_value("text-wrap", "stable pretty");
 test_invalid_value("text-wrap", "delicious wrap");
 test_invalid_value("text-wrap", "5px");
 </script>
diff --git a/tests/wpt/tests/css/css-text/parsing/text-wrap-valid.html b/tests/wpt/tests/css/css-text/parsing/text-wrap-valid.html
index 6be9e74ea34..d9ff34eee20 100644
--- a/tests/wpt/tests/css/css-text/parsing/text-wrap-valid.html
+++ b/tests/wpt/tests/css/css-text/parsing/text-wrap-valid.html
@@ -5,7 +5,7 @@
 <title>CSS Text Module Test: parsing text-wrap with valid values</title>
 <link rel="author" title="Tim Nguyen" href="https://github.com/nt1m">
 <link rel="help" href="https://drafts.csswg.org/css-text-4/#text-wrap">
-<meta name="assert" content="text-wrap supports the full grammar 'wrap | nowrap | balance | stable | pretty'.">
+<meta name="assert" content="text-wrap supports the full grammar '<text-wrap-mode> || <text-wrap-style>'.">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/css/support/parsing-testcommon.js"></script>
@@ -14,9 +14,30 @@
 <script>
 test_valid_value("text-wrap", "wrap");
 test_valid_value("text-wrap", "nowrap");
+
+test_valid_value("text-wrap", "auto");
 test_valid_value("text-wrap", "balance");
 test_valid_value("text-wrap", "stable");
 test_valid_value("text-wrap", "pretty");
+
+test_valid_value("text-wrap", "wrap auto");
+test_valid_value("text-wrap", "wrap balance");
+test_valid_value("text-wrap", "wrap pretty");
+test_valid_value("text-wrap", "wrap stable");
+test_valid_value("text-wrap", "auto wrap");
+test_valid_value("text-wrap", "balance wrap");
+test_valid_value("text-wrap", "pretty wrap");
+test_valid_value("text-wrap", "stable wrap");
+
+test_valid_value("text-wrap", "nowrap auto");
+test_valid_value("text-wrap", "nowrap balance");
+test_valid_value("text-wrap", "nowrap pretty");
+test_valid_value("text-wrap", "nowrap stable");
+test_valid_value("text-wrap", "auto nowrap");
+test_valid_value("text-wrap", "balance nowrap");
+test_valid_value("text-wrap", "pretty nowrap");
+test_valid_value("text-wrap", "stable nowrap");
+
 test_valid_value("text-wrap", "initial");
 test_valid_value("text-wrap", "inherit");
 test_valid_value("text-wrap", "unset");
diff --git a/tests/wpt/tests/css/css-text/parsing/white-space-shorthand.html b/tests/wpt/tests/css/css-text/parsing/white-space-shorthand.html
index a7788f74ae3..01c409a79cd 100644
--- a/tests/wpt/tests/css/css-text/parsing/white-space-shorthand.html
+++ b/tests/wpt/tests/css/css-text/parsing/white-space-shorthand.html
@@ -40,10 +40,10 @@ test_valid_and_computed_value("white-space", "wrap preserve-breaks", "pre-line")
 test_valid_and_computed_value("white-space", "preserve-breaks nowrap", "preserve-breaks nowrap");
 test_valid_and_computed_value("white-space", "nowrap preserve-breaks", "preserve-breaks nowrap");
 
-// Values not used in the pre-defined set.
-test_valid_and_computed_value("white-space", "balance", "balance");
-test_valid_and_computed_value("white-space", "collapse balance", "balance");
-test_valid_and_computed_value("white-space", "balance collapse", "balance");
-test_valid_and_computed_value("white-space", "preserve balance", "preserve balance");
-test_valid_and_computed_value("white-space", "balance preserve", "preserve balance");
+// Values not availabe through the shorthand.
+test_invalid_value("white-space", "balance");
+test_invalid_value("white-space", "collapse balance");
+test_invalid_value("white-space", "balance collapse");
+test_invalid_value("white-space", "preserve balance");
+test_invalid_value("white-space", "balance preserve");
 </script>
diff --git a/tests/wpt/tests/css/css-text/parsing/word-boundary-detection-computed.html b/tests/wpt/tests/css/css-text/parsing/word-boundary-detection-computed.html
deleted file mode 100644
index b12922924ad..00000000000
--- a/tests/wpt/tests/css/css-text/parsing/word-boundary-detection-computed.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8">
-<title>CSS Text: getComputedStyle().wordBoundaryDetection</title>
-<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-boundary-detection">
-<meta name="assert" content="word-boundary-detection computed value is specified keyword.">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/css/support/computed-testcommon.js"></script>
-</head>
-<body>
-<div id="target"></div>
-<script>
-test_computed_value("word-boundary-detection", "normal");
-test_computed_value("word-boundary-detection", "manual");
-/* Not sure how to test for auto(<lang>) generically, as which one will parse depends on languages actually supported */
-</script>
-</body>
-</html>
diff --git a/tests/wpt/tests/css/css-text/parsing/word-boundary-detection-invalid.html b/tests/wpt/tests/css/css-text/parsing/word-boundary-detection-invalid.html
deleted file mode 100644
index a844566b8ca..00000000000
--- a/tests/wpt/tests/css/css-text/parsing/word-boundary-detection-invalid.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8">
-<title>CSS Text Module Test: parsing word-boundary-detection with invalid values</title>
-<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-boundary-detection">
-<meta name="assert" content="word-boundary-detection supports only the grammar 'normal | manual | auto(<lang>)'.">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/css/support/parsing-testcommon.js"></script>
-</head>
-<body>
-<script>
-test_invalid_value("word-boundary-detection", "auto"); /*needs a language*/
-test_invalid_value("word-boundary-detection", "auto()"); /*needs a language*/
-test_invalid_value("word-boundary-detection", "none");
-test_invalid_value("word-boundary-detection", "normal manual");
-</script>
-</body>
-</html>
diff --git a/tests/wpt/tests/css/css-text/parsing/word-boundary-detection-valid.html b/tests/wpt/tests/css/css-text/parsing/word-boundary-detection-valid.html
deleted file mode 100644
index 81a8ea32b99..00000000000
--- a/tests/wpt/tests/css/css-text/parsing/word-boundary-detection-valid.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8">
-<title>CSS Text Module Test: parsing word-boundary-detection with valid values</title>
-<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-boundary-detection">
-<meta name="assert" content="word-boundary-detection supports the full grammar 'normal | manual | auto(<lang>) '.">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/css/support/parsing-testcommon.js"></script>
-</head>
-<body>
-<script>
-test_valid_value("word-boundary-detection", "normal");
-test_valid_value("word-boundary-detection", "manual");
-/* Not sure how to test for auto(<lang>) generically, as which one will parse depends on languages actually supported */
-</script>
-</body>
-</html>
diff --git a/tests/wpt/tests/css/css-text/parsing/word-boundary-expansion-computed.html b/tests/wpt/tests/css/css-text/parsing/word-boundary-expansion-computed.html
deleted file mode 100644
index 054a298ae78..00000000000
--- a/tests/wpt/tests/css/css-text/parsing/word-boundary-expansion-computed.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8">
-<title>CSS Text: getComputedStyle().wordBoundaryExpansion</title>
-<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-boundary-expansion">
-<meta name="assert" content="word-boundary-expansion computed value is specified keyword.">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/css/support/computed-testcommon.js"></script>
-</head>
-<body>
-<div id="target"></div>
-<script>
-test_computed_value("word-boundary-expansion", "none");
-test_computed_value("word-boundary-expansion", "space");
-test_computed_value("word-boundary-expansion", "ideographic-space");
-</script>
-</body>
-</html>
diff --git a/tests/wpt/tests/css/css-text/parsing/word-boundary-expansion-invalid.html b/tests/wpt/tests/css/css-text/parsing/word-boundary-expansion-invalid.html
deleted file mode 100644
index 6b68e578d4d..00000000000
--- a/tests/wpt/tests/css/css-text/parsing/word-boundary-expansion-invalid.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8">
-<title>CSS Text Module Test: parsing word-boundary-expansion with invalid values</title>
-<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-boundary-expansion">
-<meta name="assert" content="word-boundary-expansion supports only the grammar 'none | space | ideographic-space'.">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/css/support/parsing-testcommon.js"></script>
-</head>
-<body>
-<script>
-test_invalid_value("word-boundary-expansion", "auto");
-test_invalid_value("word-boundary-expansion", "normal");
-test_invalid_value("word-boundary-expansion", "spaces");
-test_invalid_value("word-boundary-expansion", "space ideographic-space");
-</script>
-</body>
-</html>
diff --git a/tests/wpt/tests/css/css-text/parsing/word-boundary-expansion-valid.html b/tests/wpt/tests/css/css-text/parsing/word-boundary-expansion-valid.html
deleted file mode 100644
index cf1128a5f72..00000000000
--- a/tests/wpt/tests/css/css-text/parsing/word-boundary-expansion-valid.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8">
-<title>CSS Text Module Test: parsing word-boundary-expansion with valid values</title>
-<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-boundary-expansion">
-<meta name="assert" content="word-boundary-expansion supports the full grammar 'none | space | ideographic-space'.">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/css/support/parsing-testcommon.js"></script>
-</head>
-<body>
-<script>
-test_valid_value("word-boundary-expansion", "none");
-test_valid_value("word-boundary-expansion", "space");
-test_valid_value("word-boundary-expansion", "ideographic-space");
-</script>
-</body>
-</html>
diff --git a/tests/wpt/tests/css/css-text/parsing/word-break-invalid.html b/tests/wpt/tests/css/css-text/parsing/word-break-invalid.html
index 46456b677d8..91b4a8ec479 100644
--- a/tests/wpt/tests/css/css-text/parsing/word-break-invalid.html
+++ b/tests/wpt/tests/css/css-text/parsing/word-break-invalid.html
@@ -4,7 +4,7 @@
 <meta charset="utf-8">
 <title>CSS Text Module Test: parsing word-break with invalid values</title>
 <link rel="help" href="https://www.w3.org/TR/css-text-3/#propdef-word-break">
-<meta name="assert" content="word-break supports only the grammar 'normal | keep-all | break-all | break-word'.">
+<meta name="assert" content="word-break supports only the grammar 'normal | break-all| keep-all | manual | auto-phrase | break-word'.">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/css/support/parsing-testcommon.js"></script>
diff --git a/tests/wpt/tests/css/css-text/parsing/word-break-valid.html b/tests/wpt/tests/css/css-text/parsing/word-break-valid.html
index 40015d9dd36..93c58e8557d 100644
--- a/tests/wpt/tests/css/css-text/parsing/word-break-valid.html
+++ b/tests/wpt/tests/css/css-text/parsing/word-break-valid.html
@@ -4,7 +4,7 @@
 <meta charset="utf-8">
 <title>CSS Text Module Test: parsing word-break with valid values</title>
 <link rel="help" href="https://www.w3.org/TR/css-text-3/#propdef-word-break">
-<meta name="assert" content="word-break supports the full grammar 'normal | keep-all | break-all | break-word'.">
+<meta name="assert" content="word-break supports only the grammar 'normal | break-all| keep-all | manual | auto-phrase | break-word'.">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/css/support/parsing-testcommon.js"></script>
@@ -12,10 +12,11 @@
 <body>
 <script>
 test_valid_value("word-break", "normal");
-test_valid_value("word-break", "keep-all");
 test_valid_value("word-break", "break-all");
-test_valid_value("word-break", "break-word");
+test_valid_value("word-break", "keep-all");
+test_valid_value("word-break", "manual");
 test_valid_value("word-break", "auto-phrase");
+test_valid_value("word-break", "break-word");
 </script>
 </body>
 </html>
diff --git a/tests/wpt/tests/css/css-text/parsing/word-space-transform-computed.html b/tests/wpt/tests/css/css-text/parsing/word-space-transform-computed.html
new file mode 100644
index 00000000000..2137305cec8
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/parsing/word-space-transform-computed.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Text: getComputedStyle().wordSpaceTransform</title>
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-space-transform">
+<meta name="assert" content="word-space-transform computed value is specified keyword.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/computed-testcommon.js"></script>
+</head>
+<body>
+<div id="target"></div>
+<script>
+test_computed_value("word-space-transform", "none");
+test_computed_value("word-space-transform", "space");
+test_computed_value("word-space-transform", "ideographic-space");
+test_computed_value("word-space-transform", "space auto-phrase");
+test_computed_value("word-space-transform", "ideographic-space auto-phrase");
+</script>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-text/parsing/word-space-transform-invalid.html b/tests/wpt/tests/css/css-text/parsing/word-space-transform-invalid.html
new file mode 100644
index 00000000000..049bf1d0da8
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/parsing/word-space-transform-invalid.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Text Module Test: parsing word-space-transform with invalid values</title>
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-space-transform">
+<meta name="assert" content="word-space-transform supports only the grammar 'none | [ space | ideographic-space ] && auto-phrase?'.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+</head>
+<body>
+<script>
+test_invalid_value("word-space-transform", "auto");
+test_invalid_value("word-space-transform", "normal");
+test_invalid_value("word-space-transform", "spaces");
+test_invalid_value("word-space-transform", "space ideographic-space");
+test_invalid_value("word-space-transform", "auto-phrase");
+test_invalid_value("word-space-transform", "none auto-phrase");
+</script>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-text/parsing/word-space-transform-valid.html b/tests/wpt/tests/css/css-text/parsing/word-space-transform-valid.html
new file mode 100644
index 00000000000..2323931f531
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/parsing/word-space-transform-valid.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Text Module Test: parsing word-space-transform with valid values</title>
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-space-transform">
+<meta name="assert" content="word-space-transform supports the full grammar 'none | [ space | ideographic-space ] && auto-phrase?'.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+</head>
+<body>
+<script>
+test_valid_value("word-space-transform", "none");
+test_valid_value("word-space-transform", "space");
+test_valid_value("word-space-transform", "ideographic-space");
+test_valid_value("word-space-transform", "space auto-phrase");
+test_valid_value("word-space-transform", "ideographic-space auto-phrase");
+test_valid_value("word-space-transform", "auto-phrase space");
+test_valid_value("word-space-transform", "auto-phrase ideographic-space");
+</script>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-text/support/get-char-advances.js b/tests/wpt/tests/css/css-text/support/get-char-advances.js
new file mode 100644
index 00000000000..846a39a2b76
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/support/get-char-advances.js
@@ -0,0 +1,25 @@
+'use strict';
+
+/**
+ * Returns an array of advances (widths) for all characters in the descendants
+ * of the specified element.
+ */
+function getCharAdvances(element) {
+  const range = document.createRange();
+  let advances = [];
+  for (const node of element.childNodes) {
+    const nodeType = node.nodeType;
+    if (nodeType === Node.TEXT_NODE) {
+      const text = node.nodeValue;
+      for (let i = 0; i < text.length; ++i) {
+        range.setStart(node, i);
+        range.setEnd(node, i + 1);
+        const bounds = range.getBoundingClientRect();
+        advances.push(bounds.width);
+      }
+    } else if (nodeType === Node.ELEMENT_NODE) {
+      advances = advances.concat(getCharAdvances(node));
+    }
+  }
+  return advances;
+}
diff --git a/tests/wpt/tests/css/css-text/tab-size/tab-min-rendered-width-1-ref.html b/tests/wpt/tests/css/css-text/tab-size/tab-min-rendered-width-1-ref.html
index 7623adb59e6..e154e0ca626 100644
--- a/tests/wpt/tests/css/css-text/tab-size/tab-min-rendered-width-1-ref.html
+++ b/tests/wpt/tests/css/css-text/tab-size/tab-min-rendered-width-1-ref.html
@@ -3,9 +3,11 @@
 <head>
   <title>CSS Text Test: minimum rendered width of tab character</title>
   <link rel="author" title="Jonathan Kew" href="mailto:jkew@mozilla.com">
+  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
   <style>
-    span { background-color: yellow; display: inline-block; letter-spacing: -.1em; }
-    pre { position: absolute; top: 0; }
+    span { background-color: yellow; display: inline-block; }
+    pre { position: absolute; top: 0; font: 16px Ahem; }
+    tt { font: 16px monospace; }
   </style>
 </head>
 <body>
@@ -17,16 +19,16 @@
   let pre = document.getElementsByTagName("pre")[0];
   let test = "";
   for (i = 7.0; i <= 8.125; i += 0.125) {
-    test += `<span style="width:${i}ch">${i}ch</span>\n`;
+    test += `<span style="width:${i}ch"><tt>${i}ch</tt></span>\n`;
   }
   pre.innerHTML = test;
   pre = document.getElementsByTagName("pre")[1];
   test = "";
   for (i = 0; i < 5; i++) {
-    test += `\tfoo\n`;
+    test += `\t<tt>foo</tt>\n`;
   }
   for (i = 0; i < 5; i++) {
-    test += `\t\tfoo\n`;
+    test += `\t\t<tt>foo</tt>\n`;
   }
   pre.innerHTML = test;
 </script>
diff --git a/tests/wpt/tests/css/css-text/tab-size/tab-min-rendered-width-1.html b/tests/wpt/tests/css/css-text/tab-size/tab-min-rendered-width-1.html
index 6b014260e36..e4cd2afaf1f 100644
--- a/tests/wpt/tests/css/css-text/tab-size/tab-min-rendered-width-1.html
+++ b/tests/wpt/tests/css/css-text/tab-size/tab-min-rendered-width-1.html
@@ -7,9 +7,13 @@
   <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-2">
   <link rel="match" href="tab-min-rendered-width-1-ref.html">
   <meta name="assert" content="If [rendered width of tab would be] less than 0.5ch, then the subsequent tab stop is used instead.">
+  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
   <style>
-    span { background-color: yellow; display: inline-block; letter-spacing: -.1em; }
-    pre { position: absolute; top: 0; }
+    span { background-color: yellow; display: inline-block; }
+    /* Using 16px Ahem means that the 'ch' unit will be evenly divisible by 8 (for the 0.125ch
+       increment used below) without running into floating-point accuracy limitations */
+    pre { position: absolute; top: 0; font: 16px Ahem; }
+    tt { font: 16px monospace; }
   </style>
 </head>
 <body>
@@ -19,7 +23,7 @@
   let pre = document.getElementsByTagName("pre")[0];
   let test = "";
   for (i = 7.0; i <= 8.125; i += 0.125) {
-    test += `<span style="width:${i}ch">${i}ch</span>&#9;foo\n`;
+    test += `<span style="width:${i}ch"><tt>${i}ch</tt></span>&#9;<tt>foo</tt>\n`;
   }
   pre.innerHTML = test;
 </script>
diff --git a/tests/wpt/tests/css/css-text/tab-size/tab-size-integer-005-ref.html b/tests/wpt/tests/css/css-text/tab-size/tab-size-integer-005-ref.html
new file mode 100644
index 00000000000..3e0a04b957f
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/tab-size/tab-size-integer-005-ref.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html>
+<meta charset=utf-8>
+<title>CSS Text Reference</title>
+<link rel="author" title="Jonathan Kew" href="mailto:jkew@mozilla.com">
+<style>
+@font-face {
+    /* this font-family does not support <space>, so should not be used to resolve tab-size */
+    font-family: without-space;
+    src: url("/fonts/CanvasTest-nospace.ttf");
+}
+@font-face {
+    /* the <space> in this font is much narrower than the default/.notdef in "first" */
+    font-family: with-space;
+    src: url("/fonts/GentiumPlus-R.woff");
+}
+div {
+    font: 40px/2 without-space, with-space, sans-serif;
+}
+span {
+    font-family: with-space, sans-serif;
+}
+</style>
+
+<p>Test passes if the two black squares below are vertically aligned.
+
+<div><span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>E</div>
+<div><span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>E</div>
diff --git a/tests/wpt/tests/css/css-text/tab-size/tab-size-integer-005.html b/tests/wpt/tests/css/css-text/tab-size/tab-size-integer-005.html
new file mode 100644
index 00000000000..a58e4ea23a7
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/tab-size/tab-size-integer-005.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<html>
+<meta charset=utf-8>
+<title>CSS Text Test: tab-size</title>
+<link rel="author" title="Jonathan Kew" href="mailto:jkew@mozilla.com">
+<link rel="help" href="http://www.w3.org/TR/css-text-3/#tab-size">
+<link rel="match" href="tab-size-integer-005-ref.html">
+<meta name="assert" content="Integer tab sizes are based on the width of <space> in the block container">
+<style>
+@font-face {
+    /* this font-family does not support <space>, so should not be used to resolve tab-size */
+    font-family: without-space;
+    src: url("/fonts/CanvasTest-nospace.ttf");
+}
+@font-face {
+    /* the <space> in this font is much narrower than the default/.notdef in "first" */
+    font-family: with-space;
+    src: url("/fonts/GentiumPlus-R.woff");
+}
+div {
+    font: 40px/2 without-space, with-space, sans-serif;
+    white-space: pre;
+    tab-size: 8;
+}
+span {
+    font-family: with-space, sans-serif;
+}
+</style>
+
+<p>Test passes if the two black squares below are vertically aligned.
+
+<div><span>&nbsp;</span>&#09;E</div>
+<div><span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>E</div>
diff --git a/tests/wpt/tests/css/css-text/text-autospace/text-autospace-001.html b/tests/wpt/tests/css/css-text/text-autospace/text-autospace-001.html
new file mode 100644
index 00000000000..40a98861ad9
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/text-autospace/text-autospace-001.html
@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#text-autospace-property">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../support/get-char-advances.js"></script>
+<style>
+.test {
+  font-family: Ahem;
+  font-size: 40px;
+}
+.no-autospace {
+  text-autospace: no-autospace;
+}
+</style>
+<div id="container">
+  <div class="test" expect="1,3">国国XX国</div>
+  <div class="test" expect="3">国。XX国</div>
+  <div dir="rtl" class="test" expect="1,3">国国XX国</div>
+  <div dir="rtl" class="test" expect="3">国。XX国</div>
+  <div class="test" expect="1,3"><span>国国11国</span></div>
+</div>
+<script>
+// Compute expected advances from advances without `text-autospace` and the
+// `expect` attribute.
+const container = document.getElementById('container');
+container.classList.add('no-autospace');
+const tests = [];
+for (const element of document.getElementsByClassName('test')) {
+  const em = parseFloat(getComputedStyle(element).fontSize);
+  const spacing = em / 8;
+  const advances = getCharAdvances(element);
+  const expect = element.getAttribute('expect').split(',').map(i => parseInt(i));
+  for (const i of expect) {
+    advances[i] += spacing;
+  }
+  tests.push({element: element, advances: advances});
+}
+
+// Apply `text-autospace` and compare the actual advances.
+container.classList.remove('no-autospace');
+for (const t of tests) {
+  const advances = getCharAdvances(t.element);
+  test(() => {
+    assert_array_equals(advances, t.advances);
+  })
+}
+</script>
diff --git a/tests/wpt/tests/css/css-text/text-autospace/text-autospace-break-001-ref.html b/tests/wpt/tests/css/css-text/text-autospace/text-autospace-break-001-ref.html
new file mode 100644
index 00000000000..80c82714c3a
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/text-autospace/text-autospace-break-001-ref.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
+<style>
+.test-container {
+  font-family: Ahem;
+  font-size: 40px;
+  width: 4.5em;
+}
+.test > span {
+  outline: 1px solid blue;
+}
+</style>
+<div class="test-container">
+  <div class="test"><span>国国国国<br>X国</span></div>
+  <div class="test"><span>国国国国<br>1国</span></div>
+  <div class="test"><span>XXXX<br>国X</span></div>
+  <div class="test"><span>1111<br>国1</span></div>
+</div>
diff --git a/tests/wpt/tests/css/css-text/text-autospace/text-autospace-break-001.html b/tests/wpt/tests/css/css-text/text-autospace/text-autospace-break-001.html
new file mode 100644
index 00000000000..337d3c7624f
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/text-autospace/text-autospace-break-001.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#text-autospace-property">
+<link rel="match" href="text-autospace-break-001-ref.html">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
+<style>
+.test-container {
+  font-family: Ahem;
+  font-size: 40px;
+  width: 4.5em;
+}
+.test > span {
+  outline: 1px solid blue;
+}
+</style>
+<div class="test-container">
+  <div class="test"><span>国国国国X国</span></div>
+  <div class="test"><span>国国国国1国</span></div>
+  <div class="test"><span>XXXX国X</span></div>
+  <div class="test"><span>1111国1</span></div>
+</div>
diff --git a/tests/wpt/tests/css/css-text/text-autospace/text-autospace-dynamic-001.html b/tests/wpt/tests/css/css-text/text-autospace/text-autospace-dynamic-001.html
new file mode 100644
index 00000000000..db718eca8da
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/text-autospace/text-autospace-dynamic-001.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#text-autospace-property">
+<link rel="match" href="text-autospace-no-001-ref.html">
+<link rel="mismatch" href="text-autospace-no-001-mismatch-ref.html">
+<style>
+.no-as { text-autospace: no-autospace; }
+</style>
+<div class="test no-as">国国AA国国AA国国</div>
+<div class="test">国国AA国国AA国国</div>
+<script>
+document.body.offsetTop;  // Force layout.
+for (const element of document.getElementsByClassName('test')) {
+  element.classList.toggle('no-as');
+}
+</script>
diff --git a/tests/wpt/tests/css/css-text/text-autospace/text-autospace-dynamic-text-001-ref.html b/tests/wpt/tests/css/css-text/text-autospace/text-autospace-dynamic-text-001-ref.html
new file mode 100644
index 00000000000..d26fae09b03
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/text-autospace/text-autospace-dynamic-text-001-ref.html
@@ -0,0 +1,2 @@
+<!DOCTYPE html>
+<div id="target">国国AA国国AA国々</div>
diff --git a/tests/wpt/tests/css/css-text/text-autospace/text-autospace-dynamic-text-001.html b/tests/wpt/tests/css/css-text/text-autospace/text-autospace-dynamic-text-001.html
new file mode 100644
index 00000000000..dfde20a265a
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/text-autospace/text-autospace-dynamic-text-001.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#text-autospace-property">
+<link rel="help" href="text-autospace-dynamic-text-001-ref.html">
+<div id="target">国国</div>
+<script>
+const target_text = document.getElementById('target').firstChild;
+for (const ch of 'AA国国AA国国') {
+  document.body.offsetTop;  // Force layout.
+  target_text.appendData(ch);
+}
+</script>
diff --git a/tests/wpt/tests/css/css-text/text-autospace/text-autospace-dynamic-text-002.html b/tests/wpt/tests/css/css-text/text-autospace/text-autospace-dynamic-text-002.html
new file mode 100644
index 00000000000..ffc3d907ee5
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/text-autospace/text-autospace-dynamic-text-002.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#text-autospace-property">
+<link rel="help" href="text-autospace-dynamic-text-001-ref.html">
+<div id="target">国国国国</div>
+<script>
+const target_text = document.getElementById('target').firstChild;
+document.body.offsetTop;  // Force layout.
+target_text.insertData(2, 'AA国国AA');
+</script>
diff --git a/tests/wpt/tests/css/css-text/text-autospace/text-autospace-dynamic-text-003.html b/tests/wpt/tests/css/css-text/text-autospace/text-autospace-dynamic-text-003.html
new file mode 100644
index 00000000000..cf2237d48ef
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/text-autospace/text-autospace-dynamic-text-003.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#text-autospace-property">
+<link rel="help" href="text-autospace-dynamic-text-001-ref.html">
+<div id="target">国国国国国</div>
+<script>
+const target_text = document.getElementById('target').firstChild;
+document.body.offsetTop;  // Force layout.
+target_text.replaceData(2, 1, 'AA国国AA');
+</script>
diff --git a/tests/wpt/tests/css/css-text/text-autospace/text-autospace-dynamic-text-004.html b/tests/wpt/tests/css/css-text/text-autospace/text-autospace-dynamic-text-004.html
new file mode 100644
index 00000000000..c1057fc9005
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/text-autospace/text-autospace-dynamic-text-004.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#text-autospace-property">
+<link rel="help" href="text-autospace-dynamic-text-001-ref.html">
+<div id="target">国国AAAA国国AAAA国国</div>
+<script>
+const target_text = document.getElementById('target').firstChild;
+document.body.offsetTop;  // Force layout.
+target_text.deleteData(2, 2);
+document.body.offsetTop;  // Force layout.
+target_text.deleteData(6, 2);
+</script>
diff --git a/tests/wpt/tests/css/css-text/text-autospace/text-autospace-first-line-001.html b/tests/wpt/tests/css/css-text/text-autospace/text-autospace-first-line-001.html
new file mode 100644
index 00000000000..7294856b8f6
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/text-autospace/text-autospace-first-line-001.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#text-autospace-property">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../support/get-char-advances.js"></script>
+<style>
+.test {
+  font-family: Ahem;
+  font-size: 40px;
+}
+.first-line::first-line {
+  font-size: 200%;
+}
+</style>
+<div id="container">
+  <div id="test1" class="test first-line">国国XX国<br>国国XX国</div>
+</div>
+<script>
+test(() => {
+  const advances = getCharAdvances(test1);
+  assert_array_equals(advances, [80, 90, 80, 90, 80, 40, 45, 40, 45, 40]);
+})
+</script>
diff --git a/tests/wpt/tests/css/css-text/text-autospace/text-autospace-ligature-001.html b/tests/wpt/tests/css/css-text/text-autospace/text-autospace-ligature-001.html
new file mode 100644
index 00000000000..0d431f65d6d
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/text-autospace/text-autospace-ligature-001.html
@@ -0,0 +1,87 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#text-autospace-property">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+@font-face {
+  font-family: ligature-font;
+  src: url('../../css-fonts/support/fonts/Lato-Medium-Liga.ttf');
+}
+#test-container {
+  font-family: ligature-font;
+  font-size: 40px;
+}
+.base {
+  text-autospace: no-autospace;
+}
+</style>
+<div id="test-container">
+  <div id="test1">国fi</div>
+  <div id="test2">fi国</div>
+  <div id="test3">国fi国</div>
+</div>
+<script>
+function getAdvance(node, start, end) {
+  const range = document.createRange();
+  range.setStart(node, start);
+  range.setEnd(node, end);
+  const bounds = range.getBoundingClientRect();
+  return bounds.width;
+}
+
+class AutoSpaceTest {
+  constructor(id) {
+    const element = document.getElementById(id);
+
+    // Create a base element with the `base` class.
+    const baseElement = element.cloneNode(true);
+    baseElement.removeAttribute('id');
+    baseElement.classList.add('base');
+    element.after(baseElement);
+
+    this.element = element;
+    this.baseElement = baseElement;
+  }
+
+  assert(start, end, spacing) {
+    const node = this.element.firstChild;
+    const advance = getAdvance(node, start, end);
+    const baseNode = this.baseElement.firstChild;
+    const baseAdvance = getAdvance(baseNode, start, end);
+    assert_approx_equals(advance, baseAdvance + spacing, 0.001);
+  }
+}
+
+const test1 = new AutoSpaceTest('test1');
+const test2 = new AutoSpaceTest('test2');
+const test3 = new AutoSpaceTest('test3');
+
+function run() {
+  if (!CSS.supports('text-autospace', 'no-autospace')) {
+    test(() => assert_true(false), 'text-autospace not implemented');
+    return;
+  }
+
+  // The `getBoundingClientRect()` for the middle of a ligature isn't
+  // well-defined. Ensure ligatures are measured as a range.
+  const spacing = 5;
+  test(() => test1.assert(0, 1, spacing));
+  test(() => test1.assert(1, 3, 0));
+
+  test(() => test2.assert(0, 2, spacing));
+  test(() => test2.assert(2, 3, 0));
+
+  test(() => test3.assert(0, 1, spacing));
+  test(() => test3.assert(1, 3, spacing));
+  test(() => test3.assert(3, 4, 0));
+}
+
+setup({explicit_done: true});
+window.addEventListener('load', () => {
+  document.fonts.ready.then(() => {
+    run();
+    done();
+  });
+});
+</script>
diff --git a/tests/wpt/tests/css/css-text/text-autospace/text-autospace-no-001-mismatch-ref.html b/tests/wpt/tests/css/css-text/text-autospace/text-autospace-no-001-mismatch-ref.html
new file mode 100644
index 00000000000..b249fd63c67
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/text-autospace/text-autospace-no-001-mismatch-ref.html
@@ -0,0 +1,4 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<div>国国AA国国AA国国</div>
+<div>国国AA国国AA国国</div>
diff --git a/tests/wpt/tests/css/css-text/text-autospace/text-autospace-no-001-ref.html b/tests/wpt/tests/css/css-text/text-autospace/text-autospace-no-001-ref.html
new file mode 100644
index 00000000000..e7064057723
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/text-autospace/text-autospace-no-001-ref.html
@@ -0,0 +1,4 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<div>国国AA国国AA国国</div>
+<div>国国&ZeroWidthSpace;AA&ZeroWidthSpace;国国&ZeroWidthSpace;AA&ZeroWidthSpace;国国</div>
diff --git a/tests/wpt/tests/css/css-text/text-autospace/text-autospace-no-001.html b/tests/wpt/tests/css/css-text/text-autospace/text-autospace-no-001.html
new file mode 100644
index 00000000000..6b5fd6132d8
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/text-autospace/text-autospace-no-001.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#text-autospace-property">
+<link rel="match" href="text-autospace-no-001-ref.html">
+<link rel="mismatch" href="text-autospace-no-001-mismatch-ref.html">
+<style>
+.no-as { text-autospace: no-autospace; }
+</style>
+<div>国国AA国国AA国国</div>
+<div class="no-as">国国AA国国AA国国</div>
diff --git a/tests/wpt/tests/css/css-text/text-autospace/text-autospace-vertical-combine-001-ref.html b/tests/wpt/tests/css/css-text/text-autospace/text-autospace-vertical-combine-001-ref.html
new file mode 100644
index 00000000000..36c1cb45a1e
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/text-autospace/text-autospace-vertical-combine-001-ref.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<style>
+#container {
+  writing-mode: vertical-rl;
+  font-size: 20px;
+}
+.tcy {
+  text-combine-upright: all;
+}
+.no-autospace {
+  text-autospace: no-autospace;
+}
+</style>
+<div id="container">
+  <div class="no-autospace">国<span class="tcy">XX</span>国</div>
+  <div class="no-autospace">国<span class="tcy">11</span>国</div>
+</div>
diff --git a/tests/wpt/tests/css/css-text/text-autospace/text-autospace-vertical-combine-001.html b/tests/wpt/tests/css/css-text/text-autospace/text-autospace-vertical-combine-001.html
new file mode 100644
index 00000000000..bed306e1597
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/text-autospace/text-autospace-vertical-combine-001.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#text-autospace-property">
+<link rel="match" href="text-autospace-vertical-combine-001-ref.html">
+<style>
+#container {
+  writing-mode: vertical-rl;
+  font-size: 20px;
+}
+.tcy {
+  text-combine-upright: all;
+}
+</style>
+<div id="container">
+  <div>国<span class="tcy">XX</span>国</div>
+  <div>国<span class="tcy">11</span>国</div>
+</div>
diff --git a/tests/wpt/tests/css/css-text/text-autospace/text-autospace-vertical-upright-001-ref.html b/tests/wpt/tests/css/css-text/text-autospace/text-autospace-vertical-upright-001-ref.html
new file mode 100644
index 00000000000..1c9caec112a
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/text-autospace/text-autospace-vertical-upright-001-ref.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<style>
+#container {
+  writing-mode: vertical-rl;
+  font-size: 20px;
+}
+.upright {
+  text-orientation: upright;
+}
+.no-autospace {
+  text-autospace: no-autospace;
+}
+</style>
+<div id="container">
+  <div class="upright no-autospace">国X国</div>
+  <div class="upright no-autospace">国1国</div>
+  <div class="no-autospace">国<span class="upright">X</span>国</div>
+  <div class="no-autospace">国<span class="upright">1</span>国</div>
+</div>
diff --git a/tests/wpt/tests/css/css-text/text-autospace/text-autospace-vertical-upright-001.html b/tests/wpt/tests/css/css-text/text-autospace/text-autospace-vertical-upright-001.html
new file mode 100644
index 00000000000..21d454e7133
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/text-autospace/text-autospace-vertical-upright-001.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#text-autospace-property">
+<link rel="match" href="text-autospace-vertical-upright-001-ref.html">
+<style>
+#container {
+  writing-mode: vertical-rl;
+  font-size: 20px;
+}
+.upright {
+  text-orientation: upright;
+}
+</style>
+<div id="container">
+  <div class="upright">国X国</div>
+  <div class="upright">国1国</div>
+  <div>国<span class="upright">X</span>国</div>
+  <div>国<span class="upright">1</span>国</div>
+</div>
diff --git a/tests/wpt/tests/css/css-text/text-indent/text-indent-overflow.html b/tests/wpt/tests/css/css-text/text-indent/text-indent-overflow.html
index c8678bf8aa8..faefbf628f8 100644
--- a/tests/wpt/tests/css/css-text/text-indent/text-indent-overflow.html
+++ b/tests/wpt/tests/css/css-text/text-indent/text-indent-overflow.html
@@ -4,7 +4,6 @@
 <link rel="author" title="Martin Robinson" href="mailto:mrobinson@igalia.com">
 <link rel="help" href="https://drafts.csswg.org/css-text-3/#text-indent-property">
 <link rel="match" href="reference/text-indent-overflow-ref.html">
-<meta name="assert" content="Percentages in text-indent refer to width of the element's content box">
 <style>
 .container {
   border: solid;
diff --git a/tests/wpt/tests/css/css-text/text-indent/text-indent-text-align-end.html b/tests/wpt/tests/css/css-text/text-indent/text-indent-text-align-end.html
index df37463ae7b..6afda2b5ab4 100644
--- a/tests/wpt/tests/css/css-text/text-indent/text-indent-text-align-end.html
+++ b/tests/wpt/tests/css/css-text/text-indent/text-indent-text-align-end.html
@@ -4,7 +4,6 @@
 <link rel="author" title="Martin Robinson" href="mailto:mrobinson@igalia.com">
 <link rel="help" href="https://drafts.csswg.org/css-text-3/#text-indent-property">
 <link rel="match" href="reference/text-indent-text-align-end-ref.html">
-<meta name="assert" content="Percentages in text-indent refer to width of the element's content box">
 <style>
 .container {
   border: solid;
diff --git a/tests/wpt/tests/css/css-text/text-spacing-trim/reference/text-spacing-trim-001-ref.html b/tests/wpt/tests/css/css-text/text-spacing-trim/reference/text-spacing-trim-001-ref.html
new file mode 100644
index 00000000000..d49abab3808
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/text-spacing-trim/reference/text-spacing-trim-001-ref.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<script src="support/variant-class.js"></script>
+<style>
+@font-face {
+  font-family: halt-font;
+  src: url('/fonts/noto/cjk/NotoSansCJKjp-Regular-subset-halt.otf');
+}
+#container {
+  font-family: halt-font;
+  font-size: 20px;
+  text-spacing-trim: space-all;
+}
+.vrl {
+  writing-mode: vertical-rl;
+}
+halt {
+  font-feature-settings: 'halt' 1, 'vhal' 1;
+}
+</style>
+<div id="container">
+  <!-- Open + Open/Close/Middle -->
+  <div>国（<halt>（</halt>国</div>
+  <div>国（<halt>（（</halt>国</div>
+  <div>国（）国</div>
+  <div>国（・国</div>
+  <div>国（　国</div>
+  <!-- Close + Open/Close/Middle -->
+  <div>国）<halt>（</halt>国</div>
+  <div>国<halt>）</halt>）国</div>
+  <div>国<halt>））</halt>）国</div>
+  <div>国<halt>）</halt>・国</div>
+  <div>国<halt>）</halt>　国</div>
+  <!-- Middle + Open/Middle/Close -->
+  <div>国・<halt>（</halt>国</div>
+  <div>国・・国</div>
+  <div>国・）国</div>
+  <div>国　<halt>（</halt>国</div>
+  <div>国　　国</div>
+  <div>国　）国</div>
+</div>
diff --git a/tests/wpt/tests/css/css-text/text-spacing-trim/reference/text-spacing-trim-colon-001-ref.html b/tests/wpt/tests/css/css-text/text-spacing-trim/reference/text-spacing-trim-colon-001-ref.html
new file mode 100644
index 00000000000..f36743fd1c6
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/text-spacing-trim/reference/text-spacing-trim-colon-001-ref.html
@@ -0,0 +1,121 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<script src="support/variant-class.js"></script>
+<style>
+@font-face {
+  font-family: halt-font;
+  src: url('/fonts/noto/cjk/NotoSansCJKjp-Regular-subset-halt.otf');
+}
+#container {
+  font-family: halt-font;
+  font-size: 20px;
+  position: relative;
+  text-spacing-trim: space-all;
+}
+#container > div {
+  position: absolute;
+}
+:root:not(.vrl) .col1 {
+  left: 6em;
+}
+:root:not(.vrl) .col2 {
+  left: 12em;
+}
+:root.vrl {
+  writing-mode: vertical-rl;
+}
+:root.vrl .col1 {
+  top: 6em;
+}
+:root.vrl div.col2 {
+  top: 12em;
+}
+halt {
+  font-feature-settings: 'halt' 1, 'vhal' 1;
+}
+novhal halt {
+  font-feature-settings: 'halt' 1;
+}
+</style>
+<div id="container">
+  <div lang="ja">
+    <!-- In Adobe's convention, colon rotates, while semicolon is upright. -->
+    <!-- In this case, colon can be either middle or other. -->
+    <!-- Colon + Open/Close/Middle -->
+    <div>国：<halt>（</halt>国</div>
+    <div>国：）国</div>
+    <div>国：・国</div>
+    <div>国：　国</div>
+    <!-- Open/Close/Middle + Colon -->
+    <div>国（：国</div>
+    <div>国<halt>）</halt>：国</div>
+    <div>国・：国</div>
+    <div>国　：国</div>
+    <novhal>
+      <!-- Semicolon + Open/Close/Middle -->
+      <div>国；<halt>（</halt>国</div>
+      <div>国；）国</div>
+      <div>国；・国</div>
+      <div>国；　国</div>
+      <!-- Open/Close/Middle + Semicolon -->
+      <div>国（；国</div>
+      <div>国<halt>）</halt>；国</div>
+      <div>国・；国</div>
+      <div>国　；国</div>
+    </novhal>
+  </div>
+
+  <!-- The same content with "zh-hans". -->
+  <div lang="zh-hans" class="col1">
+    <!-- In Adobe's convention, both colon and semicolon are upright. -->
+    <novhal>
+      <!-- Colon + Open/Close/Middle -->
+      <div>国：<halt>（</halt>国</div>
+      <div>国<halt>：</halt>）国</div>
+      <div>国<halt>：</halt>・国</div>
+      <div>国<halt>：</halt>　国</div>
+      <!-- Open/Close/Middle + Colon -->
+      <div>国（：国</div>
+      <div>国<halt>）</halt>：国</div>
+      <div>国・：国</div>
+      <div>国　：国</div>
+      <!-- Semicolon + Open/Close/Middle -->
+      <div>国；<halt>（</halt>国</div>
+      <div>国<halt>；</halt>）国</div>
+      <div>国<halt>；</halt>・国</div>
+      <div>国<halt>；</halt>　国</div>
+      <!-- Open/Close/Middle + Semicolon -->
+      <div>国（；国</div>
+      <div>国<halt>）</halt>；国</div>
+      <div>国・；国</div>
+      <div>国　；国</div>
+    </novhal>
+  </div>
+
+  <!-- The same content with "zh-hant". -->
+  <div lang="zh-hant" class="col2">
+    <!-- In Adobe's convention, both colon and semicolon are upright. -->
+    <novhal>
+      <!-- Colon + Open/Close/Middle -->
+      <div>国：<halt>（</halt>国</div>
+      <div>国：）国</div>
+      <div>国：・国</div>
+      <div>国：　国</div>
+      <!-- Open/Close/Middle + Colon -->
+      <div>国（：国</div>
+      <div>国<halt>）</halt>：国</div>
+      <div>国・：国</div>
+      <div>国　：国</div>
+      <!-- Semicolon + Open/Close/Middle -->
+      <div>国；<halt>（</halt>国</div>
+      <div>国；）国</div>
+      <div>国；・国</div>
+      <div>国；　国</div>
+      <!-- Open/Close/Middle + Semicolon -->
+      <div>国（；国</div>
+      <div>国<halt>）</halt>；国</div>
+      <div>国・；国</div>
+      <div>国　；国</div>
+    </novhal>
+  </div>
+</div>
diff --git a/tests/wpt/tests/css/css-text/text-spacing-trim/reference/text-spacing-trim-dot-001-ref.html b/tests/wpt/tests/css/css-text/text-spacing-trim/reference/text-spacing-trim-dot-001-ref.html
new file mode 100644
index 00000000000..acbf37f2506
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/text-spacing-trim/reference/text-spacing-trim-dot-001-ref.html
@@ -0,0 +1,78 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<script src="support/variant-class.js"></script>
+<style>
+@font-face {
+  font-family: halt-font;
+  src: url('/fonts/noto/cjk/NotoSansCJKjp-Regular-subset-halt.otf');
+}
+#container {
+  font-family: halt-font;
+  font-size: 20px;
+  position: relative;
+  text-spacing-trim: space-all;
+}
+#container > div {
+  position: absolute;
+}
+:root:not(.vrl) .col1 {
+  left: 6em;
+}
+:root:not(.vrl) .col2 {
+  left: 12em;
+}
+:root.vrl {
+  writing-mode: vertical-rl;
+}
+:root.vrl .col1 {
+  top: 6em;
+}
+:root.vrl div.col2 {
+  top: 12em;
+}
+halt {
+  font-feature-settings: 'halt' 1, 'vhal' 1;
+}
+</style>
+<div id="container">
+  <div lang="ja">
+    <!-- Dot + Open/Close/Middle -->
+    <div>国。<halt>（</halt>国</div>
+    <div>国<halt>。</halt>）国</div>
+    <div>国<halt>。</halt>・国</div>
+    <div>国<halt>。</halt>　国</div>
+    <!-- Open/Close/Middle + Dot -->
+    <div>国（。国</div>
+    <div>国<halt>）</halt>。国</div>
+    <div>国・。国</div>
+    <div>国　。国</div>
+  </div>
+
+  <!-- The same content with "zh-hans". -->
+  <div lang="zh-hans" class="col1">
+    <!-- Dot + Open/Close/Middle -->
+    <div>国。<halt>（</halt>国</div>
+    <div>国<halt>。</halt>）国</div>
+    <div>国<halt>。</halt>・国</div>
+    <div>国<halt>。</halt>　国</div>
+    <!-- Open/Close/Middle + Dot -->
+    <div>国（。国</div>
+    <div>国<halt>）</halt>。国</div>
+    <div>国・。国</div>
+    <div>国　。国</div>
+  </div>
+
+  <!-- The same content with "zh-hant". -->
+  <div lang="zh-hant" class="col2">
+    <!-- Dot + Open/Close/Middle -->
+    <div>国。<halt>（</halt>国</div>
+    <div>国。）国</div>
+    <div>国。・国</div>
+    <div>国。　国</div>
+    <!-- Open/Close/Middle + Dot -->
+    <div>国（。国</div>
+    <div>国<halt>）</halt>。国</div>
+    <div>国・。国</div>
+    <div>国　。国</div>
+  </div>
+</div>
diff --git a/tests/wpt/tests/css/css-text/text-spacing-trim/reference/text-spacing-trim-trim-all-001-ref.html b/tests/wpt/tests/css/css-text/text-spacing-trim/reference/text-spacing-trim-trim-all-001-ref.html
new file mode 100644
index 00000000000..d541fcc5f81
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/text-spacing-trim/reference/text-spacing-trim-trim-all-001-ref.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<script src="support/variant-class.js"></script>
+<style>
+@font-face {
+  font-family: halt-font;
+  src: url('/fonts/noto/cjk/NotoSansCJKjp-Regular-subset-halt.otf');
+}
+#container {
+  font-family: halt-font;
+  font-size: 20px;
+  text-spacing-trim: space-all;
+}
+.vrl {
+  writing-mode: vertical-rl;
+}
+halt {
+  font-feature-settings: 'halt' 1;
+}
+.vrl halt {
+  font-feature-settings: 'halt' 1, 'vhal' 1;
+}
+</style>
+<div id="container">
+  <div>国<halt>（</halt>国</div>
+  <div>国<halt>）</halt>国</div>
+  <div>国<halt>、</halt>国</div>
+  <div>国<halt>・</halt>国</div>
+  <div>国<halt>。</halt>国</div>
+  <div>国<halt>「</halt>国</div>
+  <div>国<halt>」</halt>国</div>
+</div>
diff --git a/tests/wpt/tests/css/css-text/text-spacing-trim/support/variant-class.js b/tests/wpt/tests/css/css-text/text-spacing-trim/support/variant-class.js
new file mode 100644
index 00000000000..d1ca547cfd7
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/text-spacing-trim/support/variant-class.js
@@ -0,0 +1,13 @@
+'use strict';
+
+/**
+ * Add `class` search params to the `class` attribute of the root element.
+ */
+if (window.location.search) {
+  const params = new URLSearchParams(window.location.search);
+  if (params.has('class')) {
+    const values = params.getAll('class')
+                         .flatMap(value => value.split(','));
+    document.documentElement.classList.add(...values);
+  }
+}
diff --git a/tests/wpt/tests/css/css-text/text-spacing-trim/text-spacing-trim-001.html b/tests/wpt/tests/css/css-text/text-spacing-trim/text-spacing-trim-001.html
new file mode 100644
index 00000000000..28f11c62261
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/text-spacing-trim/text-spacing-trim-001.html
@@ -0,0 +1,50 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#text-spacing-trim-property">
+<link rel="match" href="reference/text-spacing-trim-001-ref.html">
+<meta name="variant" content="?class=halt,htb">
+<meta name="variant" content="?class=chws,htb">
+<meta name="variant" content="?class=halt,vrl">
+<meta name="variant" content="?class=chws,vrl">
+<script src="support/variant-class.js"></script>
+<style>
+@font-face {
+  font-family: halt-font;
+  src: url('/fonts/noto/cjk/NotoSansCJKjp-Regular-subset-halt.otf');
+}
+@font-face {
+  font-family: chws-font;
+  src: url('/fonts/noto/cjk/NotoSansCJKjp-Regular-subset-chws.otf');
+}
+#container {
+  font-family: halt-font;
+  font-size: 20px;
+}
+.chws #container {
+  font-family: chws-font;
+}
+.vrl {
+  writing-mode: vertical-rl;
+}
+</style>
+<div id="container">
+  <!-- Open + Open/Close/Middle -->
+  <div>国（（国</div>
+  <div>国（（（国</div>
+  <div>国（）国</div>
+  <div>国（・国</div>
+  <div>国（　国</div>
+  <!-- Close + Open/Close/Middle -->
+  <div>国）（国</div>
+  <div>国））国</div>
+  <div>国）））国</div>
+  <div>国）・国</div>
+  <div>国）　国</div>
+  <!-- Middle + Open/Middle/Close -->
+  <div>国・（国</div>
+  <div>国・・国</div>
+  <div>国・）国</div>
+  <div>国　（国</div>
+  <div>国　　国</div>
+  <div>国　）国</div>
+</div>
diff --git a/tests/wpt/tests/css/css-text/text-spacing-trim/text-spacing-trim-colon-001.html b/tests/wpt/tests/css/css-text/text-spacing-trim/text-spacing-trim-colon-001.html
new file mode 100644
index 00000000000..31df6093b95
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/text-spacing-trim/text-spacing-trim-colon-001.html
@@ -0,0 +1,117 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#text-spacing-trim-property">
+<link rel="match" href="reference/text-spacing-trim-colon-001-ref.html">
+<meta name="variant" content="?class=halt,htb">
+<meta name="variant" content="?class=chws,htb">
+<meta name="variant" content="?class=halt,vrl">
+<meta name="variant" content="?class=chws,vrl">
+<script src="support/variant-class.js"></script>
+<style>
+@font-face {
+  font-family: halt-font;
+  src: url('/fonts/noto/cjk/NotoSansCJKjp-Regular-subset-halt.otf');
+}
+@font-face {
+  font-family: chws-font;
+  src: url('/fonts/noto/cjk/NotoSansCJKjp-Regular-subset-chws.otf');
+}
+#container {
+  font-family: halt-font;
+  font-size: 20px;
+  position: relative;
+}
+.chws #container {
+  font-family: chws-font;
+}
+#container > div {
+  position: absolute;
+}
+:root:not(.vrl) .col1 {
+  left: 6em;
+}
+:root:not(.vrl) .col2 {
+  left: 12em;
+}
+:root.vrl {
+  writing-mode: vertical-rl;
+}
+:root.vrl .col1 {
+  top: 6em;
+}
+:root.vrl div.col2 {
+  top: 12em;
+}
+</style>
+<div id="container">
+  <div lang="ja">
+    <!-- Colon + Open/Close/Middle -->
+    <div>国：（国</div>
+    <div>国：）国</div>
+    <div>国：・国</div>
+    <div>国：　国</div>
+    <!-- Open/Close/Middle + Colon -->
+    <div>国（：国</div>
+    <div>国）：国</div>
+    <div>国・：国</div>
+    <div>国　：国</div>
+    <!-- Semicolon + Open/Close/Middle -->
+    <div>国；（国</div>
+    <div>国；）国</div>
+    <div>国；・国</div>
+    <div>国；　国</div>
+    <!-- Open/Close/Middle + Semicolon -->
+    <div>国（；国</div>
+    <div>国）；国</div>
+    <div>国・；国</div>
+    <div>国　；国</div>
+  </div>
+
+  <!-- The same content with "zh-hans". -->
+  <div lang="zh-hans" class="col1">
+    <!-- Colon + Open/Close/Middle -->
+    <div>国：（国</div>
+    <div>国：）国</div>
+    <div>国：・国</div>
+    <div>国：　国</div>
+    <!-- Open/Close/Middle + Colon -->
+    <div>国（：国</div>
+    <div>国）：国</div>
+    <div>国・：国</div>
+    <div>国　：国</div>
+    <!-- Semicolon + Open/Close/Middle -->
+    <div>国；（国</div>
+    <div>国；）国</div>
+    <div>国；・国</div>
+    <div>国；　国</div>
+    <!-- Open/Close/Middle + Semicolon -->
+    <div>国（；国</div>
+    <div>国）；国</div>
+    <div>国・；国</div>
+    <div>国　；国</div>
+  </div>
+
+  <!-- The same content with "zh-hant". -->
+  <div lang="zh-hant" class="col2">
+    <!-- Colon + Open/Close/Middle -->
+    <div>国：（国</div>
+    <div>国：）国</div>
+    <div>国：・国</div>
+    <div>国：　国</div>
+    <!-- Open/Close/Middle + Colon -->
+    <div>国（：国</div>
+    <div>国）：国</div>
+    <div>国・：国</div>
+    <div>国　：国</div>
+    <!-- Semicolon + Open/Close/Middle -->
+    <div>国；（国</div>
+    <div>国；）国</div>
+    <div>国；・国</div>
+    <div>国；　国</div>
+    <!-- Open/Close/Middle + Semicolon -->
+    <div>国（；国</div>
+    <div>国）；国</div>
+    <div>国・；国</div>
+    <div>国　；国</div>
+  </div>
+</div>
diff --git a/tests/wpt/tests/css/css-text/text-spacing-trim/text-spacing-trim-combinations-001.html b/tests/wpt/tests/css/css-text/text-spacing-trim/text-spacing-trim-combinations-001.html
new file mode 100644
index 00000000000..4b49e64323a
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/text-spacing-trim/text-spacing-trim-combinations-001.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#text-spacing-trim-property">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../support/get-char-advances.js"></script>
+<style>
+#container {
+  /* This test prefers fonts with the `halt` feature. */
+  font-family: 'Yu Gothic', 'Noto Sans CJK JP';
+  font-size: 10px;
+}
+</style>
+<div id="container">
+  <div expect="FFHF">国（（国</div>
+  <div expect="FFHF">国・（国</div>
+  <div expect="FFHF">国）（国</div>
+  <div expect="FFHF">国　（国</div>
+  <div expect="FHFF">国））国</div>
+  <div expect="FHFF">国）・国</div>
+  <div expect="FHFF">国）　国</div>
+  <div expect="FFHHF">国（（（国</div>
+  <div expect="FHHFF">国）））国</div>
+</div>
+<script>
+const range = document.createRange();
+
+function assertNode(element, expect) {
+  const advances = getCharAdvances(element);
+  const results = advances.map(advance => advance >= 8 ? 'F' : 'H');
+  const result = results.join('');
+  assert_equals(result, expect);
+}
+
+for (const element of document.querySelectorAll('div[expect]')) {
+  test(() => {
+    let expect = element.getAttribute('expect');
+    assertNode(element, expect);
+  }, `"${element.innerHTML}"`);
+}
+</script>
diff --git a/tests/wpt/tests/css/css-text/text-spacing-trim/text-spacing-trim-dot-001.html b/tests/wpt/tests/css/css-text/text-spacing-trim/text-spacing-trim-dot-001.html
new file mode 100644
index 00000000000..4ce1e047771
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/text-spacing-trim/text-spacing-trim-dot-001.html
@@ -0,0 +1,87 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#text-spacing-trim-property">
+<link rel="match" href="reference/text-spacing-trim-dot-001-ref.html">
+<meta name="variant" content="?class=halt,htb">
+<meta name="variant" content="?class=chws,htb">
+<meta name="variant" content="?class=halt,vrl">
+<meta name="variant" content="?class=chws,vrl">
+<script src="support/variant-class.js"></script>
+<style>
+@font-face {
+  font-family: halt-font;
+  src: url('/fonts/noto/cjk/NotoSansCJKjp-Regular-subset-halt.otf');
+}
+@font-face {
+  font-family: chws-font;
+  src: url('/fonts/noto/cjk/NotoSansCJKjp-Regular-subset-chws.otf');
+}
+#container {
+  font-family: halt-font;
+  font-size: 20px;
+  position: relative;
+}
+.chws #container {
+  font-family: chws-font;
+}
+#container > div {
+  position: absolute;
+}
+:root:not(.vrl) .col1 {
+  left: 6em;
+}
+:root:not(.vrl) .col2 {
+  left: 12em;
+}
+:root.vrl {
+  writing-mode: vertical-rl;
+}
+:root.vrl .col1 {
+  top: 6em;
+}
+:root.vrl div.col2 {
+  top: 12em;
+}
+</style>
+<div id="container">
+  <div lang="ja">
+    <!-- Dot + Open/Close/Middle -->
+    <div>国。（国</div>
+    <div>国。）国</div>
+    <div>国。・国</div>
+    <div>国。　国</div>
+    <!-- Open/Close/Middle + Dot -->
+    <div>国（。国</div>
+    <div>国）。国</div>
+    <div>国・。国</div>
+    <div>国　。国</div>
+  </div>
+
+  <!-- The same content with "zh-hans". -->
+  <div lang="zh-hans" class="col1">
+    <!-- Dot + Open/Close/Middle -->
+    <div>国。（国</div>
+    <div>国。）国</div>
+    <div>国。・国</div>
+    <div>国。　国</div>
+    <!-- Open/Close/Middle + Dot -->
+    <div>国（。国</div>
+    <div>国）。国</div>
+    <div>国・。国</div>
+    <div>国　。国</div>
+  </div>
+
+  <!-- The same content with "zh-hant". -->
+  <div lang="zh-hant" class="col2">
+    <!-- Dot + Open/Close/Middle -->
+    <div>国。（国</div>
+    <div>国。）国</div>
+    <div>国。・国</div>
+    <div>国。　国</div>
+    <!-- Open/Close/Middle + Dot -->
+    <div>国（。国</div>
+    <div>国）。国</div>
+    <div>国・。国</div>
+    <div>国　。国</div>
+  </div>
+</div>
diff --git a/tests/wpt/tests/css/css-text/text-spacing-trim/text-spacing-trim-dynamic-001.html b/tests/wpt/tests/css/css-text/text-spacing-trim/text-spacing-trim-dynamic-001.html
new file mode 100644
index 00000000000..3fc949efd1c
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/text-spacing-trim/text-spacing-trim-dynamic-001.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#text-spacing-trim-property">
+<link rel="match" href="text-spacing-trim-space-all-001-ref.html">
+<meta name="variant" content="?class=halt">
+<meta name="variant" content="?class=chws">
+<script src="support/variant-class.js"></script>
+<style>
+@font-face {
+  font-family: halt-font;
+  src: url('/fonts/noto/cjk/NotoSansCJKjp-Regular-subset-halt.otf');
+}
+@font-face {
+  font-family: chws-font;
+  src: url('/fonts/noto/cjk/NotoSansCJKjp-Regular-subset-chws.otf');
+}
+#container {
+  font-family: halt-font;
+  font-size: 20px;
+  width: 4em;
+}
+.chws #container {
+  font-family: chws-font;
+}
+#container > div > span {
+  background: black;
+}
+.off {
+  text-spacing-trim: space-all;
+}
+</style>
+<div id="container">
+  <div><span>国）（国国（（国（国</span></div>
+</div>
+<script>
+document.fonts.ready.then(() => {
+  document.body.offsetTop;
+  const container = document.getElementById('container');
+  container.classList.add('off');
+});
+</script>
diff --git a/tests/wpt/tests/css/css-text/text-spacing-trim/text-spacing-trim-space-all-001-ref.html b/tests/wpt/tests/css/css-text/text-spacing-trim/text-spacing-trim-space-all-001-ref.html
new file mode 100644
index 00000000000..d33e3b62edd
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/text-spacing-trim/text-spacing-trim-space-all-001-ref.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<style>
+@font-face {
+  font-family: halt-font;
+  src: url('/fonts/noto/cjk/NotoSansCJKjp-Regular-subset-halt.otf');
+}
+#container {
+  font-family: halt-font;
+  font-size: 20px;
+  text-spacing-trim: space-all;
+  width: 4em;
+}
+#container > div > span {
+  background: black;
+}
+</style>
+<div id="container">
+  <div><span>国国国国国国国国国国</span></div>
+</div>
diff --git a/tests/wpt/tests/css/css-text/text-spacing-trim/text-spacing-trim-space-all-001.html b/tests/wpt/tests/css/css-text/text-spacing-trim/text-spacing-trim-space-all-001.html
new file mode 100644
index 00000000000..20e59c5a01a
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/text-spacing-trim/text-spacing-trim-space-all-001.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#text-spacing-trim-property">
+<link rel="match" href="text-spacing-trim-space-all-001-ref.html">
+<meta name="variant" content="?class=halt">
+<meta name="variant" content="?class=chws">
+<script src="support/variant-class.js"></script>
+<style>
+@font-face {
+  font-family: halt-font;
+  src: url('/fonts/noto/cjk/NotoSansCJKjp-Regular-subset-halt.otf');
+}
+@font-face {
+  font-family: chws-font;
+  src: url('/fonts/noto/cjk/NotoSansCJKjp-Regular-subset-chws.otf');
+}
+#container {
+  font-family: halt-font;
+  font-size: 20px;
+  text-spacing-trim: space-all;
+  width: 4em;
+}
+.chws #container {
+  font-family: chws-font;
+}
+#container > div > span {
+  background: black;
+}
+</style>
+<div id="container">
+  <div><span>国）（国国（（国（国</span></div>
+</div>
diff --git a/tests/wpt/tests/css/css-text/text-spacing-trim/text-spacing-trim-trim-all-001.html b/tests/wpt/tests/css/css-text/text-spacing-trim/text-spacing-trim-trim-all-001.html
new file mode 100644
index 00000000000..daec2fc4d23
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/text-spacing-trim/text-spacing-trim-trim-all-001.html
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#text-spacing-trim-property">
+<link rel="match" href="reference/text-spacing-trim-trim-all-001-ref.html">
+<meta name="variant" content="?class=halt,htb">
+<meta name="variant" content="?class=chws,htb">
+<meta name="variant" content="?class=halt,vrl">
+<meta name="variant" content="?class=chws,vrl">
+<script src="support/variant-class.js"></script>
+<style>
+@font-face {
+  font-family: halt-font;
+  src: url('/fonts/noto/cjk/NotoSansCJKjp-Regular-subset-halt.otf');
+}
+@font-face {
+  font-family: chws-font;
+  src: url('/fonts/noto/cjk/NotoSansCJKjp-Regular-subset-chws.otf');
+}
+#container {
+  font-family: halt-font;
+  font-size: 20px;
+}
+.chws #container {
+  font-family: chws-font;
+}
+.vrl {
+  writing-mode: vertical-rl;
+}
+</style>
+<div id="container">
+  <div>国（国</div>
+  <div>国）国</div>
+  <div>国、国</div>
+  <div>国・国</div>
+  <div>国。国</div>
+  <div>国「国</div>
+  <div>国」国</div>
+</div>
diff --git a/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-full-size-kana-008-ref.html b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-full-size-kana-008-ref.html
new file mode 100644
index 00000000000..42fc5104acc
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/text-transform/reference/text-transform-full-size-kana-008-ref.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text level 3 Reference: Unicode 15 kana and text-transform: full-size-kana</title>
+<link rel="author" title="Elika Etemad" href="http://fantasai.inkedblade.net/contact">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-text-transform-full-size-kana">
+<style>
+td:nth-of-type(2) {
+  text-transform: full-size-kana
+}
+</style>
+
+<p>Test passes if the characters in the second column are
+the same shape and size as those in the rightmost column,
+not small as those in the leftmost column.<br>
+Any missing glyph should be ignored as long as it is missing in both the second and the rightmost column.
+
+<table>
+  <tr><td>&#x1B132;<td>&#x3053;<td>&#x3053;
+  <tr><td>&#x1B150;<td>&#x3090;<td>&#x3090;
+  <tr><td>&#x1B151;<td>&#x3091;<td>&#x3091;
+  <tr><td>&#x1B152;<td>&#x3092;<td>&#x3092;
+  <tr><td>&#x1B155;<td>&#x30B3;<td>&#x30B3;
+  <tr><td>&#x1B164;<td>&#x30F0;<td>&#x30F0;
+  <tr><td>&#x1B165;<td>&#x30F1;<td>&#x30F1;
+  <tr><td>&#x1B166;<td>&#x30F2;<td>&#x30F2;
+  <tr><td>&#x1B167;<td>&#x30F3;<td>&#x30F3;
+</table>
diff --git a/tests/wpt/tests/css/css-text/text-transform/text-transform-capitalize-035-ref.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-capitalize-035-ref.html
new file mode 100644
index 00000000000..7993386715d
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/text-transform/text-transform-capitalize-035-ref.html
@@ -0,0 +1,57 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<title>CSS Test reference</title>
+<link rel="author" href="https://florian.rivoal.net" title="Florian Rivoal">
+<style>
+.test {
+  text-decoration-color: orange;
+}
+span {
+    text-decoration: underline solid blue;
+}
+span + span::before {
+    content: "\a";
+    white-space:pre;
+}
+div {
+    margin-top: 1em;
+}
+
+</style>
+<p>
+The test passes if,
+in each pair of words below,
+the same letters are upper or lower case.
+
+<div lang=ca>
+    <span class=test>Cancel·lar</span>
+    <span>Cancel·lar</span>
+<div>
+
+<div lang=sc>
+    <span class=test>Agiuda·nos</span>
+    <span>Agiuda·nos</span>
+<div>
+
+<div lang=oc>
+    <span class=test>In·hèrn</span>
+    <span>In·hèrn</span>
+<div>
+
+<div lang=frp>
+    <span class=test>G·eografia</span>
+    <span>G·eografia</span>
+<div>
+
+<div lang=fr-gallo>
+    <span class=test>Ag·rouée</span>
+    <span>Ag·rouée</span>
+<div>
+
+<div lang=fr>
+    <span class=test>Un·e Député·e</span>
+    <span>Un·e Député·e</span>
+<div>
+
+
+
diff --git a/tests/wpt/tests/css/css-text/text-transform/text-transform-capitalize-035.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-capitalize-035.html
new file mode 100644
index 00000000000..8b979ab2d80
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/text-transform/text-transform-capitalize-035.html
@@ -0,0 +1,66 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<title>CSS Test: text-transform treatment of </title>
+<link rel="author" href="https://florian.rivoal.net" title="Florian Rivoal">
+<link rel="help" href="https://drafts.csswg.org/css-text/#propdef-text-transform">
+<link rel="help" href="https://drafts.csswg.org/css-text/#text-transform-mapping">
+<link rel="match" href="text-transform-capitalize-035-ref.html">
+<style>
+.test {
+  text-transform: capitalize;
+}
+/* The remaining styles make it easier to review,
+   but don't affect the behavior under test.
+*/
+.test {
+  text-decoration-color: orange;
+}
+span {
+    text-decoration: underline solid blue;
+}
+span + span::before {
+    content: "\a";
+    white-space:pre;
+}
+div {
+    margin-top: 1em;
+}
+
+</style>
+<p>
+The test passes if,
+in each pair of words below,
+the same letters are upper or lower case.
+
+<div lang=ca>
+    <span class=test>cancel·lar</span>
+    <span>Cancel·lar</span>
+<div>
+
+<div lang=sc>
+    <span class=test>agiuda·nos</span>
+    <span>Agiuda·nos</span>
+<div>
+
+<div lang=oc>
+    <span class=test>in·hèrn</span>
+    <span>In·hèrn</span>
+<div>
+
+<div lang=frp>
+    <span class=test>g·eografia</span>
+    <span>G·eografia</span>
+<div>
+
+<div lang=fr-gallo>
+    <span class=test>ag·rouée</span>
+    <span>Ag·rouée</span>
+<div>
+
+<div lang=fr>
+    <span class=test>un·e député·e</span>
+    <span>Un·e Député·e</span>
+<div>
+
+
+
diff --git a/tests/wpt/tests/css/css-text/text-transform/text-transform-full-size-kana-008.html b/tests/wpt/tests/css/css-text/text-transform/text-transform-full-size-kana-008.html
new file mode 100644
index 00000000000..5b1cdde7b39
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/text-transform/text-transform-full-size-kana-008.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text level 3 Test: Unicode 15 kana and text-transform: full-size-kana</title>
+<link rel="author" title="Elika Etemad" href="http://fantasai.inkedblade.net/contact">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#valdef-text-transform-full-size-kana">
+<link rel="match" href="reference/text-transform-full-size-kana-008-ref.html">
+<meta name="assert" content="small kana added in Unicode 15 are transformed to normal kana by text-tranform:full-size-kana">
+<style>
+td:nth-of-type(2) {
+  text-transform: full-size-kana
+}
+</style>
+
+<p>Test passes if the characters in the second column are
+the same shape and size as those in the rightmost column,
+not small as those in the leftmost column.<br>
+Any missing glyph should be ignored as long as it is missing in both the second and the rightmost column.
+
+<table>
+  <tr><td>&#x1B132;<td>&#x1B132;<td>&#x3053;
+  <tr><td>&#x1B150;<td>&#x1B150;<td>&#x3090;
+  <tr><td>&#x1B151;<td>&#x1B151;<td>&#x3091;
+  <tr><td>&#x1B152;<td>&#x1B152;<td>&#x3092;
+  <tr><td>&#x1B155;<td>&#x1B155;<td>&#x30B3;
+  <tr><td>&#x1B164;<td>&#x1B164;<td>&#x30F0;
+  <tr><td>&#x1B165;<td>&#x1B165;<td>&#x30F1;
+  <tr><td>&#x1B166;<td>&#x1B166;<td>&#x30F2;
+  <tr><td>&#x1B167;<td>&#x1B167;<td>&#x30F3;
+</table>
diff --git a/tests/wpt/tests/css/css-text/white-space/reference/text-wrap-balance-float-001-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/text-wrap-balance-float-001-ref.html
new file mode 100644
index 00000000000..0e3e5c79677
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/white-space/reference/text-wrap-balance-float-001-ref.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<style>
+.container {
+  font: 20px/1.5 monospace;
+  width: 23.5ch;
+  border: solid 1px;
+}
+.float {
+  background: yellow;
+  padding: 0.2em 1ch;
+  line-height: 1.2;
+  float: left;
+}
+</style>
+
+<div class="container"><div class="float">FLOAT<br>FLOAT</div>abc de fg<br>hij klm<br>nop qrst uvw xyz!</div>
diff --git a/tests/wpt/tests/css/css-text/white-space/reference/text-wrap-balance-float-002-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/text-wrap-balance-float-002-ref.html
new file mode 100644
index 00000000000..fc068905f2f
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/white-space/reference/text-wrap-balance-float-002-ref.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<style>
+.container {
+  font: 20px/1.5 monospace;
+  width: 23.5ch;
+  border: solid 1px;
+}
+.float {
+  background: yellow;
+  padding: 0.2em 1ch;
+  line-height: 1.2;
+  float: right;
+}
+</style>
+
+<div class="container"><div class="float">FLOAT<br>FLOAT</div>abc de fg<br>hij klm<br>nop qrst uvw xyz!</div>
diff --git a/tests/wpt/tests/css/css-text/white-space/reference/text-wrap-balance-float-005-ref.html b/tests/wpt/tests/css/css-text/white-space/reference/text-wrap-balance-float-005-ref.html
new file mode 100644
index 00000000000..b28426f5754
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/white-space/reference/text-wrap-balance-float-005-ref.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<style>
+.container {
+  font: 20px/1.5 monospace;
+  width: 26.5ch;
+  border: solid 1px;
+}
+.float {
+  background: yellow;
+  padding: 0.2em 1ch;
+  line-height: 1.2;
+  float: left;
+}
+.float2 {
+  background: cyan;
+  padding: 0.2em 1ch;
+  line-height: 1.2;
+  float: right;
+}
+</style>
+
+<div class="container"><div class="float">FLOAT<br>FLOAT</div>abcde fghi<br>jklm nop<div class="float2">FLOAT<br>FLOAT</div><br>qrst uvw xyz!</div>
diff --git a/tests/wpt/tests/css/css-text/white-space/reference/text-space-collapse-discard-001-ref.xht b/tests/wpt/tests/css/css-text/white-space/reference/white-space-collapse-discard-001-ref.xht
similarity index 87%
rename from tests/wpt/tests/css/css-text/white-space/reference/text-space-collapse-discard-001-ref.xht
rename to tests/wpt/tests/css/css-text/white-space/reference/white-space-collapse-discard-001-ref.xht
index b07483773f1..02649bebce0 100644
--- a/tests/wpt/tests/css/css-text/white-space/reference/text-space-collapse-discard-001-ref.xht
+++ b/tests/wpt/tests/css/css-text/white-space/reference/white-space-collapse-discard-001-ref.xht
@@ -2,7 +2,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 	<head>
-		<title>CSS Test: text-space-collapse - discard - basic cases Reftest Reference</title>
+		<title>CSS Test: white-space-collapse - discard - basic cases Reftest Reference</title>
 		<link rel="author" title="Satoshi Umehara" href="mailto:umehara@est.co.jp" />
 		<style type="text/css">
 			<![CDATA[
diff --git a/tests/wpt/tests/css/css-text/white-space/reference/text-space-collapse-preserve-breaks-001-ref.xht b/tests/wpt/tests/css/css-text/white-space/reference/white-space-collapse-preserve-breaks-001-ref.xht
similarity index 89%
rename from tests/wpt/tests/css/css-text/white-space/reference/text-space-collapse-preserve-breaks-001-ref.xht
rename to tests/wpt/tests/css/css-text/white-space/reference/white-space-collapse-preserve-breaks-001-ref.xht
index 3fa9f07ed13..462c2fc4264 100644
--- a/tests/wpt/tests/css/css-text/white-space/reference/text-space-collapse-preserve-breaks-001-ref.xht
+++ b/tests/wpt/tests/css/css-text/white-space/reference/white-space-collapse-preserve-breaks-001-ref.xht
@@ -2,7 +2,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 	<head>
-		<title>CSS Test: text-space-collapse - preserve-breaks - basic cases Reftest Reference</title>
+		<title>CSS Test: white-space-collapse - preserve-breaks - basic cases Reftest Reference</title>
 		<link rel="author" title="Satoshi Umehara" href="mailto:umehara@est.co.jp" />
 		<style type="text/css">
 			<![CDATA[
diff --git a/tests/wpt/tests/css/css-text/white-space/reference/text-space-trim-trim-inner-001-ref.xht b/tests/wpt/tests/css/css-text/white-space/reference/white-space-trim-discard-inner-001-ref.xht
similarity index 89%
rename from tests/wpt/tests/css/css-text/white-space/reference/text-space-trim-trim-inner-001-ref.xht
rename to tests/wpt/tests/css/css-text/white-space/reference/white-space-trim-discard-inner-001-ref.xht
index 19e42688a2d..64be70b5f15 100644
--- a/tests/wpt/tests/css/css-text/white-space/reference/text-space-trim-trim-inner-001-ref.xht
+++ b/tests/wpt/tests/css/css-text/white-space/reference/white-space-trim-discard-inner-001-ref.xht
@@ -2,7 +2,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 	<head>
-		<title>CSS Test: text-space-trim - trim-inner - basic cases Reftest Reference</title>
+		<title>CSS Test: white-space-trim - discard-inner - basic cases Reftest Reference</title>
 		<link rel="author" title="Satoshi Umehara" href="mailto:umehara@est.co.jp" />
 		<style type="text/css">
 			<![CDATA[
diff --git a/tests/wpt/tests/css/css-text/white-space/text-wrap-balance-float-001.html b/tests/wpt/tests/css/css-text/white-space/text-wrap-balance-float-001.html
new file mode 100644
index 00000000000..3f00fdfbf44
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/white-space/text-wrap-balance-float-001.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#valdef-text-wrap-balance">
+<link rel="match" href="reference/text-wrap-balance-float-001-ref.html">
+<style>
+.container {
+  font: 20px/1.5 monospace;
+  width: 23.5ch;
+  border: solid 1px;
+  text-wrap: balance;
+}
+.float {
+  background: yellow;
+  padding: 0.2em 1ch;
+  line-height: 1.2;
+  float: left;
+}
+</style>
+
+<div class="container"><div class="float">FLOAT<br>FLOAT</div>abc de fg hij klm nop qrst uvw xyz!</div>
diff --git a/tests/wpt/tests/css/css-text/white-space/text-wrap-balance-float-002.html b/tests/wpt/tests/css/css-text/white-space/text-wrap-balance-float-002.html
new file mode 100644
index 00000000000..b611b8d7964
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/white-space/text-wrap-balance-float-002.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#valdef-text-wrap-balance">
+<link rel="match" href="reference/text-wrap-balance-float-002-ref.html">
+<style>
+.container {
+  font: 20px/1.5 monospace;
+  width: 23.5ch;
+  border: solid 1px;
+  text-wrap: balance;
+}
+.float {
+  background: yellow;
+  padding: 0.2em 1ch;
+  line-height: 1.2;
+  float: right;
+}
+</style>
+
+<div class="container"><div class="float">FLOAT<br>FLOAT</div>abc de fg hij klm nop qrst uvw xyz!</div>
diff --git a/tests/wpt/tests/css/css-text/white-space/text-wrap-balance-float-003.html b/tests/wpt/tests/css/css-text/white-space/text-wrap-balance-float-003.html
new file mode 100644
index 00000000000..b2a4c7a43b3
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/white-space/text-wrap-balance-float-003.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#valdef-text-wrap-balance">
+<link rel="match" href="reference/text-wrap-balance-float-001-ref.html">
+<style>
+.container {
+  font: 20px/1.5 monospace;
+  width: 23.5ch;
+  border: solid 1px;
+  text-wrap: balance;
+}
+.float {
+  background: yellow;
+  padding: 0.2em 1ch;
+  line-height: 1.2;
+  float: left;
+}
+</style>
+
+<div class="container">abc de<div class="float">FLOAT<br>FLOAT</div> fg hij klm nop qrst uvw xyz!</div>
diff --git a/tests/wpt/tests/css/css-text/white-space/text-wrap-balance-float-004.html b/tests/wpt/tests/css/css-text/white-space/text-wrap-balance-float-004.html
new file mode 100644
index 00000000000..b39f329255c
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/white-space/text-wrap-balance-float-004.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#valdef-text-wrap-balance">
+<link rel="match" href="reference/text-wrap-balance-float-002-ref.html">
+<style>
+.container {
+  font: 20px/1.5 monospace;
+  width: 23.5ch;
+  border: solid 1px;
+  text-wrap: balance;
+}
+.float {
+  background: yellow;
+  padding: 0.2em 1ch;
+  line-height: 1.2;
+  float: right;
+}
+</style>
+
+<div class="container">abc de <div class="float">FLOAT<br>FLOAT</div>fg hij klm nop qrst uvw xyz!</div>
diff --git a/tests/wpt/tests/css/css-text/white-space/text-wrap-balance-float-005.html b/tests/wpt/tests/css/css-text/white-space/text-wrap-balance-float-005.html
new file mode 100644
index 00000000000..177be0e10ac
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/white-space/text-wrap-balance-float-005.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#valdef-text-wrap-balance">
+<link rel="match" href="reference/text-wrap-balance-float-005-ref.html">
+<style>
+.container {
+  font: 20px/1.5 monospace;
+  width: 26.5ch;
+  border: solid 1px;
+  text-wrap: balance;
+}
+.float {
+  background: yellow;
+  padding: 0.2em 1ch;
+  line-height: 1.2;
+  float: left;
+}
+.float2 {
+  background: cyan;
+  padding: 0.2em 1ch;
+  line-height: 1.2;
+  float: right;
+}
+</style>
+
+<!--
+The floats (inc. padding) are 7ch wide, and occupy ~2 lines,
+so without balancing, layout would be
+    +--------------------------+
+    | FLOAT abcde fghi jklm nop|
+    | FLOAT qrst uvw     FLOAT |
+    |xyx!                FLOAT |
+    +--------------------------+
+
+Applying text-wrap:balance results in
+    +--------------------------+
+    | FLOAT abcde fghi         |
+    | FLOAT jklm nop     FLOAT |
+    |qrst uvw xyx!       FLOAT |
+    +--------------------------+
+-->
+<div class="container"><div class="float">FLOAT<br>FLOAT</div>abcde fghi jklm nop<div class="float2">FLOAT<br>FLOAT</div> qrst uvw xyz!</div>
diff --git a/tests/wpt/tests/css/css-text/white-space/text-space-collapse-discard-001.xht b/tests/wpt/tests/css/css-text/white-space/white-space-collapse-discard-001.xht
similarity index 69%
rename from tests/wpt/tests/css/css-text/white-space/text-space-collapse-discard-001.xht
rename to tests/wpt/tests/css/css-text/white-space/white-space-collapse-discard-001.xht
index 4216b6292c3..dc7e5e5708a 100644
--- a/tests/wpt/tests/css/css-text/white-space/text-space-collapse-discard-001.xht
+++ b/tests/wpt/tests/css/css-text/white-space/white-space-collapse-discard-001.xht
@@ -2,15 +2,15 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 	<head>
-		<title>CSS Test: text-space-collapse - discard - basic cases</title>
+		<title>CSS Test: white-space-collapse - discard - basic cases</title>
 		<link rel="author" title="Satoshi Umehara" href="mailto:umehara@est.co.jp" />
-		<link rel="help" title="CSS Text Level 4: 3.1. White Space Collapsing: the ‘text-space-collapse’ property" href="https://drafts.csswg.org/css-text-4/#white-space-collapsing" />
-		<link rel="match" href="reference/text-space-collapse-discard-001-ref.xht"/>
-		<meta name="assert" content="The UA should discard all white space in the element when text-space-collapse is set to discard." />
+		<link rel="help" title="CSS Text Level 4: 3.1. White Space Collapsing: the ‘white-space-collapse’ property" href="https://drafts.csswg.org/css-text-4/#white-space-collapsing" />
+		<link rel="match" href="reference/white-space-collapse-discard-001-ref.xht"/>
+		<meta name="assert" content="The UA should discard all white space in the element when white-space-collapse is set to discard." />
 		<style type="text/css">
 			<![CDATA[
 				.test span {
-					text-space-collapse: discard;
+					white-space-collapse: discard;
 				}
 				/* the CSS below is not part of the test */
 				span {
diff --git a/tests/wpt/tests/css/css-text/white-space/text-space-collapse-preserve-breaks-001.xht b/tests/wpt/tests/css/css-text/white-space/white-space-collapse-preserve-breaks-001.xht
similarity index 73%
rename from tests/wpt/tests/css/css-text/white-space/text-space-collapse-preserve-breaks-001.xht
rename to tests/wpt/tests/css/css-text/white-space/white-space-collapse-preserve-breaks-001.xht
index 7f18d9a4cd3..50113eade1f 100644
--- a/tests/wpt/tests/css/css-text/white-space/text-space-collapse-preserve-breaks-001.xht
+++ b/tests/wpt/tests/css/css-text/white-space/white-space-collapse-preserve-breaks-001.xht
@@ -2,15 +2,15 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 	<head>
-		<title>CSS Test: text-space-collapse - preserve-breaks - basic cases</title>
+		<title>CSS Test: white-space-collapse - preserve-breaks - basic cases</title>
 		<link rel="author" title="Satoshi Umehara" href="mailto:umehara@est.co.jp" />
-		<link rel="help" title="CSS Text Level 4: 3.1. White Space Collapsing: the ‘text-space-collapse’ property" href="https://drafts.csswg.org/css-text-4/#white-space-collapsing" />
-		<link rel="match" href="reference/text-space-collapse-preserve-breaks-001-ref.xht"/>
-		<meta name="assert" content="The UA should collapse sequences of white space into a single character but preserve segment breaks as forced line breaks when text-space-collapse is set to preserve-breaks." />
+		<link rel="help" title="CSS Text Level 4: 3.1. White Space Collapsing: the ‘white-space-collapse’ property" href="https://drafts.csswg.org/css-text-4/#white-space-collapsing" />
+		<link rel="match" href="reference/white-space-collapse-preserve-breaks-001-ref.xht"/>
+		<meta name="assert" content="The UA should collapse sequences of white space into a single character but preserve segment breaks as forced line breaks when white-space-collapse is set to preserve-breaks." />
 		<style type="text/css">
 			<![CDATA[
 				.test span {
-					text-space-collapse: preserve-breaks;
+					white-space-collapse: preserve-breaks;
 				}
 				/* the CSS below is not part of the test */
 				span {
diff --git a/tests/wpt/tests/css/css-text/white-space/text-space-trim-trim-inner-001.xht b/tests/wpt/tests/css/css-text/white-space/white-space-trim-discard-inner-001.xht
similarity index 75%
rename from tests/wpt/tests/css/css-text/white-space/text-space-trim-trim-inner-001.xht
rename to tests/wpt/tests/css/css-text/white-space/white-space-trim-discard-inner-001.xht
index b8f84b9eb8f..e8e53074a98 100644
--- a/tests/wpt/tests/css/css-text/white-space/text-space-trim-trim-inner-001.xht
+++ b/tests/wpt/tests/css/css-text/white-space/white-space-trim-discard-inner-001.xht
@@ -2,15 +2,15 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 	<head>
-		<title>CSS Test: text-space-trim - trim-inner - basic cases</title>
+		<title>CSS Test: white-space-trim - discard-inner - basic cases</title>
 		<link rel="author" title="Satoshi Umehara" href="mailto:umehara@est.co.jp" />
-		<link rel="help" title="CSS Text Level 4: 3.2. White Space Trimming: the ‘text-space-trim’ property" href="https://drafts.csswg.org/css-text-4/#white-space-trim" />
-		<link rel="match" href="reference/text-space-trim-trim-inner-001-ref.xht"/>
-		<meta name="assert" content="The UA should discard all white space at the beginning of a block and all white space at the end of a block when text-space-trim is set to trim-inner." />
+		<link rel="help" title="CSS Text Level 4: 3.2. White Space Trimming: the ‘white-space-trim’ property" href="https://drafts.csswg.org/css-text-4/#white-space-trim" />
+		<link rel="match" href="reference/white-space-trim-discard-inner-001-ref.xht"/>
+		<meta name="assert" content="The UA should discard all white space at the beginning of a block and all white space at the end of a block when white-space-trim is set to discard-inner." />
 		<style type="text/css">
 			<![CDATA[
 				.test span {
-					text-space-trim: trim-inner;
+					white-space-trim: discard-inner;
 				}
 				/* the CSS below is not part of the test */
 				div {
diff --git a/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-105-ref.html b/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-105-ref.html
deleted file mode 100644
index 3ba4c6f143c..00000000000
--- a/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-105-ref.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>Test reference</title>
-<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
-<style>
-div {
-  font-size: 2em;
-  border: solid orange;
-  margin: 5px;
-  width: 30ch;
-}
-</style>
-
-<p>Test passes if the two boxes below are <em>different</em>.
-
-<div lang=ja>กรุงเทพคือสวยงาม</div>
-<div lang=ja>กรุงเทพคือสวยงาม</div>
diff --git a/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-106-ref.html b/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-106-ref.html
deleted file mode 100644
index 04d54ca20a8..00000000000
--- a/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-106-ref.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>Test reference</title>
-<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
-<style>
-div {
-  font-size: 2em;
-  border: solid blue;
-  margin: 5px;
-  width: 30ch;
-}
-</style>
-
-<p>Test passes if the two boxes below are identical.
-
-<div>กรุงเทพคือสวยงาม</div>
-<div>กรุงเทพคือสวยงาม</div>
diff --git a/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-109-a-ref.html b/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-109-a-ref.html
deleted file mode 100644
index 3cf81f6175d..00000000000
--- a/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-109-a-ref.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>Test reference</title>
-<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
-<style>
-.wrap {
-  font-size: 2em;
-  border: solid black;
-  margin: 5px;
-  width: 30ch;
-  word-break: keep-all;
-}
-.wrap > div {
-  width: 0;
-}
-#ref1 {
-  border-color: blue;
-}
-#ref2 {
-  border-color: orange;
-}
-</style>
-
-<p>Test passes if the black box is identical to either the blue or orange one.
-
-<div id=ref1 class=wrap>
-  <div lang=ja>東京へ<wbr>行きましょう。</div>
-</div>
-<div class=wrap>
-  <div lang=ja>東京へ<wbr>行きましょう。</div>
-</div>
-<div id=ref2 class=wrap>
-  <div lang=ja>東京<wbr>へ<wbr>行きましょう。</div>
-</div>
diff --git a/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-109-b-ref.html b/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-109-b-ref.html
deleted file mode 100644
index 3b787b91581..00000000000
--- a/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-109-b-ref.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>Test reference</title>
-<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
-<style>
-.wrap {
-  font-size: 2em;
-  border: solid black;
-  margin: 5px;
-  width: 30ch;
-  word-break: keep-all;
-}
-.wrap > div {
-  width: 0;
-}
-#ref1 {
-  border-color: blue;
-}
-#ref2 {
-  border-color: orange;
-}
-</style>
-
-<p>Test passes if the black box is identical to either the blue or orange one.
-
-<div id=ref1 class=wrap>
-  <div lang=ja>東京へ<wbr>行きましょう。</div>
-</div>
-<div class=wrap>
-  <div lang=ja>東京<wbr>へ<wbr>行きましょう。</div>
-</div>
-<div id=ref2 class=wrap>
-  <div lang=ja>東京<wbr>へ<wbr>行きましょう。</div>
-</div>
diff --git a/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-111-ref.html b/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-111-ref.html
deleted file mode 100644
index fbb536e5659..00000000000
--- a/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-111-ref.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>Test reference</title>
-<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
-<style>
-.wrap {
-  font-size: 2em;
-  border: solid black;
-  margin: 5px;
-  width: 30ch;
-}
-.wrap > div {
-  width: 0;
-}
-#ref {
-  border-color: blue;
-}
-</style>
-
-<!--
-This test should pass even in UAs that don't support word-boundary-detection:auto(th)
-since allowing south-east-asian languages to wrap is the default behavior.
--->
-
-<p>Test passes if the black box is identical to either the blue one.
-
-<div class=wrap>
-  <div lang=th>กรุงเทพ<wbr>คือ<wbr>สวยงาม</div>
-</div>
-<div id=ref class=wrap>
-  <div lang=th>กรุงเทพ<wbr>คือ<wbr>สวยงาม</div>
-</div>
diff --git a/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-125-ref.html b/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-125-ref.html
deleted file mode 100644
index aad7d3d4d95..00000000000
--- a/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-125-ref.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>CSS Text level 4 Test: word-boundary-detection:auto() forbidden</title>
-<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
-<style>
-div {
-  font-size: 2em;
-  border: solid black;
-  margin: 5px;
-  width: 30ch;
-}
-</style>
-
-<p>Test passes if the two boxes below are identical.
-
-<div lang=ja>東京!&nbsp;へ!&nbsp;行きましょう。</div>
-<div lang=ja>東京!&nbsp;へ!&nbsp;行きましょう。</div>
diff --git a/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-126-ref.html b/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-126-ref.html
deleted file mode 100644
index 91f2ec7b193..00000000000
--- a/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-126-ref.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>Test reference</title>
-<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
-<style>
-div {
-  font-size: 2em;
-  border: solid black;
-  margin: 5px;
-  width: 30ch;
-}
-</style>
-
-<p>Test passes if the two boxes below are identical.
-
-<div lang=ja>東京&nbsp;(へ&nbsp;(行きましょう。</div>
-<div lang=ja>東京&nbsp;(へ&nbsp;(行きましょう。</div>
diff --git a/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-127-ref.html b/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-127-ref.html
deleted file mode 100644
index b354a4f12dc..00000000000
--- a/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-127-ref.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>Test reference</title>
-<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
-<style>
-div {
-  font-size: 2em;
-  border: solid black;
-  margin: 5px;
-  width: 30ch;
-}
-</style>
-
-<p>Test passes if the two boxes below are identical.
-
-<div lang=ja>東京%&nbsp;へ%&nbsp;行きましょう。</div>
-<div lang=ja>東京%&nbsp;へ%&nbsp;行きましょう。</div>
diff --git a/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-128-ref.html b/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-128-ref.html
deleted file mode 100644
index 8dcabb01e29..00000000000
--- a/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-128-ref.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>Test reference</title>
-<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
-<style>
-div {
-  font-size: 2em;
-  border: solid black;
-  margin: 5px;
-  width: 30ch;
-}
-</style>
-
-<p>Test passes if the two boxes below are identical.
-
-<div lang=ja>東京‼&nbsp;へ‼&nbsp;行きましょう。</div>
-<div lang=ja>東京‼&nbsp;へ‼&nbsp;行きましょう。</div>
diff --git a/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-129-ref.html b/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-129-ref.html
deleted file mode 100644
index 5d7d5577aec..00000000000
--- a/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-129-ref.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>Test reference</title>
-<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
-<style>
-div {
-  font-size: 2em;
-  border: solid black;
-  margin: 5px;
-  width: 30ch;
-}
-</style>
-
-<p>Test passes if the two boxes below are identical.
-
-<div id=test lang=ja>東京&nbsp;$へ&nbsp;$行きましょう。</div>
-<div id=ref lang=ja>東京&nbsp;$へ&nbsp;$行きましょう。</div>
diff --git a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-105.html b/tests/wpt/tests/css/css-text/word-boundary/word-boundary-105.html
deleted file mode 100644
index fa991221e52..00000000000
--- a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-105.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>CSS Text level 4 Test: word-boundary-detection:auto(th) mistagged</title>
-<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
-<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-boundary-detection">
-<link rel="mismatch" href="reference/word-boundary-105-ref.html">
-<meta name="assert" content="word-boundary-detection:auto(th), if supported, does the same as normal (insert soft wraps for south east asian) on content tagged as the wrong language.">
-<style>
-#wrap, #ref {
-  font-size: 2em;
-  border: solid orange;
-  margin: 5px;
-  width: 30ch;
-}
-@supports (word-boundary-detection: auto(th)) {
-  #test {
-    word-boundary-detection: manual;
-  }
-}
-#test {
-  width: 0;
-  word-boundary-detection: auto(th);
-}
-</style>
-
-<p>Test passes if the two boxes below are <em>different</em>.
-
-<div id=wrap lang=ja>
-  <div id=test>กรุงเทพคือสวยงาม</div>
-</div>
-<div id=ref lang=ja>กรุงเทพคือสวยงาม</div>
diff --git a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-106.html b/tests/wpt/tests/css/css-text/word-boundary/word-boundary-106.html
deleted file mode 100644
index a968af77672..00000000000
--- a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-106.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>CSS Text level 4 Test: word-boundary-detection:auto(th) untagged</title>
-<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
-<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-boundary-detection">
-<link rel="match" href="reference/word-boundary-106-ref.html">
-<meta name="assert" content="word-boundary-detection:auto(th), if supported, does the same as normal (insert soft wraps for south east asian) on content not language tagged.">
-<style>
-#wrap, #ref {
-  font-size: 2em;
-  border: solid blue;
-  margin: 5px;
-  width: 30ch;
-}
-@supports (word-boundary-detection: auto(th)) {
-  #test {
-    word-boundary-detection: manual;
-  }
-}
-#test {
-  width: 0;
-  word-boundary-detection: auto(th);
-}
-</style>
-
-<p>Test passes if the two boxes below are identical.
-
-<div id=wrap>
-  <div id=test>กรุงเทพคือสวยงาม</div>
-</div>
-<div id=ref>กรุงเทพคือสวยงาม</div>
diff --git a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-107.html b/tests/wpt/tests/css/css-text/word-boundary/word-boundary-107.html
deleted file mode 100644
index 591c1afb8d4..00000000000
--- a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-107.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>CSS Text level 4 Test: word-boundary-detection:auto(ja) mistagged</title>
-<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
-<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-boundary-detection">
-<link rel="match" href="reference/word-boundary-107-ref.html">
-<meta name="assert" content="word-boundary-detection:auto(ja), if supported, does not affect (i.e. same as normal) content tagged as something other than Japanese">
-<style>
-#wrap, #ref {
-  font-size: 2em;
-  border: solid blue;
-  margin: 5px;
-  width: 30ch;
-}
-#test {
-  width: 0;
-  word-boundary-detection: auto(ja);
-  word-break: keep-all;
-}
-</style>
-
-<p>Test passes if the two boxes below are identical.
-
-<div id=wrap lang=zh>
-  <div id=test>東京へ行きましょう。</div>
-</div>
-<div id=ref lang=zh>東京へ行きましょう。</div>
diff --git a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-108.html b/tests/wpt/tests/css/css-text/word-boundary/word-boundary-108.html
deleted file mode 100644
index c23a6fe2b2b..00000000000
--- a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-108.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>CSS Text level 4 Test: word-boundary-detection:auto(ja) untagged</title>
-<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
-<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-boundary-detection">
-<link rel="match" href="reference/word-boundary-108-ref.html">
-<meta name="assert" content="word-boundary-detection:auto(ja), if supported, does not affect (i.e. same as normal) on content not language tagged.">
-<style>
-#wrap, #ref {
-  font-size: 2em;
-  border: solid blue;
-  margin: 5px;
-  width: 30ch;
-}
-#test {
-  width: 0;
-  word-boundary-detection: auto(ja);
-  word-break: keep-all;
-}
-</style>
-
-<p>Test passes if the two boxes below are identical.
-
-<div id=wrap>
-  <div id=test>東京へ行きましょう。</div>
-</div>
-<div id=ref>東京へ行きましょう。</div>
diff --git a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-109.html b/tests/wpt/tests/css/css-text/word-boundary/word-boundary-109.html
deleted file mode 100644
index c5694cc153f..00000000000
--- a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-109.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>CSS Text level 4 Test: word-boundary-detection:auto(ja) and line breaking</title>
-<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
-<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-boundary-detection">
-<link rel="match" href="reference/word-boundary-109-a-ref.html">
-<link rel="match" href="reference/word-boundary-109-b-ref.html">
-<meta name="assert" content="word-boundary-detection:auto(ja) inserts virtual word boundaries at reasonable points, creating soft wrapping opportunities">
-<style>
-@supports (word-boundary-detection:auto(ja)) {
-  .warn { display:none; }
-}
-.wrap {
-  font-size: 2em;
-  border: solid black;
-  margin: 5px;
-  width: 30ch;
-  word-break: keep-all;
-}
-.wrap > div {
-  width: 0;
-}
-#test {
-  word-boundary-detection: auto(ja);
-}
-#ref1 {
-  border-color: blue;
-}
-#ref2 {
-  border-color: orange;
-}
-</style>
-
-<p class=warn><strong>This test is not relevant, because this UA does not support <code>word-boundary-detection:auto(ja)</code>.</strong>
-
-<p>Test passes if the black box is identical to either the blue or orange one.
-
-<div id=ref1 class=wrap>
-  <div lang=ja>東京へ<wbr>行きましょう。</div>
-</div>
-<div class=wrap>
-  <div id=test lang=ja>東京へ行きましょう。</div>
-</div>
-<div id=ref2 class=wrap>
-  <div lang=ja>東京<wbr>へ<wbr>行きましょう。</div>
-</div>
diff --git a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-110.html b/tests/wpt/tests/css/css-text/word-boundary/word-boundary-110.html
deleted file mode 100644
index bdfedf19e61..00000000000
--- a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-110.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>CSS Text level 4 Test: word-boundary-detection:auto(ja) and expansion</title>
-<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
-<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-boundary-detection">
-<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-boundary-expansion">
-<link rel="match" href="reference/word-boundary-110-a-ref.html">
-<link rel="match" href="reference/word-boundary-110-b-ref.html">
-<meta name="assert" content="word-boundary-detection:auto(ja) inserts virtual word boundaries at reasonable points, which can then be expanded into ideographic spaces">
-<style>
-@supports (word-boundary-detection:auto(ja)) {
-  .warn { display:none; }
-}
-div {
-  font-size: 2em;
-  border: solid black;
-  margin: 5px;
-  width: 30ch;
-}
-#test {
-  word-boundary-detection: auto(ja);
-  word-boundary-expansion: ideographic-space;
-}
-#ref1 {
-  border-color: blue;
-}
-#ref2 {
-  border-color: orange;
-}
-</style>
-
-<p class=warn><strong>This test is not relevant, because this UA does not support <code>word-boundary-detection:auto(ja)</code>.</strong>
-
-<p>Test passes if the black box is identical to either the blue or orange one.
-
-<div id=ref1 lang=ja>東京へ　行きましょう。</div>
-<div id=test lang=ja>東京へ行きましょう。</div>
-<div id=ref2 lang=ja>東京　へ　行きましょう。</div>
diff --git a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-111.html b/tests/wpt/tests/css/css-text/word-boundary/word-boundary-111.html
deleted file mode 100644
index d2d3df27085..00000000000
--- a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-111.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>CSS Text level 4 Test: word-boundary-detection:auto(th) and line breaking</title>
-<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
-<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-boundary-detection">
-<link rel="match" href="reference/word-boundary-111-ref.html">
-<meta name="assert" content="word-boundary-detection:auto(th) inserts virtual word boundaries at reasonable points, creating soft wrapping opportunities">
-<style>
-.wrap {
-  font-size: 2em;
-  border: solid black;
-  margin: 5px;
-  width: 30ch;
-}
-.wrap > div {
-  width: 0;
-}
-#test {
-  word-boundary-detection: auto(th);
-}
-#ref {
-  border-color: blue;
-}
-</style>
-
-<!--
-This test should pass even in UAs that don't support word-boundary-detection:auto(th)
-since allowing south-east-asian languages to wrap is the default behavior.
--->
-
-<p>Test passes if the black box is identical to either the blue one.
-
-<div class=wrap>
-  <div id=test lang=th>กรุงเทพคือสวยงาม</div>
-</div>
-<div id=ref class=wrap>
-  <div lang=th>กรุงเทพ<wbr>คือ<wbr>สวยงาม</div>
-</div>
diff --git a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-112.html b/tests/wpt/tests/css/css-text/word-boundary/word-boundary-112.html
deleted file mode 100644
index 73c2763d836..00000000000
--- a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-112.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>CSS Text level 4 Test: word-boundary-detection:auto(th) and expansion</title>
-<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
-<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-boundary-detection">
-<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-boundary-expansion">
-<link rel="match" href="reference/word-boundary-112-ref.html">
-<meta name="assert" content="word-boundary-detection:auto(th) inserts virtual word boundaries at reasonable points, which can then be expanded into spaces">
-<style>
-div {
-  font-size: 2em;
-  border: solid black;
-  margin: 5px;
-  width: 30ch;
-}
-#test {
-  word-boundary-detection: auto(th);
-  word-boundary-expansion: space;
-}
-#ref {
-  border-color: blue;
-}
-</style>
-<!--
-
-This test should pass even in UAs that don't support word-boundary-detection:auto(th)
-since inserting virtual word boundaries is the default for south-east-asian languages.
--->
-
-<p>Test passes if the black box is identical to the blue one.
-
-<div id=test lang=th>กรุงเทพคือสวยงาม</div>
-<div id=ref lang=th>กรุงเทพ คือ สวยงาม</div>
diff --git a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-115.html b/tests/wpt/tests/css/css-text/word-boundary/word-boundary-115.html
deleted file mode 100644
index b1266c53dbd..00000000000
--- a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-115.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>CSS Text level 4 Test: word-boundary-detection:auto() forbidden</title>
-<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
-<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-boundary-detection">
-<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-boundary-expansion">
-<link rel="match" href="reference/word-boundary-115-ref.html">
-<meta name="assert" content="The UA must not insert a virtual word boundary at the beginning or end of any box whose parent box has a used value of manual.">
-<style>
-@supports (word-boundary-detection:auto(ja)) {
-  .warn { display:none; }
-}
-div {
-  font-size: 2em;
-  border: solid black;
-  margin: 5px;
-  width: 30ch;
-}
-#test {
-  word-boundary-detection: manual;
-}
-#test span {
-  word-boundary-detection: auto(ja);
-  word-boundary-expansion: ideographic-space;
-}
-</style>
-
-<p class=warn><strong>This test is not relevant, because this UA does not support <code>word-boundary-detection:auto(ja)</code>.</strong>
-
-<p>Test passes if the two boxes below are identical.
-
-<div id=test lang=ja>東京<span>へ</span>行きましょう。</div>
-<div id=ref lang=ja>東京へ行きましょう。</div>
diff --git a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-116.html b/tests/wpt/tests/css/css-text/word-boundary/word-boundary-116.html
deleted file mode 100644
index 4b152173b7c..00000000000
--- a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-116.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>CSS Text level 4 Test: word-boundary-detection:auto() forbidden</title>
-<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
-<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-boundary-detection">
-<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-boundary-expansion">
-<link rel="match" href="reference/word-boundary-116-ref.html">
-<meta name="assert" content="The UA must not insert a virtual word boundary immediately adjacent to a word-separator character">
-<style>
-@supports (word-boundary-detection:auto(ja)) {
-  .warn { display:none; }
-}
-div {
-  font-size: 2em;
-  border: solid black;
-  margin: 5px;
-  width: 30ch;
-}
-#test {
-  word-boundary-detection: auto(ja);
-  word-boundary-expansion: ideographic-space;
-}
-</style>
-
-<p class=warn><strong>This test is not relevant, because this UA does not support <code>word-boundary-detection:auto(ja)</code>.</strong>
-
-<p>Test passes if the two boxes below are identical.
-
-<div id=test lang=ja>東京 へ 行きましょう。</div>
-<div id=ref lang=ja>東京 へ 行きましょう。</div>
diff --git a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-117.html b/tests/wpt/tests/css/css-text/word-boundary/word-boundary-117.html
deleted file mode 100644
index 558b6a981f0..00000000000
--- a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-117.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>CSS Text level 4 Test: word-boundary-detection:auto() forbidden</title>
-<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
-<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-boundary-detection">
-<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-boundary-expansion">
-<link rel="match" href="reference/word-boundary-117-ref.html">
-<meta name="assert" content="The UA must not insert a virtual word boundary immediately adjacent to an other space separator.">
-<style>
-@supports (word-boundary-detection:auto(ja)) {
-  .warn { display:none; }
-}
-div {
-  font-size: 2em;
-  border: solid black;
-  margin: 5px;
-  width: 30ch;
-}
-#test {
-  word-boundary-detection: auto(ja);
-  word-boundary-expansion: ideographic-space;
-}
-</style>
-
-<p class=warn><strong>This test is not relevant, because this UA does not support <code>word-boundary-detection:auto(ja)</code>.</strong>
-
-<p>Test passes if the two boxes below are identical.
-
-<div id=test lang=ja>東京　へ　行きましょう。</div>
-<div id=ref lang=ja>東京　へ　行きましょう。</div>
diff --git a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-118.html b/tests/wpt/tests/css/css-text/word-boundary/word-boundary-118.html
deleted file mode 100644
index e20bc354105..00000000000
--- a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-118.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>CSS Text level 4 Test: word-boundary-detection:auto() forbidden</title>
-<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
-<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-boundary-detection">
-<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-boundary-expansion">
-<link rel="match" href="reference/word-boundary-117-ref.html">
-<meta name="assert" content="The UA must not insert a virtual word boundary immediately adjacent to ZERO WIDTH SPACE (U+200B) character.">
-<style>
-@supports (word-boundary-detection:auto(ja)) {
-  .warn { display:none; }
-}
-div {
-  font-size: 2em;
-  border: solid black;
-  margin: 5px;
-  width: 30ch;
-}
-#test {
-  word-boundary-detection: auto(ja);
-  word-boundary-expansion: ideographic-space;
-}
-</style>
-
-<p class=warn><strong>This test is not relevant, because this UA does not support <code>word-boundary-detection:auto(ja)</code>.</strong>
-
-<p>Test passes if the two boxes below are identical.
-
-<div id=test lang=ja>東京&#x200B;へ&#X200B;行きましょう。</div>
-<div id=ref lang=ja>東京　へ　行きましょう。</div>
diff --git a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-122.html b/tests/wpt/tests/css/css-text/word-boundary/word-boundary-122.html
deleted file mode 100644
index a9d3a999307..00000000000
--- a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-122.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>CSS Text level 4 Test: word-boundary-detection:auto() forbidden</title>
-<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
-<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-boundary-detection">
-<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-boundary-expansion">
-<link rel="match" href="reference/word-boundary-122-ref.html">
-<meta name="assert" content="The UA must not insert a virtual word boundary between a typographic letter unit and a subsequent typographic character unit from the [UAX14] CL line breaking class">
-<style>
-@supports (word-boundary-detection:auto(ja)) {
-  .warn { display:none; }
-}
-div {
-  font-size: 2em;
-  border: solid black;
-  margin: 5px;
-  width: 30ch;
-}
-#test {
-  word-boundary-detection: auto(ja);
-  word-boundary-expansion: ideographic-space;
-}
-</style>
-
-<p class=warn><strong>This test is not relevant, because this UA does not support <code>word-boundary-detection:auto(ja)</code>.</strong>
-
-<p>Test passes if the two boxes below are identical.
-
-<div id=test lang=ja>東京}&nbsp;へ}&nbsp;行きましょう。</div>
-<div id=ref lang=ja>東京}&nbsp;へ}&nbsp;行きましょう。</div>
diff --git a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-123.html b/tests/wpt/tests/css/css-text/word-boundary/word-boundary-123.html
deleted file mode 100644
index bcf1f0245e8..00000000000
--- a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-123.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>CSS Text level 4 Test: word-boundary-detection:auto() forbidden</title>
-<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
-<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-boundary-detection">
-<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-boundary-expansion">
-<link rel="match" href="reference/word-boundary-123-ref.html">
-<meta name="assert" content="The UA must not insert a virtual word boundary between a typographic letter unit and a subsequent typographic character unit from the [UAX14] CP line breaking class">
-<style>
-@supports (word-boundary-detection:auto(ja)) {
-  .warn { display:none; }
-}
-div {
-  font-size: 2em;
-  border: solid black;
-  margin: 5px;
-  width: 30ch;
-}
-#test {
-  word-boundary-detection: auto(ja);
-  word-boundary-expansion: ideographic-space;
-}
-</style>
-
-<p class=warn><strong>This test is not relevant, because this UA does not support <code>word-boundary-detection:auto(ja)</code>.</strong>
-
-<p>Test passes if the two boxes below are identical.
-
-<div id=test lang=ja>東京)&nbsp;へ)&nbsp;行きましょう。</div>
-<div id=ref lang=ja>東京)&nbsp;へ)&nbsp;行きましょう。</div>
diff --git a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-124.html b/tests/wpt/tests/css/css-text/word-boundary/word-boundary-124.html
deleted file mode 100644
index a4a4902ba29..00000000000
--- a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-124.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>CSS Text level 4 Test: word-boundary-detection:auto() forbidden</title>
-<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
-<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-boundary-detection">
-<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-boundary-expansion">
-<link rel="match" href="reference/word-boundary-124-ref.html">
-<meta name="assert" content="The UA must not insert a virtual word boundary between a typographic letter unit and a subsequent typographic character unit from the [UAX14] IS line breaking class">
-<style>
-@supports (word-boundary-detection:auto(ja)) {
-  .warn { display:none; }
-}
-div {
-  font-size: 2em;
-  border: solid black;
-  margin: 5px;
-  width: 30ch;
-}
-#test {
-  word-boundary-detection: auto(ja);
-  word-boundary-expansion: ideographic-space;
-}
-</style>
-
-<p class=warn><strong>This test is not relevant, because this UA does not support <code>word-boundary-detection:auto(ja)</code>.</strong>
-
-<p>Test passes if the two boxes below are identical.
-
-<div id=test lang=ja>東京.&nbsp;へ.&nbsp;行きましょう。</div>
-<div id=ref lang=ja>東京.&nbsp;へ.&nbsp;行きましょう。</div>
diff --git a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-125.html b/tests/wpt/tests/css/css-text/word-boundary/word-boundary-125.html
deleted file mode 100644
index a04ec4f075c..00000000000
--- a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-125.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>CSS Text level 4 Test: word-boundary-detection:auto() forbidden</title>
-<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
-<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-boundary-detection">
-<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-boundary-expansion">
-<link rel="match" href="reference/word-boundary-125-ref.html">
-<meta name="assert" content="The UA must not insert a virtual word boundary between a typographic letter unit and a subsequent typographic character unit from the [UAX14] EX line breaking class">
-<style>
-@supports (word-boundary-detection:auto(ja)) {
-  .warn { display:none; }
-}
-div {
-  font-size: 2em;
-  border: solid black;
-  margin: 5px;
-  width: 30ch;
-}
-#test {
-  word-boundary-detection: auto(ja);
-  word-boundary-expansion: ideographic-space;
-}
-</style>
-
-<p class=warn><strong>This test is not relevant, because this UA does not support <code>word-boundary-detection:auto(ja)</code>.</strong>
-
-<p>Test passes if the two boxes below are identical.
-
-<div id=test lang=ja>東京!&nbsp;へ!&nbsp;行きましょう。</div>
-<div id=ref lang=ja>東京!&nbsp;へ!&nbsp;行きましょう。</div>
diff --git a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-126.html b/tests/wpt/tests/css/css-text/word-boundary/word-boundary-126.html
deleted file mode 100644
index e4a5c6b0fb4..00000000000
--- a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-126.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>CSS Text level 4 Test: word-boundary-detection:auto() forbidden</title>
-<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
-<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-boundary-detection">
-<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-boundary-expansion">
-<link rel="match" href="reference/word-boundary-126-ref.html">
-<meta name="assert" content="The UA must not insert a virtual word boundary between a typographic letter unit and a preceeding typographic character unit from the [UAX14] OP line breaking class">
-<style>
-@supports (word-boundary-detection:auto(ja)) {
-  .warn { display:none; }
-}
-div {
-  font-size: 2em;
-  border: solid black;
-  margin: 5px;
-  width: 30ch;
-}
-#test {
-  word-boundary-detection: auto(ja);
-  word-boundary-expansion: ideographic-space;
-}
-</style>
-
-<p class=warn><strong>This test is not relevant, because this UA does not support <code>word-boundary-detection:auto(ja)</code>.</strong>
-
-<p>Test passes if the two boxes below are identical.
-
-<div id=test lang=ja>東京&nbsp;(へ&nbsp;(行きましょう。</div>
-<div id=ref lang=ja>東京&nbsp;(へ&nbsp;(行きましょう。</div>
diff --git a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-127.html b/tests/wpt/tests/css/css-text/word-boundary/word-boundary-127.html
deleted file mode 100644
index 21f00e664b7..00000000000
--- a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-127.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>CSS Text level 4 Test: word-boundary-detection:auto() forbidden</title>
-<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
-<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-boundary-detection">
-<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-boundary-expansion">
-<link rel="match" href="reference/word-boundary-127-ref.html">
-<meta name=flags content=should>
-<meta name="assert" content="The UA should not insert a virtual word boundary between a typographic letter unit and a subsequent typographic character unit from the [UAX14] PO line breaking class">
-<style>
-@supports (word-boundary-detection:auto(ja)) {
-  .warn { display:none; }
-}
-div {
-  font-size: 2em;
-  border: solid black;
-  margin: 5px;
-  width: 30ch;
-}
-#test {
-  word-boundary-detection: auto(ja);
-  word-boundary-expansion: ideographic-space;
-}
-</style>
-
-<p class=warn><strong>This test is not relevant, because this UA does not support <code>word-boundary-detection:auto(ja)</code>.</strong>
-
-<p>Test passes if the two boxes below are identical.
-
-<div id=test lang=ja>東京%&nbsp;へ%&nbsp;行きましょう。</div>
-<div id=ref lang=ja>東京%&nbsp;へ%&nbsp;行きましょう。</div>
diff --git a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-128.html b/tests/wpt/tests/css/css-text/word-boundary/word-boundary-128.html
deleted file mode 100644
index cb2d1ee4e78..00000000000
--- a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-128.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>CSS Text level 4 Test: word-boundary-detection:auto() forbidden</title>
-<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
-<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-boundary-detection">
-<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-boundary-expansion">
-<link rel="match" href="reference/word-boundary-128-ref.html">
-<meta name=flags content=should>
-<meta name="assert" content="The UA should not insert a virtual word boundary between a typographic letter unit and a subsequent typographic character unit from the [UAX14] NS line breaking class">
-<style>
-@supports (word-boundary-detection:auto(ja)) {
-  .warn { display:none; }
-}
-div {
-  font-size: 2em;
-  border: solid black;
-  margin: 5px;
-  width: 30ch;
-}
-</style>
-
-<p class=warn><strong>This test is not relevant, because this UA does not support <code>word-boundary-detection:auto(ja)</code>.</strong>
-
-<p>Test passes if the two boxes below are identical.
-
-<div id=test lang=ja>東京‼&nbsp;へ‼&nbsp;行きましょう。</div>
-<div id=ref lang=ja>東京‼&nbsp;へ‼&nbsp;行きましょう。</div>
diff --git a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-129.html b/tests/wpt/tests/css/css-text/word-boundary/word-boundary-129.html
deleted file mode 100644
index 6e137177029..00000000000
--- a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-129.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>CSS Text level 4 Test: word-boundary-detection:auto() forbidden</title>
-<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
-<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-boundary-detection">
-<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-boundary-expansion">
-<link rel="match" href="reference/word-boundary-129-ref.html">
-<meta name=flags content=should>
-<meta name="assert" content="The UA should not insert a virtual word boundary between a typographic letter unit and a preceeding typographic character unit from the [UAX14] PR line breaking class">
-<style>
-@supports (word-boundary-detection:auto(ja)) {
-  .warn { display:none; }
-}
-div {
-  font-size: 2em;
-  border: solid black;
-  margin: 5px;
-  width: 30ch;
-}
-</style>
-
-<p class=warn><strong>This test is not relevant, because this UA does not support <code>word-boundary-detection:auto(ja)</code>.</strong>
-
-<p>Test passes if the two boxes below are identical.
-
-<div id=test lang=ja>東京&nbsp;$へ&nbsp;$行きましょう。</div>
-<div id=ref lang=ja>東京&nbsp;$へ&nbsp;$行きましょう。</div>
diff --git a/tests/wpt/tests/css/css-text/word-break/auto-phrase/reference/word-break-auto-phrase-001-ref.html b/tests/wpt/tests/css/css-text/word-break/auto-phrase/reference/word-break-auto-phrase-001-ref.html
new file mode 100644
index 00000000000..51f96868f17
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/word-break/auto-phrase/reference/word-break-auto-phrase-001-ref.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Test reference</title>
+<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
+<style>
+div {
+  font-size: 2em;
+  border: solid black;
+  margin: 5px;
+  width: min-content; /*not 0, to avoid falling into overflow fallback behavior */
+  word-break: keep-all;
+}
+#ref {
+  border-color: blue;
+}
+</style>
+
+<p>Test passes if the black box is identical to the blue one.
+
+<div id=test lang=ja>
+  東京へ<wbr>行きましょう。
+</div>
+<div id=ref lang=ja>
+  東京へ<wbr>行きましょう。
+</div>
diff --git a/tests/wpt/tests/css/css-text/word-break/auto-phrase/reference/word-break-auto-phrase-002-ref.html b/tests/wpt/tests/css/css-text/word-break/auto-phrase/reference/word-break-auto-phrase-002-ref.html
new file mode 100644
index 00000000000..9f63cc951f0
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/word-break/auto-phrase/reference/word-break-auto-phrase-002-ref.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Test reference</title>
+<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
+<style>
+div {
+  font-size: 2em;
+  border: solid black;
+  margin: 5px;
+  width: min-content;
+  word-break: keep-all;
+}
+#ref {
+  border-color: blue;
+}
+</style>
+
+<p>Test passes if the black box is identical to either the blue one.
+
+<div id=test lang=th>
+  กรุงเทพ<wbr>คือ<wbr>สวยงาม
+</div>
+<div id=ref lang=th>
+  กรุงเทพ<wbr>คือ<wbr>สวยงาม
+</div>
diff --git a/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-123-ref.html b/tests/wpt/tests/css/css-text/word-break/auto-phrase/reference/word-break-auto-phrase-003-ref.html
similarity index 53%
rename from tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-123-ref.html
rename to tests/wpt/tests/css/css-text/word-break/auto-phrase/reference/word-break-auto-phrase-003-ref.html
index 35b0e5f05a7..5868eed30ad 100644
--- a/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-123-ref.html
+++ b/tests/wpt/tests/css/css-text/word-break/auto-phrase/reference/word-break-auto-phrase-003-ref.html
@@ -1,17 +1,18 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>Test reference</title>
+<title>CSS test reference</title>
 <link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
 <style>
 div {
   font-size: 2em;
   border: solid black;
   margin: 5px;
-  width: 30ch;
+  width: max-content;
+  white-space: pre;
 }
 </style>
 
 <p>Test passes if the two boxes below are identical.
 
-<div id=test lang=ja>東京)&nbsp;へ)&nbsp;行きましょう。</div>
-<div id=ref lang=ja>東京)&nbsp;へ)&nbsp;行きましょう。</div>
+<div id=test lang=ja>東京&nbsp;へ&nbsp;行きましょう。</div>
+<div id=ref lang=ja>東京&nbsp;へ&nbsp;行きましょう。</div>
diff --git a/tests/wpt/tests/css/css-text/word-break/auto-phrase/reference/word-break-auto-phrase-004-ref.html b/tests/wpt/tests/css/css-text/word-break/auto-phrase/reference/word-break-auto-phrase-004-ref.html
new file mode 100644
index 00000000000..81d075dc119
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/word-break/auto-phrase/reference/word-break-auto-phrase-004-ref.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS test reference</title>
+<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
+<style>
+div {
+  font-size: 2em;
+  border: solid black;
+  margin: 5px;
+  width: max-content;
+  white-space: pre;
+}
+</style>
+
+<p>Test passes if the two boxes below are identical.
+
+<div id=test lang=ja>東京&#x2060;へ&#x2060;行きましょう。</div>
+<div id=ref lang=ja>東京&#x2060;へ&#x2060;行きましょう。</div>
diff --git a/tests/wpt/tests/css/css-text/word-break/auto-phrase/reference/word-break-auto-phrase-005-ref.html b/tests/wpt/tests/css/css-text/word-break/auto-phrase/reference/word-break-auto-phrase-005-ref.html
new file mode 100644
index 00000000000..cecc0706375
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/word-break/auto-phrase/reference/word-break-auto-phrase-005-ref.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS test reference</title>
+<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
+<style>
+div {
+  font-size: 2em;
+  border: solid black;
+  margin: 5px;
+  width: max-content;
+  white-space: pre;
+}
+</style>
+
+<p>Test passes if the two boxes below are identical.
+
+<div id=test lang=ja>東京&#x200D;へ&#x200D;行きましょう。</div>
+<div id=ref lang=ja>東京&#x200D;へ&#x200D;行きましょう。</div>
diff --git a/tests/wpt/tests/css/css-text/word-break/auto-phrase/reference/word-break-auto-phrase-006-ref.html b/tests/wpt/tests/css/css-text/word-break/auto-phrase/reference/word-break-auto-phrase-006-ref.html
new file mode 100644
index 00000000000..662351aa8ba
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/word-break/auto-phrase/reference/word-break-auto-phrase-006-ref.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS test reference</title>
+<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
+<style>
+div {
+  font-size: 2em;
+  border: solid black;
+  margin: 5px;
+  width: min-content;
+  hyphens: none;
+}
+</style>
+
+<p>Test passes if all boxes below are identical.
+
+<div lang=en>consideration</div>
+<div lang=en>consideration</div>
+<div lang=en>consideration</div>
diff --git a/tests/wpt/tests/css/css-text/word-break/auto-phrase/reference/word-break-auto-phrase-007-ref.html b/tests/wpt/tests/css/css-text/word-break/auto-phrase/reference/word-break-auto-phrase-007-ref.html
new file mode 100644
index 00000000000..4a555332075
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/word-break/auto-phrase/reference/word-break-auto-phrase-007-ref.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS test reference</title>
+<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
+<style>
+div {
+  border: solid black;
+  margin: 5px;
+  width: min-content;
+}
+</style>
+
+<p>Test passes if the two boxes below are identical.
+
+<div id=test lang=ja>東<wbr>京<wbr>へ<wbr>行<wbr>き<wbr>ま&#x200B;し&#x200B;ょ&#x200B;う&#x200B;。</div>
+<div id=ref lang=ja>東<wbr>京<wbr>へ<wbr>行<wbr>き<wbr>ま&#x200B;し&#x200B;ょ&#x200B;う&#x200B;。</div>
diff --git a/tests/wpt/tests/css/css-text/word-break/auto-phrase/reference/word-break-auto-phrase-008-ref.html b/tests/wpt/tests/css/css-text/word-break/auto-phrase/reference/word-break-auto-phrase-008-ref.html
new file mode 100644
index 00000000000..24f54429de8
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/word-break/auto-phrase/reference/word-break-auto-phrase-008-ref.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS test reference</title>
+<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
+<style>
+div {
+  font-size: 2em;
+  border-left: solid black;
+  margin: 15px;
+  width: 0;
+  hyphens: manual;
+}
+</style>
+
+<p>Test passes if both words bellow are hyphenated.
+
+<div id=test lang=en>con&shy;sid&shy;era&shy;tion</div>
+<div id=ref lang=en>con&shy;sid&shy;era&shy;tion</div>
diff --git a/tests/wpt/tests/css/css-text/word-break/auto-phrase/reference/word-break-auto-phrase-009-ref.html b/tests/wpt/tests/css/css-text/word-break/auto-phrase/reference/word-break-auto-phrase-009-ref.html
new file mode 100644
index 00000000000..31f344c6c05
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/word-break/auto-phrase/reference/word-break-auto-phrase-009-ref.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS test reference</title>
+<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
+<style>
+div {
+  border: solid black;
+  margin: 5px;
+  width: 1em;
+}
+</style>
+
+<p>Test passes if the two boxes below are identical.
+
+<div id=test lang=ja>一生懸命働きます</div>
+<div id=ref lang=ja>一生懸命働きます</div>
diff --git a/tests/wpt/tests/css/css-text/word-break/auto-phrase/reference/word-break-auto-phrase-fallback-001-ref.html b/tests/wpt/tests/css/css-text/word-break/auto-phrase/reference/word-break-auto-phrase-fallback-001-ref.html
new file mode 100644
index 00000000000..5e65b27e2e6
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/word-break/auto-phrase/reference/word-break-auto-phrase-fallback-001-ref.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Test reference</title>
+<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
+<style>
+div {
+  font-size: 2em;
+  border: solid orange;
+  margin: 5px;
+  width: min-content; /*not 0, to avoid falling into overflow fallback behavior */
+  word-break: normal;
+}
+</style>
+
+<p>Test passes if the two boxes below are identical.
+
+<div id=test lang=ja>กรุงเทพคือสวยงาม</div>
+
+<!-- keeping the lang=ja because it may affects font selection-->
+<div id=ref lang=ja>กรุงเทพคือสวยงาม</div>
diff --git a/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-108-ref.html b/tests/wpt/tests/css/css-text/word-break/auto-phrase/reference/word-break-auto-phrase-fallback-002-ref.html
similarity index 53%
rename from tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-108-ref.html
rename to tests/wpt/tests/css/css-text/word-break/auto-phrase/reference/word-break-auto-phrase-fallback-002-ref.html
index 45497690fe4..9010ebb5d55 100644
--- a/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-108-ref.html
+++ b/tests/wpt/tests/css/css-text/word-break/auto-phrase/reference/word-break-auto-phrase-fallback-002-ref.html
@@ -7,11 +7,12 @@ div {
   font-size: 2em;
   border: solid blue;
   margin: 5px;
-  width: 30ch;
+  width: min-content; /*not 0, to avoid falling into overflow fallback behavior */
+  word-break: normal;
 }
 </style>
 
 <p>Test passes if the two boxes below are identical.
 
-<div>東京へ行きましょう。</div>
-<div>東京へ行きましょう。</div>
+<div id=test>กรุงเทพคือสวยงาม</div>
+<div id=ref>กรุงเทพคือสวยงาม</div>
diff --git a/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-107-ref.html b/tests/wpt/tests/css/css-text/word-break/auto-phrase/reference/word-break-auto-phrase-fallback-003-ref.html
similarity index 64%
rename from tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-107-ref.html
rename to tests/wpt/tests/css/css-text/word-break/auto-phrase/reference/word-break-auto-phrase-fallback-003-ref.html
index 2decfe1cc09..bd29d09cadf 100644
--- a/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-107-ref.html
+++ b/tests/wpt/tests/css/css-text/word-break/auto-phrase/reference/word-break-auto-phrase-fallback-003-ref.html
@@ -7,11 +7,14 @@ div {
   font-size: 2em;
   border: solid blue;
   margin: 5px;
-  width: 30ch;
+  width: min-content;
+}
+#test {
+  word-break: auto-phrase;
 }
 </style>
 
 <p>Test passes if the two boxes below are identical.
 
-<div lang=zh>東京へ行きましょう。</div>
-<div lang=zh>東京へ行きましょう。</div>
+<div id=test>東京へ行きましょう。</div>
+<div id=ref>東京へ行きましょう。</div>
diff --git a/tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-intrinsic-001-ref.html b/tests/wpt/tests/css/css-text/word-break/auto-phrase/reference/word-break-auto-phrase-intrinsic-001-ref.html
similarity index 100%
rename from tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-intrinsic-001-ref.html
rename to tests/wpt/tests/css/css-text/word-break/auto-phrase/reference/word-break-auto-phrase-intrinsic-001-ref.html
diff --git a/tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-overflow-001-ref.html b/tests/wpt/tests/css/css-text/word-break/auto-phrase/reference/word-break-auto-phrase-overflow-001-ref.html
similarity index 83%
rename from tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-overflow-001-ref.html
rename to tests/wpt/tests/css/css-text/word-break/auto-phrase/reference/word-break-auto-phrase-overflow-001-ref.html
index d75b50d05d8..07bbb230c70 100644
--- a/tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-overflow-001-ref.html
+++ b/tests/wpt/tests/css/css-text/word-break/auto-phrase/reference/word-break-auto-phrase-overflow-001-ref.html
@@ -1,7 +1,12 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
 <style>
+@font-face {
+  font-family: mplus;
+  src: url(/fonts/mplus-1p-regular.woff);
+}
 .container > div {
+  font-family: mplus;
   white-space: nowrap;
   font-size: 10px;
   border: 1px solid;
diff --git a/tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-wbr-nobr-001-ref.html b/tests/wpt/tests/css/css-text/word-break/auto-phrase/reference/word-break-auto-phrase-wbr-nobr-001-ref.html
similarity index 72%
rename from tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-wbr-nobr-001-ref.html
rename to tests/wpt/tests/css/css-text/word-break/auto-phrase/reference/word-break-auto-phrase-wbr-nobr-001-ref.html
index dbc18b8e291..4edf83be94f 100644
--- a/tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-wbr-nobr-001-ref.html
+++ b/tests/wpt/tests/css/css-text/word-break/auto-phrase/reference/word-break-auto-phrase-wbr-nobr-001-ref.html
@@ -1,7 +1,12 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
 <style>
+@font-face {
+  font-family: mplus;
+  src: url(/fonts/mplus-1p-regular.woff);
+}
 .container > div {
+  font-family: mplus;
   width: 3em;
   font-size: 10px;
   border: 1px solid;
diff --git a/tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-wbr-nobr-002-ref.html b/tests/wpt/tests/css/css-text/word-break/auto-phrase/reference/word-break-auto-phrase-wbr-nobr-002-ref.html
similarity index 75%
rename from tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-wbr-nobr-002-ref.html
rename to tests/wpt/tests/css/css-text/word-break/auto-phrase/reference/word-break-auto-phrase-wbr-nobr-002-ref.html
index 72d89af9bf7..8760565c1b1 100644
--- a/tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-wbr-nobr-002-ref.html
+++ b/tests/wpt/tests/css/css-text/word-break/auto-phrase/reference/word-break-auto-phrase-wbr-nobr-002-ref.html
@@ -1,7 +1,12 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
 <style>
+@font-face {
+  font-family: mplus;
+  src: url(/fonts/mplus-1p-regular.woff);
+}
 .container > div {
+  font-family: mplus;
   width: 10em;
   font-size: 10px;
   border: 1px solid;
diff --git a/tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-001.html b/tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-001.html
new file mode 100644
index 00000000000..ce837a1d5d8
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-001.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text level 4 Test: word-break:auto-phrase in Japanese</title>
+<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-break-property">
+<link rel="match" href="reference/word-break-auto-phrase-001-ref.html">
+<meta name="assert" content="word-break:auto-phrase inserts virtual word boundaries at reasonable points.">
+<style>
+div {
+  font-size: 2em;
+  border: solid black;
+  margin: 5px;
+  width: min-content; /*not 0, to avoid falling into overflow fallback behavior */
+  word-break: normal
+}
+#test {
+  word-break: auto-phrase;
+}
+#ref {
+  border-color: blue;
+  word-break: keep-all;
+}
+</style>
+
+<p>Test passes if the black box is identical to the blue one.
+
+<div id=test lang=ja>
+  東京へ行きましょう。
+</div>
+<div id=ref lang=ja>
+  東京へ<wbr>行きましょう。
+</div>
+<!-- As phrase detection is up to the UA,
+    arguably an alternative decomposition
+    with wbr before AND after へ
+    might be OK,
+    but the last phrase is longer anyway,
+    so the difference is not visible.
+-->
diff --git a/tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-002.html b/tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-002.html
new file mode 100644
index 00000000000..c4f437e99d0
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-002.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text level 4 Test: word-break: auto-phrase</title>
+<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-break-property">
+<link rel="match" href="reference/word-break-auto-phrase-002-ref.html">
+<meta name="assert" content="word-break: auto-phrase inserts virtual word boundaries at reasonable points, creating soft wrapping opportunities">
+<style>
+div {
+  font-size: 2em;
+  border: solid black;
+  margin: 5px;
+  width: min-content; /*not 0, to avoid falling into overflow fallback behavior */
+  word-break: normal;
+}
+#test {
+  word-break: auto-phrase;
+}
+#ref {
+  border-color: blue;
+}
+</style>
+
+<p>Test passes if the black box is identical to either the blue one.
+
+<div id=test lang=th>
+  กรุงเทพคือสวยงาม
+</div>
+<div id=ref lang=th>
+  กรุงเทพ<wbr>คือ<wbr>สวยงาม
+</div>
+
+<!--
+    In this particular example,
+    the expected results is one word phrases.
+    Therefore, even if auto-phrase for thai isn't specifically supported,
+    this ought to work.
+    But if it is supported,
+    gluing everything together would be mistaken:
+    this is auto-phrase,
+    not auto-sentence.
+-->
+
diff --git a/tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-003.html b/tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-003.html
new file mode 100644
index 00000000000..6ff8d959f8b
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-003.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text level 4 Test: word-break auto-phrase forbidden</title>
+<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-break-property">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-phrase-detection">
+<link rel="match" href="reference/word-break-auto-phrase-003-ref.html">
+<meta name="assert" content="The UA must not insert a virtual word boundary between a typographic letter unit and an adjacent typographic character unit from the [UAX14] GL line breaking class">
+<style>
+div {
+  font-size: 2em;
+  border: solid black;
+  margin: 5px;
+  width: min-content;
+}
+#test {
+  word-break: auto-phrase;
+}
+#ref {
+  word-break: keep-all;
+}
+</style>
+
+<p>Test passes if the two boxes below are identical.
+
+<div id=test lang=ja>東京&nbsp;へ&nbsp;行きましょう。</div>
+<div id=ref lang=ja>東京&nbsp;へ&nbsp;行きましょう。</div>
diff --git a/tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-004.html b/tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-004.html
new file mode 100644
index 00000000000..4e455091de4
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-004.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text level 4 Test: word-break: auto-phrase- forbidden</title>
+<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-break-property">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-phrase-detection">
+<link rel="match" href="reference/word-break-auto-phrase-004-ref.html">
+<meta name="assert" content="The UA must not insert a virtual word boundary between a typographic letter unit and an adjacent typographic character unit from the [UAX14] WJ line breaking class">
+<style>
+div {
+  font-size: 2em;
+  border: solid black;
+  margin: 5px;
+  width: min-content;
+}
+#test {
+  word-break: auto-phrase;
+}
+#ref {
+  word-break: keep-all;
+}
+</style>
+
+<p>Test passes if the two boxes below are identical.
+
+<div id=test lang=ja>東京&#x2060;へ&#x2060;行きましょう。</div>
+<div id=ref lang=ja>東京&#x2060;へ&#x2060;行きましょう。</div>
diff --git a/tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-005.html b/tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-005.html
new file mode 100644
index 00000000000..5183d3bc13d
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-005.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text level 4 Test: word-break: auto-phrase forbidden</title>
+<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-break-property">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-phrase-detection">
+<link rel="match" href="reference/word-break-auto-phrase-005-ref.html">
+<meta name="assert" content="The UA must not insert a virtual word boundary between a typographic letter unit and an adjacent typographic character unit from the [UAX14] ZWJ line breaking class">
+<style>
+div {
+  font-size: 2em;
+  border: solid black;
+  margin: 5px;
+  width: min-content;
+}
+#test {
+  word-break: auto-phrase;
+}
+#ref {
+  word-break: keep-all;
+}
+</style>
+
+<p>Test passes if the two boxes below are identical.
+
+<div id=test lang=ja>東京&#x200D;へ&#x200D;行きましょう。</div>
+<div id=ref lang=ja>東京&#x200D;へ&#x200D;行きましょう。</div>
diff --git a/tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-006.html b/tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-006.html
new file mode 100644
index 00000000000..9fca535a7a1
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-006.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text level 4 Test: word-break: auto-phrase hyphenation</title>
+<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-break-property">
+<link rel="match" href="reference/word-break-auto-phrase-006-ref.html">
+<meta name="assert" content="auto-phrase word breaking must suppress hyphenation">
+<style>
+div {
+  font-size: 2em;
+  border: solid black;
+  margin: 5px;
+  width: min-content;
+}
+#test1 {
+  word-break: auto-phrase;
+  hyphens: manual;
+}
+#test2 {
+  word-break: auto-phrase;
+  hyphens: auto;
+}
+#ref {
+  hyphens: none;
+}
+</style>
+
+<p>Test passes if all boxes below are identical.
+
+<div id=test1 lang=en>con&shy;sid&shy;era&shy;tion</div>
+<div id=test2 lang=en>consideration</div>
+<div id=ref lang=en>consideration</div>
diff --git a/tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-007.html b/tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-007.html
new file mode 100644
index 00000000000..154fb8c447e
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-007.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text level 4 Test: word-break: auto-phrase forbidden</title>
+<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-break-property">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-phrase-detection">
+<link rel="match" href="reference/word-break-auto-phrase-007-ref.html">
+<meta name="assert" content="UAs must not suppress wrapping opportunities introduced by wbr or ZWSP">
+<style>
+div {
+  border: solid black;
+  margin: 5px;
+  width: min-content;
+}
+#test {
+  word-break: auto-phrase;
+}
+</style>
+
+<p>Test passes if the two boxes below are identical.
+
+<div id=test lang=ja>東<wbr>京<wbr>へ<wbr>行<wbr>き<wbr>ま&#x200B;し&#x200B;ょ&#x200B;う&#x200B;。</div>
+<div id=ref lang=ja>東<wbr>京<wbr>へ<wbr>行<wbr>き<wbr>ま&#x200B;し&#x200B;ょ&#x200B;う&#x200B;。</div>
diff --git a/tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-008.html b/tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-008.html
new file mode 100644
index 00000000000..68af0f5f190
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-008.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text level 4 Test: word-break: auto-phrase hyphenation</title>
+<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-break-property">
+<link rel="match" href="reference/word-break-auto-phrase-008-ref.html">
+<meta name="assert" content="auto-phrase must give up on suppressing hyphenation when that would lead to overflow">
+<style>
+div {
+  font-size: 2em;
+  border-left: solid black;
+  margin: 15px;
+  width: 0;
+  hyphens: manual;
+}
+#test {
+  word-break: auto-phrase;
+  overflow-wrap: normal;
+}
+</style>
+
+<p>Test passes if both words bellow are hyphenated.
+
+<div id=test lang=en>con&shy;sid&shy;era&shy;tion</div>
+<div id=ref lang=en>con&shy;sid&shy;era&shy;tion</div>
diff --git a/tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-009.html b/tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-009.html
new file mode 100644
index 00000000000..6f0c736183e
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-009.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text level 4 Test: word-break: auto-phrase forbidden</title>
+<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-break-property">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-phrase-detection">
+<link rel="match" href="reference/word-break-auto-phrase-009-ref.html">
+<meta name="assert" content="auto-phrase's must give up on suppressing wrapping opportunities when that would lead to overflow.">
+<style>
+div {
+  border: solid black;
+  margin: 5px;
+  width: 1em;
+}
+#test {
+  word-break: auto-phrase;
+  overflow-wrap: normal;
+}
+</style>
+
+<p>Test passes if the two boxes below are identical.
+
+<div id=test lang=ja>一生懸命働きます</div>
+<div id=ref lang=ja>一生懸命働きます</div>
diff --git a/tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-fallback-001.html b/tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-fallback-001.html
new file mode 100644
index 00000000000..02a33734e59
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-fallback-001.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text level 4 Test: word-break:auto-phrase mistagged</title>
+<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-break-property">
+<link rel="match" href="reference/word-break-auto-phrase-fallback-001-ref.html">
+<meta name="assert" content="word-break:auto-phrase, does the same as normal (insert soft wraps for south east asian) on SA content tagged with the wrong language: soft wrap opportunities within each phrase are to be suppressed, but a run of Thai characters is not a phrase in Japanese.">
+<style>
+div {
+  font-size: 2em;
+  border: solid orange;
+  margin: 5px;
+  width: min-content; /*not 0, to avoid falling into overflow fallback behavior */
+  word-break: normal;
+}
+#test {
+  word-break: auto-phrase;
+}
+</style>
+
+<p>Test passes if the two boxes below are identical.
+
+<div id=test lang=ja>กรุงเทพคือสวยงาม</div>
+
+<!-- keeping the lang=ja because it may affects font selection-->
+<div id=ref lang=ja>กรุงเทพคือสวยงาม</div>
diff --git a/tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-fallback-002.html b/tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-fallback-002.html
new file mode 100644
index 00000000000..e2905f1d5a7
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-fallback-002.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text level 4 Test: word-break:auto-phrase untagged</title>
+<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-break-property">
+<link rel="match" href="reference/word-break-auto-phrase-fallback-002-ref.html">
+<meta name="assert" content="word-break:auto-phrase, if supported, does the same as normal (insert soft wraps for south east asian) on content not language tagged.">
+<style>
+div {
+  font-size: 2em;
+  border: solid blue;
+  margin: 5px;
+  width: min-content; /*not 0, to avoid falling into overflow fallback behavior */
+  word-break: normal;
+}
+#test {
+  word-break: auto-phrase;
+}
+</style>
+
+<p>Test passes if the two boxes below are identical.
+
+<div id=test>กรุงเทพคือสวยงาม</div>
+<div id=ref>กรุงเทพคือสวยงาม</div>
diff --git a/tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-fallback-003.html b/tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-fallback-003.html
new file mode 100644
index 00000000000..cea15820bd1
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-fallback-003.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text level 4 Test: word-break:auto-phrase untagged</title>
+<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-break-property">
+<link rel="match" href="reference/word-break-auto-phrase-fallback-003-ref.html">
+<meta name="assert" content="word-break:auto-phrase, if supported, does not affect (i.e. same as normal) content not language tagged.">
+<style>
+div {
+  font-size: 2em;
+  border: solid blue;
+  margin: 5px;
+  width: min-content; /* not 0, otherwise it would trigger the overflow fallback behavior */
+}
+#test {
+  word-break: auto-phrase;
+}
+</style>
+
+<p>Test passes if the two boxes below are identical.
+
+<div id=test>東京へ行きましょう。</div>
+<div id=ref>東京へ行きましょう。</div>
diff --git a/tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-intrinsic-001.html b/tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-intrinsic-001.html
index a16f9fb0b12..ebb07cf3b53 100644
--- a/tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-intrinsic-001.html
+++ b/tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-intrinsic-001.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
 <link rel="help" href="https://drafts.csswg.org/css-text-4/#word-break-property">
-<link rel="match" href="word-break-auto-phrase-intrinsic-001-ref.html">
+<link rel="match" href="reference/word-break-auto-phrase-intrinsic-001-ref.html">
 <!--
   This test assumes that all engines segment a Japanese text:
     楽しいドライブ
diff --git a/tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-overflow-001.html b/tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-overflow-001.html
index 7677441c9a8..fcd17528ac0 100644
--- a/tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-overflow-001.html
+++ b/tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-overflow-001.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
 <link rel="help" href="https://drafts.csswg.org/css-text-4/#word-break-property">
-<link rel="match" href="word-break-auto-phrase-overflow-001-ref.html">
+<link rel="match" href="reference/word-break-auto-phrase-overflow-001-ref.html">
 <!--
   This test assumes that all engines segment a Japanese text:
     楽しいドライブ
@@ -13,7 +13,12 @@
   algorithm is UA dependent. Please add references if different.
 -->
 <style>
+@font-face {
+  font-family: mplus;
+  src: url(/fonts/mplus-1p-regular.woff);
+}
 .container > div {
+  font-family: mplus;
   word-break: auto-phrase;
   font-size: 10px;
   border: 1px solid;
diff --git a/tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-wbr-nobr-001.html b/tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-wbr-nobr-001.html
index 76944730d5c..b8e55200462 100644
--- a/tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-wbr-nobr-001.html
+++ b/tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-wbr-nobr-001.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
 <link rel="help" href="https://drafts.csswg.org/css-text-4/#word-break-property">
-<link rel="match" href="word-break-auto-phrase-wbr-nobr-001-ref.html">
+<link rel="match" href="reference/word-break-auto-phrase-wbr-nobr-001-ref.html">
 <!--
   This test assumes that all engines segment a Japanese text:
     ドライブ
@@ -12,7 +12,12 @@
   algorithm is UA dependent. Please add references if different.
 -->
 <style>
+@font-face {
+  font-family: mplus;
+  src: url(/fonts/mplus-1p-regular.woff);
+}
 .container > div {
+  font-family: mplus;
   word-break: auto-phrase;
   width: 3em;
   font-size: 10px;
diff --git a/tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-wbr-nobr-002.html b/tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-wbr-nobr-002.html
index 9b4e55623c5..85061923cad 100644
--- a/tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-wbr-nobr-002.html
+++ b/tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-wbr-nobr-002.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
 <link rel="help" href="https://drafts.csswg.org/css-text-4/#word-break-property">
-<link rel="match" href="word-break-auto-phrase-wbr-nobr-002-ref.html">
+<link rel="match" href="reference/word-break-auto-phrase-wbr-nobr-002-ref.html">
 <!--
   This test assumes that all engines segment a Japanese text:
     楽しいドライブ
@@ -13,7 +13,12 @@
   algorithm is UA dependent. Please add references if different.
 -->
 <style>
+@font-face {
+  font-family: mplus;
+  src: url(/fonts/mplus-1p-regular.woff);
+}
 .container > div {
+  font-family: mplus;
   word-break: auto-phrase;
   width: 10em;
   font-size: 10px;
diff --git a/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-101-ref.html b/tests/wpt/tests/css/css-text/word-break/reference/word-break-manual-001-ref.html
similarity index 100%
rename from tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-101-ref.html
rename to tests/wpt/tests/css/css-text/word-break/reference/word-break-manual-001-ref.html
diff --git a/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-103-ref.html b/tests/wpt/tests/css/css-text/word-break/reference/word-break-normal-002-ref.html
similarity index 100%
rename from tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-103-ref.html
rename to tests/wpt/tests/css/css-text/word-break/reference/word-break-normal-002-ref.html
diff --git a/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-104-ref.html b/tests/wpt/tests/css/css-text/word-break/reference/word-break-normal-003-ref.html
similarity index 100%
rename from tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-104-ref.html
rename to tests/wpt/tests/css/css-text/word-break/reference/word-break-normal-003-ref.html
diff --git a/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-102-ref.html b/tests/wpt/tests/css/css-text/word-break/reference/word-break-normal-th-001-ref.html
similarity index 100%
rename from tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-102-ref.html
rename to tests/wpt/tests/css/css-text/word-break/reference/word-break-normal-th-001-ref.html
diff --git a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-101.html b/tests/wpt/tests/css/css-text/word-break/word-break-manual-001.html
similarity index 65%
rename from tests/wpt/tests/css/css-text/word-boundary/word-boundary-101.html
rename to tests/wpt/tests/css/css-text/word-break/word-break-manual-001.html
index 40a66a4271a..09d803b0fc1 100644
--- a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-101.html
+++ b/tests/wpt/tests/css/css-text/word-break/word-break-manual-001.html
@@ -1,10 +1,10 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>CSS Text level 4 Test: word-boundary-detection:manual </title>
+<title>CSS Text level 4 Test: word-break:manual </title>
 <link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
 <link rel="help" href="https://drafts.csswg.org/css-text-4/#word-boundary-detection">
-<link rel="match" href="reference/word-boundary-101-ref.html">
-<meta name="assert" content="word-boundary-detection:manual turns off detection of word boundaries in south east asian scripts">
+<link rel="match" href="reference/word-break-manual-001-ref.html">
+<meta name="assert" content="word-break: manual turns off detection of word boundaries in south east asian scripts">
 <style>
 #wrap, #ref {
   font-size: 2em;
@@ -14,7 +14,7 @@
 }
 #test {
   width: 0;
-  word-boundary-detection: manual;
+  word-break: manual;
 }
 </style>
 
diff --git a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-103.html b/tests/wpt/tests/css/css-text/word-break/word-break-normal-002.html
similarity index 57%
rename from tests/wpt/tests/css/css-text/word-boundary/word-boundary-103.html
rename to tests/wpt/tests/css/css-text/word-break/word-break-normal-002.html
index 114c6f1367c..c988928eb8f 100644
--- a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-103.html
+++ b/tests/wpt/tests/css/css-text/word-break/word-break-normal-002.html
@@ -1,10 +1,11 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>CSS Text level 4 Test: word-boundary-detection:normal mistagged</title>
+<title>CSS Text level 4 Test: word-break:normal mistagged</title>
 <link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
-<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-boundary-detection">
-<link rel="mismatch" href="reference/word-boundary-103-ref.html">
-<meta name="assert" content="word-boundary-detection:normal turns on detection of word boundaries in south east asian scripts, even if the language tagging is incorrect">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-break-property">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#lexical-breaking">
+<link rel="mismatch" href="reference/word-break-normal-002-ref.html">
+<meta name="assert" content="word-break:normal turns on detection of word boundaries in south east asian scripts, even if the language tagging is incorrect">
 <style>
 #wrap, #ref {
   font-size: 2em;
@@ -14,7 +15,7 @@
 }
 #test {
   width: 0;
-  word-boundary-detection: normal;
+  word-break: normal;
 }
 </style>
 
diff --git a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-104.html b/tests/wpt/tests/css/css-text/word-break/word-break-normal-003.html
similarity index 55%
rename from tests/wpt/tests/css/css-text/word-boundary/word-boundary-104.html
rename to tests/wpt/tests/css/css-text/word-break/word-break-normal-003.html
index a7a2f38fda1..bb6c2b477a1 100644
--- a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-104.html
+++ b/tests/wpt/tests/css/css-text/word-break/word-break-normal-003.html
@@ -1,10 +1,11 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>CSS Text level 4 Test: word-boundary-detection:normal untagged</title>
+<title>CSS Text level 4 Test: word-break:normal untagged</title>
 <link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
-<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-boundary-detection">
-<link rel="mismatch" href="reference/word-boundary-104-ref.html">
-<meta name="assert" content="word-boundary-detection:normal turns on detection of word boundaries in south east asian scripts, even if the language tagging is missing">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-break-property">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#lexical-breaking">
+<link rel="mismatch" href="reference/word-break-normal-003-ref.html">
+<meta name="assert" content="word-boundary-break:normal turns on detection of word boundaries in south east asian scripts, even if the language tagging is missing">
 <style>
 #wrap, #ref {
   font-size: 2em;
@@ -14,7 +15,7 @@
 }
 #test {
   width: 0;
-  word-boundary-detection: normal;
+  word-break: normal;
 }
 </style>
 
diff --git a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-102.html b/tests/wpt/tests/css/css-text/word-break/word-break-normal-th-001.html
similarity index 52%
rename from tests/wpt/tests/css/css-text/word-boundary/word-boundary-102.html
rename to tests/wpt/tests/css/css-text/word-break/word-break-normal-th-001.html
index e3f9828f320..919dcc22a31 100644
--- a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-102.html
+++ b/tests/wpt/tests/css/css-text/word-break/word-break-normal-th-001.html
@@ -1,10 +1,11 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>CSS Text level 4 Test: word-boundary-detection:normal</title>
+<title>CSS Text level 4 Test: word-break: normal</title>
 <link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
-<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-boundary-detection">
-<link rel="mismatch" href="reference/word-boundary-102-ref.html">
-<meta name="assert" content="word-boundary-detection:normal turns on detection of word boundaries in south east asian scripts. Preferably in a smart, word-by-word basis, but if the UA doesn't support that, on a per character basis. Eitherway, lines should wrap">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-break-property">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#lexical-breaking">
+<link rel="mismatch" href="reference/word-break-normal-th-001-ref.html">
+<meta name="assert" content="word-break:normal turns on detection of word boundaries in south east asian scripts. Preferably in a smart, word-by-word basis, but if the UA doesn't support that, on a per character basis. Eitherway, lines should wrap">
 <style>
 #wrap, #ref {
   font-size: 2em;
@@ -14,7 +15,7 @@
 }
 #test {
   width: 0;
-  word-boundary-detection: normal;
+  word-break: normal;
 }
 </style>
 
diff --git a/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-001-ref.html b/tests/wpt/tests/css/css-text/word-space-transform/reference/word-space-transform-001-ref.html
similarity index 100%
rename from tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-001-ref.html
rename to tests/wpt/tests/css/css-text/word-space-transform/reference/word-space-transform-001-ref.html
diff --git a/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-002-ref.html b/tests/wpt/tests/css/css-text/word-space-transform/reference/word-space-transform-002-ref.html
similarity index 100%
rename from tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-002-ref.html
rename to tests/wpt/tests/css/css-text/word-space-transform/reference/word-space-transform-002-ref.html
diff --git a/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-004-ref.html b/tests/wpt/tests/css/css-text/word-space-transform/reference/word-space-transform-004-ref.html
similarity index 100%
rename from tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-004-ref.html
rename to tests/wpt/tests/css/css-text/word-space-transform/reference/word-space-transform-004-ref.html
diff --git a/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-007-ref.html b/tests/wpt/tests/css/css-text/word-space-transform/reference/word-space-transform-007-ref.html
similarity index 100%
rename from tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-007-ref.html
rename to tests/wpt/tests/css/css-text/word-space-transform/reference/word-space-transform-007-ref.html
diff --git a/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-008-ref.html b/tests/wpt/tests/css/css-text/word-space-transform/reference/word-space-transform-008-ref.html
similarity index 100%
rename from tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-008-ref.html
rename to tests/wpt/tests/css/css-text/word-space-transform/reference/word-space-transform-008-ref.html
diff --git a/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-009-ref.html b/tests/wpt/tests/css/css-text/word-space-transform/reference/word-space-transform-009-ref.html
similarity index 100%
rename from tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-009-ref.html
rename to tests/wpt/tests/css/css-text/word-space-transform/reference/word-space-transform-009-ref.html
diff --git a/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-010-ref.html b/tests/wpt/tests/css/css-text/word-space-transform/reference/word-space-transform-010-ref.html
similarity index 100%
rename from tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-010-ref.html
rename to tests/wpt/tests/css/css-text/word-space-transform/reference/word-space-transform-010-ref.html
diff --git a/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-011-ref.html b/tests/wpt/tests/css/css-text/word-space-transform/reference/word-space-transform-011-ref.html
similarity index 100%
rename from tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-011-ref.html
rename to tests/wpt/tests/css/css-text/word-space-transform/reference/word-space-transform-011-ref.html
diff --git a/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-012-ref.html b/tests/wpt/tests/css/css-text/word-space-transform/reference/word-space-transform-012-ref.html
similarity index 100%
rename from tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-012-ref.html
rename to tests/wpt/tests/css/css-text/word-space-transform/reference/word-space-transform-012-ref.html
diff --git a/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-013-ref.html b/tests/wpt/tests/css/css-text/word-space-transform/reference/word-space-transform-013-ref.html
similarity index 100%
rename from tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-013-ref.html
rename to tests/wpt/tests/css/css-text/word-space-transform/reference/word-space-transform-013-ref.html
diff --git a/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-014-ref.html b/tests/wpt/tests/css/css-text/word-space-transform/reference/word-space-transform-014-ref.html
similarity index 100%
rename from tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-014-ref.html
rename to tests/wpt/tests/css/css-text/word-space-transform/reference/word-space-transform-014-ref.html
diff --git a/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-110-a-ref.html b/tests/wpt/tests/css/css-text/word-space-transform/reference/word-space-transform-016-a-ref.html
similarity index 100%
rename from tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-110-a-ref.html
rename to tests/wpt/tests/css/css-text/word-space-transform/reference/word-space-transform-016-a-ref.html
diff --git a/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-110-b-ref.html b/tests/wpt/tests/css/css-text/word-space-transform/reference/word-space-transform-016-b-ref.html
similarity index 100%
rename from tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-110-b-ref.html
rename to tests/wpt/tests/css/css-text/word-space-transform/reference/word-space-transform-016-b-ref.html
diff --git a/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-112-ref.html b/tests/wpt/tests/css/css-text/word-space-transform/reference/word-space-transform-017-ref.html
similarity index 72%
rename from tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-112-ref.html
rename to tests/wpt/tests/css/css-text/word-space-transform/reference/word-space-transform-017-ref.html
index f7f79390810..d37b2301d9c 100644
--- a/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-112-ref.html
+++ b/tests/wpt/tests/css/css-text/word-space-transform/reference/word-space-transform-017-ref.html
@@ -13,11 +13,6 @@
   border-color: blue;
 }
 </style>
-<!--
-
-This test should pass even in UAs that don't support word-boundary-detection:auto(th)
-since inserting virtual word boundaries is the default for south-east-asian languages.
--->
 
 <p>Test passes if the black box is identical to the blue one.
 
diff --git a/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-113-ref.html b/tests/wpt/tests/css/css-text/word-space-transform/reference/word-space-transform-018-ref.html
similarity index 76%
rename from tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-113-ref.html
rename to tests/wpt/tests/css/css-text/word-space-transform/reference/word-space-transform-018-ref.html
index 738c600f5b4..84cb52c478e 100644
--- a/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-113-ref.html
+++ b/tests/wpt/tests/css/css-text/word-space-transform/reference/word-space-transform-018-ref.html
@@ -16,11 +16,6 @@ u {  background: silver; }
 b {  background: green; }
 em { background: gray; }
 </style>
-<!--
-
-This test should pass even in UAs that don't support word-boundary-detection:auto(th)
-since inserting virtual word boundaries is the default for south-east-asian languages.
--->
 
 <p>Test passes if the black box is identical to the blue one.
 
diff --git a/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-114-a-ref.html b/tests/wpt/tests/css/css-text/word-space-transform/reference/word-space-transform-019-a-ref.html
similarity index 100%
rename from tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-114-a-ref.html
rename to tests/wpt/tests/css/css-text/word-space-transform/reference/word-space-transform-019-a-ref.html
diff --git a/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-114-b-ref.html b/tests/wpt/tests/css/css-text/word-space-transform/reference/word-space-transform-019-b-ref.html
similarity index 100%
rename from tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-114-b-ref.html
rename to tests/wpt/tests/css/css-text/word-space-transform/reference/word-space-transform-019-b-ref.html
diff --git a/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-115-ref.html b/tests/wpt/tests/css/css-text/word-space-transform/reference/word-space-transform-020-ref.html
similarity index 100%
rename from tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-115-ref.html
rename to tests/wpt/tests/css/css-text/word-space-transform/reference/word-space-transform-020-ref.html
diff --git a/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-116-ref.html b/tests/wpt/tests/css/css-text/word-space-transform/reference/word-space-transform-021-ref.html
similarity index 72%
rename from tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-116-ref.html
rename to tests/wpt/tests/css/css-text/word-space-transform/reference/word-space-transform-021-ref.html
index 62d26d6a4b5..1569dc9cbce 100644
--- a/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-116-ref.html
+++ b/tests/wpt/tests/css/css-text/word-space-transform/reference/word-space-transform-021-ref.html
@@ -13,5 +13,5 @@ div {
 
 <p>Test passes if the two boxes below are identical.
 
-<div lang=ja>東京 へ 行きましょう。</div>
-<div lang=ja>東京 へ 行きましょう。</div>
+<div id=test lang=ja>一生懸命 働きます。</div>
+<div id=ref lang=ja>一生懸命 働きます。</div>
diff --git a/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-117-ref.html b/tests/wpt/tests/css/css-text/word-space-transform/reference/word-space-transform-022-ref.html
similarity index 72%
rename from tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-117-ref.html
rename to tests/wpt/tests/css/css-text/word-space-transform/reference/word-space-transform-022-ref.html
index 81d1f0601dd..734c08ccab0 100644
--- a/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-117-ref.html
+++ b/tests/wpt/tests/css/css-text/word-space-transform/reference/word-space-transform-022-ref.html
@@ -13,5 +13,5 @@ div {
 
 <p>Test passes if the two boxes below are identical.
 
-<div lang=ja>東京　へ　行きましょう。</div>
-<div lang=ja>東京　へ　行きましょう。</div>
+<div id=test lang=ja>一生懸命　働きます。</div>
+<div id=ref lang=ja>一生懸命　働きます。</div>
diff --git a/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-119-ref.html b/tests/wpt/tests/css/css-text/word-space-transform/reference/word-space-transform-024-ref.html
similarity index 100%
rename from tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-119-ref.html
rename to tests/wpt/tests/css/css-text/word-space-transform/reference/word-space-transform-024-ref.html
diff --git a/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-120-ref.html b/tests/wpt/tests/css/css-text/word-space-transform/reference/word-space-transform-025-ref.html
similarity index 100%
rename from tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-120-ref.html
rename to tests/wpt/tests/css/css-text/word-space-transform/reference/word-space-transform-025-ref.html
diff --git a/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-121-ref.html b/tests/wpt/tests/css/css-text/word-space-transform/reference/word-space-transform-026-ref.html
similarity index 100%
rename from tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-121-ref.html
rename to tests/wpt/tests/css/css-text/word-space-transform/reference/word-space-transform-026-ref.html
diff --git a/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-122-ref.html b/tests/wpt/tests/css/css-text/word-space-transform/reference/word-space-transform-027-ref.html
similarity index 62%
rename from tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-122-ref.html
rename to tests/wpt/tests/css/css-text/word-space-transform/reference/word-space-transform-027-ref.html
index 27170553468..58cfc552c80 100644
--- a/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-122-ref.html
+++ b/tests/wpt/tests/css/css-text/word-space-transform/reference/word-space-transform-027-ref.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>Test reference</title>
+<title>CSS test reference</title>
 <link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
 <style>
 div {
@@ -13,5 +13,5 @@ div {
 
 <p>Test passes if the two boxes below are identical.
 
-<div lang=ja>東京}&nbsp;へ}&nbsp;行きましょう。</div>
-<div lang=ja>東京}&nbsp;へ}&nbsp;行きましょう。</div>
+<div id=test>東京へ行きましょう。</div>
+<div id=ref>東京へ行きましょう。</div>
diff --git a/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-124-ref.html b/tests/wpt/tests/css/css-text/word-space-transform/reference/word-space-transform-028-ref.html
similarity index 62%
rename from tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-124-ref.html
rename to tests/wpt/tests/css/css-text/word-space-transform/reference/word-space-transform-028-ref.html
index fd732b44ec4..9904cb96104 100644
--- a/tests/wpt/tests/css/css-text/word-boundary/reference/word-boundary-124-ref.html
+++ b/tests/wpt/tests/css/css-text/word-space-transform/reference/word-space-transform-028-ref.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>Test reference</title>
+<title>CSS test</title>
 <link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
 <style>
 div {
@@ -13,5 +13,5 @@ div {
 
 <p>Test passes if the two boxes below are identical.
 
-<div lang=ja>東京.&nbsp;へ.&nbsp;行きましょう。</div>
-<div lang=ja>東京.&nbsp;へ.&nbsp;行きましょう。</div>
+<div id=test lang=ja>東京へ行きましょう。</div>
+<div id=ref lang=ja>東京へ行きましょう。</div>
diff --git a/tests/wpt/tests/css/css-text/word-space-transform/reference/word-space-transform-029-ref.html b/tests/wpt/tests/css/css-text/word-space-transform/reference/word-space-transform-029-ref.html
new file mode 100644
index 00000000000..0844a20126d
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/word-space-transform/reference/word-space-transform-029-ref.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS test</title>
+<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
+<style>
+div {
+  font-size: 2em;
+  border: solid black;
+  margin: 5px;
+  width: 30ch;
+}
+</style>
+
+<p>Test passes if the two boxes below are identical.
+
+<div id=test lang=xyz>東京へ行きましょう。</div>
+<div id=ref lang=xyz>東京へ行きましょう。</div>
diff --git a/tests/wpt/tests/css/css-text/word-space-transform/reference/word-space-transform-030-ref.html b/tests/wpt/tests/css/css-text/word-space-transform/reference/word-space-transform-030-ref.html
new file mode 100644
index 00000000000..46df21573f1
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/word-space-transform/reference/word-space-transform-030-ref.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Test reference</title>
+<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
+<style>
+div {
+  font-size: 2em;
+  border: solid black;
+  margin: 5px;
+  width: min-content;
+  white-space: pre;
+}
+</style>
+
+<p>Test passes if the two boxes below are identical.
+
+<div lang=ja>一生懸命　<br>働きます。</div>
+<div lang=ja>一生懸命　<br>働きます。</div>
diff --git a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-001.html b/tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-001.html
similarity index 61%
rename from tests/wpt/tests/css/css-text/word-boundary/word-boundary-001.html
rename to tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-001.html
index 08ad0d1a988..5378808efe5 100644
--- a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-001.html
+++ b/tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-001.html
@@ -1,16 +1,16 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>CSS Text level 4 Test: word-boundary-expansion:ideographic-space </title>
+<title>CSS Text level 4 Test: word-space-transform:ideographic-space </title>
 <link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
-<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-boundary-expansion">
-<link rel="match" href="reference/word-boundary-001-ref.html">
-<meta name="assert" content="Both zero-width-spaces and <wbr> are expanded by word-boundary-expansion: ideographic-space">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-space-transform">
+<link rel="match" href="reference/word-space-transform-001-ref.html">
+<meta name="assert" content="Both zero-width-spaces and <wbr> are expanded by word-space-transform: ideographic-space">
 <style>
 div {
   font-size: 2em;
 }
 #test {
-  word-boundary-expansion: ideographic-space;
+  word-space-transform: ideographic-space;
 }
 </style>
 
diff --git a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-002.html b/tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-002.html
similarity index 63%
rename from tests/wpt/tests/css/css-text/word-boundary/word-boundary-002.html
rename to tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-002.html
index 58dede44b2c..5cad18ef476 100644
--- a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-002.html
+++ b/tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-002.html
@@ -1,16 +1,16 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>CSS Text level 4 Test: word-boundary-expansion:space</title>
+<title>CSS Text level 4 Test: word-space-transform:space</title>
 <link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
-<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-boundary-expansion">
-<link rel="match" href="reference/word-boundary-002-ref.html">
-<meta name="assert" content="Both zero-width-spaces and <wbr> are expanded by word-boundary-expansion: space">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-space-transform">
+<link rel="match" href="reference/word-space-transform-002-ref.html">
+<meta name="assert" content="Both zero-width-spaces and <wbr> are expanded by word-space-transform: space">
 <style>
 div {
   font-size: 2em;
 }
 #test {
-  word-boundary-expansion: space;
+  word-space-transform: space;
 }
 </style>
 
diff --git a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-003.html b/tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-003.html
similarity index 59%
rename from tests/wpt/tests/css/css-text/word-boundary/word-boundary-003.html
rename to tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-003.html
index 41151753f92..f7e4f5c9e24 100644
--- a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-003.html
+++ b/tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-003.html
@@ -1,16 +1,16 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>CSS Text level 4 Test: word-boundary-expansion inherits</title>
+<title>CSS Text level 4 Test: word-space-transform inherits</title>
 <link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
-<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-boundary-expansion">
-<link rel="match" href="reference/word-boundary-001-ref.html">
-<meta name="assert" content="word-boundary-expansion inherits">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-space-transform">
+<link rel="match" href="reference/word-space-transform-001-ref.html">
+<meta name="assert" content="word-space-transform inherits">
 <style>
 div {
   font-size: 2em;
 }
 #wrap {
-  word-boundary-expansion: ideographic-space;
+  word-space-transform: ideographic-space;
 }
 </style>
 
diff --git a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-004.html b/tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-004.html
similarity index 53%
rename from tests/wpt/tests/css/css-text/word-boundary/word-boundary-004.html
rename to tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-004.html
index ad7f19fdb99..082824542f1 100644
--- a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-004.html
+++ b/tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-004.html
@@ -1,19 +1,19 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>CSS Text level 4 Test: word-boundary-expansion off on wbr</title>
+<title>CSS Text level 4 Test: word-space-transform off on wbr</title>
 <link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
-<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-boundary-expansion">
-<link rel="match" href="reference/word-boundary-004-ref.html">
-<meta name="assert" content="word-boundary-expansion can be turned off on a <wbr>">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-space-transform">
+<link rel="match" href="reference/word-space-transform-004-ref.html">
+<meta name="assert" content="word-space-transform can be turned off on a <wbr>">
 <style>
 div {
   font-size: 2em;
 }
 #test {
-  word-boundary-expansion: space;
+  word-space-transform: space;
 }
 wbr {
-  word-boundary-expansion: none;
+  word-space-transform: none;
 }
 </style>
 
diff --git a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-005.html b/tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-005.html
similarity index 54%
rename from tests/wpt/tests/css/css-text/word-boundary/word-boundary-005.html
rename to tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-005.html
index f124c3737ca..fc994ebbe66 100644
--- a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-005.html
+++ b/tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-005.html
@@ -1,19 +1,19 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>CSS Text level 4 Test: word-boundary-expansion off on inline</title>
+<title>CSS Text level 4 Test: word-space-transform off on inline</title>
 <link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
-<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-boundary-expansion">
-<link rel="match" href="reference/word-boundary-004-ref.html">
-<meta name="assert" content="word-boundary-expansion can be turned off on a inlines">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-space-transform">
+<link rel="match" href="reference/word-space-transform-004-ref.html">
+<meta name="assert" content="word-space-transform can be turned off on a inlines">
 <style>
 div {
   font-size: 2em;
 }
 #test {
-  word-boundary-expansion: space;
+  word-space-transform: space;
 }
 span {
-  word-boundary-expansion: none;
+  word-space-transform: none;
 }
 </style>
 
diff --git a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-006.html b/tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-006.html
similarity index 55%
rename from tests/wpt/tests/css/css-text/word-boundary/word-boundary-006.html
rename to tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-006.html
index 587847b75cd..6fdd0abbe9a 100644
--- a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-006.html
+++ b/tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-006.html
@@ -1,16 +1,16 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>CSS Text level 4 Test: turn on word-boundary-expansion on wbr and inlines</title>
+<title>CSS Text level 4 Test: turn on word-space-transform on wbr and inlines</title>
 <link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
-<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-boundary-expansion">
-<link rel="match" href="reference/word-boundary-002-ref.html">
-<meta name="assert" content="word-boundary-expansion applies to inlines, including wbr">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-space-transform">
+<link rel="match" href="reference/word-space-transform-002-ref.html">
+<meta name="assert" content="word-space-transform applies to inlines, including wbr">
 <style>
 div {
   font-size: 2em;
 }
 wbr, span {
-  word-boundary-expansion: space;
+  word-space-transform: space;
 }
 </style>
 
diff --git a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-008.html b/tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-007.html
similarity index 58%
rename from tests/wpt/tests/css/css-text/word-boundary/word-boundary-008.html
rename to tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-007.html
index a1dfb828f25..5d021684de4 100644
--- a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-008.html
+++ b/tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-007.html
@@ -1,18 +1,17 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>CSS Text level 4 Test: word-boundary-expansion space non collapsing</title>
+<title>CSS Text level 4 Test: word-space-transform space collapsing</title>
 <link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
-<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-boundary-expansion">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-space-transform">
 <link rel="help" href="https://www.w3.org/TR/css-text-3/#white-space-phase-1">
-<link rel="match" href="reference/word-boundary-008-ref.html">
-<meta name="assert" content="word-boundary-expnasion happens before phase 1 of white space processing, so inserted spaces can be preserved by white-space:pre">
+<link rel="match" href="reference/word-space-transform-007-ref.html">
+<meta name="assert" content="word-space-transform happens between phase 1 and 2 of white space processing, so inserted spaces don't collapse with adjacent ones">
 <style>
 div {
   font-size: 2em;
-  white-space: pre;
 }
 #test {
-  word-boundary-expansion: space;
+  word-space-transform: space;
 }
 </style>
 
diff --git a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-007.html b/tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-008.html
similarity index 51%
rename from tests/wpt/tests/css/css-text/word-boundary/word-boundary-007.html
rename to tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-008.html
index 912188c7404..8808d936f00 100644
--- a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-007.html
+++ b/tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-008.html
@@ -1,21 +1,23 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>CSS Text level 4 Test: word-boundary-expansion space collapsing</title>
+<title>CSS Text level 4 Test: word-space-transform space non collapsing</title>
 <link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
-<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-boundary-expansion">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-space-transform">
 <link rel="help" href="https://www.w3.org/TR/css-text-3/#white-space-phase-1">
-<link rel="match" href="reference/word-boundary-007-ref.html">
-<meta name="assert" content="word-boundary-expnasion happens before phase 1 of white space processing, so inserted spaces collapse with adjacent ones">
+<link rel="match" href="reference/word-space-transform-008-ref.html">
+<meta name="assert" content="word-space-transform happens between phase 1 and 2 of white space processing, so inserted spaces are preserved, and become non-wrappable with white-space:pre">
 <style>
 div {
   font-size: 2em;
+  white-space: pre;
 }
 #test {
-  word-boundary-expansion: space;
+  word-space-transform: space;
+  width: 0;
 }
 </style>
 
 <p>Test passes if the two lines below are identical.
 
 <div id=test>a<wbr> b <wbr>c &#x200B;d&#x200B; e<wbr><wbr>f&#x200B;&#x200B;g<wbr>&#x200B;h&#x200B;<wbr>i <wbr> &#x200B; j</div>
-<div id=ref>a b c d e f g h i j</div>
+<div id=ref>a  b  c  d  e  f  g  h  i     j</div>
diff --git a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-009.html b/tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-009.html
similarity index 52%
rename from tests/wpt/tests/css/css-text/word-boundary/word-boundary-009.html
rename to tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-009.html
index cb8ec84fc2b..5c0df04d1da 100644
--- a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-009.html
+++ b/tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-009.html
@@ -1,18 +1,18 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>CSS Text level 4 Test: word-boundary-expansion and text-transform:full-width</title>
+<title>CSS Text level 4 Test: word-space-transform and text-transform:full-width</title>
 <link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
-<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-boundary-expansion">
-<link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-1">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-space-transform">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/##text-transform-order">
 <link rel="help" href="https://drafts.csswg.org/css-text-3/#text-transform-property">
-<link rel="match" href="reference/word-boundary-009-ref.html">
-<meta name="assert" content="word-boundary-expansion:space happens at the right stage of the white space processing pipeline to interact properly with text-transform:full-width">
+<link rel="match" href="reference/word-space-transform-009-ref.html">
+<meta name="assert" content="word-space-transform:space happens at the right stage of the white space processing pipeline to interact properly with text-transform:full-width">
 <style>
 div {
   font-size: 2em;
 }
 #test {
-  word-boundary-expansion: space;
+  word-space-transform: space;
   text-transform: full-width;
 }
 </style>
diff --git a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-010.html b/tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-010.html
similarity index 91%
rename from tests/wpt/tests/css/css-text/word-boundary/word-boundary-010.html
rename to tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-010.html
index 6e1cc1ccf27..b91f2d24996 100644
--- a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-010.html
+++ b/tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-010.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>CSS Text level 4 Test: word-boundary-expansion and forced line breaks</title>
+<title>CSS Text level 4 Test: word-space-transform and forced line breaks</title>
 <link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
-<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-boundary-expansion">
-<link rel="match" href="reference/word-boundary-010-ref.html">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-space-transform">
+<link rel="match" href="reference/word-space-transform-010-ref.html">
 <meta name="assert" content="must not replace instances of U+200B immediately preceding or following a forced line break (ignoring any intervening inline box boundaries, and associated margin/border/padding)">
 <style>
 div {
@@ -19,7 +19,7 @@ div {
 .border {  border: solid transparent; border-width: 0 1em; }
 .sborder { border: solid transparent; border-width: 0 0.5em; }
 .test {
-  word-boundary-expansion: ideographic-space;
+  word-space-transform: ideographic-space;
 }
 </style>
 
diff --git a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-011.html b/tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-011.html
similarity index 88%
rename from tests/wpt/tests/css/css-text/word-boundary/word-boundary-011.html
rename to tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-011.html
index 4da3a7a5c9d..9df80d70732 100644
--- a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-011.html
+++ b/tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-011.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>CSS Text level 4 Test: word-boundary-expansion and forced line breaks (br and preserved new lines)</title>
+<title>CSS Text level 4 Test: word-space-transform and forced line breaks (br and preserved new lines)</title>
 <link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
-<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-boundary-expansion">
-<link rel="match" href="reference/word-boundary-011-ref.html">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-space-transform">
+<link rel="match" href="reference/word-space-transform-011-ref.html">
 <meta name="assert" content="must not replace instances of U+200B immediately preceding or following a forced line break (br and preserved new lines)">
 <style>
 div {
@@ -13,7 +13,7 @@ div {
   margin: 1px;
 }
 .test {
-  word-boundary-expansion: ideographic-space;
+  word-space-transform: ideographic-space;
 }
 .pre {
 	white-space: pre;
diff --git a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-012.html b/tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-012.html
similarity index 84%
rename from tests/wpt/tests/css/css-text/word-boundary/word-boundary-012.html
rename to tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-012.html
index aabc8d6861e..5aa86fe4d41 100644
--- a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-012.html
+++ b/tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-012.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>CSS Text level 4 Test: word-boundary-expansion and forced line breaks (inline blocks)</title>
+<title>CSS Text level 4 Test: word-space-transform and forced line breaks (inline blocks)</title>
 <link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
-<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-boundary-expansion">
-<link rel="match" href="reference/word-boundary-012-ref.html">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-space-transform">
+<link rel="match" href="reference/word-space-transform-012-ref.html">
 <meta name="assert" content="must not replace instances of U+200B immediately preceding or following a forced line break (inline block boundaries)">
 <style>
 div {
@@ -13,7 +13,7 @@ div {
   margin: 1px;
 }
 .test {
-  word-boundary-expansion: ideographic-space;
+  word-space-transform: ideographic-space;
 }
 a { display: inline-block; }
 .mbp span {
diff --git a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-013.html b/tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-013.html
similarity index 68%
rename from tests/wpt/tests/css/css-text/word-boundary/word-boundary-013.html
rename to tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-013.html
index f0d96417987..2f3fe9c661d 100644
--- a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-013.html
+++ b/tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-013.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>CSS Text level 4 Test: word-boundary-expansion and keep-all</title>
+<title>CSS Text level 4 Test: word-space-transform and keep-all</title>
 <link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
-<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-boundary-expansion">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-space-transform">
 <link rel="help" href="https://drafts.csswg.org/css-text-3/#word-break-property">
-<link rel="match" href="reference/word-boundary-013-ref.html">
-<meta name="assert" content="ideographic spaces inserted by word-boundary-expansion provide soft wrapping opportunities, even with keep-all">
+<link rel="match" href="reference/word-space-transform-013-ref.html">
+<meta name="assert" content="ideographic spaces inserted by word-space-transform provide soft wrapping opportunities, even with keep-all">
 <style>
 div {
   font-size: 2em;
@@ -14,7 +14,7 @@ div {
   margin: 1em;
 }
 #test {
-  word-boundary-expansion: ideographic-space;
+  word-space-transform: ideographic-space;
   word-break: keep-all;
 }
 </style>
diff --git a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-014.html b/tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-014.html
similarity index 62%
rename from tests/wpt/tests/css/css-text/word-boundary/word-boundary-014.html
rename to tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-014.html
index f4400647985..9ab350c7b84 100644
--- a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-014.html
+++ b/tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-014.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>CSS Text level 4 Test: word-boundary-expansion and keep-all</title>
+<title>CSS Text level 4 Test: word-space-transform and keep-all</title>
 <link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
-<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-boundary-expansion">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-space-transform">
 <link rel="help" href="https://drafts.csswg.org/css-text-3/#word-break-property">
-<link rel="match" href="reference/word-boundary-014-ref.html">
-<meta name="assert" content="spaces inserted by word-boundary-expansion provide soft wrapping opportunities, even with keep-all">
+<link rel="match" href="reference/word-space-transform-014-ref.html">
+<meta name="assert" content="spaces inserted by word-space-transform provide soft wrapping opportunities, even with keep-all">
 <style>
 div {
   font-size: 2em;
@@ -15,7 +15,7 @@ div {
   margin: 1em;
 }
 #test {
-  word-boundary-expansion: space;
+  word-space-transform: space;
   word-break: keep-all;
 }
 </style>
diff --git a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-015-manual.html b/tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-015-manual.html
similarity index 76%
rename from tests/wpt/tests/css/css-text/word-boundary/word-boundary-015-manual.html
rename to tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-015-manual.html
index 8b7c6d98eeb..b86df3879ca 100644
--- a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-015-manual.html
+++ b/tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-015-manual.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>CSS Text level 4 Test: word-boundary-expansion copy-pasting</title>
+<title>CSS Text level 4 Test: word-space-transform copy-pasting</title>
 <link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
-<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-boundary-expansion">
-<meta name="assert" content="word-boundary-expansion does not affect copy and paste">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-space-transform">
+<meta name="assert" content="word-space-transform does not affect copy and paste">
 <style>
 div, textarea {
   font-size: 2em;
@@ -17,7 +17,7 @@ div, textarea {
 }
 #test {
   border: solid blue;
-  word-boundary-expansion: space;
+  word-space-transform: space;
 }
 #ref {
   border: solid orange;
diff --git a/tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-016.html b/tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-016.html
new file mode 100644
index 00000000000..c76acf7bf6e
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-016.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text level 4 Test: word-space-transform:auto-phrase</title>
+<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-space-transform">
+<link rel="match" href="reference/word-space-transform-016-a-ref.html">
+<link rel="match" href="reference/word-space-transform-016-b-ref.html">
+<meta name="assert" content="word-space-transform:ideographic-space auto-phrase inserts virtual word boundaries at reasonable points, which can then be expanded into ideographic spaces">
+<style>
+div {
+  font-size: 2em;
+  border: solid black;
+  margin: 5px;
+  width: 30ch;
+}
+#test {
+  word-space-transform: ideographic-space auto-phrase;
+}
+#ref1 {
+  border-color: blue;
+}
+#ref2 {
+  border-color: orange;
+}
+</style>
+
+<p>Test passes if the black box is identical to either the blue or orange one.
+
+<div id=ref1 lang=ja>東京へ　行きましょう。</div>
+<div id=test lang=ja>東京へ行きましょう。</div>
+<div id=ref2 lang=ja>東京　へ　行きましょう。</div>
+
+<!-- The first reference is preferable,
+    but as the specific algo is up to the UA
+    arguably the second one is OK too.
+-->
diff --git a/tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-017.html b/tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-017.html
new file mode 100644
index 00000000000..3a50355153c
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-017.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text level 4 Test: word-space-transform: space auto-phase</title>
+<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-space-transform">
+<link rel="match" href="reference/word-space-transform-017-ref.html">
+<meta name="assert" content="word-space-transform: space auto-phrase inserts virtual word boundaries at reasonable points, which can then be expanded into spaces">
+<style>
+div {
+  font-size: 2em;
+  border: solid black;
+  margin: 5px;
+  width: 30ch;
+}
+#test {
+  word-space-transfor: space auto-phrase;
+}
+#ref {
+  border-color: blue;
+}
+</style>
+
+<p>Test passes if the black box is identical to the blue one.
+
+<div id=test lang=th>กรุงเทพคือสวยงาม</div>
+<div id=ref lang=th>กรุงเทพ คือ สวยงาม</div>
diff --git a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-113.html b/tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-018.html
similarity index 51%
rename from tests/wpt/tests/css/css-text/word-boundary/word-boundary-113.html
rename to tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-018.html
index f5e0cdf046d..53703bb7ba6 100644
--- a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-113.html
+++ b/tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-018.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>CSS Text level 4 Test: word-boundary-detection:auto(th) outermost placement</title>
+<title>CSS Text level 4 Test: word-space-transform: auto-phrase outermost placement</title>
 <link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
-<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-boundary-detection">
-<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-boundary-expansion">
-<link rel="match" href="reference/word-boundary-113-ref.html">
-<meta name="assert" content="If a word boundary is found at the same position as one or more inline box boundaries, the virtual word boundary must be inserted in the outermost element that participates in this inline box boundary.">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-space-transform">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-phrase-detection">
+<link rel="match" href="reference/word-space-transform-018-ref.html">
+<meta name="assert" content="If a word/phrase boundary is found at the same position as one or more inline box boundaries, the virtual expandable separator must be inserted in the outermost element that participates in this inline box boundary.">
 <style>
 div {
   font-size: 2em;
@@ -14,8 +14,7 @@ div {
   width: 30ch;
 }
 #test {
-  word-boundary-detection: auto(th);
-  word-boundary-expansion: space;
+  word-space-transform: space auto-phrase;
 }
 #ref {
   border-color: blue;
@@ -24,11 +23,6 @@ u {  background: silver; }
 b {  background: green; }
 em { background: gray; }
 </style>
-<!--
-
-This test should pass even in UAs that don't support word-boundary-detection:auto(th)
-since inserting virtual word boundaries is the default for south-east-asian languages.
--->
 
 <p>Test passes if the black box is identical to the blue one.
 
diff --git a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-114.html b/tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-019.html
similarity index 50%
rename from tests/wpt/tests/css/css-text/word-boundary/word-boundary-114.html
rename to tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-019.html
index b18e1e53caf..d52fcdabd9b 100644
--- a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-114.html
+++ b/tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-019.html
@@ -1,16 +1,13 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>CSS Text level 4 Test: word-boundary-detection:auto(ja) and outermost placement</title>
+<title>CSS Text level 4 Test: word-space-transform: ideographic-space auto-phrase and outermost placement</title>
 <link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
-<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-boundary-detection">
-<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-boundary-expansion">
-<link rel="match" href="reference/word-boundary-114-a-ref.html">
-<link rel="match" href="reference/word-boundary-114-b-ref.html">
-<meta name="assert" content="If a word boundary is found at the same position as one or more inline box boundaries, the virtual word boundary must be inserted in the outermost element that participates in this inline box boundary.">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-space-transform">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-phrase-detection">
+<link rel="match" href="reference/word-space-transform-019-a-ref.html">
+<link rel="match" href="reference/word-space-transform-019-b-ref.html">
+<meta name="assert" content="If a phrase boundary is found at the same position as one or more inline box boundaries, the virtual word separator must be inserted in the outermost element that participates in this inline box boundary.">
 <style>
-@supports (word-boundary-detection:auto(ja)) {
-  .warn { display:none; }
-}
 div {
   font-size: 2em;
   border: solid black;
@@ -18,8 +15,7 @@ div {
   width: 30ch;
 }
 #test {
-  word-boundary-detection: auto(ja);
-  word-boundary-expansion: ideographic-space;
+  word-space-transform: ideographic-space auto-phrase;
 }
 #ref1 {
   border-color: blue;
@@ -32,8 +28,6 @@ b {  background: green; }
 em { background: gray; }
 </style>
 
-<p class=warn><strong>This test is not relevant, because this UA does not support <code>word-boundary-detection:auto(ja)</code>.</strong>
-
 <p>Test passes if the black box is identical to either the blue or orange one.
 
 <div id=ref1 lang=ja>東京<b><u>へ</u>　<em>行きましょ</em></b>う。</div>
diff --git a/tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-020.html b/tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-020.html
new file mode 100644
index 00000000000..fac894ab0ab
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-020.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text level 4 Test: word-space-transform: auto-phrase forbidden</title>
+<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-space-transform">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-phrase-detection">
+<link rel="match" href="reference/word-space-transform-020-ref.html">
+<meta name="assert" content="The UA must not expand a virtual word separator at the beginning or end of any box whose parent box has a used value of none.">
+<style>
+div {
+  font-size: 2em;
+  border: solid black;
+  margin: 5px;
+  width: 30ch;
+}
+#test {
+  word-space-transform: none;
+}
+#test span {
+  word-space-transform: ideographic-space auto-phrase;
+}
+</style>
+
+<p>Test passes if the two boxes below are identical.
+
+<div id=test lang=ja>東京<span>へ</span>行きましょう。</div>
+<div id=ref lang=ja>東京へ行きましょう。</div>
diff --git a/tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-021.html b/tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-021.html
new file mode 100644
index 00000000000..d77e6e41bac
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-021.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text level 4 Test: word-space-transform auto-phrase forbidden</title>
+<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-space-transform">
+<link rel="match" href="reference/word-space-transform-021-ref.html">
+<meta name="assert" content="The UA must not insert a virtual word separator immediately adjacent to a word-separator character">
+<style>
+div {
+  font-size: 2em;
+  border: solid black;
+  margin: 5px;
+  width: 30ch;
+}
+#test {
+  word-space-transform: ideographic-space auto-phrase;
+}
+</style>
+
+<p>Test passes if the two boxes below are identical.
+
+<div id=test lang=ja>一生懸命 働きます。</div>
+<div id=ref lang=ja>一生懸命 働きます。</div>
+
diff --git a/tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-022.html b/tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-022.html
new file mode 100644
index 00000000000..3e17a5bc8c5
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-022.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text level 4 Test: word-space-transform auto-phrase forbidden</title>
+<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-space-transform">
+<link rel="match" href="reference/word-space-transform-022-ref.html">
+<meta name="assert" content="The UA must not insert a virtual word boundary immediately adjacent to an other space separator.">
+<style>
+div {
+  font-size: 2em;
+  border: solid black;
+  margin: 5px;
+  width: 30ch;
+}
+#test {
+  word-space-transform: ideographic-space auto-phrase;
+}
+</style>
+
+<p>Test passes if the two boxes below are identical.
+
+<div id=test lang=ja>一生懸命　働きます。</div>
+<div id=ref lang=ja>一生懸命　働きます。</div>
diff --git a/tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-023.html b/tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-023.html
new file mode 100644
index 00000000000..044c3b18b67
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-023.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text level 4 Test: word-space-transform: auto-phrase forbidden</title>
+<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-space-transform">
+<link rel="match" href="reference/word-space-transform-022-ref.html">
+<meta name="assert" content="The UA must not insert a virtual word boundary immediately adjacent to ZERO WIDTH SPACE (U+200B) character.">
+<style>
+div {
+  font-size: 2em;
+  border: solid black;
+  margin: 5px;
+  width: 30ch;
+}
+#test {
+  word-space-transform: ideographic-space auto-phrase;
+}
+</style>
+
+<p>Test passes if the two boxes below are identical.
+
+<div id=test lang=ja>一生懸命&#X200B;働きます。</div>
+<div id=ref lang=ja>一生懸命　働きます。</div>
diff --git a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-119.html b/tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-024.html
similarity index 60%
rename from tests/wpt/tests/css/css-text/word-boundary/word-boundary-119.html
rename to tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-024.html
index fb3aaebc92a..644ee08e5e0 100644
--- a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-119.html
+++ b/tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-024.html
@@ -1,15 +1,12 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>CSS Text level 4 Test: word-boundary-detection:auto() forbidden</title>
+<title>CSS Text level 4 Test: word-space-transform auto-phrase forbidden</title>
 <link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
-<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-boundary-detection">
-<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-boundary-expansion">
-<link rel="match" href="reference/word-boundary-119-ref.html">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-space-transform">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-phrase-detection">
+<link rel="match" href="reference/word-space-transform-024-ref.html">
 <meta name="assert" content="The UA must not insert a virtual word boundary between a typographic letter unit and an adjacent typographic character unit from the [UAX14] GL line breaking class">
 <style>
-@supports (word-boundary-detection:auto(ja)) {
-  .warn { display:none; }
-}
 div {
   font-size: 2em;
   border: solid black;
@@ -17,13 +14,10 @@ div {
   width: 30ch;
 }
 #test {
-  word-boundary-detection: auto(ja);
-  word-boundary-expansion: ideographic-space;
+  word-space-transform: ideographic-space auto-phrase;
 }
 </style>
 
-<p class=warn><strong>This test is not relevant, because this UA does not support <code>word-boundary-detection:auto(ja)</code>.</strong>
-
 <p>Test passes if the two boxes below are identical.
 
 <div id=test lang=ja>東京&nbsp;へ&nbsp;行きましょう。</div>
diff --git a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-120.html b/tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-025.html
similarity index 60%
rename from tests/wpt/tests/css/css-text/word-boundary/word-boundary-120.html
rename to tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-025.html
index 8f2bff5b229..704081ac13e 100644
--- a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-120.html
+++ b/tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-025.html
@@ -1,15 +1,12 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>CSS Text level 4 Test: word-boundary-detection:auto() forbidden</title>
+<title>CSS Text level 4 Test: word-space-transform auto-phrase forbidden</title>
 <link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
-<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-boundary-detection">
-<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-boundary-expansion">
-<link rel="match" href="reference/word-boundary-120-ref.html">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-space-transform">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-phrase-detection">
+<link rel="match" href="reference/word-space-transform-025-ref.html">
 <meta name="assert" content="The UA must not insert a virtual word boundary between a typographic letter unit and an adjacent typographic character unit from the [UAX14] WJ line breaking class">
 <style>
-@supports (word-boundary-detection:auto(ja)) {
-  .warn { display:none; }
-}
 div {
   font-size: 2em;
   border: solid black;
@@ -17,13 +14,10 @@ div {
   width: 30ch;
 }
 #test {
-  word-boundary-detection: auto(ja);
-  word-boundary-expansion: ideographic-space;
+  word-space-transform: ideographic-space auto-phrase;
 }
 </style>
 
-<p class=warn><strong>This test is not relevant, because this UA does not support <code>word-boundary-detection:auto(ja)</code>.</strong>
-
 <p>Test passes if the two boxes below are identical.
 
 <div id=test lang=ja>東京&#x2060;へ&#x2060;行きましょう。</div>
diff --git a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-121.html b/tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-026.html
similarity index 60%
rename from tests/wpt/tests/css/css-text/word-boundary/word-boundary-121.html
rename to tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-026.html
index 667e1e068e2..30531bfc4b2 100644
--- a/tests/wpt/tests/css/css-text/word-boundary/word-boundary-121.html
+++ b/tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-026.html
@@ -1,15 +1,12 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>CSS Text level 4 Test: word-boundary-detection:auto() forbidden</title>
+<title>CSS Text level 4 Test: word-space-transform: auto-phrase forbidden</title>
 <link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
-<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-boundary-detection">
-<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-boundary-expansion">
-<link rel="match" href="reference/word-boundary-121-ref.html">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-space-transform">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-phrase-detection">
+<link rel="match" href="reference/word-space-transform-026-ref.html">
 <meta name="assert" content="The UA must not insert a virtual word boundary between a typographic letter unit and an adjacent typographic character unit from the [UAX14] ZWJ line breaking class">
 <style>
-@supports (word-boundary-detection:auto(ja)) {
-  .warn { display:none; }
-}
 div {
   font-size: 2em;
   border: solid black;
@@ -17,13 +14,10 @@ div {
   width: 30ch;
 }
 #test {
-  word-boundary-detection: auto(ja);
-  word-boundary-expansion: ideographic-space;
+  word-space-transform: ideographic-space auto-phrase;
 }
 </style>
 
-<p class=warn><strong>This test is not relevant, because this UA does not support <code>word-boundary-detection:auto(ja)</code>.</strong>
-
 <p>Test passes if the two boxes below are identical.
 
 <div id=test lang=ja>東京&#x200D;へ&#x200D;行きましょう。</div>
diff --git a/tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-027.html b/tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-027.html
new file mode 100644
index 00000000000..325daa12c4f
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-027.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text level 4 Test: word-space-transform: auto-phrase forbidden</title>
+<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-space-transform">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-phrase-detection">
+<link rel="match" href="reference/word-space-transform-027-ref.html">
+<meta name="assert" content="The UA must not insert (and expand) a virtual word boundary when the language is unknown">
+<style>
+div {
+  font-size: 2em;
+  border: solid black;
+  margin: 5px;
+  width: 30ch;
+}
+#test {
+  word-space-transform: ideographic-space auto-phrase;
+}
+</style>
+
+<p>Test passes if the two boxes below are identical.
+
+<div id=test>東京へ行きましょう。</div>
+<div id=ref>東京へ行きましょう。</div>
diff --git a/tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-028.html b/tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-028.html
new file mode 100644
index 00000000000..e334449a70e
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-028.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text level 4 Test: word-space-transform: auto-phrase forbidden</title>
+<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-space-transform">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-phrase-detection">
+<link rel="match" href="reference/word-space-transform-028-ref.html">
+<meta name="assert" content="The UA must not insert (and expand) a virtual word boundary when  auto-phrase is not specified, only explicit ones.">
+<style>
+div {
+  font-size: 2em;
+  border: solid black;
+  margin: 5px;
+  width: 30ch;
+}
+#test {
+  word-space-transform: ideographic-space;
+}
+</style>
+
+<p>Test passes if the two boxes below are identical.
+
+<div id=test lang=ja>東京へ行きましょう。</div>
+<div id=ref lang=ja>東京へ行きましょう。</div>
diff --git a/tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-029.html b/tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-029.html
new file mode 100644
index 00000000000..8eb25c13511
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-029.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text level 4 Test: word-space-transform: auto-phrase forbidden</title>
+<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-space-transform">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-phrase-detection">
+<link rel="match" href="reference/word-space-transform-029-ref.html">
+<meta name="assert" content="The UA must not insert (and expand) a virtual word boundary when the language is unsupported">
+<style>
+div {
+  font-size: 2em;
+  border: solid black;
+  margin: 5px;
+  width: 30ch;
+}
+#test {
+  word-space-transform: ideographic-space auto-phrase;
+}
+</style>
+
+<p>Test passes if the two boxes below are identical.
+
+<div id=test lang=xyz>東京へ行きましょう。</div>
+<div id=ref lang=xyz>東京へ行きましょう。</div>
diff --git a/tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-030.html b/tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-030.html
new file mode 100644
index 00000000000..9c1ba11fd56
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/word-space-transform/word-space-transform-030.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text level 4 Test: word-space-transform: auto-phrase forbidden</title>
+<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-space-transform">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-phrase-detection">
+<link rel="match" href="reference/word-space-transform-030-ref.html">
+<meta name="assert" content="Transform effects, notably transforming virtual word separators into spaces, affect line breaking.">
+<style>
+div {
+  font-size: 2em;
+  border: solid black;
+  margin: 5px;
+  width: min-content;
+  word-break: keep-all;
+}
+#test {
+  word-space-transform: ideographic-space auto-phrase;
+}
+</style>
+
+<p>Test passes if the two boxes below are identical.
+
+<div id=test lang=ja>一生懸命働きます。</div>
+<div id=ref lang=ja>一生懸命　<br>働きます。</div>
diff --git a/tests/wpt/tests/css/css-transforms/backface-visibility-hidden-002.tentative.html b/tests/wpt/tests/css/css-transforms/backface-visibility-hidden-002.html
similarity index 100%
rename from tests/wpt/tests/css/css-transforms/backface-visibility-hidden-002.tentative.html
rename to tests/wpt/tests/css/css-transforms/backface-visibility-hidden-002.html
diff --git a/tests/wpt/tests/css/css-transforms/backface-visibility-hidden-003-ref.html b/tests/wpt/tests/css/css-transforms/backface-visibility-hidden-003-ref.html
index 7dab6b947fb..b21977caa5e 100644
--- a/tests/wpt/tests/css/css-transforms/backface-visibility-hidden-003-ref.html
+++ b/tests/wpt/tests/css/css-transforms/backface-visibility-hidden-003-ref.html
@@ -1,21 +1,14 @@
 <!DOCTYPE html>
-<title>backface visibility: hidden applies to pseudo-stacking contexts</title>
-<link rel="author" title="Chris Harrelson" href="mailto:chrishtr@chromium.org">
+<title>backface visibility: hidden</title>
+<link rel="author" title="Matt Woodrow" href="mailto:mattwoodrow@apple.com">
 <link rel="help" href="http://www.w3.org/TR/css-transforms-1/#transform-property">
 <link rel="help" href="http://www.w3.org/TR/css-transforms-2/#propdef-backface-visibility">
 
-<p>The test passes if there is a green rectangle and no red</p>
+<p>The test passes if there is a green rectangle and no red.</p>
 <style>
   div {
     width: 100px;
     height: 100px;
   }
-  .target {
-    transform: rotateY(180deg);
-  }
 </style>
-<div class=target style="backface-visibility: hidden">
-</div>
-<div class=target>
-  <div style="background: green"></div>
-</div>
+<div style="background: green"></div>
diff --git a/tests/wpt/tests/css/css-transforms/backface-visibility-hidden-003.html b/tests/wpt/tests/css/css-transforms/backface-visibility-hidden-003.html
new file mode 100644
index 00000000000..bda82b697ab
--- /dev/null
+++ b/tests/wpt/tests/css/css-transforms/backface-visibility-hidden-003.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<title>backface visibility: hidden creates containing block and stacking context when participating in a 3D rendering context</title>
+<link rel="author" title="Matt Woodrow" href="mailto:mattwoodrow@apple.com">
+<link rel="help" href="http://www.w3.org/TR/css-transforms-1/#transform-property">
+<link rel="help" href="http://www.w3.org/TR/css-transforms-2/#propdef-backface-visibility">
+<link rel="match" href="backface-visibility-hidden-003-ref.html">
+
+<p>The test passes if there is a green rectangle and no red.</p>
+<style>
+.outer {
+  transform-style: preserve-3d;
+  width: 100px;
+  height: 100px;
+  background-color: red;
+}
+
+.inner {
+  backface-visibility: hidden;
+}
+
+.positioned {
+  position: absolute;
+  top: -100px;
+  z-index: -1;
+  width: 100px;
+  height: 100px;
+  background-color: green;
+}
+
+.sibling {
+  width: 100px;
+  height: 100px;
+  background-color: blue;
+}
+
+</style>
+
+<div class="outer">
+  <div class="sibling"></div>
+  <div class="inner">
+    <div class="positioned"></div>
+  </div>
+</div>
diff --git a/tests/wpt/tests/css/css-transforms/backface-visibility-hidden-003.tentative.html b/tests/wpt/tests/css/css-transforms/backface-visibility-hidden-003.tentative.html
deleted file mode 100644
index d104662b26e..00000000000
--- a/tests/wpt/tests/css/css-transforms/backface-visibility-hidden-003.tentative.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<title>backface visibility: hidden applies to pseudo-stacking contexts</title>
-<link rel="author" title="Chris Harrelson" href="mailto:chrishtr@chromium.org">
-<link rel="help" href="http://www.w3.org/TR/css-transforms-1/#transform-property">
-<link rel="help" href="http://www.w3.org/TR/css-transforms-2/#propdef-backface-visibility">
-<link rel="match" href="backface-visibility-hidden-003-ref.html">
-
-<p>The test passes if there is a green rectangle and no red</p>
-<style>
-  div {
-    width: 100px;
-    height: 100px;
-  }
-  .target {
-    transform: rotateY(180deg);
-  }
-</style>
-<div class=target style="backface-visibility: hidden">
-  <div style="background: red"></div>
-</div>
-<div class=target>
-  <div style="background: green"></div>
-</div>
diff --git a/tests/wpt/tests/css/css-transforms/backface-visibility-hidden-004.html b/tests/wpt/tests/css/css-transforms/backface-visibility-hidden-004.html
new file mode 100644
index 00000000000..8a8834c39e4
--- /dev/null
+++ b/tests/wpt/tests/css/css-transforms/backface-visibility-hidden-004.html
@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<title>backface visibility: hidden creates containing block and stacking context when participating in a 3D rendering context</title>
+<link rel="author" title="Matt Woodrow" href="mailto:mattwoodrow@apple.com">
+<link rel="help" href="http://www.w3.org/TR/css-transforms-1/#transform-property">
+<link rel="help" href="http://www.w3.org/TR/css-transforms-2/#propdef-backface-visibility">
+<link rel="match" href="backface-visibility-hidden-003-ref.html">
+
+<p>The test passes if there is a green rectangle and no red.</p>
+<style>
+.outer {
+  transform-style: preserve-3d;
+  transform: rotateX(180deg);
+  width: 100px;
+  height: 100px;
+}
+
+.card {
+  width: 100px;
+  height: 100px;
+  position: absolute;
+  backface-visibility: hidden;
+}
+
+.front {
+  background-color: red;
+}
+
+.back {
+  background-color: green;
+  transform: rotateX(180deg);
+}
+
+.inner {
+  position: fixed;
+  width: 100px;
+  height: 100px;
+  background-color: red;
+}
+
+</style>
+
+<div class="outer">
+  <div class="card back"></div>
+  <div class="card front">
+    <div class="inner"></div>
+  </div>
+</div>
diff --git a/tests/wpt/tests/css/css-transforms/backface-visibility-hidden-004.tentative.html b/tests/wpt/tests/css/css-transforms/backface-visibility-hidden-004.tentative.html
deleted file mode 100644
index 1fb3fffd3d1..00000000000
--- a/tests/wpt/tests/css/css-transforms/backface-visibility-hidden-004.tentative.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<title>backface visibility: hidden does not apply to child pseudo-stacking context descendants</title>
-<link rel="author" title="Chris Harrelson" href="mailto:chrishtr@chromium.org">
-<link rel="help" href="http://www.w3.org/TR/css-transforms-1/#transform-property">
-<link rel="help" href="http://www.w3.org/TR/css-transforms-2/#propdef-backface-visibility">
-<link rel="match" href="backface-visibility-hidden-004-ref.html">
-
-<p>The test passes if there is a green rectangle and no red</p>
-<style>
-  div {
-    width: 100px;
-    height: 100px;
-  }
-  .target {
-    transform: rotateY(180deg);
-  }
-</style>
-<div class=target style="backface-visibility: hidden">
-  <div style="background: green; isolation: isolate"></div>
-</div>
diff --git a/tests/wpt/tests/css/css-transforms/backface-visibility-hidden-005.html b/tests/wpt/tests/css/css-transforms/backface-visibility-hidden-005.html
new file mode 100644
index 00000000000..4a77466fe40
--- /dev/null
+++ b/tests/wpt/tests/css/css-transforms/backface-visibility-hidden-005.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<title>backface visibility: hidden creates containing block and stacking context when transformed</title>
+<link rel="author" title="Matt Woodrow" href="mailto:mattwoodrow@apple.com">
+<link rel="help" href="http://www.w3.org/TR/css-transforms-1/#transform-property">
+<link rel="help" href="http://www.w3.org/TR/css-transforms-2/#propdef-backface-visibility">
+<link rel="match" href="backface-visibility-hidden-003-ref.html">
+
+<p>The test passes if there is a green rectangle and no red.</p>
+<style>
+.background {
+  width: 100px;
+  height: 100px;
+  background-color: green;
+}
+
+.flipper {
+  backface-visibility:hidden;
+  transform: rotateY(180deg);
+  width: 100px;
+  top: -100px;
+  margin-top: -100px;
+}
+
+.scroll {
+  overflow-y: scroll;
+  width: 100px;
+  height: 100px;
+}
+
+.inner {
+  height: 900px;
+  background: red;
+}
+
+</style>
+
+<div class="background"></div>
+<div class="flipper">
+  <div class="scroll">
+    <div class="inner">
+    </div>
+  </div>
+</div>
diff --git a/tests/wpt/tests/css/css-transforms/backface-visibility-hidden-005.tentative.html b/tests/wpt/tests/css/css-transforms/backface-visibility-hidden-005.tentative.html
deleted file mode 100644
index d53ee1c606f..00000000000
--- a/tests/wpt/tests/css/css-transforms/backface-visibility-hidden-005.tentative.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<title>backface visibility: hidden inside preserve-3d does not apply to pseudo-stacking context descendants</title>
-<link rel="author" title="Chris Harrelson" href="mailto:chrishtr@chromium.org">
-<link rel="help" href="http://www.w3.org/TR/css-transforms-1/#transform-property">
-<link rel="help" href="http://www.w3.org/TR/css-transforms-2/#propdef-backface-visibility">
-<link rel="match" href="backface-visibility-hidden-005-ref.html">
-
-<p>The test passes if there is a green rectangle and no red</p>
-<style>
-  div {
-    width: 100px;
-    height: 100px;
-  }
-  .target {
-    transform: rotateY(180deg);
-  }
-</style>
-<div style="transform-style: preserve-3d">
-  <div class=target style="backface-visibility: hidden; transform-style: preserve-3d">
-    <div style="background: green; isolation: isolate; "></div>
-</div>
-</div>
diff --git a/tests/wpt/tests/css/css-transforms/backface-visibility-hidden-animated-002.html b/tests/wpt/tests/css/css-transforms/backface-visibility-hidden-animated-002.html
deleted file mode 100644
index 107b79946de..00000000000
--- a/tests/wpt/tests/css/css-transforms/backface-visibility-hidden-animated-002.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<title>backface visibility: hidden does not apply to child pseudo-stacking context descendants, even when animation is present</title>
-<link rel="author" title="Chris Harrelson" href="mailto:chrishtr@chromium.org">
-<link rel="help" href="http://www.w3.org/TR/css-transforms-1/#transform-property">
-<link rel="help" href="http://www.w3.org/TR/css-transforms-2/#propdef-backface-visibility">
-<link rel="match" href="backface-visibility-hidden-004-ref.html">
-
-<p>The test passes if there is a green rectangle and no red</p>
-<style>
-
-  div {
-    width: 100px;
-    height: 100px;
-  }
-  @keyframes spin {
-    from { transform: rotateY(180deg); }
-    to { transform: rotateY(180deg); }
-  }
-  .target {
-    animation: 10000s linear 0s 1 forwards spin;
-  }
-</style>
-<div class=target style="backface-visibility: hidden">
-  <div style="background: green; isolation: isolate"></div>
-</div>
diff --git a/tests/wpt/tests/css/css-transforms/transform-2d-getComputedStyle-001.html b/tests/wpt/tests/css/css-transforms/transform-2d-getComputedStyle-001.html
index b6a2a7cef21..c70cfa9cdc5 100644
--- a/tests/wpt/tests/css/css-transforms/transform-2d-getComputedStyle-001.html
+++ b/tests/wpt/tests/css/css-transforms/transform-2d-getComputedStyle-001.html
@@ -75,8 +75,16 @@
     }
     function clear(id) {
         const element = document.getElementById(id);
+        const value = window.getComputedStyle(element).transform;
         element.style.display = 'none';
-        assert_equals(window.getComputedStyle(element).getPropertyValue("transform"), "none", "Computed style for an element with 'display: none' should be 'transform: none'");
+        // https://drafts.csswg.org/css-transforms-2/#serialization-of-the-computed-value
+        // For now both 'none' and 'matrix()' are accepted as resolved value of
+        // transform for an element with 'display: none' until we get a consensus
+        // in https://github.com/w3c/csswg-drafts/issues/9121.
+        assert_in_array(
+            window.getComputedStyle(element).transform, ['none', value],
+            "The resolved value of 'transform' for an element with 'display: none' " +
+            "should be 'none' or should not depend on display value.");
     }
 
     test(function() {
diff --git a/tests/wpt/tests/css/css-transforms/transform-box/reference/svgbox-rect-dasharray-ref.html b/tests/wpt/tests/css/css-transforms/transform-box/reference/svgbox-rect-dasharray-ref.html
new file mode 100644
index 00000000000..ae4c8aa6f61
--- /dev/null
+++ b/tests/wpt/tests/css/css-transforms/transform-box/reference/svgbox-rect-dasharray-ref.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<style>
+#target {
+  fill: green;
+  stroke: black;
+  stroke-width: 20;
+  stroke-dasharray: 100 50;
+}
+</style>
+<svg width="400" height="300">
+  <rect id="target" width="50" height="100" x="50" y="80"/>
+</svg>
diff --git a/tests/wpt/tests/css/css-transforms/transform-box/reference/svgbox-rect-ref.html b/tests/wpt/tests/css/css-transforms/transform-box/reference/svgbox-rect-ref.html
new file mode 100644
index 00000000000..eb1ac1fca2a
--- /dev/null
+++ b/tests/wpt/tests/css/css-transforms/transform-box/reference/svgbox-rect-ref.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+
+<style>
+#target {
+  fill: green;
+  stroke: black;
+  stroke-width: 20;
+  transform: none;
+}
+</style>
+
+<svg width="400" height="300">
+  <rect id="target" width="50" height="100" x="50" y="80"/>
+</svg>
diff --git a/tests/wpt/tests/css/css-transforms/transform-box/stroke-box-mutation-001.html b/tests/wpt/tests/css/css-transforms/transform-box/stroke-box-mutation-001.html
index c2723849817..8c64e5406af 100644
--- a/tests/wpt/tests/css/css-transforms/transform-box/stroke-box-mutation-001.html
+++ b/tests/wpt/tests/css/css-transforms/transform-box/stroke-box-mutation-001.html
@@ -1,27 +1,27 @@
 <!DOCTYPE html>
 <html class="reftest-wait">
 <title>transform-box: stroke-box, stroke mutated</title>
-<link rel="match" href="reference/svgbox-ref.html">
+<link rel="match" href="reference/svgbox-rect-ref.html">
 <link rel="help" href="https://drafts.csswg.org/css-transforms-1/#transform-box">
 <script src="/common/reftest-wait.js"></script>
 <script src="/common/rendering-utils.js"></script>
-<meta name="assert" content="This should display a C shape with the center of the top endpoint at 200,100."/>
+<meta name="assert" content="This should display a rect whose center of rotation is at (20, 0) of its stroke-box."/>
 <style>
 #target {
   fill: green;
   stroke: black;
-  stroke-width: 25;
+  stroke-width: 10;
   transform-box: stroke-box;
-  transform-origin: 25px 0px;
+  transform-origin: 20px 0px;
   transform: rotate(90deg);
 }
 </style>
 <svg width="400" height="300">
-  <path id="target" d="M200,100v100h100v-100"/>
+  <rect id="target" width="100" height="50" x="100" y="100"/>
 </svg>
 <script>
   waitForAtLeastOneFrame().then(() => {
-    document.querySelector('#target').style.strokeWidth = '50px';
+    document.querySelector('#target').style.strokeWidth = '20px';
     takeScreenshot();
   });
 </script>
diff --git a/tests/wpt/tests/css/css-transforms/transform-box/stroke-box-mutation-002.html b/tests/wpt/tests/css/css-transforms/transform-box/stroke-box-mutation-002.html
index f460b8e26a2..3884b98a89a 100644
--- a/tests/wpt/tests/css/css-transforms/transform-box/stroke-box-mutation-002.html
+++ b/tests/wpt/tests/css/css-transforms/transform-box/stroke-box-mutation-002.html
@@ -1,27 +1,27 @@
 <!DOCTYPE html>
 <html class="reftest-wait">
 <title>transform-box: stroke-box, shape mutated</title>
-<link rel="match" href="reference/svgbox-ref.html">
+<link rel="match" href="reference/svgbox-rect-ref.html">
 <link rel="help" href="https://drafts.csswg.org/css-transforms-1/#transform-box">
 <script src="/common/reftest-wait.js"></script>
 <script src="/common/rendering-utils.js"></script>
-<meta name="assert" content="This should display a C shape with the center of the top endpoint at 200,100."/>
+<meta name="assert" content="This should display a rect whose center of rotation is at (20, 0) of its stroke-box."/>
 <style>
 #target {
   fill: green;
   stroke: black;
-  stroke-width: 50;
+  stroke-width: 20;
   transform-box: stroke-box;
-  transform-origin: 25px 0px;
+  transform-origin: 20px 0px;
   transform: rotate(90deg);
 }
 </style>
 <svg width="400" height="300">
-  <path id="target" d="M200,100v50h100v-50"/>
+  <rect id="target" width="100" height="100" x="100" y="100"/>
 </svg>
 <script>
   waitForAtLeastOneFrame().then(() => {
-    document.querySelector('#target').setAttribute('d', 'M200,100v100h100v-100');
+    document.querySelector('#target').setAttribute('height', '50');
     takeScreenshot();
   });
 </script>
diff --git a/tests/wpt/tests/css/css-transforms/transform-box/stroke-box-mutation-003.html b/tests/wpt/tests/css/css-transforms/transform-box/stroke-box-mutation-003.html
index f82bf5acbcf..717cf170f10 100644
--- a/tests/wpt/tests/css/css-transforms/transform-box/stroke-box-mutation-003.html
+++ b/tests/wpt/tests/css/css-transforms/transform-box/stroke-box-mutation-003.html
@@ -1,31 +1,31 @@
 <!DOCTYPE html>
 <html class="reftest-wait">
 <title>transform-box: stroke-box, on group (&lt;g>), stroke on child mutated</title>
-<link rel="match" href="reference/svgbox-ref.html">
+<link rel="match" href="reference/svgbox-rect-ref.html">
 <link rel="help" href="https://drafts.csswg.org/css-transforms-1/#transform-box">
 <script src="/common/reftest-wait.js"></script>
 <script src="/common/rendering-utils.js"></script>
-<meta name="assert" content="This should display a C shape with the center of the top endpoint at 200,100."/>
+<meta name="assert" content="This should display a rect whose center of rotation is at (20, 0) of its stroke-box."/>
 <style>
 #target {
   transform-box: stroke-box;
-  transform-origin: 25px 0px;
+  transform-origin: 20px 0px;
   transform: rotate(90deg);
 }
-#target > path {
+#target > rect {
   fill: green;
   stroke: black;
-  stroke-width: 25;
+  stroke-width: 10;
 }
 </style>
 <svg width="400" height="300">
   <g id="target">
-    <path d="M200,100v100h100v-100"/>
+    <rect width="100" height="50" x="100" y="100"/>
   </g>
 </svg>
 <script>
   waitForAtLeastOneFrame().then(() => {
-    document.querySelector('#target > path').style.strokeWidth = '50px';
+    document.querySelector('#target > rect').style.strokeWidth = '20px';
     takeScreenshot();
   });
 </script>
diff --git a/tests/wpt/tests/css/css-transforms/transform-box/stroke-box-mutation-004.html b/tests/wpt/tests/css/css-transforms/transform-box/stroke-box-mutation-004.html
index 51df8ebb91c..ace6b6252ae 100644
--- a/tests/wpt/tests/css/css-transforms/transform-box/stroke-box-mutation-004.html
+++ b/tests/wpt/tests/css/css-transforms/transform-box/stroke-box-mutation-004.html
@@ -1,32 +1,32 @@
 <!DOCTYPE html>
 <html class="reftest-wait">
 <title>transform-box: stroke-box, on group (&lt;g>), child shape mutated</title>
-<link rel="match" href="reference/svgbox-ref.html">
+<link rel="match" href="reference/svgbox-rect-ref.html">
 <link rel="help" href="https://drafts.csswg.org/css-transforms-1/#transform-box">
 <script src="/common/reftest-wait.js"></script>
 <script src="/common/rendering-utils.js"></script>
-<meta name="assert" content="This should display a C shape with the center of the top endpoint at 200,100."/>
+<meta name="assert" content="This should display a rect whose center of rotation is at (20, 0) of its stroke-box."/>
 <style>
 #target {
   transform-box: stroke-box;
-  transform-origin: 25px 0px;
+  transform-origin: 20px 0px;
   transform: rotate(90deg);
 }
-#target > path {
+#target > rect {
   fill: green;
   stroke: black;
-  stroke-width: 50;
+  stroke-width: 20;
 }
 </style>
 <svg width="400" height="300">
   <g id="target">
-    <path d="M200,100v50h100v-50"/>
+    <rect width="100" height="100" x="100" y="100"/>
   </g>
 </svg>
 <script>
   waitForAtLeastOneFrame().then(() => {
-    const path = document.querySelector('#target > path');
-    path.setAttribute('d', 'M200,100v100h100v-100');
+    const rect = document.querySelector('#target > rect');
+    rect.setAttribute('height', '50');
     takeScreenshot();
   });
 </script>
diff --git a/tests/wpt/tests/css/css-transforms/transform-box/svgbox-border-box.html b/tests/wpt/tests/css/css-transforms/transform-box/svgbox-border-box.html
index 921dba1d738..b848dbf238a 100644
--- a/tests/wpt/tests/css/css-transforms/transform-box/svgbox-border-box.html
+++ b/tests/wpt/tests/css/css-transforms/transform-box/svgbox-border-box.html
@@ -1,22 +1,22 @@
 <!DOCTYPE html>
 <title>transform-box: border-box (SVG layout)</title>
-<link rel="match" href="./reference/svgbox-ref.html">
+<link rel="match" href="./reference/svgbox-rect-ref.html">
 <link rel="help" href="https://drafts.csswg.org/css-transforms-1/#transform-box">
-<meta name="assert" content="This should display a C shape with the center of the top endpoint at 200,100."/>
+<meta name="assert" content="This should display a rect whose center of rotation is at (20, 0) of its stroke-box."/>
 
 <style>
 #target {
   fill: green;
   stroke: black;
-  stroke-width: 50;
+  stroke-width: 20;
   transform-box: border-box; /* alias for stroke-box */
-  transform-origin: 25px 0px;
+  transform-origin: 20px 0px;
   transform: rotate(90deg);
 }
 </style>
 
 <svg width="400" height="300">
-    <path id="target" d="M 200 100 v 100 h 100 v -100"/>
+  <rect id="target" width="100" height="50" x="100" y="100"/>
 </svg>
 
 <div id="error"></div>
@@ -24,5 +24,5 @@
 var refStyle = "border-box";
 var compStyle = getComputedStyle(document.getElementById('target')).transformBox;
 if (refStyle != compStyle)
-    document.getElementById('error').textContent = "Error, got computed style " + compStyle;
+  document.getElementById('error').textContent = "Error, got computed style " + compStyle;
 </script>
diff --git a/tests/wpt/tests/css/css-transforms/transform-box/svgbox-stroke-box-001.html b/tests/wpt/tests/css/css-transforms/transform-box/svgbox-stroke-box-001.html
index d2ca1411ae8..2687d933b1a 100644
--- a/tests/wpt/tests/css/css-transforms/transform-box/svgbox-stroke-box-001.html
+++ b/tests/wpt/tests/css/css-transforms/transform-box/svgbox-stroke-box-001.html
@@ -1,22 +1,22 @@
 <!DOCTYPE html>
 <title>transform-box: stroke-box (SVG layout)</title>
-<link rel="match" href="./reference/svgbox-ref.html">
+<link rel="match" href="./reference/svgbox-rect-ref.html">
 <link rel="help" href="https://drafts.csswg.org/css-transforms-1/#transform-box">
-<meta name="assert" content="This should display a C shape with the center of the top endpoint at 200,100."/>
+<meta name="assert" content="This should display a rect whose center of rotation is at (20, 0) of its stroke-box."/>
 
 <style>
 #target {
   fill: green;
   stroke: black;
-  stroke-width: 50;
+  stroke-width: 20;
   transform-box: stroke-box;
-  transform-origin: 25px 0px;
+  transform-origin: 20px 0px;
   transform: rotate(90deg);
 }
 </style>
 
 <svg width="400" height="300">
-    <path id="target" d="M 200 100 v 100 h 100 v -100"/>
+  <rect id="target" width="100" height="50" x="100" y="100"/>
 </svg>
 
 <div id="error"></div>
@@ -24,5 +24,5 @@
 var refStyle = "stroke-box";
 var compStyle = getComputedStyle(document.getElementById('target')).transformBox;
 if (refStyle != compStyle)
-    document.getElementById('error').textContent = "Error, got computed style " + compStyle;
+  document.getElementById('error').textContent = "Error, got computed style " + compStyle;
 </script>
diff --git a/tests/wpt/tests/css/css-transforms/transform-box/svgbox-stroke-box-002.html b/tests/wpt/tests/css/css-transforms/transform-box/svgbox-stroke-box-002.html
index dd7d656eacf..50afbae813d 100644
--- a/tests/wpt/tests/css/css-transforms/transform-box/svgbox-stroke-box-002.html
+++ b/tests/wpt/tests/css/css-transforms/transform-box/svgbox-stroke-box-002.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <title>transform-box: stroke-box, stroke with dash array</title>
-<link rel="match" href="reference/svgbox-dasharray-ref.html">
+<link rel="match" href="reference/svgbox-rect-dasharray-ref.html">
 <link rel="help" href="https://drafts.csswg.org/css-transforms-1/#transform-box">
 <link rel="help" href="https://svgwg.org/svg2-draft/coords.html#TermStrokeBoundingBox">
 <meta name="assert" content="A dash array does not contribute to the stroke bounding box"/>
@@ -8,14 +8,14 @@
 #target {
   fill: green;
   stroke: black;
-  stroke-width: 50;
-  stroke-dasharray: 100;
-  stroke-dashoffset: 100;
+  stroke-width: 20;
+  stroke-dasharray: 100 50;
+  stroke-dashoffset: 50;
   transform-box: stroke-box;
-  transform-origin: 25px 0px;
+  transform-origin: 20px 0px;
   transform: rotate(90deg);
 }
 </style>
 <svg width="400" height="300">
-  <path id="target" d="M200,100v100h100v-100"/>
+  <rect id="target" width="100" height="50" x="100" y="100"/>
 </svg>
diff --git a/tests/wpt/tests/css/css-transforms/transform-input-009-ref.html b/tests/wpt/tests/css/css-transforms/transform-input-009-ref.html
index 90d048b9141..b363509c911 100644
--- a/tests/wpt/tests/css/css-transforms/transform-input-009-ref.html
+++ b/tests/wpt/tests/css/css-transforms/transform-input-009-ref.html
@@ -3,8 +3,10 @@
   <head>
     <title>CSS Reftest Reference</title>
     <link rel="author" title="Aryeh Gregor" href="mailto:ayg@aryeh.name">
+    <link rel="stylesheet" href="/fonts/ahem.css">
     <style>
       input {
+        font: 25px/1 Ahem;
         margin: 10px;
         position: relative;
       }
diff --git a/tests/wpt/tests/css/css-transforms/transform-input-009.html b/tests/wpt/tests/css/css-transforms/transform-input-009.html
index cde6397c77a..0295be5ded4 100644
--- a/tests/wpt/tests/css/css-transforms/transform-input-009.html
+++ b/tests/wpt/tests/css/css-transforms/transform-input-009.html
@@ -5,6 +5,7 @@
     <link rel="author" title="Aryeh Gregor" href="mailto:ayg@aryeh.name">
     <link rel="help" href="http://www.w3.org/TR/css-transforms-1/#transform-property">
     <link rel="reviewer" title="Apple Inc." href="http://www.apple.com">
+    <link rel="stylesheet" href="/fonts/ahem.css">
     <meta name="assert" content='The input element is an atomic inline element,
     so it falls under the definition of transformable and should be affected by
     transformations as usual.  This is one in a series of tests that verify
@@ -13,9 +14,10 @@
     difficult to construct a correct reference file for more complex
     transforms.)'>
     <link rel="match" href="transform-input-009-ref.html">
-    <meta name="fuzzy" content="maxDifference=0-129;totalPixels=0-1340">
     <style>
       input {
+        /* Ahem font to avoid antialiasing fuzziness */
+        font: 25px/1 Ahem;
         /* Margin to avoid overlap of translated inputs */
         margin: 10px;
       }
diff --git a/tests/wpt/tests/css/css-transforms/transform3d-preserve3d-001-ref.html b/tests/wpt/tests/css/css-transforms/transform3d-preserve3d-001-ref.html
index 383bc7a63eb..63dce0180ae 100644
--- a/tests/wpt/tests/css/css-transforms/transform3d-preserve3d-001-ref.html
+++ b/tests/wpt/tests/css/css-transforms/transform3d-preserve3d-001-ref.html
@@ -4,10 +4,16 @@
     <title>CSS Reftest Reference</title>
     <link rel="author" title="Matt Woodrow" href="mailto:mwoodrow@mozilla.com">
     <link rel="author" title="Aryeh Gregor" href="mailto:ayg@aryeh.name">
+    <link rel="stylesheet" href="/fonts/ahem.css">
+    <style>
+      div {
+        font: 25px/1 Ahem;
+      }
+    </style>
   </head>
   <body>
     <div style="transform: rotatex(180deg); width: 100px; height: 100px;">
-      Test Text
+      XXpp
     </div>
   </body>
 </html>
diff --git a/tests/wpt/tests/css/css-transforms/transform3d-preserve3d-001.html b/tests/wpt/tests/css/css-transforms/transform3d-preserve3d-001.html
index dbebc64139a..9459381760a 100644
--- a/tests/wpt/tests/css/css-transforms/transform3d-preserve3d-001.html
+++ b/tests/wpt/tests/css/css-transforms/transform3d-preserve3d-001.html
@@ -5,16 +5,22 @@
     <link rel="author" title="Matt Woodrow" href="mailto:mwoodrow@mozilla.com">
     <link rel="author" title="Aryeh Gregor" href="mailto:ayg@aryeh.name">
     <link rel="help" href="http://www.w3.org/TR/css-transforms-2/#transform-style-property">
+    <link rel="stylesheet" href="/fonts/ahem.css">
     <meta name="assert" content="This tests that if preserve-3d is specified,
     four 45deg rotations equal one 180deg rotation.">
     <link rel="match" href="transform3d-preserve3d-001-ref.html">
+    <style>
+      div {
+        font: 25px/1 Ahem;
+      }
+    </style>
   </head>
   <body>
     <div style="transform: rotatex(45deg); transform-style: preserve-3d;">
       <div style="transform: rotatex(45deg); transform-style: preserve-3d;">
         <div style="transform: rotatex(45deg); transform-style: preserve-3d;">
           <div style="transform: rotatex(45deg); width: 100px; height: 100px;">
-            Test Text
+            XXpp
           </div>
         </div>
       </div>
diff --git a/tests/wpt/tests/css/css-transitions/all-with-discrete.tentative.html b/tests/wpt/tests/css/css-transitions/all-with-discrete.tentative.html
index c8734f28029..c3642eeed89 100644
--- a/tests/wpt/tests/css/css-transitions/all-with-discrete.tentative.html
+++ b/tests/wpt/tests/css/css-transitions/all-with-discrete.tentative.html
@@ -22,13 +22,11 @@
 
 <script>
 promise_test(async () => {
-  let transitionstartFired = false;
-  target.addEventListener('transitionstart', () => {
-    transitionstartFired = true;
-  });
   await waitForAnimationFrames(2);
   target.classList.add('animated');
-  await waitForAnimationFrames(1);
-  assert_true(transitionstartFired);
+  const anims = document.getAnimations();
+  assert_equals(anims.length, 1,
+                "Did not start a discrete-property transition");
+  assert_equals(anims[0].transitionProperty, 'float');
 }, 'transition:all with transition-behavior:allow-discrete should animate discrete properties.');
 </script>
diff --git a/tests/wpt/tests/css/css-typed-om/factory-font-relative-length.html b/tests/wpt/tests/css/css-typed-om/factory-font-relative-length.html
new file mode 100644
index 00000000000..f7e41ee2976
--- /dev/null
+++ b/tests/wpt/tests/css/css-typed-om/factory-font-relative-length.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>CSSOM Test: Numeric Factory Functions for font relative length</title>
+    <link rel="author" title="Tim Nguyen" href="https://github.com/nt1m">
+    <link rel="help" href="https://drafts.css-houdini.org/css-typed-om-1/#numeric-factory">
+    <meta name="assert" content="CSS factory functions produce expected CSSUnitValue">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+    <script>
+        "use strict";
+
+        let units = [
+            "cap",
+            "ch",
+            "em",
+            "ex",
+            "ic",
+            "lh",
+            "rcap",
+            "rch",
+            "rem",
+            "rex",
+            "ric",
+            "rlh"
+        ];
+        let counter = 1;
+        for (let unit of units) {
+            test(function(){
+                let length = CSS[unit](counter);
+                assert_true(length instanceof CSSUnitValue);
+                assert_equals(length.value, counter);
+                assert_equals(length.unit, unit);
+                counter++;
+            }, `CSS.${unit}() produces ${unit} length`);
+        }
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/font-variant-emoji.html b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/font-variant-emoji.html
index 38cd6d237be..9433263fd90 100644
--- a/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/font-variant-emoji.html
+++ b/tests/wpt/tests/css/css-typed-om/the-stylepropertymap/properties/font-variant-emoji.html
@@ -14,9 +14,10 @@
 'use strict';
 
 runPropertyTests('font-variant-emoji', [
-  { syntax: 'auto' },
+  { syntax: 'normal' },
   { syntax: 'text' },
   { syntax: 'emoji' },
+  { syntax: 'unicode' },
 ]);
 
 </script>
diff --git a/tests/wpt/tests/css/css-ui/compute-kind-widget-no-fallback-props-001.html b/tests/wpt/tests/css/css-ui/compute-kind-widget-no-fallback-props-001.html
index 0533da654ff..bda712ec50d 100644
--- a/tests/wpt/tests/css/css-ui/compute-kind-widget-no-fallback-props-001.html
+++ b/tests/wpt/tests/css/css-ui/compute-kind-widget-no-fallback-props-001.html
@@ -1,4 +1,5 @@
 <!DOCTYPE html>
+<meta name=fuzzy content="maxDifference=0-65; totalPixels=0-100">
 <meta charset="utf-8">
 <title>CSS Basic User Interface Test: Compute kind of widget: properties that DO NOT disable native appearance for widgets</title>
 <link rel="help" href="https://drafts.csswg.org/css-ui-4/#computing-kind-widget">
diff --git a/tests/wpt/tests/css/css-ui/inheritance.html b/tests/wpt/tests/css/css-ui/inheritance.html
index c2aab07a23b..9a2efdd049e 100644
--- a/tests/wpt/tests/css/css-ui/inheritance.html
+++ b/tests/wpt/tests/css/css-ui/inheritance.html
@@ -41,10 +41,7 @@ assert_not_inherited('nav-down', 'auto', '#foo');
 assert_not_inherited('nav-left', 'auto', '#foo');
 assert_not_inherited('nav-right', 'auto', '#foo');
 assert_not_inherited('nav-up', 'auto', '#foo');
-if (CSS.supports('outline-color', 'invert'))
-  assert_not_inherited('outline-color', 'invert', 'rgba(42, 53, 64, 0.75)');
-else
-  assert_not_inherited('outline-color', currentColor, 'rgba(42, 53, 64, 0.75)');
+assert_not_inherited('outline-color', currentColor, 'rgba(42, 53, 64, 0.75)');
 assert_not_inherited('outline-offset', '0px', '10px');
 assert_not_inherited('outline-style', 'none', 'auto');
 assert_not_inherited('outline-width', mediumWidth, '10px');
diff --git a/tests/wpt/tests/css/css-ui/negative-outline-offset-ref.html b/tests/wpt/tests/css/css-ui/negative-outline-offset-ref.html
new file mode 100644
index 00000000000..acf1a6e0e88
--- /dev/null
+++ b/tests/wpt/tests/css/css-ui/negative-outline-offset-ref.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<style>
+  div {
+    border: 2px solid black;
+    padding: 5px 0; /* No horizontal padding as outline-offset is not affected by it and span simulates it */
+    font-size: 16px;
+  }
+
+  span {
+    display: block;
+
+    /* 3/6px offset for border */
+    height: 2px;
+    width: calc(100% - 20em + 6px);
+    margin: -1px calc(10em - 3px); /* -1px vertical to remove height of span from div height */
+    background: red;
+  }
+</style>
+
+<p>PASS if there is a thin red line in the middle of the box.</p>
+<div>
+  <span></span>
+</div>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-ui/negative-outline-offset.html b/tests/wpt/tests/css/css-ui/negative-outline-offset.html
new file mode 100644
index 00000000000..3d20df08539
--- /dev/null
+++ b/tests/wpt/tests/css/css-ui/negative-outline-offset.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<link rel="help" href="https://www.w3.org/TR/css-ui-4/#outline-offset">
+<link rel="match" href="negative-outline-offset-ref.html">
+<style>
+  div {
+    outline: 1px solid red;
+    outline-offset: -10em;
+
+    border: 2px solid black;
+    padding: 5px;
+    font-size: 16px;
+  }
+</style>
+
+<p>PASS if there is a thin red line in the middle of the box.</p>
+<div></div>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-ui/outline-006.html b/tests/wpt/tests/css/css-ui/outline-006.html
deleted file mode 100644
index 29f0ea66d51..00000000000
--- a/tests/wpt/tests/css/css-ui/outline-006.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!doctype html>
-<html lang=en>
-  <meta charset=utf-8>
-  <title>CSS-UI test: outline-color:invert</title>
-  <link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net">
-  <meta name=flags content="">
-  <meta name=assert content="outline-color:invert must do pixel-level color invertion OR fail to parse, in which case the initial value must be currentcolor">
-  <link rel="match" href="reference/outline-006-ref.html">
-  <link rel=help href="https://drafts.csswg.org/css-ui-3/#outline-props">
-<style>
-body > div {
-  width: 100px;
-  height: 100px;
-  display: table-cell; /* Make a BFC */
-  background: rgb(255,127,255); /* inverse of green (rgb(0,128,0)) */
-}
-div > div {
-  color: green;
-  background: green;
-  margin: 25px;
-  width: 50px;
-  height: 50px;
-  outline: solid 25px;
-  outline-color: invert;
-}
-
-</style>
-
-  <p>Test passes if there is a filled green square and <strong>no pink</strong>.</p>
-  <div><div></div></div>
-
diff --git a/tests/wpt/tests/css/css-ui/parsing/form-sizing-computed.html b/tests/wpt/tests/css/css-ui/parsing/form-sizing-computed.html
new file mode 100644
index 00000000000..557b1d5eb96
--- /dev/null
+++ b/tests/wpt/tests/css/css-ui/parsing/form-sizing-computed.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<title>CSS UI: getComputedStyle().formSizing</title>
+<link rel="help" href="https://github.com/w3c/csswg-drafts/pull/9251">
+<link rel="author" title="Kent Tamura" href="mailto:tkent@chromium.org">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/computed-testcommon.js"></script>
+<body>
+<div id="target"></div>
+<script>
+test_computed_value('form-sizing', 'auto');
+test_computed_value('form-sizing', 'normal');
+</script>
+</body>
diff --git a/tests/wpt/tests/css/css-ui/parsing/form-sizing-invalid.html b/tests/wpt/tests/css/css-ui/parsing/form-sizing-invalid.html
new file mode 100644
index 00000000000..80ab546f90e
--- /dev/null
+++ b/tests/wpt/tests/css/css-ui/parsing/form-sizing-invalid.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<title>CSS UI: parsing form-sizing with invalid values</title>
+<link rel="help" href="https://github.com/w3c/csswg-drafts/pull/9251">
+<link rel="author" title="Kent Tamura" href="mailto:tkent@chromium.org">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+<body>
+<script>
+test_invalid_value('form-sizing', 'none');
+test_invalid_value('form-sizing', 'legacy');
+test_invalid_value('form-sizing', 'normal auto');
+test_invalid_value('form-sizing', '100%');
+test_invalid_value('form-sizing', '10px');
+</script>
+</body>
diff --git a/tests/wpt/tests/css/css-ui/parsing/form-sizing-valid.html b/tests/wpt/tests/css/css-ui/parsing/form-sizing-valid.html
new file mode 100644
index 00000000000..f7cc8f44c3c
--- /dev/null
+++ b/tests/wpt/tests/css/css-ui/parsing/form-sizing-valid.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<title>CSS UI: parsing form-sizing with valid values</title>
+<link rel="help" href="https://github.com/w3c/csswg-drafts/pull/9251">
+<link rel="author" title="Kent Tamura" href="mailto:tkent@chromium.org">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+<body>
+<script>
+test_valid_value('form-sizing', 'auto');
+test_valid_value('form-sizing', 'normal');
+</script>
+</body>
diff --git a/tests/wpt/tests/css/css-ui/parsing/outline-color-computed.html b/tests/wpt/tests/css/css-ui/parsing/outline-color-computed.html
index b9aab1d230a..c6631881b01 100644
--- a/tests/wpt/tests/css/css-ui/parsing/outline-color-computed.html
+++ b/tests/wpt/tests/css/css-ui/parsing/outline-color-computed.html
@@ -10,11 +10,19 @@
 <style>
   #target {
     color: blue;
+    outline-style: auto;
+    outline-color: auto;
+  }
+  #target2 {
+    color: blue;
+    outline-style: solid;
+    outline-color: auto;
   }
 </style>
 </head>
 <body>
 <div id="target"></div>
+<div id="target2"></div>
 <script>
 'use strict';
 const currentColor = "rgb(0, 0, 255)";
@@ -23,10 +31,10 @@ test_computed_value("outline-color", "red", "rgb(255, 0, 0)");
 
 test(() => {
   const target = document.getElementById('target');
-  target.style.outlineColor = 'invert';
-  if (target.style.outlineColor === 'invert')
-    assert_equals(getComputedStyle(target).outlineColor, 'invert');
-}, 'invert, if supported, computes to invert');
+  const target2 = document.getElementById('target2');
+  assert_equals(getComputedStyle(target).outlineColor, 'auto');
+  assert_equals(getComputedStyle(target2).outlineColor, currentColor);
+}, 'auto computes to itself or to currentColor depending on the value of outline-style');
 </script>
 </body>
 </html>
diff --git a/tests/wpt/tests/css/css-ui/parsing/outline-color-invalid.html b/tests/wpt/tests/css/css-ui/parsing/outline-color-invalid.html
index 2b910e80303..91823ffca34 100644
--- a/tests/wpt/tests/css/css-ui/parsing/outline-color-invalid.html
+++ b/tests/wpt/tests/css/css-ui/parsing/outline-color-invalid.html
@@ -5,14 +5,14 @@
 <title>CSS UI Level 3: parsing outline-color with invalid values</title>
 <link rel="author" title="Eric Willigers" href="mailto:ericwilligers@chromium.org">
 <link rel="help" href="https://drafts.csswg.org/css-ui-3/#outline-color">
-<meta name="assert" content="outline-color supports only the grammar '<color> | invert'.">
+<meta name="assert" content="outline-color supports only the grammar '<color> | auto'.">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/css/support/parsing-testcommon.js"></script>
 </head>
 <body>
 <script>
-test_invalid_value("outline-color", "auto");
+test_invalid_value("outline-color", "invert");
 test_invalid_value("outline-color", "none");
 test_invalid_value("outline-color", "50%");
 </script>
diff --git a/tests/wpt/tests/css/css-ui/parsing/outline-color-valid-optional.html b/tests/wpt/tests/css/css-ui/parsing/outline-color-valid-optional.html
deleted file mode 100644
index 79932990988..00000000000
--- a/tests/wpt/tests/css/css-ui/parsing/outline-color-valid-optional.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8">
-<title>CSS UI Level 3: parsing outline-color with valid values</title>
-<link rel="author" title="Eric Willigers" href="mailto:ericwilligers@chromium.org">
-<link rel="help" href="https://drafts.csswg.org/css-ui-3/#outline-color">
-<meta name="assert" content="outline-color supports 'invert'.">
-<meta name="flags" content="may">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/css/support/parsing-testcommon.js"></script>
-</head>
-<body>
-<script>
-// Conformant UAs may ignore the invert value on platforms that do not support color inversion of the pixels on the screen.
-test_valid_value("outline-color", "invert");
-</script>
-</body>
-</html>
diff --git a/tests/wpt/tests/css/css-ui/parsing/outline-color-valid-mandatory.html b/tests/wpt/tests/css/css-ui/parsing/outline-color-valid.html
similarity index 82%
rename from tests/wpt/tests/css/css-ui/parsing/outline-color-valid-mandatory.html
rename to tests/wpt/tests/css/css-ui/parsing/outline-color-valid.html
index 2af06658241..ce28fbb4b60 100644
--- a/tests/wpt/tests/css/css-ui/parsing/outline-color-valid-mandatory.html
+++ b/tests/wpt/tests/css/css-ui/parsing/outline-color-valid.html
@@ -5,7 +5,7 @@
 <title>CSS UI Level 3: parsing outline-color with valid values</title>
 <link rel="author" title="Eric Willigers" href="mailto:ericwilligers@chromium.org">
 <link rel="help" href="https://drafts.csswg.org/css-ui-3/#outline-color">
-<meta name="assert" content="outline-color supports '<color>'.">
+<meta name="assert" content="outline-color supports '<color> | auto'.">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/css/support/parsing-testcommon.js"></script>
@@ -13,6 +13,7 @@
 <body>
 <script>
 test_valid_value("outline-color", "rgba(10, 20, 30, 0.4)");
+test_valid_value("outline-color", "auto");
 </script>
 </body>
 </html>
diff --git a/tests/wpt/tests/css/css-ui/parsing/outline-invalid.html b/tests/wpt/tests/css/css-ui/parsing/outline-invalid.html
index c43cc3c6434..1d14e7854f0 100644
--- a/tests/wpt/tests/css/css-ui/parsing/outline-invalid.html
+++ b/tests/wpt/tests/css/css-ui/parsing/outline-invalid.html
@@ -13,6 +13,7 @@
 <body>
 <script>
 test_invalid_value("outline", "invert solid rgba(10, 20, 30, 0.4)");
+test_invalid_value("outline", "invert solid");
 test_invalid_value("outline", "double invert groove");
 test_invalid_value("outline", "thin outset thick");
 </script>
diff --git a/tests/wpt/tests/css/css-ui/parsing/outline-valid-optional.html b/tests/wpt/tests/css/css-ui/parsing/outline-valid-optional.html
deleted file mode 100644
index 8150ffa208e..00000000000
--- a/tests/wpt/tests/css/css-ui/parsing/outline-valid-optional.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8">
-<title>CSS UI Level 3: parsing outline with valid values</title>
-<link rel="author" title="Eric Willigers" href="mailto:ericwilligers@chromium.org">
-<link rel="help" href="https://drafts.csswg.org/css-ui-3/#outline">
-<link rel="help" href="https://drafts.csswg.org/cssom/#serializing-css-values">
-<meta name="assert" content="outline supports the full grammar '<outline-color> || <outline> || <outline>'.">
-<meta name="assert" content="outline serializes in canonical order, with shortest possible serialization.">
-<meta name="flags" content="may">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/css/support/parsing-testcommon.js"></script>
-</head>
-<body>
-<script>
-// Conformant UAs may ignore the invert value on platforms that do not support color inversion of the pixels on the screen.
-test_valid_value("outline", "invert");
-test_valid_value("outline", "invert dotted 1px");
-</script>
-</body>
-</html>
diff --git a/tests/wpt/tests/css/css-ui/parsing/outline-valid-mandatory.html b/tests/wpt/tests/css/css-ui/parsing/outline-valid.html
similarity index 90%
rename from tests/wpt/tests/css/css-ui/parsing/outline-valid-mandatory.html
rename to tests/wpt/tests/css/css-ui/parsing/outline-valid.html
index 94d87cb1125..7259a838077 100644
--- a/tests/wpt/tests/css/css-ui/parsing/outline-valid-mandatory.html
+++ b/tests/wpt/tests/css/css-ui/parsing/outline-valid.html
@@ -17,7 +17,7 @@
 test_valid_value("outline", "rgba(10, 20, 30, 0.4)");
 
 test_valid_value("outline", "auto");
-test_valid_value("outline", "none", ["invert", "currentcolor", "none", "medium"]);
+test_valid_value("outline", "none", ["currentcolor", "none", "medium"]);
 test_valid_value("outline", "dotted");
 test_valid_value("outline", "dashed");
 test_valid_value("outline", "solid");
@@ -31,7 +31,7 @@ test_valid_value("outline", "0", "0px");
 test_valid_value("outline", "1px");
 test_valid_value("outline", "calc(2em + 3ex)");
 test_valid_value("outline", "thin");
-test_valid_value("outline", "medium", ["invert", "currentcolor", "none", "medium"]);
+test_valid_value("outline", "medium", ["currentcolor", "none", "medium"]);
 test_valid_value("outline", "thick");
 
 test_valid_value("outline", "dashed thin");
diff --git a/tests/wpt/tests/css/css-values/acos-asin-atan-atan2-computed.html b/tests/wpt/tests/css/css-values/acos-asin-atan-atan2-computed.html
index 82e9dde6223..5f4b7b9aa32 100644
--- a/tests/wpt/tests/css/css-values/acos-asin-atan-atan2-computed.html
+++ b/tests/wpt/tests/css/css-values/acos-asin-atan-atan2-computed.html
@@ -56,7 +56,9 @@ test_math_used('atan2(1em, -1em)', '135deg', {type:'angle', approx:0.1});
 test_math_used('atan2(1ex, -1ex)', '135deg', {type:'angle', approx:0.1});
 test_math_used('atan2(1ch, -1ch)', '135deg', {type:'angle', approx:0.1});
 test_math_used('atan2(1rem, -1rem)', '135deg', {type:'angle', approx:0.1});
+test_math_used('atan2(1rem + 1px - 1px, -1rem)', '135deg', {type:'angle', approx:0.1});
 test_math_used('atan2(1vh, -1vh)', '135deg', {type:'angle', approx:0.1});
+test_math_used('atan2(1vh + 0px, -1vh + 0px)', '135deg', {type:'angle', approx:0.1});
 test_math_used('atan2(1vw, -1vw)', '135deg', {type:'angle', approx:0.1});
 test_math_used('atan2(1deg, -1deg)', '135deg', {type:'angle', approx:0.1});
 test_math_used('atan2(1grad, -1grad)', '135deg', {type:'angle', approx:0.1});
diff --git a/tests/wpt/tests/css/css-values/attr-notype-fallback-ref.html b/tests/wpt/tests/css/css-values/attr-notype-fallback-ref.html
new file mode 100644
index 00000000000..efb9b969f3a
--- /dev/null
+++ b/tests/wpt/tests/css/css-values/attr-notype-fallback-ref.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<style>
+  #one::after {
+    content: "Fallback value";
+  }
+
+  #two::after {
+    content: "Not fallback value";
+  }
+
+  #three::after {
+    content: "";
+  }
+
+  #four::after {
+    content: "";
+  }
+
+  #five::after {
+    content: "";
+  }
+
+  #six::after {
+    content: "";
+  }
+</style>
+
+<div id="one"></div>
+<div id="two"></div>
+<div id="three"></div>
+<div id="four"></div>
+<div id="five"></div>
+<div id="six"></div>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-values/attr-notype-fallback.html b/tests/wpt/tests/css/css-values/attr-notype-fallback.html
new file mode 100644
index 00000000000..b88f3de4b57
--- /dev/null
+++ b/tests/wpt/tests/css/css-values/attr-notype-fallback.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-values-5/#attr-notation">
+<link rel="match" href="attr-notype-fallback-ref.html">
+<style>
+  #one::after {
+    content: attr(does-not-exist, "Fallback value");
+  }
+
+  #two::after {
+    content: attr(does-exist, "Fallback value");
+  }
+
+  #three::after {
+    content: attr(does-not-exist, invalid);
+  }
+
+  #four::after {
+    content: attr(does-exist, invalid);
+  }
+
+  #five::after {
+    content: attr(does-exist, "Fallback value");
+  }
+
+  #six::after {
+    content: attr(does-exist, "Fallback value");
+  }
+</style>
+
+<div id="one"></div>
+<div id="two" does-exist="Not fallback value"></div>
+<div id="three"></div>
+<div id="four" does-exist="Not fallback value"></div>
+<div id="five" does-exist=""></div>
+<div id="six" does-exist></div>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-values/calc-border-radius-1.html b/tests/wpt/tests/css/css-values/calc-border-radius-1.html
index 05e98505e51..f94bdf2cb94 100644
--- a/tests/wpt/tests/css/css-values/calc-border-radius-1.html
+++ b/tests/wpt/tests/css/css-values/calc-border-radius-1.html
@@ -5,7 +5,8 @@
   <link rel="author" title="L. David Baron" href="https://dbaron.org/">
   <link rel="help" href="http://www.w3.org/TR/css3-values/#calc-notation">
   <link rel="match" href="calc-border-radius-1-ref.html">
-<style type="text/css">
+  <meta name="fuzzy" content="maxDifference=0-5; totalPixels=0-5">
+<style>
 
 p {
   /* We use powers of two here to avoid floating-point issues.
diff --git a/tests/wpt/tests/css/css-values/calc-z-index-fractions-001.html b/tests/wpt/tests/css/css-values/calc-z-index-fractions-001.html
index eef8032169b..caa75ea7842 100644
--- a/tests/wpt/tests/css/css-values/calc-z-index-fractions-001.html
+++ b/tests/wpt/tests/css/css-values/calc-z-index-fractions-001.html
@@ -46,11 +46,12 @@
     }
 
  /* verifyComputedStyle(property_name, initial_value, specified_value, expected_value, description) */
-
+    verifyComputedStyle("z-index", "auto", "calc(2.5 / 2)", "1", "testing z-index: calc(2.5 / 2)");
     verifyComputedStyle("z-index", "auto", "calc(3 / 2)", "2", "testing z-index: calc(3 / 2)");
-
+    verifyComputedStyle("z-index", "auto", "calc(3.5 / 2)", "2", "testing z-index: calc(3.5 / 2)");
+    verifyComputedStyle("z-index", "auto", "calc(-2.5 / 2)", "-1", "testing z-index: calc(-2.5 / 2)");
     verifyComputedStyle("z-index", "auto", "calc(-3 / 2)", "-1", "testing z-index: calc(-3 / 2)");
-
+    verifyComputedStyle("z-index", "auto", "calc(-3.5 / 2)", "-2", "testing z-index: calc(-3.5 / 2)");
   }
 
   startTesting();
diff --git a/tests/wpt/tests/css/css-values/ch-unit-004.html b/tests/wpt/tests/css/css-values/ch-unit-004.html
index 1c2f818ce68..82ebb1b0375 100644
--- a/tests/wpt/tests/css/css-values/ch-unit-004.html
+++ b/tests/wpt/tests/css/css-values/ch-unit-004.html
@@ -5,6 +5,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-values-3/#font-relative-lengths">
 <link rel="match" href="reference/ch-unit-001-ref.html">
 <meta name="assert" content="In vertical sideways, The ch unit is equal to the used horizontal advance measure of the 0 (ZERO, U+0030) glyph found in the font used to render it.">
+<meta name="fuzzy" content="maxDifference=0-28; totalPixels=0-9">
 <style>
 span {
     background: green;
diff --git a/tests/wpt/tests/css/css-values/clamp-length-computed.html b/tests/wpt/tests/css/css-values/clamp-length-computed.html
index 8ace5b95502..9ca089d2552 100644
--- a/tests/wpt/tests/css/css-values/clamp-length-computed.html
+++ b/tests/wpt/tests/css/css-values/clamp-length-computed.html
@@ -31,4 +31,17 @@ test_length_equals('clamp(10px , 35px, 30px)', '30px');
 // so MIN wins over MAX if they are in the wrong order.
 test_length_equals('clamp(30px, 100px, 20px)', '30px');
 
+// also test with negative values
+test_length_equals('clamp(-30px, -20px, -10px)', '-20px');
+test_length_equals('clamp(-30px, -100px, -10px)', '-30px');
+test_length_equals('clamp(-30px, 100px, -10px)', '-10px');
+test_length_equals('clamp(-10px, 100px, -30px)', '-10px');
+test_length_equals('clamp(-10px, -100px, -30px)', '-10px');
+
+// and negating the result of clamp
+test_length_equals('calc(0px + clamp(10px, 20px, 30px))', '20px');
+test_length_equals('calc(0px - clamp(10px, 20px, 30px))', '-20px');
+test_length_equals('calc(0px + clamp(30px, 100px, 20px))', '30px');
+test_length_equals('calc(0px - clamp(30px, 100px, 20px))', '-30px');
+
 </script>
diff --git a/tests/wpt/tests/css/css-values/clamp-length-serialize.html b/tests/wpt/tests/css/css-values/clamp-length-serialize.html
index 36738447ed2..987d028ee87 100644
--- a/tests/wpt/tests/css/css-values/clamp-length-serialize.html
+++ b/tests/wpt/tests/css/css-values/clamp-length-serialize.html
@@ -13,4 +13,32 @@ function test_valid_length(value, expected) {
 test_valid_length('clamp(1px, 2px, 3px)', 'calc(2px)');
 test_valid_length('clamp(1px, 2px, clamp(2px, 3px, 4px))', 'calc(2px)');
 
+test_valid_length('clamp(10px, 5px, 30px)', 'calc(10px)');
+test_valid_length('clamp(10px, 35px, 30px)', 'calc(30px)');
+test_valid_length('clamp(10px, 35px , 30px)', 'calc(30px)');
+test_valid_length('clamp(10px, 35px /*foo*/, 30px)', 'calc(30px)');
+test_valid_length('clamp(10px /* foo */ , 35px, 30px)', 'calc(30px)');
+test_valid_length('clamp(10px , 35px, 30px)', 'calc(30px)');
+
+// clamp(MIN, VAL, MAX) is identical to max(MIN, min(VAL, MAX)),
+// so MIN wins over MAX if they are in the wrong order.
+test_valid_length('clamp(30px, 100px, 20px)', 'calc(30px)');
+
+// also test with negative values
+test_valid_length('clamp(-30px, -20px, -10px)', 'calc(-20px)');
+test_valid_length('clamp(-30px, -100px, -10px)', 'calc(-30px)');
+test_valid_length('clamp(-30px, 100px, -10px)', 'calc(-10px)');
+test_valid_length('clamp(-10px, 100px, -30px)', 'calc(-10px)');
+test_valid_length('clamp(-10px, -100px, -30px)', 'calc(-10px)');
+
+// and negating the result of clamp
+test_valid_length('calc(0px + clamp(10px, 20px, 30px))', 'calc(20px)');
+test_valid_length('calc(0px - clamp(10px, 20px, 30px))', 'calc(-20px)');
+test_valid_length('calc(0px + clamp(30px, 100px, 20px))', 'calc(30px)');
+test_valid_length('calc(0px - clamp(30px, 100px, 20px))', 'calc(-30px)');
+
+// mixed units that can't be resolved until computed-value time
+test_valid_length('clamp(1px, 1em, 1vh)', 'clamp(1px, 1em, 1vh)');
+test_valid_length('calc(0px + clamp(1px, 1em, 1vh))', 'calc(0px + clamp(1px, 1em, 1vh))');
+test_valid_length('calc(0px - clamp(1px, 1em, 1vh))', 'calc(0px - clamp(1px, 1em, 1vh))');
 </script>
diff --git a/tests/wpt/tests/css/css-values/getComputedStyle-calc-mixed-units-001.html b/tests/wpt/tests/css/css-values/getComputedStyle-calc-mixed-units-001.html
index c6fea70aae9..4b8ec04188d 100644
--- a/tests/wpt/tests/css/css-values/getComputedStyle-calc-mixed-units-001.html
+++ b/tests/wpt/tests/css/css-values/getComputedStyle-calc-mixed-units-001.html
@@ -67,7 +67,7 @@
       }, description);
     }
 
-    verifyComputedStyle("background-size", "calc(67% - 54% + 4em)", "calc(13% + 64px)", "testing background-size: calc(67% - 54% + 4em)");
+    verifyComputedStyle("background-size", "calc(67% - 54% + 4em) 50%", "calc(13% + 64px) 50%", "testing background-size: calc(67% - 54% + 4em) 50%");
 
     /*
     "Where percentages are not resolved at computed-value time,
diff --git a/tests/wpt/tests/css/css-values/lh-unit-005.html b/tests/wpt/tests/css/css-values/lh-unit-005.html
new file mode 100644
index 00000000000..477c153c0d0
--- /dev/null
+++ b/tests/wpt/tests/css/css-values/lh-unit-005.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Values and Units Test: lh unit based on inherited line-height</title>
+<link rel="help" href="https://drafts.csswg.org/css-values-4/#font-relative-lengths">
+<link rel="help" href="https://crbug.com/1487480">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+  #lh50, #lh100 {
+    height: 1lh;
+  }
+</style>
+<div style="line-height: 50px">
+  <div id="lh50"></div>
+</div>
+<div style="line-height: 100px">
+  <div id="lh100"></div>
+</div>
+<script>
+  test(() => {
+    assert_equals(getComputedStyle(lh50).height, "50px");
+    assert_equals(getComputedStyle(lh100).height, "100px");
+  }, "lh relative to line-height inherited from parent");
+</script>
diff --git a/tests/wpt/tests/css/css-values/mod-length-degrees-crash.html b/tests/wpt/tests/css/css-values/mod-length-degrees-crash.html
new file mode 100644
index 00000000000..91d4c65bbb9
--- /dev/null
+++ b/tests/wpt/tests/css/css-values/mod-length-degrees-crash.html
@@ -0,0 +1,6 @@
+<!DOCTYPE html>
+<link rel="author" title="Tim Nguyen" href="https://github.com/nt1m">
+<link rel="help" href="https://bugs.webkit.org/show_bug.cgi?id=260941">
+
+<p>PASS if no crash.</p>
+<div style="height: calc(mod(0px, 0deg))"></div>
diff --git a/tests/wpt/tests/css/css-values/rem-length-degrees-crash.html b/tests/wpt/tests/css/css-values/rem-length-degrees-crash.html
new file mode 100644
index 00000000000..c62a2e769d3
--- /dev/null
+++ b/tests/wpt/tests/css/css-values/rem-length-degrees-crash.html
@@ -0,0 +1,6 @@
+<!DOCTYPE html>
+<link rel="author" title="Tim Nguyen" href="https://github.com/nt1m">
+<link rel="help" href="https://bugs.webkit.org/show_bug.cgi?id=260941">
+
+<p>PASS if no crash.</p>
+<div style="height: calc(rem(0px, 0deg))"></div>
diff --git a/tests/wpt/tests/css/css-values/round-length-degrees-crash.html b/tests/wpt/tests/css/css-values/round-length-degrees-crash.html
new file mode 100644
index 00000000000..9250c399c5f
--- /dev/null
+++ b/tests/wpt/tests/css/css-values/round-length-degrees-crash.html
@@ -0,0 +1,6 @@
+<!DOCTYPE html>
+<link rel="author" title="Tim Nguyen" href="https://github.com/nt1m">
+<link rel="help" href="https://bugs.webkit.org/show_bug.cgi?id=260941">
+
+<p>PASS if no crash.</p>
+<div style="height: calc(round(0px, 0deg))"></div>
diff --git a/tests/wpt/tests/css/css-values/round-mod-rem-invalid.html b/tests/wpt/tests/css/css-values/round-mod-rem-invalid.html
index c0857cc5262..01268091908 100644
--- a/tests/wpt/tests/css/css-values/round-mod-rem-invalid.html
+++ b/tests/wpt/tests/css/css-values/round-mod-rem-invalid.html
@@ -7,6 +7,11 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="../support/parsing-testcommon.js"></script>
 <script>
+function test_invalid_length_percentage(value) {
+  test_invalid_value('height', value);
+  test_invalid_value('height', `calc(${value})`);
+}
+
 function test_invalid_number(value) {
   test_invalid_value('opacity', value);
 }
@@ -91,4 +96,20 @@ test_invalid_number('rem(1, 0deg)');
 test_invalid_number('rem(1, 0Hz)');
 test_invalid_number('rem(1, 0dpi)');
 test_invalid_number('rem(1, 0fr)');
+
+test_invalid_length_percentage('round(0px, 0s)');
+test_invalid_length_percentage('round(0px, 0deg)');
+test_invalid_length_percentage('round(0px, 0Hz)');
+test_invalid_length_percentage('round(0px, 0dpi)');
+test_invalid_length_percentage('round(0px, 0fr)');
+test_invalid_length_percentage('mod(0px, 0s)');
+test_invalid_length_percentage('mod(0px, 0deg)');
+test_invalid_length_percentage('mod(0px, 0Hz)');
+test_invalid_length_percentage('mod(0px, 0dpi)');
+test_invalid_length_percentage('mod(0px, 0fr)');
+test_invalid_length_percentage('rem(0px, 0s)');
+test_invalid_length_percentage('rem(0px, 0deg)');
+test_invalid_length_percentage('rem(0px, 0Hz)');
+test_invalid_length_percentage('rem(0px, 0dpi)');
+test_invalid_length_percentage('rem(0px, 0fr)');
 </script>
diff --git a/tests/wpt/tests/css/css-values/sin-cos-tan-serialize.html b/tests/wpt/tests/css/css-values/sin-cos-tan-serialize.html
index c6a25e96025..59d682421da 100644
--- a/tests/wpt/tests/css/css-values/sin-cos-tan-serialize.html
+++ b/tests/wpt/tests/css/css-values/sin-cos-tan-serialize.html
@@ -39,20 +39,16 @@ var test_map = {
     "tan(0.78539816)"                                  :"calc(1)",
     "tan(0.78539816rad)"                               :"calc(1)",
     "tan(0.125turn)"                                   :"calc(1)",
-    "tan(90deg)"                                       :"calc(infinity)",
-    "tan(-90deg)"                                      :"calc(-infinity)",
     "sin(180deg)"                                      :"calc(0)",
     "cos(180deg)"                                      :"calc(-1)",
     "tan(180deg)"                                      :"calc(0)",
     "sin(270deg)"                                      :"calc(-1)",
     "cos(270deg)"                                      :"calc(0)",
-    "tan(270deg)"                                      :"calc(-infinity)",
     "sin(-180deg)"                                     :"calc(0)",
     "cos(-180deg)"                                     :"calc(-1)",
     "tan(-180deg)"                                     :"calc(0)",
     "sin(-270deg)"                                     :"calc(1)",
     "cos(-270deg)"                                     :"calc(0)",
-    "tan(-270deg)"                                     :"calc(infinity)",
     "calc(sin(30deg) + cos(60deg) + tan(45deg))"       :"calc(2)",
     "calc(sin(infinity))"                              :"calc(NaN)",
     "calc(cos(infinity))"                              :"calc(NaN)",
diff --git a/tests/wpt/tests/css/css-variables/variable-presentation-attribute.html b/tests/wpt/tests/css/css-variables/variable-presentation-attribute.html
index 1674f3ffdbc..6e35c444b53 100644
--- a/tests/wpt/tests/css/css-variables/variable-presentation-attribute.html
+++ b/tests/wpt/tests/css/css-variables/variable-presentation-attribute.html
@@ -51,7 +51,7 @@
         });
 
         let testproperties = [
-            { property: "alignment-baseline", valuesToTest:["auto", "baseline", "before-edge", "text-before-edge", "middle", "central", "after-edge", "text-after-edge", "ideographic", "alphabetic", "hanging", "mathematical"], default: "auto" },
+            { property: "alignment-baseline", valuesToTest:["baseline", "before-edge", "text-before-edge", "middle", "central", "after-edge", "text-after-edge", "ideographic", "alphabetic", "hanging", "mathematical"], default: "baseline" },
             { property: "baseline-shift", valuesToTest:["baseline", "sub", "super", "13%", "28px"], default: "baseline" },
             { property: "clip-rule", valuesToTest:["nonzero", "evenodd"], default: "nonzero" },
             { property: "color", valuesToTest:["rgb(128, 0, 128)"], default: "rgb(0, 0, 0)" },
diff --git a/tests/wpt/tests/css/css-variables/whitespace-in-fallback-crash.html b/tests/wpt/tests/css/css-variables/whitespace-in-fallback-crash.html
new file mode 100644
index 00000000000..7e150e8453e
--- /dev/null
+++ b/tests/wpt/tests/css/css-variables/whitespace-in-fallback-crash.html
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<title>Fallback to a whitespace-only string should not crash</title>
+<link rel="author" title="Steinar H. Gunderson" href="mailto:sesse@chromium.org">
+<link rel="help" href="https://crbug.com/1476811">
+<style>
+  #t1 {--a:var(--b,var(--c,) );}
+</style>
+<div id="t1">Test passes if it does not crash.</div>
diff --git a/tests/wpt/tests/css/css-view-transitions/content-with-clip-ref.html b/tests/wpt/tests/css/css-view-transitions/content-with-clip-ref.html
index 28d8733e27a..a322301686f 100644
--- a/tests/wpt/tests/css/css-view-transitions/content-with-clip-ref.html
+++ b/tests/wpt/tests/css/css-view-transitions/content-with-clip-ref.html
@@ -17,6 +17,7 @@
 
 body {
   height: 150vh;
+  background: pink;
 }
 </style>
 <div id="target1" class="target">
diff --git a/tests/wpt/tests/css/css-view-transitions/content-with-clip.html b/tests/wpt/tests/css/css-view-transitions/content-with-clip.html
index c4775409570..28bfa868752 100644
--- a/tests/wpt/tests/css/css-view-transitions/content-with-clip.html
+++ b/tests/wpt/tests/css/css-view-transitions/content-with-clip.html
@@ -34,6 +34,10 @@ body {
   height: 150vh;
 }
 
+html::view-transition {
+  background: pink;
+  height: 100%;
+}
 html::view-transition-group(hidden) { animation-duration: 300s; }
 html::view-transition-image-pair(hidden) { animation: unset; opacity: 0; }
 
@@ -43,6 +47,7 @@ html::view-transition-group(target1), html::view-transition-group(target2) {
 }
 html::view-transition-old(target1) { animation: unset; opacity: 1; }
 html::view-transition-new(target2) { animation: unset; opacity: 1; }
+html::view-transition-group(root) { display: none }
 
 </style>
 
@@ -60,13 +65,11 @@ html::view-transition-new(target2) { animation: unset; opacity: 1; }
 failIfNot(document.startViewTransition, "Missing document.startViewTransition");
 
 async function runTest() {
-  document.startViewTransition(() => {
+  let transition = document.startViewTransition(() => {
     target1.style = "";
     target2.style = "view-transition-name: target2";
-    requestAnimationFrame(() => requestAnimationFrame(() =>
-      requestAnimationFrame(() => requestAnimationFrame(takeScreenshot))
-    ));
   });
+  transition.ready.then(takeScreenshot);
 }
 onload = () => requestAnimationFrame(() => requestAnimationFrame(runTest));
 </script>
diff --git a/tests/wpt/tests/css/css-view-transitions/inline-element-size-ref.html b/tests/wpt/tests/css/css-view-transitions/inline-element-size-ref.html
new file mode 100644
index 00000000000..177594c870c
--- /dev/null
+++ b/tests/wpt/tests/css/css-view-transitions/inline-element-size-ref.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html>
+<title>View transitions: capture elements with display inline (ref)</title>
+<link rel="help" href="https://github.com/WICG/view-transitions">
+<link rel="author" href="mailto:vmpstr@chromium.org">
+
+<style>
+body {
+  background: pink;
+}
+#box {
+  background: green;
+}
+
+</style>
+
+<span id=box>BOX</span>
+
+</html>
diff --git a/tests/wpt/tests/css/css-view-transitions/inline-element-size.html b/tests/wpt/tests/css/css-view-transitions/inline-element-size.html
new file mode 100644
index 00000000000..c9f0d48942c
--- /dev/null
+++ b/tests/wpt/tests/css/css-view-transitions/inline-element-size.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<title>View transitions: capture elements with display inline</title>
+<link rel="help" href="https://github.com/WICG/view-transitions">
+<link rel="author" href="mailto:vmpstr@chromium.org">
+<link rel="match" href="inline-element-size-ref.html">
+<script src="/common/reftest-wait.js"></script>
+<style>
+#box {
+  background: green;
+  view-transition-name: target;
+}
+
+/* We're verifying what we capture, so just display the old contents for 5 minutes.  */
+html::view-transition-group(*) { animation-duration: 300s; }
+html::view-transition-group(target) { background: green; }
+html::view-transition-new(*) { animation: unset; opacity: 0; }
+html::view-transition-old(*) { animation: unset; opacity: 1; }
+/* hide the root so we show transition background to ensure we're in a transition */
+html::view-transition-group(root) { animation: unset; opacity: 0; }
+html::view-transition { background: pink; }
+</style>
+
+<span id=box>BOX</span>
+<script>
+failIfNot(document.startViewTransition, "Missing document.startViewTransition");
+
+async function runTest() {
+  let t = document.startViewTransition();
+  t.ready.then(takeScreenshot);
+}
+onload = () => requestAnimationFrame(() => requestAnimationFrame(runTest));
+</script>
+
+</html>
diff --git a/tests/wpt/tests/css/css-view-transitions/pseudo-get-computed-style.html b/tests/wpt/tests/css/css-view-transitions/pseudo-get-computed-style.html
index 268df4718e6..2481a713133 100644
--- a/tests/wpt/tests/css/css-view-transitions/pseudo-get-computed-style.html
+++ b/tests/wpt/tests/css/css-view-transitions/pseudo-get-computed-style.html
@@ -16,6 +16,7 @@ div {
   view-transition-name: target;
   mix-blend-mode: multiply;
   text-orientation: upright;
+  color-scheme: dark light;
 }
 ::view-transition-image-pair(target) {
   position: fixed;
@@ -33,6 +34,7 @@ promise_test(() => {
       assert_equals(getComputedStyle(document.documentElement, ":view-transition-group(target)").position, "absolute", "container(target)");
       assert_equals(getComputedStyle(document.documentElement, ":view-transition-group(target)").mixBlendMode, "multiply", "container(target)");
       assert_equals(getComputedStyle(document.documentElement, ":view-transition-group(target)").textOrientation, "upright", "container(target)");
+      assert_equals(getComputedStyle(document.documentElement, ":view-transition-group(target)").colorScheme, "dark light", "container(target)");
       assert_equals(getComputedStyle(document.documentElement, ":view-transition-image-pair(target)").position, "absolute", "wrapper(target)");
 
       assert_equals(getComputedStyle(document.documentElement, ":view-transition-old(target)").position, "absolute", "outgoing(target)");
@@ -47,6 +49,7 @@ promise_test(() => {
         assert_equals(getComputedStyle(document.documentElement, ":view-transition-group(target)").position, "absolute", "raf container(target)");
         assert_equals(getComputedStyle(document.documentElement, ":view-transition-group(target)").mixBlendMode, "multiply", "raf container(target)");
       assert_equals(getComputedStyle(document.documentElement, ":view-transition-group(target)").textOrientation, "upright", "raf container(target)");
+      assert_equals(getComputedStyle(document.documentElement, ":view-transition-group(target)").colorScheme, "dark light", "raf container(target)");
         assert_equals(getComputedStyle(document.documentElement, ":view-transition-image-pair(target)").position, "fixed", "raf wrapper(target)");
 
         assert_equals(getComputedStyle(document.documentElement, ":view-transition-old(target)").position, "absolute", "raf outgoing(target)");
@@ -85,6 +88,7 @@ promise_test(() => {
     assert_equals(getComputedStyle(document.documentElement, ":view-transition-group(target)").position, "absolute");
     assert_equals(getComputedStyle(document.documentElement, ":view-transition-group(target)").mixBlendMode, "multiply");
     assert_equals(getComputedStyle(document.documentElement, ":view-transition-group(target)").textOrientation, "upright");
+    assert_equals(getComputedStyle(document.documentElement, ":view-transition-group(target)").colorScheme, "dark light");
     assert_equals(getComputedStyle(document.documentElement, ":view-transition-image-pair(target)").position, "fixed");
 
     assert_equals(getComputedStyle(document.documentElement, ":view-transition-old(target)").position, "absolute");
diff --git a/tests/wpt/tests/css/css-view-transitions/snapshot-containing-block-includes-scrollbar-gutter-ref.html b/tests/wpt/tests/css/css-view-transitions/snapshot-containing-block-includes-scrollbar-gutter-ref.html
new file mode 100644
index 00000000000..8a74bd21645
--- /dev/null
+++ b/tests/wpt/tests/css/css-view-transitions/snapshot-containing-block-includes-scrollbar-gutter-ref.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<html>
+<title>View transitions: snapshot containing block includes scrollbar gutters (ref)</title>
+<link rel="help" href="https://github.com/WICG/view-transitions">
+<link rel="author" href="mailto:bokan@chromium.org">
+<style>
+:root {
+  scrollbar-gutter: stable both-edges
+}
+#view-transition-mock {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background-color: palegreen;
+}
+#target {
+  position: absolute;
+  top: 100px;
+  left: 0px;
+  width: 200px;
+  height: 200px;
+  background-color: limegreen;
+}
+</style>
+<div id="view-transition-mock">
+<!--
+    This box should be a scrollbar's width from the left edge and
+    exactly aligned with the light green background.
+-->
+  <div id="target">
+  </div>
+</div>
diff --git a/tests/wpt/tests/css/css-view-transitions/snapshot-containing-block-includes-scrollbar-gutter.html b/tests/wpt/tests/css/css-view-transitions/snapshot-containing-block-includes-scrollbar-gutter.html
new file mode 100644
index 00000000000..6e9bf568f67
--- /dev/null
+++ b/tests/wpt/tests/css/css-view-transitions/snapshot-containing-block-includes-scrollbar-gutter.html
@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<html class=reftest-wait>
+<title>View transitions: snapshot containing block includes scrollbar gutters</title>
+<link rel="help" href="https://github.com/WICG/view-transitions">
+<link rel="author" href="mailto:bokan@chromium.org">
+<link rel="match" href="snapshot-containing-block-includes-scrollbar-gutter-ref.html">
+<meta name="fuzzy" content="snapshot-containing-block-includes-scrollbar-gutter-ref.html:0-20;0-100">
+<script src="/common/reftest-wait.js"></script>
+<style>
+  :root {
+    scrollbar-gutter: stable both-edges;
+    /* unset so ::view-transition is visible. */
+    view-transition-name: none;
+  }
+  ::view-transition {
+    background-color: palegreen;
+  }
+  #target {
+    position: absolute;
+    top: 100px;
+    left: 0px;
+    width: 200px;
+    height: 200px;
+    background-color: limegreen;
+    view-transition-name: target;
+  }
+  ::view-transition-group(target) {
+    animation-duration: 300s;
+  }
+</style>
+<!--
+  This box should be a scrollbar's width from the left edge and
+  exactly aligned with the light green background.
+-->
+<div id="target">
+</div>
+<script>
+  failIfNot(document.startViewTransition,
+      "Missing document.startViewTransition");
+
+  async function runTest() {
+    let transition = document.startViewTransition();
+    await transition.ready;
+    takeScreenshot();
+  }
+
+  onload = () => requestAnimationFrame(() => requestAnimationFrame(runTest));
+</script>
diff --git a/tests/wpt/tests/css/css-view-transitions/span-with-overflowing-text-hidden-ref.html b/tests/wpt/tests/css/css-view-transitions/span-with-overflowing-text-hidden-ref.html
new file mode 100644
index 00000000000..1d27e470ac1
--- /dev/null
+++ b/tests/wpt/tests/css/css-view-transitions/span-with-overflowing-text-hidden-ref.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html>
+<title>View transitions: span with overflowing text is rendered correctly (ref)</title>
+<link rel="help" href="https://drafts.csswg.org/css-view-transitions-1/">
+<link rel="author" href="mailto:khushalsagar@chromium.org">
+
+<style>
+div {
+  background: grey;
+}
+span {
+  text-shadow: red 2px 5px;
+  visibility: hidden;
+}
+
+body {
+  background: pink;
+}
+</style>
+
+<div>
+  <span>This text should render correctly</span>
+</div>
diff --git a/tests/wpt/tests/css/css-view-transitions/span-with-overflowing-text-hidden.html b/tests/wpt/tests/css/css-view-transitions/span-with-overflowing-text-hidden.html
new file mode 100644
index 00000000000..65b1497c700
--- /dev/null
+++ b/tests/wpt/tests/css/css-view-transitions/span-with-overflowing-text-hidden.html
@@ -0,0 +1,61 @@
+<!DOCTYPE html>
+<html class=reftest-wait>
+<title>View transitions: span with overflowing text is rendered correctly</title>
+<link rel="help" href="https://drafts.csswg.org/css-view-transitions-1/">
+<link rel="author" href="mailto:khushalsagar@chromium.org">
+<link rel="match" href="span-with-overflowing-text-hidden-ref.html">
+
+
+<script src="/common/reftest-wait.js"></script>
+<script src="/common/rendering-utils.js"></script>
+<style>
+#target {
+  view-transition-name: target;
+  background: grey;
+}
+.hidden {
+  view-transition-name: hidden;
+}
+span {
+  text-shadow: red 2px 5px;
+  visibility: hidden;
+}
+
+html::view-transition-group(hidden) { animation-duration: 300s; }
+html::view-transition-image-pair(hidden) { animation: unset; opacity: 0; }
+html::view-transition-group(root) { visibility: hidden; }
+
+html::view-transition-group(target) {
+  animation: unset;
+}
+
+html::view-transition-old(target) {
+  animation: unset;
+  opacity: 0;
+}
+
+html::view-transition-new(target) {
+  animation: unset;
+  opacity: 1;
+}
+
+html::view-transition {
+  background: pink;
+}
+</style>
+
+<div id ="target">
+  <span>This text should render correctly</span>
+</div>
+<div class="hidden"></div>
+
+<script>
+failIfNot(document.startViewTransition, "Missing document.startViewTransition");
+
+async function runTest() {
+  let transition = document.startViewTransition();
+  transition.ready.then(takeScreenshot);
+}
+onload = () => requestAnimationFrame(() => requestAnimationFrame(runTest));
+</script>
+
diff --git a/tests/wpt/tests/css/css-view-transitions/span-with-overflowing-text-ref.html b/tests/wpt/tests/css/css-view-transitions/span-with-overflowing-text-ref.html
new file mode 100644
index 00000000000..76fc3671da1
--- /dev/null
+++ b/tests/wpt/tests/css/css-view-transitions/span-with-overflowing-text-ref.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+<title>View transitions: span with overflowing text is rendered correctly (ref)</title>
+<link rel="help" href="https://drafts.csswg.org/css-view-transitions-1/">
+<link rel="author" href="mailto:khushalsagar@chromium.org">
+
+<style>
+span {
+  text-shadow: red 2px 5px;
+}
+
+body {
+  background: pink;
+}
+</style>
+
+<span>This text should render correctly</span>
+
diff --git a/tests/wpt/tests/css/css-view-transitions/span-with-overflowing-text.html b/tests/wpt/tests/css/css-view-transitions/span-with-overflowing-text.html
new file mode 100644
index 00000000000..4abee4e6e00
--- /dev/null
+++ b/tests/wpt/tests/css/css-view-transitions/span-with-overflowing-text.html
@@ -0,0 +1,57 @@
+<!DOCTYPE html>
+<html class=reftest-wait>
+<title>View transitions: span with overflowing text is rendered correctly</title>
+<link rel="help" href="https://drafts.csswg.org/css-view-transitions-1/">
+<link rel="author" href="mailto:khushalsagar@chromium.org">
+<link rel="match" href="span-with-overflowing-text-ref.html">
+<meta name="fuzzy" content="span-with-overflowing-text-ref.html:maxDifference=0-2;totalPixels=0-1100">
+
+
+<script src="/common/reftest-wait.js"></script>
+<script src="/common/rendering-utils.js"></script>
+<style>
+span {
+  text-shadow: red 2px 5px;
+  view-transition-name: target;
+}
+
+.hidden {
+  view-transition-name: hidden;
+}
+
+html::view-transition-group(hidden) { animation-duration: 300s; }
+html::view-transition-image-pair(hidden) { animation: unset; opacity: 0; }
+html::view-transition-group(root) { visibility: hidden; }
+
+html::view-transition-group(target) {
+  animation: unset;
+}
+
+html::view-transition-old(target) {
+  animation: unset;
+  opacity: 0;
+}
+
+html::view-transition-new(target) {
+  animation: unset;
+  opacity: 1;
+}
+
+html::view-transition {
+  background: pink;
+}
+</style>
+
+<span>This text should render correctly</span>
+<div class="hidden"></div>
+
+<script>
+failIfNot(document.startViewTransition, "Missing document.startViewTransition");
+
+async function runTest() {
+  let transition = document.startViewTransition();
+  transition.ready.then(takeScreenshot);
+}
+onload = () => requestAnimationFrame(() => requestAnimationFrame(runTest));
+</script>
+
diff --git a/tests/wpt/tests/css/css-writing-modes/forms/button-appearance-native-computed-style.html b/tests/wpt/tests/css/css-writing-modes/forms/button-appearance-native-computed-style.html
new file mode 100644
index 00000000000..dd82b54d6d0
--- /dev/null
+++ b/tests/wpt/tests/css/css-writing-modes/forms/button-appearance-native-computed-style.html
@@ -0,0 +1,70 @@
+<!doctype html>
+<meta charset="utf-8">
+<link rel="author" title="Tim Nguyen" href="https://github.com/nt1m">
+<link rel="help" href="https://drafts.csswg.org/css-writing-modes/#block-flow">
+<title>Button appearance native writing mode computed style</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<button id="horizontal-button">あいなき あいなき</button>
+<button id="horizontal-button-multiline">あいなき あいなき<br>あいなき</button>
+
+<input type="button" id="horizontal-input" value="あいなき あいなき">
+<input type="button" id="horizontal-input-multiline" value="あいなき あいなき&#10;あいなき">
+
+<button id="vertical-lr-button" style="writing-mode: vertical-lr">あいなき あいなき</button>
+<button id="vertical-rl-button" style="writing-mode: vertical-rl">あいなき あいなき</button>
+<button id="vertical-lr-button-multiline" style="writing-mode: vertical-lr">あいなき あいなき<br>あいなき</button>
+<button id="vertical-rl-button-multiline" style="writing-mode: vertical-rl">あいなき あいなき<br>あいなき</button>
+
+<input type="button" id="vertical-lr-input" style="writing-mode: vertical-lr" value="あいなき あいなき">
+<input type="button" id="vertical-rl-input" style="writing-mode: vertical-rl" value="あいなき あいなき">
+<input type="button" id="vertical-lr-input-multiline" style="writing-mode: vertical-lr" value="あいなき あいなき&#10;あいなき">
+<input type="button" id="vertical-rl-input-multiline" style="writing-mode: vertical-rl" value="あいなき あいなき&#10;あいなき">
+
+<script>
+for (const element of document.querySelectorAll("[id^='horizontal-']")) {
+    test(() => {
+        const style = getComputedStyle(element);
+        const blockSize = parseInt(style.blockSize, 10);
+        const inlineSize = parseInt(style.inlineSize, 10);
+        assert_not_equals(blockSize, 0);
+        assert_not_equals(inlineSize, 0);
+        assert_greater_than(inlineSize, blockSize);
+        assert_equals(style.blockSize, style.height);
+        assert_equals(style.inlineSize, style.width);
+    }, `${element.id} block size should match height and inline size should match width`);
+    if (!element.matches("[id$='-multiline']")) {
+        test(() => {
+            const multiline = document.querySelector(`#${element.id}-multiline`);
+            const style = getComputedStyle(element);
+            const multilineStyle = getComputedStyle(multiline);
+            assert_greater_than(parseInt(multilineStyle.height, 10), parseInt(style.height, 10));
+            assert_equals(multilineStyle.width, style.width);
+        }, `${element.id}'s height is less than its multi-line counterpart, but width is identical.`);
+    }
+}
+
+for (const element of document.querySelectorAll("[id^='vertical-']")) {
+    test(() => {
+        const style = getComputedStyle(element);
+        const blockSize = parseInt(style.blockSize, 10);
+        const inlineSize = parseInt(style.inlineSize, 10);
+        assert_not_equals(blockSize, 0);
+        assert_not_equals(inlineSize, 0);
+        assert_greater_than(inlineSize, blockSize);
+        assert_equals(style.blockSize, style.width);
+        assert_equals(style.inlineSize, style.height);
+    }, `${element.id} block size should match width and inline size should match height`);
+
+    if (!element.matches("[id$='-multiline']")) {
+        test(() => {
+            const multiline = document.querySelector(`#${element.id}-multiline`);
+            const style = getComputedStyle(element);
+            const multilineStyle = getComputedStyle(multiline);
+            assert_greater_than(parseInt(multilineStyle.width, 10), parseInt(style.width, 10));
+            assert_equals(multilineStyle.height, style.height);
+        }, `${element.id}'s width is less than its multi-line counterpart, but height is identical.`);
+    }
+}
+</script>
diff --git a/tests/wpt/tests/css/css-writing-modes/forms/meter-appearance-native-computed-style.optional.html b/tests/wpt/tests/css/css-writing-modes/forms/meter-appearance-native-computed-style.optional.html
index 58e1daee471..446036b73c9 100644
--- a/tests/wpt/tests/css/css-writing-modes/forms/meter-appearance-native-computed-style.optional.html
+++ b/tests/wpt/tests/css/css-writing-modes/forms/meter-appearance-native-computed-style.optional.html
@@ -13,8 +13,11 @@
 test(() => {
   const meter = document.querySelector(`meter[style="writing-mode: horizontal-tb"]`);
   const style = getComputedStyle(meter);
-  assert_equals(style.blockSize, "16px");
-  assert_equals(style.inlineSize, "80px");
+  const blockSize = parseInt(style.blockSize, 10);
+  const inlineSize = parseInt(style.inlineSize, 10);
+  assert_not_equals(blockSize, 0);
+  assert_not_equals(inlineSize, 0);
+  assert_greater_than(inlineSize, blockSize);
   assert_equals(style.blockSize, style.height);
   assert_equals(style.inlineSize, style.width);
 }, `meter[style="writing-mode: horizontal-tb"] block size should match height and inline size should match width`);
@@ -23,8 +26,11 @@ for (const writingMode of ["vertical-lr", "vertical-rl"]) {
   test(() => {
     const meter = document.querySelector(`meter[style="writing-mode: ${writingMode}"]`);
     const style = getComputedStyle(meter);
-    assert_equals(style.blockSize, "16px");
-    assert_equals(style.inlineSize, "80px");
+    const blockSize = parseInt(style.blockSize, 10);
+    const inlineSize = parseInt(style.inlineSize, 10);
+    assert_not_equals(blockSize, 0);
+    assert_not_equals(inlineSize, 0);
+    assert_greater_than(inlineSize, blockSize);
     assert_equals(style.blockSize, style.width);
     assert_equals(style.inlineSize, style.height);
   }, `meter[style="writing-mode: ${writingMode}"] block size should match width and inline size should match height`);
diff --git a/tests/wpt/tests/css/css-writing-modes/forms/progress-appearance-native-computed-style.optional.html b/tests/wpt/tests/css/css-writing-modes/forms/progress-appearance-native-computed-style.optional.html
index 47cd65ecf75..0f2e4f1792b 100644
--- a/tests/wpt/tests/css/css-writing-modes/forms/progress-appearance-native-computed-style.optional.html
+++ b/tests/wpt/tests/css/css-writing-modes/forms/progress-appearance-native-computed-style.optional.html
@@ -13,8 +13,11 @@
 test(() => {
   const progress = document.querySelector(`progress[style="writing-mode: horizontal-tb"]`);
   const style = getComputedStyle(progress);
-  assert_equals(style.blockSize, "16px");
-  assert_equals(style.inlineSize, "160px");
+  const blockSize = parseInt(style.blockSize, 10);
+  const inlineSize = parseInt(style.inlineSize, 10);
+  assert_not_equals(blockSize, 0);
+  assert_not_equals(inlineSize, 0);
+  assert_greater_than(inlineSize, blockSize);
   assert_equals(style.blockSize, style.height);
   assert_equals(style.inlineSize, style.width);
 }, `progress[style="writing-mode: horizontal-tb"] block size should match height and inline size should match width`);
@@ -23,8 +26,11 @@ for (const writingMode of ["vertical-lr", "vertical-rl"]) {
   test(() => {
     const progress = document.querySelector(`progress[style="writing-mode: ${writingMode}"]`);
     const style = getComputedStyle(progress);
-    assert_equals(style.blockSize, "16px");
-    assert_equals(style.inlineSize, "160px");
+    const blockSize = parseInt(style.blockSize, 10);
+    const inlineSize = parseInt(style.inlineSize, 10);
+    assert_not_equals(blockSize, 0);
+    assert_not_equals(inlineSize, 0);
+    assert_greater_than(inlineSize, blockSize);
     assert_equals(style.blockSize, style.width);
     assert_equals(style.inlineSize, style.height);
   }, `progress[style="writing-mode: ${writingMode}"] block size should match width and inline size should match height`);
diff --git a/tests/wpt/tests/css/css-writing-modes/forms/select-multiple-options-visual-order.html b/tests/wpt/tests/css/css-writing-modes/forms/select-multiple-options-visual-order.html
new file mode 100644
index 00000000000..359c09279ed
--- /dev/null
+++ b/tests/wpt/tests/css/css-writing-modes/forms/select-multiple-options-visual-order.html
@@ -0,0 +1,73 @@
+<!doctype html>
+<link rel="author" title="Aditya Keerthi" href="https://github.com/pxlcoder">
+<link rel="help" href="https://html.spec.whatwg.org/#the-select-element">
+<link rel="help" href="https://drafts.csswg.org/css-writing-modes-4/#block-flow">
+<title>Test &lt;select&gt; multiple attribute options visual order</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+
+<select multiple size="4"></select>
+<script>
+const select = document.querySelector("select");
+for (let i = 0; i < 4; i++) {
+    const option = document.createElement("option");
+    option.textContent = `Option ${i + 1}`;
+    select.appendChild(option);
+}
+
+for (const writingMode of ["horizontal-tb", "vertical-lr", "vertical-rl", "sideways-lr", "sideways-rl"]) {
+    if (!CSS.supports(`writing-mode: ${writingMode}`))
+        continue;
+
+    const isHorizontal = writingMode === "horizontal-tb";
+    const isReversedBlockFlowDirection = writingMode.endsWith("-rl");
+
+    promise_test(async function() {
+        select.style.writingMode = writingMode;
+        this.add_cleanup(() => {
+            select.removeAttribute("style");
+        });
+
+        const elementBox = select.getBoundingClientRect();
+        const computedStyle = getComputedStyle(select);
+
+        const borderAndPaddingTop = parseFloat(computedStyle.borderTopWidth) + parseFloat(computedStyle.paddingTop);
+        const borderAndPaddingRight = parseFloat(computedStyle.borderRightWidth) + parseFloat(computedStyle.paddingRight);
+        const borderAndPaddingBottom = parseFloat(computedStyle.borderBottomWidth) + parseFloat(computedStyle.paddingBottom);
+        const borderAndPaddingLeft = parseFloat(computedStyle.borderLeftWidth) + parseFloat(computedStyle.paddingLeft);
+
+        const contentX = elementBox.x + borderAndPaddingLeft;
+        const contentY = elementBox.y + borderAndPaddingTop;
+        const contentWidth = elementBox.width - borderAndPaddingLeft - borderAndPaddingRight;
+        const contentHeight = elementBox.height - borderAndPaddingTop - borderAndPaddingBottom;
+
+        const logicalOptionHeight = (isHorizontal ? contentHeight : contentWidth) / select.size;
+
+        let currentX = contentX + (isHorizontal ? contentWidth : logicalOptionHeight) / 2;
+        let currentY = contentY + (isHorizontal ? logicalOptionHeight : contentHeight) / 2;
+
+        for (let i = 0; i < select.size; i++) {
+            await new test_driver.Actions()
+                .pointerMove(Math.round(currentX), Math.round(currentY))
+                .pointerDown()
+                .pointerUp()
+                .send();
+
+            assert_equals(
+                select.value,
+                select.options[isReversedBlockFlowDirection ? (select.size - i - 1) : i].value,
+                "options are in visually incorrect order"
+            );
+
+            if (isHorizontal) {
+                currentY += logicalOptionHeight;
+            } else {
+                currentX += logicalOptionHeight;
+            }
+        }
+    }, `select[multiple][style="writing-mode: ${writingMode}"] has visually correct option order`);
+};
+</script>
diff --git a/tests/wpt/tests/css/css-writing-modes/forms/text-input-vertical-overflow-no-scroll.html b/tests/wpt/tests/css/css-writing-modes/forms/text-input-vertical-overflow-no-scroll.html
index 50d2cb44ea6..601acb17e0c 100644
--- a/tests/wpt/tests/css/css-writing-modes/forms/text-input-vertical-overflow-no-scroll.html
+++ b/tests/wpt/tests/css/css-writing-modes/forms/text-input-vertical-overflow-no-scroll.html
@@ -12,7 +12,22 @@
     .spacer {
         height: 100vh;
     }
-    input { font-family: monospace; }
+    input {
+        font-family: monospace;
+
+        /* Use an explicit whole-number-of-pixels height, to avoid tripping
+           Mozilla bug 1851066, regarding fractional scroll positions
+           triggering an async 1px adjustment to scrollTop. We can remove this
+           once that bug is fixed.
+           (Without this hack, the input element may end up with a height
+           that's a fractional number of pixels, depending on the font.
+           And then this test's call to 'scrollIntoView' puts us at a
+           fractional scroll-position, to bottom-align the input element. And
+           that's sufficient to trigger bug 1851066 and get an asynchronous 1px
+           adjustment to scrollTop, which this test doesn't expect.
+        */
+        height: 200px;
+    }
 </style>
 
 <div class="spacer"></div>
diff --git a/tests/wpt/tests/css/cssom-view/scroll-behavior-main-frame-root.html b/tests/wpt/tests/css/cssom-view/scroll-behavior-main-frame-root.html
index 7b4a8e38632..d60275f1ccf 100644
--- a/tests/wpt/tests/css/cssom-view/scroll-behavior-main-frame-root.html
+++ b/tests/wpt/tests/css/cssom-view/scroll-behavior-main-frame-root.html
@@ -39,6 +39,11 @@
 
     add_completion_callback(() => { resetScroll(scrollingElement); });
 
+    promise_test(async () => {
+      await new Promise(resolve => requestAnimationFrame(resolve));
+      await new Promise(resolve => requestAnimationFrame(resolve));
+    }, `Make sure the page content is stable`);
+
     ["scroll", "scrollTo", "scrollBy", "scrollIntoView"].forEach((scrollFunction) => {
       promise_test(() => {
         resetScroll(scrollingElement);
diff --git a/tests/wpt/tests/css/cssom-view/scroll-behavior-main-frame-window.html b/tests/wpt/tests/css/cssom-view/scroll-behavior-main-frame-window.html
index 8024d5319b4..7593baf1b86 100644
--- a/tests/wpt/tests/css/cssom-view/scroll-behavior-main-frame-window.html
+++ b/tests/wpt/tests/css/cssom-view/scroll-behavior-main-frame-window.html
@@ -39,6 +39,11 @@
 
     add_completion_callback(() => { resetScrollForWindow(window); });
 
+    promise_test(async () => {
+      await new Promise(resolve => requestAnimationFrame(resolve));
+      await new Promise(resolve => requestAnimationFrame(resolve));
+    }, `Make sure the page content is stable`);
+
     ["scroll", "scrollTo", "scrollBy"].forEach((scrollFunction) => {
       promise_test(() => {
         resetScrollForWindow(scrollingWindow);
diff --git a/tests/wpt/tests/css/cssom/getComputedStyle-insets-absolute-logical-crash.html b/tests/wpt/tests/css/cssom/getComputedStyle-insets-absolute-logical-crash.html
new file mode 100644
index 00000000000..1e3ef8ab121
--- /dev/null
+++ b/tests/wpt/tests/css/cssom/getComputedStyle-insets-absolute-logical-crash.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<title>Chromium bug: getComputedStyle() crashes with logical inset properties</title>
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1478578">
+
+<style>
+.target {
+  position: absolute;
+}
+</style>
+
+<div class="target" id="target1"></div>
+<script>getComputedStyle(target1).insetInlineStart</script>
+
+<div class="target" id="targetr2"></div>
+<script>getComputedStyle(target2).insetInlineEnd</script>
+
+<div class="target" id="target3"></div>
+<script>getComputedStyle(target3).insetBlockStart</script>
+
+<div class="target" id="target4"></div>
+<script>getComputedStyle(target4).insetBlockEnd</script>
+
+<div class="target" id="target5"></div>
+<script>getComputedStyle(target5).insetInline</script>
+
+<div class="target" id="target6"></div>
+<script>getComputedStyle(target6).insetBlock</script>
+
+<div class="target" id="target7"></div>
+<script>getComputedStyle(target7).inset</script>
+
diff --git a/tests/wpt/tests/css/cssom/getComputedStyle-insets-absolute-roundtrip.html b/tests/wpt/tests/css/cssom/getComputedStyle-insets-absolute-roundtrip.html
new file mode 100644
index 00000000000..d89a22d8665
--- /dev/null
+++ b/tests/wpt/tests/css/cssom/getComputedStyle-insets-absolute-roundtrip.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<title>Chromium bug: getComputedStyle() fixed-length inset values don't roundtrip</title>
+<link rel="help" href="https://drafts.csswg.org/cssom/#resolved-value">
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1482703">
+<link rel="author" href="mailto:xiaochengh@chromium.org">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<style>
+.target {
+  position: absolute;
+}
+</style>
+
+<div class="target" id="target1" style="left: 20.7px"></div>
+<script>
+test(() => {
+  assert_equals(getComputedStyle(target1).left, '20.7px');
+}, 'Fixed-length left property value should roundtrip');
+</script>
+
+<div class="target" id="target2" style="right: 20.7px"></div>
+<script>
+test(() => {
+  assert_equals(getComputedStyle(target2).right, '20.7px');
+}, 'Fixed-length right property value should roundtrip');
+</script>
+
+<div class="target" id="target3" style="top: 20.7px"></div>
+<script>
+test(() => {
+  assert_equals(getComputedStyle(target3).top, '20.7px');
+}, 'Fixed-length top property value should roundtrip');
+</script>
+
+<div class="target" id="target4" style="bottom: 20.7px"></div>
+<script>
+test(() => {
+  assert_equals(getComputedStyle(target4).bottom, '20.7px');
+}, 'Fixed-length bottom property value should roundtrip');
+</script>
diff --git a/tests/wpt/tests/css/cssom/getComputedStyle-margins-roundtrip.html b/tests/wpt/tests/css/cssom/getComputedStyle-margins-roundtrip.html
new file mode 100644
index 00000000000..8913be012d7
--- /dev/null
+++ b/tests/wpt/tests/css/cssom/getComputedStyle-margins-roundtrip.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<title>Chromium bug: getComputedStyle() fixed-length inset values don't roundtrip</title>
+<link rel="help" href="https://drafts.csswg.org/cssom/#resolved-value">
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1482703">
+<link rel="help" href="mailto:xiaochengh@chromium.org">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<div id="target1" style="margin-left: 20.7px"></div>
+<script>
+test(() => {
+  assert_equals(getComputedStyle(target1).marginLeft, '20.7px');
+}, 'Fixed-length margin-left property value should roundtrip');
+</script>
+
+<div id="target2" style="margin-right: 20.7px"></div>
+<script>
+test(() => {
+  assert_equals(getComputedStyle(target2).marginRight, '20.7px');
+}, 'Fixed-length margin-right property value should roundtrip');
+</script>
+
+<div id="target3" style="margin-top: 20.7px"></div>
+<script>
+test(() => {
+  assert_equals(getComputedStyle(target3).marginTop, '20.7px');
+}, 'Fixed-length margin-top property value should roundtrip');
+</script>
+
+<div id="target4" style="margin-bottom: 20.7px"></div>
+<script>
+test(() => {
+  assert_equals(getComputedStyle(target4).marginBottom, '20.7px');
+}, 'Fixed-length margin-bottom property value should roundtrip');
+</script>
diff --git a/tests/wpt/tests/css/cssom/getComputedStyle-pseudo.html b/tests/wpt/tests/css/cssom/getComputedStyle-pseudo.html
index 40af5b0818c..59c7db9e734 100644
--- a/tests/wpt/tests/css/cssom/getComputedStyle-pseudo.html
+++ b/tests/wpt/tests/css/cssom/getComputedStyle-pseudo.html
@@ -4,6 +4,7 @@
 <link rel="help" href="https://drafts.csswg.org/cssom/#dom-window-getcomputedstyle">
 <link rel="help" href="https://drafts.csswg.org/cssom/#resolved-values">
 <link rel="author" title="Emilio Cobos Álvarez" href="mailto:emilio@crisal.io">
+<link rel="author" title="Karl Dubost" href="https://github.com/karlcow">
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <style>
@@ -54,6 +55,12 @@
 #contents-pseudos-dynamic.contents::after {
   display: contents;
 }
+#pseudo-invalid::marker {
+  color: rgb(0, 128, 0);
+}
+#pseudo-invalid {
+  color: rgb(255, 0, 0)
+}
 </style>
 <div id="test">
   <div id="contents"></div>
@@ -62,6 +69,7 @@
   <div id="flex-no-pseudo"></div>
   <div id="contents-pseudos"></div>
   <div id="contents-pseudos-dynamic"></div>
+  <ul><li id="pseudo-invalid">Item</li></ul>
 </div>
 <script>
 test(function() {
@@ -150,4 +158,19 @@ test(function() {
     getComputedStyle(div, ":totallynotapseudo").length == 0,
     "Should return an empty style for unknown pseudo-elements starting with colon");
 }, "Unknown pseudo-elements");
+test(function() {
+  let li = document.querySelector('li');
+  assert_true(
+    getComputedStyle(li, ':marker').length == 0,
+    "Should return an empty style for :marker");
+  assert_true(
+    getComputedStyle(li, 'marker').length != 0,
+    "Should return the element style for marker");
+  assert_equals(
+    getComputedStyle(li, 'marker').color, "rgb(255, 0, 0)",
+    "Should return the element style for marker (ex: color is rgb(255, 0, 0), not rgb(0, 128, 0)");
+  assert_equals(
+  getComputedStyle(li, '::marker').color, "rgb(0, 128, 0)",
+  "Should return the element style for marker (ex: color is rgb(0, 128, 0)");
+}, "Unknown pseudo-element with a known string (ex: marker)");
 </script>
diff --git a/tests/wpt/tests/css/cssom/serialize-values.html b/tests/wpt/tests/css/cssom/serialize-values.html
index e92808af70d..2d20f263f4f 100644
--- a/tests/wpt/tests/css/cssom/serialize-values.html
+++ b/tests/wpt/tests/css/cssom/serialize-values.html
@@ -97,7 +97,17 @@
     }
 
     function attr() {
-      var values = ['attr(foo-bar)', 'attr(foo_bar)'];
+      var values = ['attr(foo-bar)', 'attr(foo_bar)',
+                    {actual: "attr(|bar)", serialized: "attr(bar)"},
+                    {actual: "attr( |bar )", serialized: "attr(bar)"}];
+      return iterable(values);
+    }
+
+    function attr_fallback() {
+      var values = ['attr(foo-bar, "fallback")', 'attr(foo_bar, "fallback")',
+                    {actual: 'attr(|bar, "fallback")', serialized: 'attr(bar, "fallback")'},
+                    {actual: 'attr(foo, "")', serialized: 'attr(foo)'},
+                    {actual: 'attr( |foo ,  "" )', serialized: 'attr(foo)'}];
       return iterable(values);
     }
 
@@ -140,23 +150,7 @@
       return null;
     }
 
-    // A more elegant way of doing this would be better, but for now this exception list handles cases where "center" must be omitted.
     var minimal_results = {
-        "background-position: 5% center": "5%",
-        "background-position: 0.5% center": "0.5%",
-        "background-position: -5% center": "-5%",
-        "background-position: -0.5% center": "-0.5%",
-        "background-position: 0px center": "0px",
-        "background-position: 1px center": "1px",
-        "background-position: 0.1em center": "0.1em",
-        "background-position: 0px center": "0px",
-        "background-position: -1px center": "-1px",
-        "background-position: -0.1em center": "-0.1em",
-        "background-position: left center": "left",
-        "background-position: center top": "top",
-        "background-position: center center": "center",
-        "background-position: center bottom": "bottom",
-        "background-position: right center": "right",
     };
 
     function create_result(propertyName, actual, expected) {
@@ -377,7 +371,7 @@
         'initial': 'black', //FIXME depends on user agent
       }],
       ['content', {
-        'values': ['normal', 'none', string, uri, counter, attr, 'inherit'], //FIXME
+        'values': ['normal', 'none', string, uri, counter, attr, attr_fallback, 'inherit'], //FIXME
         'initial': 'normal',
       }],
       //counter-increment
diff --git a/tests/wpt/tests/css/filter-effects/backdrop-filters-brightness.html b/tests/wpt/tests/css/filter-effects/backdrop-filters-brightness.html
index dfb8ba248ee..cb74e0a8863 100644
--- a/tests/wpt/tests/css/filter-effects/backdrop-filters-brightness.html
+++ b/tests/wpt/tests/css/filter-effects/backdrop-filters-brightness.html
@@ -3,6 +3,7 @@
 <link rel="author" href="mailto:masonf@chromium.org">
 <link rel="help" href="https://drafts.fxtf.org/filter-effects-2/#BackdropFilterProperty">
 <link rel="match" href="backdrop-filters-brightness-ref.html">
+<meta name="fuzzy" content="maxDifference=0-1; totalPixels=37500" />
 <style>
     .square {
         position: absolute;
diff --git a/tests/wpt/tests/css/filter-effects/backdrop-filters-contrast.html b/tests/wpt/tests/css/filter-effects/backdrop-filters-contrast.html
index e3150d1e8d5..e2f5ccdd8bf 100644
--- a/tests/wpt/tests/css/filter-effects/backdrop-filters-contrast.html
+++ b/tests/wpt/tests/css/filter-effects/backdrop-filters-contrast.html
@@ -3,6 +3,7 @@
 <link rel="author" href="mailto:masonf@chromium.org">
 <link rel="help" href="https://drafts.fxtf.org/filter-effects-2/#BackdropFilterProperty">
 <link rel="match" href="backdrop-filters-contrast-ref.html">
+<meta name="fuzzy" content="maxDifference=0-1; totalPixels=0-7500" />
 <style>
     .square {
         position: absolute;
diff --git a/tests/wpt/tests/css/filter-effects/backdrop-filters-invert.html b/tests/wpt/tests/css/filter-effects/backdrop-filters-invert.html
index 7e0dea64739..b6529468186 100644
--- a/tests/wpt/tests/css/filter-effects/backdrop-filters-invert.html
+++ b/tests/wpt/tests/css/filter-effects/backdrop-filters-invert.html
@@ -3,6 +3,7 @@
 <link rel="author" href="mailto:masonf@chromium.org">
 <link rel="help" href="https://drafts.fxtf.org/filter-effects-2/#BackdropFilterProperty">
 <link rel="match" href="backdrop-filters-invert-ref.html">
+<meta name="fuzzy" content="maxDifference=0-1; totalPixels=0-37500" />
 <style>
     .square {
         position: absolute;
diff --git a/tests/wpt/tests/css/filter-effects/backdrop-filters-saturate.html b/tests/wpt/tests/css/filter-effects/backdrop-filters-saturate.html
index 2b7d33b2323..4a5de5b560f 100644
--- a/tests/wpt/tests/css/filter-effects/backdrop-filters-saturate.html
+++ b/tests/wpt/tests/css/filter-effects/backdrop-filters-saturate.html
@@ -3,6 +3,7 @@
 <link rel="author" href="mailto:masonf@chromium.org">
 <link rel="help" href="https://drafts.fxtf.org/filter-effects-2/#BackdropFilterProperty">
 <link rel="match" href="backdrop-filters-saturate-ref.html">
+<meta name="fuzzy" content="maxDifference=0-4; totalPixels=0-37500" />
 <style>
     .square {
         position: absolute;
diff --git a/tests/wpt/tests/css/filter-effects/css-filters-animation-blur-ref.html b/tests/wpt/tests/css/filter-effects/css-filters-animation-blur-ref.html
index 3bde6f1826f..86929b82e68 100644
--- a/tests/wpt/tests/css/filter-effects/css-filters-animation-blur-ref.html
+++ b/tests/wpt/tests/css/filter-effects/css-filters-animation-blur-ref.html
@@ -11,6 +11,7 @@
             height: 100px;
             background: blue;
             filter: blur(10px);
+            will-change: filter;
         }
     </style>
 </head>
diff --git a/tests/wpt/tests/css/filter-effects/drop-shadow-currentcolor-dynamic-001.html b/tests/wpt/tests/css/filter-effects/drop-shadow-currentcolor-dynamic-001.html
new file mode 100644
index 00000000000..9c70274d5d8
--- /dev/null
+++ b/tests/wpt/tests/css/filter-effects/drop-shadow-currentcolor-dynamic-001.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<title>Filter Effects: Dynamic 'currentcolor' in drop-shadow()</title>
+<link rel="help" href="https://drafts.fxtf.org/filter-effects/#funcdef-filter-drop-shadow">
+<link rel="match" href="reference/green-100x100.html">
+<script src="/common/reftest-wait.js"></script>
+<script src="/common/rendering-utils.js"></script>
+<style>
+#target {
+  background-color: green;
+  width: 50px;
+  height: 100px;
+  filter: drop-shadow(50px 0px 0px currentcolor);
+}
+.red {
+  color: red;
+}
+.green {
+  color: green;
+}
+</style>
+<div id="container" class="red">
+  <div id="target"></div>
+</div>
+<script>
+waitForAtLeastOneFrame().then(() => {
+  const container = document.getElementById('container');
+  container.classList.toggle('red');
+  container.classList.toggle('green');
+  takeScreenshot();
+});
+</script>
diff --git a/tests/wpt/tests/css/filter-effects/drop-shadow-currentcolor-dynamic-002.html b/tests/wpt/tests/css/filter-effects/drop-shadow-currentcolor-dynamic-002.html
new file mode 100644
index 00000000000..3f17b5d634e
--- /dev/null
+++ b/tests/wpt/tests/css/filter-effects/drop-shadow-currentcolor-dynamic-002.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<title>Filter Effects: Dynamic 'currentcolor' in drop-shadow(); SVG content</title>
+<link rel="help" href="https://drafts.fxtf.org/filter-effects/#funcdef-filter-drop-shadow">
+<link rel="match" href="reference/green-100x100.html">
+<script src="/common/reftest-wait.js"></script>
+<script src="/common/rendering-utils.js"></script>
+<style>
+#target {
+  fill: green;
+  filter: drop-shadow(50px 0px 0px currentcolor);
+}
+.red {
+  color: red;
+}
+.green {
+  color: green;
+}
+</style>
+<svg id="container" class="red">
+  <rect id="target" width="50" height="100"/>
+</svg>
+<script>
+waitForAtLeastOneFrame().then(() => {
+  const container = document.getElementById('container');
+  container.classList.toggle('red');
+  container.classList.toggle('green');
+  takeScreenshot();
+});
+</script>
diff --git a/tests/wpt/tests/css/geometry/DOMMatrix-001.html b/tests/wpt/tests/css/geometry/DOMMatrix-001.html
index 1752c2c5cae..f578da076cb 100644
--- a/tests/wpt/tests/css/geometry/DOMMatrix-001.html
+++ b/tests/wpt/tests/css/geometry/DOMMatrix-001.html
@@ -117,8 +117,16 @@
              'translateX(5ex)',
              'translateX(5ch)',
              'translateX(5rem)',
+             'translateX(5cqw)',
+             'translateX(5cqh)',
+             'translateX(5cqb)',
+             'translateX(5cqi)',
+             'translateX(5cqmin)',
+             'translateX(5cqmax)',
              'translateX(5vw)',
              'translateX(5vh)',
+             'translateX(5vb)',
+             'translateX(5vi)',
              'translateX(5vmin)',
              'translateX(5vmax)',
              'translateX(5%)',
diff --git a/tests/wpt/tests/css/mediaqueries/display-mode.html b/tests/wpt/tests/css/mediaqueries/display-mode.html
new file mode 100644
index 00000000000..e6633de856c
--- /dev/null
+++ b/tests/wpt/tests/css/mediaqueries/display-mode.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<link rel="help" href="http://www.w3.org/TR/mediaqueries-5/#display-mode" />
+<script type="text/javascript" src="/resources/testharness.js"></script>
+<script type="text/javascript" src="/resources/testharnessreport.js"></script>
+<script type="text/javascript" src="resources/matchmedia-utils.js"></script>
+<script>
+  query_should_be_known("(display-mode)");
+  query_should_be_known("(display-mode: standalone)");
+  query_should_be_known("(display-mode: browser)");
+  query_should_be_known("(display-mode: minimal-ui)");
+  query_should_be_known("(display-mode: fullscreen)");
+
+  query_should_be_unknown("(display-mode: 0)");
+  query_should_be_unknown("(display-mode: none)");
+  query_should_be_unknown("(display-mode: random)");
+  query_should_be_unknown("(display-mode: 10px)");
+  query_should_be_unknown("(display-mode: 1%)");
+
+  test(() => {
+    let booleanContext = window.matchMedia("(display-mode)");
+    assert_true(booleanContext.matches);
+  }, "Check that display-mode evaluates to true in the boolean context");
+</script>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/mediaqueries/display-mode.tentative.html b/tests/wpt/tests/css/mediaqueries/display-mode.tentative.html
new file mode 100644
index 00000000000..0762d065c33
--- /dev/null
+++ b/tests/wpt/tests/css/mediaqueries/display-mode.tentative.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<link rel="help" href="http://wicg.github.io/manifest-incubations/#display-mode-extensions" />
+<script type="text/javascript" src="/resources/testharness.js"></script>
+<script type="text/javascript" src="/resources/testharnessreport.js"></script>
+<script type="text/javascript" src="resources/matchmedia-utils.js"></script>
+<script>
+  // These are meant to be moved to the non-tentative file one day when/if they
+  // will be implemented in other browsers.
+  query_should_be_known("(display-mode: borderless)");
+  query_should_be_known("(display-mode: window-controls-overlay)");
+</script>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/motion/offset-path-coord-box-001.html b/tests/wpt/tests/css/motion/offset-path-coord-box-001.html
index 15f378e0386..a8f7d98b22a 100644
--- a/tests/wpt/tests/css/motion/offset-path-coord-box-001.html
+++ b/tests/wpt/tests/css/motion/offset-path-coord-box-001.html
@@ -1,10 +1,10 @@
 <!doctype html>
 <meta charset="utf-8">
 <title>CSS Motion Path test: &lt;coord-box&gt; &lt;border-box&gt;</title>
-<meta name=fuzzy content="0-20;0-200">
 <link rel="author" title="Daniil Sakhapov" href="sakhapov@google.com">
 <link rel="match" href="offset-path-coord-box-001-ref.html">
 <link rel="help" href="https://drafts.fxtf.org/motion/#valdef-offset-path-coord-box">
+<meta name="fuzzy" content="maxDifference=0-100; totalPixels=0-450">
 
 <style>
 #outer {
diff --git a/tests/wpt/tests/css/motion/offset-path-ray-001.html b/tests/wpt/tests/css/motion/offset-path-ray-001.html
index 39c10330f4b..1820eb6cfa6 100644
--- a/tests/wpt/tests/css/motion/offset-path-ray-001.html
+++ b/tests/wpt/tests/css/motion/offset-path-ray-001.html
@@ -6,6 +6,7 @@
     <link rel="help" href="https://drafts.fxtf.org/motion-1/#offset-path-property">
     <link rel="match" href="offset-path-ray-001-ref.html">
     <meta name="assert" content="This tests that ray() generates a rotation and translation.">
+    <meta name="fuzzy" content="maxDifference=0-1; totalPixels=0-10">
     <style>
       #target {
         position: absolute;
diff --git a/tests/wpt/tests/css/motion/offset-path-ray-002.html b/tests/wpt/tests/css/motion/offset-path-ray-002.html
index 4af6394ef2d..adfac939f37 100644
--- a/tests/wpt/tests/css/motion/offset-path-ray-002.html
+++ b/tests/wpt/tests/css/motion/offset-path-ray-002.html
@@ -5,6 +5,7 @@
     <link rel="help" href="https://drafts.fxtf.org/motion-1/#offset-path-property">
     <link rel="match" href="offset-path-ray-001-ref.html">
     <meta name="assert" content="This tests that ray() generates a rotation and translation.">
+    <meta name="fuzzy" content="maxDifference=0-1; totalPixels=0-10">
     <style>
       #target {
         position: absolute;
diff --git a/tests/wpt/tests/css/motion/offset-path-ray-010.html b/tests/wpt/tests/css/motion/offset-path-ray-010.html
index da0935019b6..9e99898222f 100644
--- a/tests/wpt/tests/css/motion/offset-path-ray-010.html
+++ b/tests/wpt/tests/css/motion/offset-path-ray-010.html
@@ -6,6 +6,7 @@
     <link rel="help" href="https://drafts.fxtf.org/motion-1/#offset-path-property">
     <link rel="match" href="offset-path-ray-001-ref.html">
     <meta name="assert" content="This tests that ray() generates a rotation and translation.">
+    <meta name="fuzzy" content="maxDifference=0-1; totalPixels=0-10">
     <style>
       #target {
         position: absolute;
diff --git a/tests/wpt/tests/css/motion/offset-path-ray-019-ref.html b/tests/wpt/tests/css/motion/offset-path-ray-019-ref.html
new file mode 100644
index 00000000000..1bf242e3fc6
--- /dev/null
+++ b/tests/wpt/tests/css/motion/offset-path-ray-019-ref.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>CSS Motion Path: ray paths</title>
+    <style>
+      #container1 {
+        width: 100px;
+        height: 100px;
+      }
+      #container2 {
+        width: 200px;
+        height: 200px;
+      }
+      #target1 {
+        position: relative;
+        width: 50px;
+        height: 50px;
+        background-color: lime;
+        transform-origin: 0px 0px;
+        transform: translateX(100px);
+      }
+      #target2 {
+        position: relative;
+        width: 50px;
+        height: 50px;
+        background-color: lime;
+        transform-origin: 0px 0px;
+        transform: translateX(200px);
+      }
+    </style>
+  </head>
+  <body>
+    <div id="container1">
+      <div id="target1"></div>
+    </div>
+    <div id="container2">
+      <div id="target2"></div>
+    </div>
+  </body>
+</html>
diff --git a/tests/wpt/tests/css/motion/offset-path-ray-019.html b/tests/wpt/tests/css/motion/offset-path-ray-019.html
new file mode 100644
index 00000000000..31681fd43c2
--- /dev/null
+++ b/tests/wpt/tests/css/motion/offset-path-ray-019.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>CSS Motion Path: ray paths</title>
+    <link rel="help" href="https://drafts.fxtf.org/motion-1/#offset-path-property">
+    <link rel="match" href="offset-path-ray-019-ref.html">
+    <meta name="assert" content="Tests ray() when sharing style with different sized containing blocks.">
+    <style>
+      #container1 {
+        width: 100px;
+        height: 100px;
+      }
+      #container2 {
+        width: 200px;
+        height: 200px;
+      }
+      #target {
+        position: relative;
+        width: 50px;
+        height: 50px;
+        background-color: lime;
+        transform-origin: 0px 0px;
+        offset-path: ray(90deg sides);
+        offset-distance: 100%;
+        offset-position: auto;
+      }
+    </style>
+  </head>
+  <body>
+    <div id="container1">
+      <div id="target"></div>
+    </div>
+    <div id="container2">
+      <div id="target"></div>
+    </div>
+  </body>
+</html>
diff --git a/tests/wpt/tests/css/motion/offset-path-ray-020.html b/tests/wpt/tests/css/motion/offset-path-ray-020.html
new file mode 100644
index 00000000000..b332453af9c
--- /dev/null
+++ b/tests/wpt/tests/css/motion/offset-path-ray-020.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>CSS Motion Path: ray paths</title>
+    <link rel="help" href="https://drafts.fxtf.org/motion-1/#offset-path-property">
+    <link rel="match" href="offset-path-ray-007-ref.html">
+    <meta name="assert" content="This tests ray() in a flex box.">
+    <style>
+      #container {
+        display: flex;
+        width: 400px;
+        height: 300px;
+      }
+      #target {
+        position: relative;
+        left: 200px;
+        top: 100px;
+        width: 100px;
+        height: 50px;
+        background-color: lime;
+        transform-origin: 0px 0px;
+        offset-path: ray(180deg sides);
+        offset-distance: 100%;
+        offset-position: auto;
+      }
+    </style>
+  </head>
+  <body>
+    <div id="container">
+      <div id="target"></div>
+    </div>
+  </body>
+</html>
diff --git a/tests/wpt/tests/css/motion/offset-path-ray-021.html b/tests/wpt/tests/css/motion/offset-path-ray-021.html
new file mode 100644
index 00000000000..f0a18ea4cb9
--- /dev/null
+++ b/tests/wpt/tests/css/motion/offset-path-ray-021.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>CSS Motion Path: ray paths</title>
+    <link rel="help" href="https://drafts.fxtf.org/motion-1/#offset-path-property">
+    <link rel="match" href="offset-path-ray-007-ref.html">
+    <meta name="assert" content="This tests ray() in a flex box.">
+    <style>
+      #container {
+        display: grid;
+        width: 400px;
+        height: 300px;
+      }
+      #target {
+        position: relative;
+        left: 200px;
+        top: 100px;
+        width: 100px;
+        height: 50px;
+        background-color: lime;
+        transform-origin: 0px 0px;
+        offset-path: ray(180deg sides);
+        offset-distance: 100%;
+        offset-position: auto;
+      }
+    </style>
+  </head>
+  <body>
+    <div id="container">
+      <div id="target"></div>
+    </div>
+  </body>
+</html>
diff --git a/tests/wpt/tests/css/motion/offset-path-ray-022-ref.html b/tests/wpt/tests/css/motion/offset-path-ray-022-ref.html
new file mode 100644
index 00000000000..63bbc2cfb32
--- /dev/null
+++ b/tests/wpt/tests/css/motion/offset-path-ray-022-ref.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>CSS Motion Path: ray paths</title>
+    <style>
+      #container {
+        width: 400px;
+        height: 300px;
+        overflow: scroll;
+      }
+      #target {
+        position: relative;
+        left: 200px;
+        top: 100px;
+        width: 100px;
+        height: 50px;
+        background-color: lime;
+        transform-origin: 0px 0px;
+        transform: rotate(90deg) translate(200px);
+      }
+    </style>
+  </head>
+  <body>
+    <div id="container">
+      <div id="target"></div>
+    </div>
+  </body>
+</html>
diff --git a/tests/wpt/tests/css/motion/offset-path-ray-022.html b/tests/wpt/tests/css/motion/offset-path-ray-022.html
new file mode 100644
index 00000000000..c264076c91a
--- /dev/null
+++ b/tests/wpt/tests/css/motion/offset-path-ray-022.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>CSS Motion Path: ray paths</title>
+    <link rel="help" href="https://drafts.fxtf.org/motion-1/#offset-path-property">
+    <link rel="match" href="offset-path-ray-022-ref.html">
+    <meta name="assert" content="This tests that ray() affects overflow .">
+    <style>
+      #container {
+        width: 400px;
+        height: 300px;
+        overflow: scroll;
+      }
+
+      #target {
+        position: relative;
+        left: 200px;
+        top: 100px;
+        width: 100px;
+        height: 50px;
+        background-color: lime;
+        transform-origin: 0px 0px;
+        offset-path: ray(180deg sides);
+        offset-distance: 100%;
+        offset-position: auto;
+      }
+    </style>
+  </head>
+  <body>
+    <div id="container">
+      <div id="target"></div>
+    </div>
+  </body>
+</html>
diff --git a/tests/wpt/tests/css/motion/offset-path-shape-circle-001.html b/tests/wpt/tests/css/motion/offset-path-shape-circle-001.html
index 2205d9d3f69..5b05cb8811b 100644
--- a/tests/wpt/tests/css/motion/offset-path-shape-circle-001.html
+++ b/tests/wpt/tests/css/motion/offset-path-shape-circle-001.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <meta charset="utf-8">
 <title>CSS Motion Path test: &lt;basic-shape&gt; circle() path with explicit arguments</title>
-<meta name=fuzzy content="0-35;0-200">
+<meta name="fuzzy" content="maxDifference=0-150; totalPixels=0-300">
 <link rel="author" title="Daniil Sakhapov" href="sakhapov@google.com">
 <link rel="match" href="offset-path-shape-circle-001-ref.html">
 <link rel="help" href="https://drafts.fxtf.org/motion/#valdef-offset-path-basic-shape">
diff --git a/tests/wpt/tests/css/motion/offset-path-shape-circle-003.html b/tests/wpt/tests/css/motion/offset-path-shape-circle-003.html
index ef69e7e41b6..390b587de57 100644
--- a/tests/wpt/tests/css/motion/offset-path-shape-circle-003.html
+++ b/tests/wpt/tests/css/motion/offset-path-shape-circle-003.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <meta charset="utf-8">
 <title>CSS Motion Path test: &lt;basic-shape&gt; circle() path with offset-distance</title>
-<meta name=fuzzy content="0-110;0-500">
+<meta name="fuzzy" content="maxDifference=0-170; totalPixels=0-550">
 <link rel="author" title="Daniil Sakhapov" href="sakhapov@google.com">
 <link rel="match" href="offset-path-shape-circle-003-ref.html">
 <link rel="help" href="https://drafts.fxtf.org/motion/#valdef-offset-path-basic-shape">
diff --git a/tests/wpt/tests/css/motion/offset-path-shape-circle-004.html b/tests/wpt/tests/css/motion/offset-path-shape-circle-004.html
index d22665636e6..6c8bbcc1706 100644
--- a/tests/wpt/tests/css/motion/offset-path-shape-circle-004.html
+++ b/tests/wpt/tests/css/motion/offset-path-shape-circle-004.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <meta charset="utf-8">
 <title>CSS Motion Path test: &lt;basic-shape&gt; circle() path with offset-distance and offset-anchor</title>
-<meta name=fuzzy content="0-80;0-310">
+<meta name="fuzzy" content="maxDifference=0-300; totalPixels=0-500">
 <link rel="author" title="Daniil Sakhapov" href="sakhapov@google.com">
 <link rel="match" href="offset-path-shape-circle-004-ref.html">
 <link rel="help" href="https://drafts.fxtf.org/motion/#valdef-offset-path-basic-shape">
diff --git a/tests/wpt/tests/css/motion/offset-path-shape-circle-005.html b/tests/wpt/tests/css/motion/offset-path-shape-circle-005.html
index 2ba5bc1650a..e35ab294919 100644
--- a/tests/wpt/tests/css/motion/offset-path-shape-circle-005.html
+++ b/tests/wpt/tests/css/motion/offset-path-shape-circle-005.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <meta charset="utf-8">
 <title>CSS Motion Path test: &lt;basic-shape&gt; circle() path with offset-position</title>
-<meta name=fuzzy content="0-18;0-400">
+<meta name="fuzzy" content="maxDifference=0-100; totalPixels=0-500">
 <link rel="author" title="Daniil Sakhapov" href="sakhapov@google.com">
 <link rel="match" href="offset-path-shape-circle-005-ref.html">
 <link rel="help" href="https://drafts.fxtf.org/motion/#valdef-offset-path-basic-shape">
diff --git a/tests/wpt/tests/css/motion/offset-path-shape-circle-006.html b/tests/wpt/tests/css/motion/offset-path-shape-circle-006.html
new file mode 100644
index 00000000000..f94af711bdd
--- /dev/null
+++ b/tests/wpt/tests/css/motion/offset-path-shape-circle-006.html
@@ -0,0 +1,29 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSS Motion Path test: &lt;basic-shape&gt; circle() path with border radius on container</title>
+<meta name="fuzzy" content="maxDifference=0-100; totalPixels=0-500" />
+<link rel="match" href="offset-path-shape-circle-005-ref.html">
+<link rel="help" href="https://drafts.fxtf.org/motion/#valdef-offset-path-basic-shape">
+
+<style>
+#outer {
+  top: 100px;
+  left: 100px;
+  position: relative;
+  width: 600px;
+  height: 400px;
+  border-radius: 50%;
+}
+#box {
+  background-color: green;
+  position: relative;
+  offset-path: circle(100px);
+  offset-position: normal;
+  width: 100px;
+  height: 100px;
+}
+</style>
+
+<div id="outer">
+  <div id="box"></div>
+</div>
diff --git a/tests/wpt/tests/css/motion/offset-path-shape-circle-007.html b/tests/wpt/tests/css/motion/offset-path-shape-circle-007.html
new file mode 100644
index 00000000000..ea292e56055
--- /dev/null
+++ b/tests/wpt/tests/css/motion/offset-path-shape-circle-007.html
@@ -0,0 +1,31 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSS Motion Path test: &lt;basic-shape&gt; circle() path with offset from container</title>
+<meta name="fuzzy" content="maxDifference=0-170; totalPixels=0-550">
+<link rel="match" href="offset-path-shape-circle-003-ref.html">
+<link rel="help" href="https://drafts.fxtf.org/motion/#valdef-offset-path-basic-shape">
+
+<style>
+#outer {
+  top: 100px;
+  left: 100px;
+  position: relative;
+  width: 600px;
+  height: 400px;
+}
+#box {
+  top: 100px;
+  left: 100px;
+  background-color: green;
+  position: relative;
+  offset-path: circle(farthest-side at top);
+  offset-distance: 18%;
+  border-radius: 50% 50% 0 0;
+  width: 100px;
+  height: 100px;
+}
+</style>
+
+<div id="outer">
+  <div id="box"></div>
+</div>
diff --git a/tests/wpt/tests/css/motion/offset-path-shape-ellipse-001.html b/tests/wpt/tests/css/motion/offset-path-shape-ellipse-001.html
index be3ade57c6d..ec152e323c5 100644
--- a/tests/wpt/tests/css/motion/offset-path-shape-ellipse-001.html
+++ b/tests/wpt/tests/css/motion/offset-path-shape-ellipse-001.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <meta charset="utf-8">
 <title>CSS Motion Path test: &lt;basic-shape&gt; ellipse() path with explicit arguments</title>
-<meta name=fuzzy content="0-24;0-200">
+<meta name="fuzzy" content="maxDifference=0-100; totalPixels=0-400">
 <link rel="author" title="Daniil Sakhapov" href="sakhapov@google.com">
 <link rel="match" href="offset-path-shape-ellipse-001-ref.html">
 <link rel="help" href="https://drafts.fxtf.org/motion/#valdef-offset-path-basic-shape">
diff --git a/tests/wpt/tests/css/motion/offset-path-shape-ellipse-003.html b/tests/wpt/tests/css/motion/offset-path-shape-ellipse-003.html
index 1831af7019d..ead22291433 100644
--- a/tests/wpt/tests/css/motion/offset-path-shape-ellipse-003.html
+++ b/tests/wpt/tests/css/motion/offset-path-shape-ellipse-003.html
@@ -3,7 +3,7 @@
 <title>CSS Motion Path test: &lt;basic-shape&gt; ellipse() path with offset-distance</title>
 <!-- Chrome currently passes with 13 max pixel difference and 473 total different pixels -->
 <!-- You can increase the numbers to handle anti-aliasing -->
-<meta name=fuzzy content="0-25;0-473">
+<meta name="fuzzy" content="maxDifference=0-150; totalPixels=0-530">
 <link rel="author" title="Daniil Sakhapov" href="sakhapov@google.com">
 <link rel="match" href="offset-path-shape-ellipse-003-ref.html">
 <link rel="help" href="https://drafts.fxtf.org/motion/#valdef-offset-path-basic-shape">
diff --git a/tests/wpt/tests/css/motion/offset-path-shape-ellipse-004.html b/tests/wpt/tests/css/motion/offset-path-shape-ellipse-004.html
index 0ed4816e3d0..af178eb14ef 100644
--- a/tests/wpt/tests/css/motion/offset-path-shape-ellipse-004.html
+++ b/tests/wpt/tests/css/motion/offset-path-shape-ellipse-004.html
@@ -1,6 +1,7 @@
 <!doctype html>
 <meta charset="utf-8">
 <title>CSS Motion Path test: &lt;basic-shape&gt; ellipse() path with offset-distance and offset-anchor</title>
+<meta name="fuzzy" content="maxDifference=0-250; totalPixels=0-500" />
 <link rel="author" title="Daniil Sakhapov" href="sakhapov@google.com">
 <link rel="match" href="offset-path-shape-ellipse-004-ref.html">
 <link rel="help" href="https://drafts.fxtf.org/motion/#valdef-offset-path-basic-shape">
diff --git a/tests/wpt/tests/css/motion/offset-path-shape-ellipse-005.html b/tests/wpt/tests/css/motion/offset-path-shape-ellipse-005.html
index 2b2c0abeff9..7364728df1f 100644
--- a/tests/wpt/tests/css/motion/offset-path-shape-ellipse-005.html
+++ b/tests/wpt/tests/css/motion/offset-path-shape-ellipse-005.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <meta charset="utf-8">
 <title>CSS Motion Path test: &lt;basic-shape&gt; ellipse() path with offset-position</title>
-<meta name=fuzzy content="0-18;0-400">
+<meta name="fuzzy" content="maxDifference=0-100; totalPixels=0-500" />
 <link rel="author" title="Daniil Sakhapov" href="sakhapov@google.com">
 <link rel="match" href="offset-path-shape-ellipse-005-ref.html">
 <link rel="help" href="https://drafts.fxtf.org/motion/#valdef-offset-path-basic-shape">
diff --git a/tests/wpt/tests/css/motion/offset-path-shape-ellipse-006.html b/tests/wpt/tests/css/motion/offset-path-shape-ellipse-006.html
new file mode 100644
index 00000000000..6ec56ff4962
--- /dev/null
+++ b/tests/wpt/tests/css/motion/offset-path-shape-ellipse-006.html
@@ -0,0 +1,33 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSS Motion Path test: &lt;basic-shape&gt; ellipse() path with offset from container</title>
+<!-- Chrome currently passes with 13 max pixel difference and 473 total different pixels -->
+<!-- You can increase the numbers to handle anti-aliasing -->
+<meta name="fuzzy" content="maxDifference=0-150; totalPixels=0-530">
+<link rel="match" href="offset-path-shape-ellipse-003-ref.html">
+<link rel="help" href="https://drafts.fxtf.org/motion/#valdef-offset-path-basic-shape">
+
+<style>
+#outer {
+  top: 100px;
+  left: 100px;
+  position: relative;
+  width: 400px;
+  height: 200px;
+}
+#box {
+  top: 100px;
+  left: 100px;
+  background-color: green;
+  position: relative;
+  offset-path: ellipse(farthest-side farthest-side at top);
+  offset-distance: 37.5%;
+  border-radius: 50% 50% 0 0;
+  width: 100px;
+  height: 100px;
+}
+</style>
+
+<div id="outer">
+  <div id="box"></div>
+</div>
diff --git a/tests/wpt/tests/css/motion/offset-path-shape-inset-001.html b/tests/wpt/tests/css/motion/offset-path-shape-inset-001.html
index 27f5e3fc7d6..8d90aef2e19 100644
--- a/tests/wpt/tests/css/motion/offset-path-shape-inset-001.html
+++ b/tests/wpt/tests/css/motion/offset-path-shape-inset-001.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <meta charset="utf-8">
 <title>CSS Motion Path test: &lt;basic-shape&gt; inset() path with explicit arguments</title>
-<meta name=fuzzy content="0-30;0-200">
+<meta name="fuzzy" content="maxDifference=0-80; totalPixels=0-230">
 <link rel="author" title="Daniil Sakhapov" href="sakhapov@google.com">
 <link rel="match" href="offset-path-shape-inset-001-ref.html">
 <link rel="help" href="https://drafts.fxtf.org/motion/#valdef-offset-path-basic-shape">
diff --git a/tests/wpt/tests/css/motion/offset-path-shape-inset-002.html b/tests/wpt/tests/css/motion/offset-path-shape-inset-002.html
index 5ca502e8b1c..ceafdd8cd23 100644
--- a/tests/wpt/tests/css/motion/offset-path-shape-inset-002.html
+++ b/tests/wpt/tests/css/motion/offset-path-shape-inset-002.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <meta charset="utf-8">
 <title>CSS Motion Path test: &lt;basic-shape&gt; inset() path with explicit arguments and radius</title>
-<meta name=fuzzy content="0-75;0-500">
+<meta name="fuzzy" content="maxDifference=0-170; totalPixels=0-500">
 <link rel="author" title="Daniil Sakhapov" href="sakhapov@google.com">
 <link rel="match" href="offset-path-shape-inset-002-ref.html">
 <link rel="help" href="https://drafts.fxtf.org/motion/#valdef-offset-path-basic-shape">
diff --git a/tests/wpt/tests/css/motion/offset-path-shape-polygon-001.html b/tests/wpt/tests/css/motion/offset-path-shape-polygon-001.html
index 7e9ccdbfda9..fcb31f24525 100644
--- a/tests/wpt/tests/css/motion/offset-path-shape-polygon-001.html
+++ b/tests/wpt/tests/css/motion/offset-path-shape-polygon-001.html
@@ -4,6 +4,7 @@
 <link rel="author" title="Daniil Sakhapov" href="sakhapov@google.com">
 <link rel="match" href="offset-path-shape-polygon-001-ref.html">
 <link rel="help" href="https://drafts.fxtf.org/motion/#valdef-offset-path-basic-shape">
+<meta name="fuzzy" content="maxDifference=0-20; totalPixels=0-100">
 
 <style>
 #outer {
diff --git a/tests/wpt/tests/css/motion/offset-path-shape-rect-002.html b/tests/wpt/tests/css/motion/offset-path-shape-rect-002.html
index 114143b18d1..204eadcfc34 100644
--- a/tests/wpt/tests/css/motion/offset-path-shape-rect-002.html
+++ b/tests/wpt/tests/css/motion/offset-path-shape-rect-002.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <meta charset="utf-8">
 <title>CSS Motion Path test: &lt;basic-shape&gt; rect() path with explicit arguments and radius</title>
-<meta name=fuzzy content="0-96;0-440">
+<meta name="fuzzy" content="maxDifference=0-160; totalPixels=0-520">
 <link rel="author" title="Daniil Sakhapov" href="sakhapov@google.com">
 <link rel="match" href="offset-path-shape-rect-002-ref.html">
 <link rel="help" href="https://drafts.fxtf.org/motion/#valdef-offset-path-basic-shape">
diff --git a/tests/wpt/tests/css/motion/offset-path-shape-xywh-002.html b/tests/wpt/tests/css/motion/offset-path-shape-xywh-002.html
index 4c4f4ac86c1..ef6a9e63242 100644
--- a/tests/wpt/tests/css/motion/offset-path-shape-xywh-002.html
+++ b/tests/wpt/tests/css/motion/offset-path-shape-xywh-002.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <meta charset="utf-8">
 <title>CSS Motion Path test: &lt;basic-shape&gt; xywh() path with explicit arguments and radius</title>
-<meta name=fuzzy content="0-130;0-250">
+<meta name="fuzzy" content="maxDifference=0-140; totalPixels=0-500">
 <link rel="author" title="Daniil Sakhapov" href="sakhapov@google.com">
 <link rel="match" href="offset-path-shape-xywh-002-ref.html">
 <link rel="help" href="https://drafts.fxtf.org/motion/#valdef-offset-path-basic-shape">
diff --git a/tests/wpt/tests/css/printing/remote-origin-iframe-print-ref.html b/tests/wpt/tests/css/printing/remote-origin-iframe-print-ref.html
new file mode 100644
index 00000000000..f632519cd6e
--- /dev/null
+++ b/tests/wpt/tests/css/printing/remote-origin-iframe-print-ref.html
@@ -0,0 +1,4 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<p>The word "PASS" should be seen below.</p>
+<div style="padding-top:50px;">PASS</div>
diff --git a/tests/wpt/tests/css/printing/remote-origin-iframe-print.html b/tests/wpt/tests/css/printing/remote-origin-iframe-print.html
new file mode 100644
index 00000000000..aba10a2a399
--- /dev/null
+++ b/tests/wpt/tests/css/printing/remote-origin-iframe-print.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1486995">
+<link rel="match" href="remote-origin-iframe-print-ref.html">
+<style>
+  iframe {
+    display: block;
+    width: 100px;
+    height: 100px;
+    border: none;
+  }
+</style>
+<script src="/common/get-host-info.sub.js"></script>
+<p>The word "PASS" should be seen below.</p>
+<script>
+  const iframe = document.createElement("iframe");
+  iframe.src = get_host_info().REMOTE_ORIGIN + "/css/printing/resources/iframe-with-abspos.html";
+  document.body.appendChild(iframe);
+</script>
diff --git a/tests/wpt/tests/css/printing/resources/iframe-with-abspos.html b/tests/wpt/tests/css/printing/resources/iframe-with-abspos.html
new file mode 100644
index 00000000000..27de3aad5e0
--- /dev/null
+++ b/tests/wpt/tests/css/printing/resources/iframe-with-abspos.html
@@ -0,0 +1,5 @@
+<!DOCTYPE html>
+<style>
+  body { margin: 0; }
+</style>
+<div style="position:absolute; top:50px;">PASS</div>
diff --git a/tests/wpt/tests/css/selectors/dir-pseudo-on-input-element.html b/tests/wpt/tests/css/selectors/dir-pseudo-on-input-element.html
index b61a829b30a..db528d4079b 100644
--- a/tests/wpt/tests/css/selectors/dir-pseudo-on-input-element.html
+++ b/tests/wpt/tests/css/selectors/dir-pseudo-on-input-element.html
@@ -129,6 +129,30 @@ for (let type of ['text', 'search', 'url', 'email']) {
     }, `input element whose type attribute is in the ${type} state`);
 }
 
+test(() => {
+    const input = document.createElement('input');
+    input.type = 'text';
+    // bidirectional character type R
+    input.value = '\u05EA';
+    input.setAttribute('dir', 'auto');
+
+    const container = document.createElement('div');
+    container.appendChild(input);
+
+    assert_false(input.matches(':dir(ltr)'));
+    assert_true(input.matches(':dir(rtl)'));
+
+    // Changing to a different type that does't use value causes the bidi rule to no longer apply.
+    input.type = 'password';
+    assert_true(input.matches(':dir(ltr)'));
+    assert_false(input.matches(':dir(rtl)'));
+
+    // And restoring type=text brings back that behavior.
+    input.type = 'text';
+    assert_false(input.matches(':dir(ltr)'));
+    assert_true(input.matches(':dir(rtl)'));
+}, 'dynamic changes to type of input elements affect whether value is used for dir=auto');
+
 for (let type of ['password', 'date', 'time', 'number', 'range', 'color',
     'checkbox', 'radio', 'submit', 'image', 'reset', 'button']) {
     test(() => {
diff --git a/tests/wpt/tests/css/selectors/dir-style-01a.html b/tests/wpt/tests/css/selectors/dir-style-01a.html
index e362cd838d5..f379d14e189 100644
--- a/tests/wpt/tests/css/selectors/dir-style-01a.html
+++ b/tests/wpt/tests/css/selectors/dir-style-01a.html
@@ -8,7 +8,7 @@
     <link rel="help" href="https://drafts.csswg.org/selectors-4/#the-dir-pseudo">
     <meta name="assert" content="Test checks :dir() basic functions with valid and invalid values.">
     <link rel="match" href="dir-style-01-ref.html">
-    <meta name="fuzzy" content="maxDifference=0-255; totalPixels=0-20">
+    <meta name="fuzzy" content="maxDifference=0-255; totalPixels=0-30">
     <style>
       div { text-align: left; }
       :dir(ltr) { color: blue }
diff --git a/tests/wpt/tests/css/selectors/dir-style-01b.html b/tests/wpt/tests/css/selectors/dir-style-01b.html
index 109a7bc646d..37ad9406cfd 100644
--- a/tests/wpt/tests/css/selectors/dir-style-01b.html
+++ b/tests/wpt/tests/css/selectors/dir-style-01b.html
@@ -8,7 +8,7 @@
     <link rel="help" href="https://drafts.csswg.org/selectors-4/#the-dir-pseudo">
     <meta name="assert" content="Test checks :dir() basic functions after dynamic directionality change on elements.">
     <link rel="match" href="dir-style-01-ref.html">
-    <meta name="fuzzy" content="maxDifference=0-255; totalPixels=0-20">
+    <meta name="fuzzy" content="maxDifference=0-255; totalPixels=0-30">
     <style>
       div { text-align: left; }
       :dir(ltr) { color: blue }
diff --git a/tests/wpt/tests/css/selectors/dir-style-04.html b/tests/wpt/tests/css/selectors/dir-style-04.html
index d0a458c8498..cbfe1307d43 100644
--- a/tests/wpt/tests/css/selectors/dir-style-04.html
+++ b/tests/wpt/tests/css/selectors/dir-style-04.html
@@ -8,6 +8,7 @@
     <link rel="help" href="https://drafts.csswg.org/selectors-4/#the-dir-pseudo">
     <meta name="assert" content="Test checks :dir() basic functions on runtime added elements.">
     <link rel="match" href="dir-style-04-ref.html">
+    <meta name="fuzzy" content="maxDifference=0-70; totalPixels=0-180">
     <style>
       :dir(ltr) { color: blue }
       :dir(rtl) { color: lime }
diff --git a/tests/wpt/tests/css/selectors/hash-collision.html b/tests/wpt/tests/css/selectors/hash-collision.html
new file mode 100644
index 00000000000..04f15e75887
--- /dev/null
+++ b/tests/wpt/tests/css/selectors/hash-collision.html
@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>Test string hash collision in bucketing</title>
+    <meta rel="author" href="mailto:sesse@chromium.org" title="Steinar H. Gunderson">
+    <link rel="help" href="https://www.w3.org/TR/css3-selectors/#selectors"/>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <style>
+      /* These strings all collide in Blink's AtomicString hash function. */
+      .abetfx { --a: a; }
+      .adqcne { --b: b; }
+      .anztgy { --c: c; }
+      .jkeyea { --d: d; }
+      .ltjjvc { --e: e; }
+      .osniry { --f: f; }
+      .otgvil { --g: g; }
+      .ppvdzg { --h: h; }
+      .pwkbxn { --i: i; }
+      .rkefup { --j: j; }
+      .wsqwrf { --k: k; }
+      .zzpnvg { --l: l; }
+    </style>
+  </head>
+  <body>
+    <div id="d" class="abetfx adqcne anztgy jkeyea ltjjvc osniry otgvil ppvdzg pwkbxn rkefup wsqwrf zzpnvg">Some text</div>
+    <script>
+test(() => {
+  const cs = getComputedStyle(d);
+  assert_equals('a', cs.getPropertyValue('--a'));
+  assert_equals('b', cs.getPropertyValue('--b'));
+  assert_equals('c', cs.getPropertyValue('--c'));
+  assert_equals('d', cs.getPropertyValue('--d'));
+  assert_equals('e', cs.getPropertyValue('--e'));
+  assert_equals('f', cs.getPropertyValue('--f'));
+  assert_equals('g', cs.getPropertyValue('--g'));
+  assert_equals('h', cs.getPropertyValue('--h'));
+  assert_equals('i', cs.getPropertyValue('--i'));
+  assert_equals('j', cs.getPropertyValue('--j'));
+  assert_equals('k', cs.getPropertyValue('--k'));
+  assert_equals('l', cs.getPropertyValue('--l'));
+});
+    </script>
+  </body>
+</html>
diff --git a/tests/wpt/tests/css/selectors/invalidation/empty-pseudo-in-has.html b/tests/wpt/tests/css/selectors/invalidation/empty-pseudo-in-has.html
index 83cf0515656..4e9f6f27378 100644
--- a/tests/wpt/tests/css/selectors/invalidation/empty-pseudo-in-has.html
+++ b/tests/wpt/tests/css/selectors/invalidation/empty-pseudo-in-has.html
@@ -34,4 +34,12 @@ child.appendChild(document.createElement("div"));
 
 testColor("Insert div to div.#child", blue);
 
-</script>
\ No newline at end of file
+child.replaceChildren();
+testColor("Remove div from div.#child", green);
+
+child.textContent = "Test";
+testColor("Insert text into div.#child", blue);
+
+child.textContent = "";
+testColor("Remove text from div.#child", green);
+</script>
diff --git a/tests/wpt/tests/css/selectors/invalidation/has-sibling-insertion-removal.html b/tests/wpt/tests/css/selectors/invalidation/has-sibling-insertion-removal.html
new file mode 100644
index 00000000000..1331a22ad55
--- /dev/null
+++ b/tests/wpt/tests/css/selectors/invalidation/has-sibling-insertion-removal.html
@@ -0,0 +1,186 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>:has() invalidation for sibling insertion and removal</title>
+<link rel="author" title="Byungwoo Lee" href="mailto:blee@igalia.com">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<link rel="help" href="https://drafts.csswg.org/selectors/#relational">
+<style>
+div, main { color: grey }
+#subject1:has(+ #sibling1_1 + #sibling1_2) { color: red }
+#subject2:has(+ #sibling2_2) { color: green }
+#subject3:has(+ #sibling3_1 + #sibling3_2 > #siblingchild3_2_1) { color: blue }
+#subject4:has(+ #sibling4_2 > #siblingchild4_2_1) { color: yellow }
+#subject5:has(+ #sibling5_1 + #sibling5_2) { color: red }
+#subject6:has(+ #sibling6_2) { color: green }
+#subject7:has(+ #sibling7_1 + #sibling7_2 > #siblingchild7_2_1) { color: blue }
+#subject8:has(+ #sibling8_2 > #siblingchild8_2_1) { color: yellow }
+#subject9:has(+ #sibling9_1 + #sibling9_2 ~ #sibling9_3) { color: red }
+#subject10:has(+ #sibling10_2 ~ #sibling10_3) { color: green }
+#subject11:has(+ #sibling11_1 + #sibling11_2 ~ #sibling11_3 > #siblingchild11_3_1) { color: blue }
+#subject12:has(+ #sibling12_2 ~ #sibling12_3 > #siblingchild12_3_1) { color: yellow }
+</style>
+
+<main id="main">
+  <div id="parent1">
+    <div id="subject1"></div>
+    <div id="sibling1_2"></div>
+    <div id="sibling1_3"></div>
+  </div>
+  <div id="parent2">
+    <div id="subject2"></div>
+    <div id="sibling2_1"></div>
+    <div id="sibling2_2"></div>
+    <div id="sibling2_3""></div>
+  </div>
+  <div id="parent3">
+    <div id="subject3"></div>
+    <div id="sibling3_2">
+      <div id="siblingchild3_2_1"></div>
+    </div>
+    <div id="sibling3_3"></div>
+  </div>
+  <div id="parent4">
+    <div id="subject4"></div>
+    <div id="sibling4_1"></div>
+    <div id="sibling4_2">
+      <div id="siblingchild4_2_1"></div>
+    </div>
+    <div id="sibling4_3"></div>
+  </div>
+  <div id="parent5">
+    <div id="subject5"></div>
+    <div id="sibling5_1"></div>
+    <div id="sibling5_2"></div>
+    <div id="sibling5_3""></div>
+  </div>
+  <div id="parent6">
+    <div id="subject6"></div>
+    <div id="sibling6_2"></div>
+    <div id="sibling6_3"></div>
+  </div>
+  <div id="parent7">
+    <div id="subject7"></div>
+    <div id="sibling7_1"></div>
+    <div id="sibling7_2">
+      <div id="siblingchild7_2_1"></div>
+    </div>
+    <div id="sibling7_3"></div>
+  <div id="parent8">
+    <div id="subject8"></div>
+    <div id="sibling8_2">
+      <div id="siblingchild8_2_1"></div>
+    </div>
+    <div id="sibling8_3"></div>
+  </div>
+  <div id="parent9">
+    <div id="subject9"></div>
+    <div id="sibling9_2"></div>
+    <div id="sibling9_3"></div>
+    <div id="sibling9_4"></div>
+  </div>
+  <div id="parent10">
+    <div id="subject10"></div>
+    <div id="sibling10_1"></div>
+    <div id="sibling10_2"></div>
+    <div id="sibling10_3""></div>
+    <div id="sibling10_4""></div>
+  </div>
+  <div id="parent11">
+    <div id="subject11"></div>
+    <div id="sibling11_2"></div>
+    <div id="sibling11_3">
+      <div id="siblingchild11_3_1"></div>
+    </div>
+    <div id="sibling11_4"></div>
+  </div>
+  <div id="parent12">
+    <div id="subject12"></div>
+    <div id="sibling12_1"></div>
+    <div id="sibling12_2"></div>
+    <div id="sibling12_3">
+      <div id="siblingchild12_3_1"></div>
+    </div>
+    <div id="sibling12_4"></div>
+  </div>
+</main>
+<script>
+
+const grey = 'rgb(128, 128, 128)';
+const red = 'rgb(255, 0, 0)';
+const green = 'rgb(0, 128, 0)';
+const blue = 'rgb(0, 0, 255)';
+const yellow = 'rgb(255, 255, 0)';
+
+function testColor(test_name, element, color) {
+  test(function() {
+    assert_equals(getComputedStyle(element).color, color);
+  }, test_name);
+}
+
+function insertBefore(parent, reference, child_id) {
+  var child = document.createElement("div");
+  child.id = child_id;
+  parent.insertBefore(child, reference);
+}
+
+testColor(`subject1: initial color should be ${grey}`, subject1, grey);
+insertBefore(parent1, sibling1_2, "sibling1_1");
+testColor(`subject1: color after #sibling1_1 inserted should be ${red}`,
+          subject1, red);
+
+testColor(`subject2: initial color should be ${grey}`, subject2, grey);
+sibling2_1.remove();
+testColor(`subject2: color after #sibling2_1 removed should be ${green}`,
+          subject2, green);
+
+testColor(`subject3: initial color should be ${grey}`, subject3, grey);
+insertBefore(parent3, sibling3_2, "sibling3_1");
+testColor(`subject3: color after #sibling3_1 inserted should be ${blue}`,
+          subject3, blue);
+
+testColor(`subject4: initial color should be ${grey}`, subject4, grey);
+sibling4_1.remove();
+testColor(`subject4: color after #sibling4_1 removed should be ${yellow}`,
+          subject4, yellow);
+
+testColor(`subject5: initial color should be ${red}`, subject5, red);
+sibling5_1.remove();
+testColor(`subject5: color after #sibling5_1 removed should be ${grey}`,
+          subject5, grey);
+
+testColor(`subject6: initial color should be ${green}`, subject6, green);
+insertBefore(parent6, sibling6_2, "sibling6_1");
+testColor(`subject6: color after #sibling6_1 inserted should be ${grey}`,
+          subject6, grey);
+
+testColor(`subject7: initial color should be ${blue}`, subject7, blue);
+sibling7_1.remove();
+testColor(`subject7: color after #sibling7_1 removed should be ${grey}`,
+          subject7, grey);
+
+testColor(`subject8: initial color should be ${yellow}`, subject8, yellow);
+insertBefore(parent8, sibling8_2, "sibling8_1");
+testColor(`subject8: color after #sibling8_1 inserted should be ${grey}`,
+          subject8, grey);
+
+testColor(`subject9: initial color should be ${grey}`, subject9, grey);
+insertBefore(parent9, sibling9_2, "sibling9_1");
+testColor(`subject9: color after #sibling9_1 inserted should be ${red}`,
+          subject1, red);
+
+testColor(`subject10: initial color should be ${grey}`, subject10, grey);
+sibling10_1.remove();
+testColor(`subject10: color after #sibling10_1 removed should be ${green}`,
+          subject10, green);
+
+testColor(`subject11: initial color should be ${grey}`, subject11, grey);
+insertBefore(parent11, sibling11_2, "sibling11_1");
+testColor(`subject11: color after #sibling11_1 inserted should be ${blue}`,
+          subject11, blue);
+
+testColor(`subject12: initial color should be ${grey}`, subject12, grey);
+sibling12_1.remove();
+testColor(`subject12: color after #sibling12_1 removed should be ${yellow}`,
+          subject12, yellow);
+</script>
diff --git a/tests/wpt/tests/css/selectors/invalidation/has-side-effect.html b/tests/wpt/tests/css/selectors/invalidation/has-side-effect.html
new file mode 100644
index 00000000000..0ea0dee993f
--- /dev/null
+++ b/tests/wpt/tests/css/selectors/invalidation/has-side-effect.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Selector Invalidation: Invalidate :has() as result of insertion/removal</title>
+<link rel="author" title="David Shin" href="mailto:dshin@mozilla.com">
+<link rel="author" title="Emilio Cobos Álvarez" href="mailto:emilio@crisal.io">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<link rel="help" href="https://drafts.csswg.org/selectors/#relational">
+<style>
+div, main { color: grey }
+#subject:has(+ #next_sibling) { color: red; }
+#prev_sibling:has(+ #subject + #next_sibling) { color: green; }
+</style>
+
+<main id=main>
+  <div id=prev_sibling></div>
+  <div id=subject></div>
+  <div id=blocks_match></div>
+  <div id=next_sibling></div>
+</main>
+
+<script>
+const grey = 'rgb(128, 128, 128)';
+const red = 'rgb(255, 0, 0)';
+const green = 'rgb(0, 128, 0)';
+
+function testColors(test_name, subject_color, prev_sibling_color) {
+    test(function() {
+        assert_equals(getComputedStyle(subject).color, subject_color);
+        assert_equals(getComputedStyle(prev_sibling).color, prev_sibling_color);
+    }, test_name);
+}
+
+testColors('Initial colors', grey, grey);
+
+const d = blocks_match;
+d.remove();
+
+testColors('Matches after #blocks_match removed', red, green);
+subject.after(d);
+
+testColors('Does not match after #blocks_match added', grey, grey);
+</script>
diff --git a/tests/wpt/tests/css/selectors/invalidation/has-unstyled.html b/tests/wpt/tests/css/selectors/invalidation/has-unstyled.html
new file mode 100644
index 00000000000..6a64e493587
--- /dev/null
+++ b/tests/wpt/tests/css/selectors/invalidation/has-unstyled.html
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Selector Invalidation: :has() affected by unstyled elements</title>
+<link rel="author" title="David Shin" href="mailto:dshin@mozilla.com">
+<link rel="author" title="Emilio Cobos Álvarez" href="mailto:emilio@crisal.io">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<link rel="help" href="https://drafts.csswg.org/selectors/#relational">
+<style>
+div, main { color: grey }
+.none { display: none; }
+#subject:has(.test) { color: red; }
+#subject:has(~ #sibling .test) { color: green; }
+#subject:has(:is(.test_inner #subject_descendant)) { color: blue; }
+#subject:has(~ #sibling :is(.test_inner #sibling_descendant)) { color: yellow; }
+</style>
+
+<main id=main>
+  <div id=subject>
+    <div id=subject_child class="none">
+      <div id=subject_descendant></div>
+    </div>
+  </div>
+  <div id=sibling class="none">
+    <div id=sibling_child>
+      <div id=sibling_descendant></div>
+    </div>
+  </div>
+</main>
+
+<script>
+const grey = 'rgb(128, 128, 128)';
+const red = 'rgb(255, 0, 0)';
+const green = 'rgb(0, 128, 0)';
+const blue = 'rgb(0, 0, 255)';
+const yellow = "rgb(255, 255, 0)";
+const colors = {
+  grey: {
+    classTest: grey,
+  },
+  red: {
+    classTest: red,
+  },
+  green: {
+    classTest: green,
+  },
+  blue: {
+    classTest: blue,
+  },
+  yellow: {
+    classTest: yellow,
+  },
+};
+
+function testColor(test_name, color) {
+    test(function() {
+        assert_equals(getComputedStyle(subject).color, color);
+    }, test_name);
+}
+
+function testClassChange(element, cls, expectedColorName)
+{
+    const expectedColorForClassTest = colors[expectedColorName].classTest;
+    element.classList.add(cls);
+    testColor(`add ${cls} to ${element.id}`, expectedColorForClassTest);
+    element.classList.remove(cls);
+    testColor(`remove ${cls} from ${element.id}`, grey);
+}
+
+testColor('Initial color', grey);
+
+testClassChange(subject_descendant, 'test', 'red');
+testClassChange(sibling_descendant, 'test', 'green');
+testClassChange(subject_child, 'test_inner', 'blue');
+testClassChange(sibling_child, 'test_inner', 'yellow');
+
+</script>
diff --git a/tests/wpt/tests/css/selectors/invalidation/host-context-pseudo-class-in-has.html b/tests/wpt/tests/css/selectors/invalidation/host-context-pseudo-class-in-has.html
new file mode 100644
index 00000000000..ca140af6b34
--- /dev/null
+++ b/tests/wpt/tests/css/selectors/invalidation/host-context-pseudo-class-in-has.html
@@ -0,0 +1,56 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSS Test: Invalidation for :host-context() inside :has()</title>
+<link rel="author" title="Byungwoo" href="mailto:blee@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/selectors/#relational">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="host_parent"><div id="host"></div></div>
+<script>
+  var shadow = host.attachShadow({ mode: 'open' });
+  shadow.innerHTML = `
+    <style>
+      .subject {
+        color: red;
+      }
+      .subject:has(:is(:host-context(.a) > .foo .bar)) { color: green }
+      .subject:has(:is(:host-context(.a) .bar)) { color: blue }
+    </style>
+    <div class="foo">
+      <div id="subject1" class="subject">
+        <div class="bar"></div>
+      </div>
+    </div>
+    <div>
+      <div class="foo">
+        <div id="subject2" class="subject">
+          <div class="bar"></div>
+        </div>
+      </div>
+    </div>
+  `;
+
+  const red = "rgb(255, 0, 0)";
+  const green = "rgb(0, 128, 0)";
+  const blue = "rgb(0, 0, 255)";
+
+  function checkColor(test_name, subject_id, subject_color) {
+    test(function() {
+      let subject = shadow.querySelector("#" + subject_id);
+      assert_equals(getComputedStyle(subject).color, subject_color);
+    }, test_name + ": Check #" + subject_id + " color");
+  }
+
+  checkColor("Before adding 'a' to #host_parent", "subject1", red);
+  checkColor("Before adding 'a' to #host_parent", "subject2", red);
+
+  host_parent.classList.add('a');
+
+  checkColor("After adding 'a' to #host_parent", "subject1", green);
+  checkColor("After adding 'a' to #host_parent", "subject2", blue);
+
+  host_parent.classList.remove('a');
+
+  checkColor("After removing 'a' from #host_parent", "subject1", red);
+  checkColor("After removing 'a' from #host_parent", "subject2", red);
+</script>
diff --git a/tests/wpt/tests/css/selectors/invalidation/host-pseudo-class-in-has.html b/tests/wpt/tests/css/selectors/invalidation/host-pseudo-class-in-has.html
index a2c63d54635..4d300befa76 100644
--- a/tests/wpt/tests/css/selectors/invalidation/host-pseudo-class-in-has.html
+++ b/tests/wpt/tests/css/selectors/invalidation/host-pseudo-class-in-has.html
@@ -1,6 +1,6 @@
 <!doctype html>
 <meta charset="utf-8">
-<title>CSS Test: Invalidation for :host() and :host-context() inside :has()</title>
+<title>CSS Test: Invalidation for :host() inside :has()</title>
 <link rel="author" title="Byungwoo" href="mailto:blee@igalia.com">
 <link rel="help" href="https://drafts.csswg.org/selectors/#relational">
 <script src="/resources/testharness.js"></script>
@@ -13,10 +13,8 @@
       .subject {
         color: red;
       }
-      .subject:has(:is(:host-context(.a) > .foo .bar)) { color: green }
-      .subject:has(:is(:host(.a) > .foo .bar)) { color: yellowgreen }
-      .subject:has(:is(:host-context(.a) .bar)) { color: blue }
-      .subject:has(:is(:host(.a) .bar)) { color: skyblue }
+      .subject:has(:is(:host(.a) > .foo .bar)) { color: green }
+      .subject:has(:is(:host(.a) .bar)) { color: blue }
     </style>
     <div class="foo">
       <div id="subject1" class="subject">
@@ -34,9 +32,7 @@
 
   const red = "rgb(255, 0, 0)";
   const green = "rgb(0, 128, 0)";
-  const yellowgreen = "rgb(154, 205, 50)";
   const blue = "rgb(0, 0, 255)";
-  const skyblue = "rgb(135, 206, 235)";
 
   function checkColor(test_name, subject_id, subject_color) {
     test(function() {
@@ -45,21 +41,11 @@
     }, test_name + ": Check #" + subject_id + " color");
   }
 
-  checkColor("Before adding 'a' to #host_parent", "subject1", red);
-  checkColor("Before adding 'a' to #host_parent", "subject2", red);
-
-  host_parent.classList.add('a');
-
-  checkColor("After adding 'a' to #host_parent", "subject1", green);
-  checkColor("After adding 'a' to #host_parent", "subject2", blue);
-
-  host_parent.classList.remove('a');
-
-  checkColor("After removing 'a' from #host_parent", "subject1", red);
-  checkColor("After removing 'a' from #host_parent", "subject2", red);
+  checkColor("Before adding 'a' to #host", "subject1", red);
+  checkColor("Before adding 'a' to #host", "subject2", red);
 
   host.classList.add('a');
 
-  checkColor("After adding 'a' to #host", "subject1", yellowgreen);
-  checkColor("After adding 'a' to #host", "subject2", skyblue);
+  checkColor("After adding 'a' to #host", "subject1", green);
+  checkColor("After adding 'a' to #host", "subject2", blue);
 </script>
diff --git a/tests/wpt/tests/css/selectors/invalidation/input-pseudo-classes-in-has.html b/tests/wpt/tests/css/selectors/invalidation/input-pseudo-classes-in-has.html
index 67aeedf315e..a9a1d9f5ee7 100644
--- a/tests/wpt/tests/css/selectors/invalidation/input-pseudo-classes-in-has.html
+++ b/tests/wpt/tests/css/selectors/invalidation/input-pseudo-classes-in-has.html
@@ -16,6 +16,7 @@
   .ancestor:has(#numberinput:out-of-range) { color: darkgreen }
   .ancestor:has(#numberinput:required) { color: pink }
   .ancestor:has(#progress:indeterminate) { color: orange }
+  .ancestor:has(#checkboxinput:default) { color: purple; }
 </style>
 <div id=subject class=ancestor>
   <input type="checkbox" name="my-checkbox" id="checkme">
@@ -24,10 +25,16 @@
   <input id="radioinput" checked>
   <input id="numberinput" type="number" min="1" max="10" value="5">
   <progress id="progress" value="50" max="100"></progress>
+  <input id="checkboxinput" type="checkbox">
 </div>
 <script>
   test(function() {
+    let input = null;
     this.add_cleanup(() => {
+      if (input) {
+        // Need to put the input back for the rest of the tests.
+        subject.prepend(input);
+      }
       checkme.checked = false;
     });
     checkme.checked = false;
@@ -39,13 +46,14 @@
     checkme.indeterminate = true;
     assert_equals(getComputedStyle(subject).color, "rgb(154, 205, 50)",
                   "ancestor should be yellowgreen");
-    const input = checkme;
+    input = checkme;
     checkme.remove();
     input.indeterminate = false;
     assert_equals(getComputedStyle(subject).color, "rgb(0, 0, 0)",
                   "ancestor should be black");
 
     subject.prepend(input);
+    input = null;
     checkme.checked = true;
     assert_equals(getComputedStyle(subject).color, "rgb(0, 128, 0)",
                   "ancestor should be green");
@@ -138,4 +146,25 @@
     assert_equals(getComputedStyle(subject).color, "rgb(0, 0, 128)",
                   "ancestor should be navy");
   }, ":placeholder-shown invalidation");
+
+  test(function() {
+    this.add_cleanup(() => {
+      checkboxinput.checked = false;
+      checkboxinput.removeAttribute("checked");
+    });
+    assert_equals(getComputedStyle(subject).color, "rgb(0, 0, 0)",
+                  "ancestor should be black");
+    checkboxinput.checked = true;
+    assert_equals(getComputedStyle(subject).color, "rgb(0, 0, 0)",
+                  "ancestor should still be black");
+    checkboxinput.setAttribute("checked", "");
+    assert_equals(getComputedStyle(subject).color, "rgb(128, 0, 128)",
+                  "ancestor should be purple");
+    checkboxinput.checked = false;
+    assert_equals(getComputedStyle(subject).color, "rgb(128, 0, 128)",
+                  "ancestor should still be purple");
+    checkboxinput.removeAttribute("checked");
+    assert_equals(getComputedStyle(subject).color, "rgb(0, 0, 0)",
+                  "ancestor should be black");
+  }, ":default invalidation with input[type=checkbox] and assignment to .checked");
 </script>
diff --git a/tests/wpt/tests/css/selectors/invalidation/is-pseudo-containing-complex-in-has.html b/tests/wpt/tests/css/selectors/invalidation/is-pseudo-containing-complex-in-has.html
index 4e6d4c8832e..c189b0f4beb 100644
--- a/tests/wpt/tests/css/selectors/invalidation/is-pseudo-containing-complex-in-has.html
+++ b/tests/wpt/tests/css/selectors/invalidation/is-pseudo-containing-complex-in-has.html
@@ -376,4 +376,4 @@ testClassChange(removeClass, "m", "child", selector, false, "has_scope", grey);
 testClassChange(addClass, "n", "child", selector, true, "has_scope", orange);
 testClassChange(removeClass, "n", "child", selector, false, "has_scope", grey);
 testClassChange(removeClass, "orange", "has_scope", selector, false, "has_scope", grey);
-</script>
\ No newline at end of file
+</script>
diff --git a/tests/wpt/tests/css/selectors/invalidation/part-pseudo-ref.html b/tests/wpt/tests/css/selectors/invalidation/part-pseudo-ref.html
new file mode 100644
index 00000000000..aeb724778a7
--- /dev/null
+++ b/tests/wpt/tests/css/selectors/invalidation/part-pseudo-ref.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<head>
+  <meta charset="utf-8">
+  <title>CSS Test Reference</title>
+  <style id="sheet">div { color: green; }</style>
+</head>
+<body>
+  <div>
+    <div>
+      <div>Should be green</div>
+    </div>
+  </div>
+</body>
diff --git a/tests/wpt/tests/css/selectors/invalidation/part-pseudo.html b/tests/wpt/tests/css/selectors/invalidation/part-pseudo.html
new file mode 100644
index 00000000000..a409271762f
--- /dev/null
+++ b/tests/wpt/tests/css/selectors/invalidation/part-pseudo.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<head>
+  <meta charset="utf-8">
+  <title>CSS Selectors Invalidation: ::part()</title>
+  <link rel="author" title="Steinar H. Gunderson" href="mailto:sesse@chromium.org">
+  <link rel="help" href="https://drafts.csswg.org/css-shadow-parts/">
+  <link rel="match" href="part-pseudo-ref.html">
+  <style id="sheet">#host::part(green) { color: red; }</style>
+  <script src="/resources/declarative-shadow-dom-polyfill.js"></script>
+</head>
+<body>
+  <div id="host">
+    <template shadowrootmode="open">
+      <div>
+        <div part="green">Should be green</div>
+      </div>
+    </template>
+  </div>
+  <script>
+    document.body.offsetTop;
+    sheet.innerText = "#host::part(green) { color: green; }";
+  </script>
+</body>
diff --git a/tests/wpt/tests/css/selectors/invalidation/placeholder-shown.html b/tests/wpt/tests/css/selectors/invalidation/placeholder-shown.html
new file mode 100644
index 00000000000..71233ed2a28
--- /dev/null
+++ b/tests/wpt/tests/css/selectors/invalidation/placeholder-shown.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<title>CSS Selectors Test: :placeholder-shown invalidation</title>
+<link rel="help" href="https://drafts.csswg.org/selectors/#placeholder">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+  #target { color: red; }
+  input:placeholder-shown + #target { color: green; }
+</style>
+<input id="input" type="text">
+<span id="target"></span>
+<script>
+  const red = "rgb(255, 0, 0)";
+  const green = "rgb(0, 128, 0)";
+
+  test(() => {
+    assert_equals(getComputedStyle(target).color, red);
+  }, "Initially no placeholder text");
+
+  test(() => {
+    input.setAttribute("placeholder", "PLACEHOLDER");
+    assert_equals(getComputedStyle(target).color, green);
+  }, "Added placeholder text");
+
+  test(() => {
+    input.setAttribute("placeholder", "");
+    assert_equals(getComputedStyle(target).color, green);
+  }, "Set placeholder text to empty string");
+
+  test(() => {
+    input.removeAttribute("placeholder");
+    assert_equals(getComputedStyle(target).color, red);
+  }, "Removed placeholder attribute");
+</script>
diff --git a/tests/wpt/tests/css/selectors/parsing/parse-has-disallow-nesting-has-inside-has.html b/tests/wpt/tests/css/selectors/parsing/parse-has-disallow-nesting-has-inside-has.html
index c5fcb589a3c..a633c913d16 100644
--- a/tests/wpt/tests/css/selectors/parsing/parse-has-disallow-nesting-has-inside-has.html
+++ b/tests/wpt/tests/css/selectors/parsing/parse-has-disallow-nesting-has-inside-has.html
@@ -8,6 +8,12 @@
 <script src="/css/support/parsing-testcommon.js"></script>
 <script>
   test_invalid_selector('.a:has(.b:has(.c))');
-  test_valid_selector('.a:has(:is(.b:has(.c)))');
-  test_valid_selector('.a:has(:is(.b:has(.c), .d))');
+  test(() => {
+    // It's not easy to check that these are invalid because :is() and :where()
+    // use forgiving parsing. Check that they never match instead.
+    assert_false(document.documentElement.matches(":has(:is(:has(*)))"));
+    assert_false(document.documentElement.matches(":has(:where(:has(*)))"));
+    assert_true(document.documentElement.matches(":has(:is(:has(*), script))"));
+    assert_true(document.documentElement.matches(":has(:where(:has(*), script))"));
+  })
 </script>
diff --git a/tests/wpt/tests/css/selectors/parsing/parse-has.html b/tests/wpt/tests/css/selectors/parsing/parse-has.html
index 902fc98ff68..3492373a336 100644
--- a/tests/wpt/tests/css/selectors/parsing/parse-has.html
+++ b/tests/wpt/tests/css/selectors/parsing/parse-has.html
@@ -37,5 +37,5 @@
   test_invalid_selector(':has()');
   test_invalid_selector(':has(123)');
   test_invalid_selector(':has(.a, 123)');
-  test_valid_selector(':has(:is(.a, 123))');
+  test_valid_selector(':has(:is(.a, 123))', [':has(:is(.a, 123))', ':has(:is(.a))']);
 </script>
diff --git a/tests/wpt/tests/css/selectors/placeholder-shown.html b/tests/wpt/tests/css/selectors/placeholder-shown.html
new file mode 100644
index 00000000000..62f6f96a103
--- /dev/null
+++ b/tests/wpt/tests/css/selectors/placeholder-shown.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<title>CSS Selectors Test: :placeholder-shown matching</title>
+<link rel="help" href="https://drafts.csswg.org/selectors/#placeholder">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+  :not(:placeholder-shown) + #t1,
+  :placeholder-shown + #t2,
+  :placeholder-shown + #t3,
+  :placeholder-shown + #t4,
+  :not(:placeholder-shown) + #t5,
+  :not(:placeholder-shown) + #t6,
+  :not(:placeholder-shown) + #t7 {
+    color: green;
+  }
+</style>
+<input type="text"><span id="t1">Should be green</span>
+<input type="text" placeholder><span id="t2">Should be green</span>
+<input type="text" placeholder=""><span id="t3">Should be green</span>
+<input type="text" placeholder="placeholder"><span id="t4">Should be green</span>
+<input type="text" placeholder value="value"><span id="t5">Should be green</span>
+<input type="text" placeholder="" value="value"><span id="t6">Should be green</span>
+<input type="text" placeholder="placeholder" value="value"><span id="t7">Should be green</span>
+<script>
+  const green = "rgb(0, 128, 0)";
+
+  test(() => assert_equals(getComputedStyle(t1).color, green,
+                           "No placeholder attribute"));
+  test(() => assert_equals(getComputedStyle(t2).color, green,
+                           "Placeholder attribute without value"));
+  test(() => assert_equals(getComputedStyle(t3).color, green,
+                           "Placeholder attribute - empty string"));
+  test(() => assert_equals(getComputedStyle(t4).color, green,
+                           "Placeholder attribute - non-empty string"));
+  test(() => assert_equals(getComputedStyle(t5).color, green,
+                           "Placeholder attribute without value - input text"));
+  test(() => assert_equals(getComputedStyle(t6).color, green,
+                           "Placeholder attribute - empty string - input text"));
+  test(() => assert_equals(getComputedStyle(t7).color, green,
+                           "Placeholder attribute - non-empty string - input text"));
+</script>
diff --git a/tests/wpt/tests/css/selectors/user-invalid.html b/tests/wpt/tests/css/selectors/user-invalid.html
index e7e008e677b..f20d9970715 100644
--- a/tests/wpt/tests/css/selectors/user-invalid.html
+++ b/tests/wpt/tests/css/selectors/user-invalid.html
@@ -2,6 +2,7 @@
 <title>Support for the :user-invalid pseudo-class</title>
 <link rel="author" title="Tim Nguyen" href="https://github.com/nt1m">
 <link rel="help" href="https://drafts.csswg.org/selectors/#user-pseudos">
+<link rel="help" href="https://html.spec.whatwg.org/#selector-user-invalid">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/resources/testdriver.js"></script>
@@ -79,7 +80,7 @@ promise_test(async () => {
   assert_false(requiredTextarea.matches(":user-valid"), "Initially does not match :user-valid");
   assert_false(requiredTextarea.matches(":user-invalid"), "Initially does not match :user-invalid");
 
-  await test_driver.click(submitButton);
+  submitButton.click();
 
   assert_true(requiredInput.matches(":user-invalid"), "Submitted the form, input is validated");
   assert_false(requiredInput.matches(":user-valid"), "Submitted the form, input is validated");
@@ -87,13 +88,22 @@ promise_test(async () => {
   assert_true(requiredTextarea.matches(":user-invalid"), "Submitted the form, textarea is validated");
   assert_false(requiredTextarea.matches(":user-valid"), "Submitted the form, textarea is validated");
 
-  await test_driver.click(resetButton);
+  resetButton.click();
 
   assert_false(requiredInput.matches(":user-valid"), "Reset the form, user-interacted flag is reset");
   assert_false(requiredInput.matches(":user-invalid"), "Reset the form, user-interacted flag is reset");
 
   assert_false(requiredTextarea.matches(":user-valid"), "Reset the form, user-interacted flag is reset");
   assert_false(requiredTextarea.matches(":user-invalid"), "Reset the form, user-interacted flag is reset");
+
+  // Test programmatic form submission with constraint validation.
+  form.requestSubmit();
+
+  assert_true(requiredInput.matches(":user-invalid"), "Called form.requestSubmit(), input is validated");
+  assert_false(requiredInput.matches(":user-valid"), "Called form.requestSubmit(), input is validated");
+
+  assert_true(requiredTextarea.matches(":user-invalid"), "Called form.requestSubmit(), textarea is validated");
+  assert_false(requiredTextarea.matches(":user-valid"), "Called form.requestSubmit(), textarea is validated");
 }, ":user-invalid selector properly interacts with submit & reset buttons");
 
 // historical: https://github.com/w3c/csswg-drafts/issues/1329
diff --git a/tests/wpt/tests/css/selectors/user-valid-user-invalid-invalidation.html b/tests/wpt/tests/css/selectors/user-valid-user-invalid-invalidation.html
new file mode 100644
index 00000000000..bca20fc99c3
--- /dev/null
+++ b/tests/wpt/tests/css/selectors/user-valid-user-invalid-invalidation.html
@@ -0,0 +1,57 @@
+<!DOCTYPE html>
+<link rel=author href="mailto:jarhar@chromium.org">
+<link rel=help href="https://bugs.chromium.org/p/chromium/issues/detail?id=1477396">
+<link rel=help href="https://bugs.chromium.org/p/chromium/issues/detail?id=1477392">
+<link rel=help href="https://drafts.csswg.org/selectors/#user-pseudos">
+<link rel=help href="https://html.spec.whatwg.org/#selector-user-valid">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+
+<form>
+  <input type=email>
+  <input type=submit>
+</form>
+
+<style>
+input:user-valid {
+  color: rgb(0, 255, 0);
+}
+input:user-invalid {
+  background-color: rgb(255, 0, 0);
+}
+</style>
+
+<script>
+const green = 'rgb(0, 255, 0)';
+const red = 'rgb(255, 0, 0)';
+
+promise_test(async () => {
+  const emailInput = document.querySelector('input[type=email]');
+  assert_not_equals(getComputedStyle(emailInput).color, green,
+    'Input should not initially match :user-valid.');
+  assert_not_equals(getComputedStyle(emailInput).backgroundColor, red,
+    'Input should not initially match :user-invalid.');
+
+  emailInput.focus();
+  await test_driver.send_keys(emailInput, 'user');
+  assert_not_equals(getComputedStyle(emailInput).color, green,
+    ':user-valid should not match until after blurring.');
+  assert_not_equals(getComputedStyle(emailInput).backgroundColor, red,
+    ':user-invalid should not match until after blurring.');
+
+  emailInput.blur();
+  assert_not_equals(getComputedStyle(emailInput).color, green,
+    'Invalid input should not match :user-valid.');
+  assert_equals(getComputedStyle(emailInput).backgroundColor, red,
+    'Invalid input should match :user-invalid.');
+
+  emailInput.focus();
+  await test_driver.send_keys(emailInput, '@example.com');
+  assert_equals(getComputedStyle(emailInput).color, green,
+    'Valid input should match :user-valid.');
+  assert_not_equals(getComputedStyle(emailInput).backgroundColor, red,
+    'Valid input should not match :user-invalid.');
+}, ':user-valid and :user-invalid should invalidate after user input.');
+</script>
diff --git a/tests/wpt/tests/css/selectors/user-valid.html b/tests/wpt/tests/css/selectors/user-valid.html
index 86e756df2ee..9960fc846a0 100644
--- a/tests/wpt/tests/css/selectors/user-valid.html
+++ b/tests/wpt/tests/css/selectors/user-valid.html
@@ -2,6 +2,7 @@
 <title>Support for the :user-valid pseudo-class</title>
 <link rel="author" title="Tim Nguyen" href="https://github.com/nt1m">
 <link rel="help" href="https://drafts.csswg.org/selectors/#user-pseudos">
+<link rel="help" href="https://html.spec.whatwg.org/#selector-user-valid">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/resources/testdriver.js"></script>
@@ -76,7 +77,7 @@ promise_test(async () => {
   assert_false(optionalTextarea.matches(":user-valid"), "Initially does not match :user-valid");
   assert_false(optionalTextarea.matches(":user-invalid"), "Initially does not match :user-invalid");
 
-  await test_driver.click(submitButton);
+  submitButton.click();
 
   assert_true(optionalInput.matches(":user-valid"), "Submitted the form, input is validated");
   assert_false(optionalInput.matches(":user-invalid"), "Submitted the form, input is validated");
@@ -84,12 +85,21 @@ promise_test(async () => {
   assert_true(optionalTextarea.matches(":user-valid"), "Submitted the form, textarea is validated");
   assert_false(optionalTextarea.matches(":user-invalid"), "Submitted the form, textarea is validated");
 
-  await test_driver.click(resetButton);
+  resetButton.click();
 
   assert_false(optionalInput.matches(":user-valid"), "Reset the form, user-interacted flag is reset");
   assert_false(optionalInput.matches(":user-invalid"), "Reset the form, user-interacted flag is reset");
 
   assert_false(optionalTextarea.matches(":user-valid"), "Reset the form, user-interacted flag is reset");
   assert_false(optionalTextarea.matches(":user-invalid"), "Reset the form, user-interacted flag is reset");
+
+  // Test programmatic form submission with constraint validation.
+  form.requestSubmit();
+
+  assert_true(optionalInput.matches(":user-valid"), "Called form.requestSubmit(), input is validated");
+  assert_false(optionalInput.matches(":user-invalid"), "Called form.requestSubmit(), input is validated");
+
+  assert_true(optionalTextarea.matches(":user-valid"), "Called form.requestSubmit(), textarea is validated");
+  assert_false(optionalTextarea.matches(":user-invalid"), "Called form.requestSubmit(), textarea is validated");
 }, ":user-valid selector properly interacts with submit & reset buttons");
 </script>
diff --git a/tests/wpt/tests/css/selectors/valid-invalid-form-fieldset.html b/tests/wpt/tests/css/selectors/valid-invalid-form-fieldset.html
new file mode 100644
index 00000000000..95bfd9c844c
--- /dev/null
+++ b/tests/wpt/tests/css/selectors/valid-invalid-form-fieldset.html
@@ -0,0 +1,75 @@
+<!DOCTYPE html>
+<link rel=author href="mailto:jarhar@chromium.org">
+<link rel=help href="https://github.com/w3c/csswg-drafts/issues/9257">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+
+<form>
+  <fieldset>
+    <input type=email>
+    <input type=submit>
+  </fieldset>
+</form>
+
+<script>
+promise_test(async () => {
+  const form = document.querySelector('form');
+  const fieldset = document.querySelector('fieldset');
+  const input = document.querySelector('input[type=email]');
+
+  assert_false(form.matches(':invalid'), 'form should not initially match :invalid.');
+  assert_true(form.matches(':valid'), 'form should initialy match :valid.');
+  assert_false(form.matches(':user-valid'), 'initial state: form should never match :user-valid.');
+  assert_false(form.matches(':user-invalid'), 'initial state: form should never match :user-invalid.');
+
+  assert_false(fieldset.matches(':invalid'), 'fieldset should not initially match :invalid.');
+  assert_true(fieldset.matches(':valid'), 'fieldset should initialy match :valid.');
+  assert_false(fieldset.matches(':user-valid'), 'initial state: fieldset should never match :user-valid.');
+  assert_false(fieldset.matches(':user-invalid'), 'initial state: fieldset should never match :user-invalid.');
+
+  assert_false(input.matches(':invalid'), 'input should not initially match :invalid.');
+  assert_true(input.matches(':valid'), 'input should initialy match :valid.');
+  assert_false(input.matches(':user-valid'), 'input should not initialy match :user-valid.');
+  assert_false(input.matches(':user-invalid'), 'input should not initialy match :user-invalid.');
+
+  await test_driver.click(input);
+  await test_driver.send_keys(input, 'user');
+  input.blur();
+
+  assert_true(form.matches(':invalid'), 'form should match :invalid after invalid text was entered.');
+  assert_false(form.matches(':valid'), 'form should not match :valid after invalid text was entered.');
+  assert_false(form.matches(':user-valid'), 'after text was entered: form should never match :user-valid.');
+  assert_false(form.matches(':user-invalid'), 'after text was entered: form should never match :user-invalid.');
+
+  assert_true(fieldset.matches(':invalid'), 'fieldset should match :invalid after invalid text was entered.');
+  assert_false(fieldset.matches(':valid'), 'fieldset should not match :valid after invalid text was entered.');
+  assert_false(fieldset.matches(':user-valid'), 'after invalid text was entered: fieldset should never match :user-valid.');
+  assert_false(fieldset.matches(':user-invalid'), 'after ininvalid text was entered: fieldset should never match :user-invalid.');
+
+  assert_true(input.matches(':invalid'), 'input should match :invalid after invalid text was entered.');
+  assert_false(input.matches(':valid'), 'input should not match :valid after invalid text was entered.');
+  assert_false(input.matches(':user-valid'), 'input should not match :user-valid after invalid text was entered.');
+  assert_true(input.matches(':user-invalid'), 'input should match :user-invalid after invalid text was entered.');
+
+  await test_driver.click(input);
+  await test_driver.send_keys(input, '@example.com');
+  await input.blur();
+
+  assert_false(form.matches(':invalid'), 'form should not match :invalid after valid text was entered.');
+  assert_true(form.matches(':valid'), 'form should match :valid after valid text was entered.');
+  assert_false(form.matches(':user-valid'), 'after valid text was entered: form should never match :user-valid.');
+  assert_false(form.matches(':user-invalid'), 'after invalid text was entered: form should never match :user-invalid.');
+
+  assert_false(fieldset.matches(':invalid'), 'fieldset should not match :invalid after valid text was entered.');
+  assert_true(fieldset.matches(':valid'), 'fieldset should match :valid after valid text was entered.');
+  assert_false(fieldset.matches(':user-valid'), 'after valid text was entered: fieldset should never match :user-valid.');
+  assert_false(fieldset.matches(':user-invalid'), 'after invalid text was entered: fieldset should never match :user-invalid.');
+
+  assert_false(input.matches(':invalid'), 'input should not match :invalid after valid text was entered.');
+  assert_true(input.matches(':valid'), 'input should match :valid after valid text was entered.');
+  assert_true(input.matches(':user-valid'), 'input should match :user-valid after valid text was entered.');
+  assert_false(input.matches(':user-invalid'), 'input should not match :user-invalid after invalid text was entered.');
+}, 'form and fieldset elements should match :valid/:invalid but not :user-valid/:user-invalid.');
+</script>
diff --git a/tests/wpt/tests/css/support/color-testcommon.js b/tests/wpt/tests/css/support/color-testcommon.js
new file mode 100644
index 00000000000..44ca0bbb33c
--- /dev/null
+++ b/tests/wpt/tests/css/support/color-testcommon.js
@@ -0,0 +1,81 @@
+'use strict';
+
+/**
+ * Set up a test for color properties that does not expect exact equality for
+ * numeric values within the color. This is necessary for color-mix and
+ * relative color syntax, which perform float arithmetic on color channels.
+ *
+ * @param {number} epsilon       Epsilon for comparison of numeric values.
+ */
+function set_up_fuzzy_color_test(epsilon) {
+  if (!epsilon) {
+    epsilon = 0.01;
+  }
+
+  // The function
+  function fuzzy_compare_colors(input, expected) {
+    const colorElementDividers = /( |\(|,)/;
+    // Return the string stripped of numbers.
+    function getNonNumbers(color) {
+      return color.replace(/[0-9\.]/g, '');
+    }
+    // Return an array of all numbers in the color.
+    function getNumbers(color) {
+      const result = [];
+      color.split(colorElementDividers).forEach(element => {
+        const numberElement = parseFloat(element);
+        if (!isNaN(numberElement)) {
+          result.push(numberElement);
+        }
+      });
+      return result;
+    }
+
+    try {
+      assert_array_approx_equals(getNumbers(input), getNumbers(expected), epsilon, "Numeric parameters are approximately equal.");
+      // Assert that the text of the two colors are equal. i.e. colorSpace, colorFunction and format.
+      assert_equals(getNonNumbers(input), getNonNumbers(expected), "Color format is correct.");
+    } catch (error) {
+      throw `Colors do not match.\nActual:   ${input}\nExpected: ${expected}.\n${error}`
+    }
+  }
+
+  return fuzzy_compare_colors;
+}
+
+/**
+ * Test the computed value of a color with some tolerance for numeric parameters.
+ *
+ * @param {string} specified  A specified value for the color.
+ * @param {string} computed   The expected computed color. If omitted, defaults
+ *                            to the default test_computed_value test, as
+ *                            fuzziness is unnecessary.
+ * @param {object} epsilon    Epsilon for comparison of numeric values.
+ */
+
+function fuzzy_test_computed_color(specified, computed, epsilon) {
+  if (!computed) {
+    test_computed_value("color", specified);
+    return;
+  }
+
+  test_computed_value("color", specified, computed, undefined /* titleExtra */, {comparisonFunction: set_up_fuzzy_color_test(epsilon)});
+}
+
+/**
+ * Test the parsed value of a color.
+ *
+ * @param {string} specified  A specified value for the property.
+ * @param {string} parsed     The expected parsed color. If omitted, defaults
+ *                            to the default test_valid_value test, as
+ *                            fuzziness is unnecessary.
+ * @param {object} epsilon    Epsilon for comparison of numeric values.
+ */
+function fuzzy_test_valid_color(specified, parsed, epsilon) {
+  if (!parsed) {
+    test_valid_value("color", specified);
+    return;
+  }
+
+  test_valid_value("color", specified, parsed, {comparisonFunction: set_up_fuzzy_color_test(epsilon)});
+}
diff --git a/tests/wpt/tests/css/support/computed-testcommon.js b/tests/wpt/tests/css/support/computed-testcommon.js
index 31bf451ecf3..8e746258061 100644
--- a/tests/wpt/tests/css/support/computed-testcommon.js
+++ b/tests/wpt/tests/css/support/computed-testcommon.js
@@ -9,8 +9,13 @@
  * @param {string|array} computed  The expected computed value,
  *                                 or an array of permitted computed value.
  *                                 If omitted, defaults to specified.
+ * @param {string} titleExtra Additional information to put in test output.
+ * @param {object} options  Additional test information, such as a custom
+ *                          comparison function required for color tests.
+ *                          comparisonFunction is a function that takes two
+ *                          arguments, actual and expected and contains asserts.
  */
-function test_computed_value(property, specified, computed, titleExtra) {
+function test_computed_value(property, specified, computed, titleExtra, options = {}) {
   if (!computed)
     computed = specified;
 
@@ -22,13 +27,12 @@ function test_computed_value(property, specified, computed, titleExtra) {
     target.style[property] = specified;
 
     let readValue = getComputedStyle(target)[property];
-    if (Array.isArray(computed)) {
+    if (options.comparisonFunction) {
+      options.comparisonFunction(readValue, computed);
+    } else if (Array.isArray(computed)) {
       assert_in_array(readValue, computed);
     } else {
-      if (property == "color")
-        colorValuesAlmostEqual(readValue, computed, 0.0001, 1);
-      else
-        assert_equals(readValue, computed);
+      assert_equals(readValue, computed);
     }
     if (readValue !== specified) {
       target.style[property] = '';
@@ -39,32 +43,6 @@ function test_computed_value(property, specified, computed, titleExtra) {
   }, `Property ${property} value '${specified}'${titleExtra ? ' ' + titleExtra : ''}`);
 }
 
-function colorValuesAlmostEqual(color1, color2, float_epsilon, integer_epsilon) {
-  // Legacy color formats use integers in [0, 255] and thus will have wider epsilons
-  const epsilon = getNonNumbers(color1).startsWith("rgb") ? integer_epsilon : float_epsilon;
-  // Colors can be split by spaces, commas or the '(' character.
-  const colorElementDividers = /( |\(|,)/;
-  // Return the string stripped of numbers.
-  function getNonNumbers(color) {
-    return color.replace(/[0-9]/g, '');
-  }
-  // Return an array of all numbers in the color.
-  function getNumbers(color) {
-    const result = [];
-    color.split(colorElementDividers).forEach(element => {
-      const numberElement = parseFloat(element);
-      if (!isNaN(numberElement)) {
-        result.push(numberElement);
-      }
-    });
-    return result;
-  }
-
-  assert_array_approx_equals(getNumbers(color1), getNumbers(color2), epsilon, "Numeric parameters are approximately equal.");
-  // Assert that the text of the two colors are equal. i.e. colorSpace, colorFunction and format.
-  assert_equals(getNonNumbers(color1), getNonNumbers(color2), "Color format is correct.");
-}
-
 function testComputedValueGreaterOrLowerThan(property, specified, expected, titleExtra) {
     test(() => {
       const target = document.getElementById('target');
diff --git a/tests/wpt/tests/css/support/parsing-testcommon.js b/tests/wpt/tests/css/support/parsing-testcommon.js
index cc040be5116..e480f26b3f3 100644
--- a/tests/wpt/tests/css/support/parsing-testcommon.js
+++ b/tests/wpt/tests/css/support/parsing-testcommon.js
@@ -1,9 +1,20 @@
 'use strict';
 
-// serializedValue can be the expected serialization of value,
-// or an array of permitted serializations,
-// or omitted if value should serialize as value.
-function test_valid_value(property, value, serializedValue) {
+/**
+ * Create test that a CSS property computes to the expected value.
+ * The document element #target is used to perform the test.
+ *
+ * @param {string} property  The name of the CSS property being tested.
+ * @param {string} value     A specified value for the property.
+ * @param {string|array} serializedValue  The expected serialized value,
+ *                                 or an array of permitted serializations.
+ *                                 If omitted, defaults to the specified value.
+ * @param {object} options  Additional test information, such as a custom
+ *                          comparison function required for color tests.
+ *                          comparisonFunction is a function that takes two
+ *                          arguments, actual and expected and contains asserts.
+ */
+function test_valid_value(property, value, serializedValue, options = {}) {
     if (arguments.length < 3)
         serializedValue = value;
 
@@ -15,7 +26,9 @@ function test_valid_value(property, value, serializedValue) {
         div.style[property] = value;
         var readValue = div.style.getPropertyValue(property);
         assert_not_equals(readValue, "", "property should be set");
-        if (Array.isArray(serializedValue))
+        if (options.comparisonFunction)
+            options.comparisonFunction(readValue, serializedValue);
+        else if (Array.isArray(serializedValue))
             assert_in_array(readValue, serializedValue, "serialization should be sound");
         else
             assert_equals(readValue, serializedValue, "serialization should be canonical");
@@ -163,4 +176,4 @@ function test_keyframes_name_invalid(keyframes_name) {
         const sheet = _set_style(`@keyframes ${keyframes_name} {}`);
         assert_equals(sheet.cssRules.length, 0);
     }, `invalid: @keyframes ${keyframes_name} { }`);
-}
\ No newline at end of file
+}
diff --git a/tests/wpt/tests/css/zoom/tentative/basic-ref.html b/tests/wpt/tests/css/zoom/tentative/basic-ref.html
new file mode 100644
index 00000000000..5de90caf7f0
--- /dev/null
+++ b/tests/wpt/tests/css/zoom/tentative/basic-ref.html
@@ -0,0 +1,10 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSS test reference</title>
+<style>
+div {
+  background-color: green;
+}
+</style>
+<div style="width: 100px; height: 100px"></div>
+<div style="width: 200px; height: 200px;"></div>
diff --git a/tests/wpt/tests/css/zoom/tentative/basic.html b/tests/wpt/tests/css/zoom/tentative/basic.html
new file mode 100644
index 00000000000..fcd1761cfad
--- /dev/null
+++ b/tests/wpt/tests/css/zoom/tentative/basic.html
@@ -0,0 +1,15 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>zoom property: basic test</title>
+<link rel="author" href="mailto:emilio@crisal.io" title="Emilio Cobos Álvarez">
+<link rel="author" href="https://mozilla.com" title="Mozilla">
+<link rel="match" href="basic-ref.html">
+<style>
+div {
+  width: 100px;
+  height: 100px;
+  background-color: green;
+}
+</style>
+<div></div>
+<div style="zoom: 2"></div>
diff --git a/tests/wpt/tests/css/zoom/tentative/green-square-100px.html b/tests/wpt/tests/css/zoom/tentative/green-square-100px.html
new file mode 100644
index 00000000000..6677176230e
--- /dev/null
+++ b/tests/wpt/tests/css/zoom/tentative/green-square-100px.html
@@ -0,0 +1,3 @@
+<!doctype html>
+<meta charset="utf-8">
+<div style="width: 100px; height: 100px; background-color: green"></div>
diff --git a/tests/wpt/tests/css/zoom/tentative/inherited-length.html b/tests/wpt/tests/css/zoom/tentative/inherited-length.html
new file mode 100644
index 00000000000..2bc04ff0cbe
--- /dev/null
+++ b/tests/wpt/tests/css/zoom/tentative/inherited-length.html
@@ -0,0 +1,14 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>zoom property: inherited length into zoom</title>
+<link rel="author" href="mailto:emilio@crisal.io" title="Emilio Cobos Álvarez">
+<link rel="author" href="https://mozilla.com" title="Mozilla">
+<link rel="match" href="green-square-100px.html">
+<style>
+div {
+  background-color: green;
+}
+</style>
+<div style="width: 100px; height: 100px;">
+  <div style="zoom: 2; width: inherit;"></div>
+</div>
diff --git a/tests/wpt/tests/css/zoom/tentative/inherited.html b/tests/wpt/tests/css/zoom/tentative/inherited.html
new file mode 100644
index 00000000000..baa7f7ed8ac
--- /dev/null
+++ b/tests/wpt/tests/css/zoom/tentative/inherited.html
@@ -0,0 +1,20 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>Effective zoom value is inherited</title>
+<link rel="author" href="mailto:emilio@crisal.io" title="Emilio Cobos Álvarez">
+<link rel="author" href="https://mozilla.com" title="Mozilla">
+<link rel="match" href="basic-ref.html">
+<style>
+.container {
+  zoom: 2;
+}
+.child {
+  width: 100px;
+  height: 100px;
+  background-color: green;
+}
+</style>
+<div class="child"></div>
+<div class="container">
+  <div class="child"></div>
+</div>
diff --git a/tests/wpt/tests/css/zoom/tentative/parsing/zoom-computed.html b/tests/wpt/tests/css/zoom/tentative/parsing/zoom-computed.html
new file mode 100644
index 00000000000..37379014909
--- /dev/null
+++ b/tests/wpt/tests/css/zoom/tentative/parsing/zoom-computed.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Test: getComputedStyle().zoom</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/computed-testcommon.js"></script>
+<div id="target"></div>
+<script>
+test_computed_value("zoom", "normal", "1");
+
+test_computed_value("zoom", "1", "1");
+test_computed_value("zoom", "1.5", "1.5");
+test_computed_value("zoom", "0.75", "0.75");
+
+test_computed_value("zoom", "100%", "1");
+test_computed_value("zoom", "150%", "1.5");
+test_computed_value("zoom", "75%", "0.75");
+
+// Legacy crap, wat
+test_computed_value("zoom", "0", "1");
+test_computed_value("zoom", "0%", "1");
+</script>
diff --git a/tests/wpt/tests/css/zoom/tentative/parsing/zoom-valid.html b/tests/wpt/tests/css/zoom/tentative/parsing/zoom-valid.html
new file mode 100644
index 00000000000..3db16e0748b
--- /dev/null
+++ b/tests/wpt/tests/css/zoom/tentative/parsing/zoom-valid.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Test: parsing zoom with valid and invalid values</title>
+<link rel="author" title="Emilio Cobos Álvarez" href="mailto:emilio@crisal.io">
+<link rel="author" title="Mozilla" href="https://mozilla.com">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+<body>
+<script>
+test_valid_value("zoom", "normal");
+test_valid_value("zoom", "1");
+test_valid_value("zoom", "100%");
+test_valid_value("zoom", "0");
+test_valid_value("zoom", "0%");
+test_valid_value("zoom", "1.5");
+test_valid_value("zoom", "150%")
+test_valid_value("zoom", "75%");
+test_valid_value("zoom", "0.5");
+
+test_invalid_value("zoom", "auto");
+test_invalid_value("zoom", "-100%");
+test_invalid_value("zoom", "-200%");
+test_invalid_value("zoom", "-1");
+test_invalid_value("zoom", "-2");
+</script>
diff --git a/tests/wpt/tests/css/zoom/tentative/scrollbar-crash.html b/tests/wpt/tests/css/zoom/tentative/scrollbar-crash.html
new file mode 100644
index 00000000000..791022407fd
--- /dev/null
+++ b/tests/wpt/tests/css/zoom/tentative/scrollbar-crash.html
@@ -0,0 +1,2 @@
+<textarea style="zoom: 0.20">
+
diff --git a/tests/wpt/tests/custom-elements/form-associated/focusability.html b/tests/wpt/tests/custom-elements/form-associated/focusability.html
new file mode 100644
index 00000000000..cc12b7d51b9
--- /dev/null
+++ b/tests/wpt/tests/custom-elements/form-associated/focusability.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<title>Focusability of form-associated custom elements</title>
+<link rel="author" title="Michael[tm] Smith" href="mailto:mike@w3.org">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<x-foo></x-foo>
+<x-bar tabindex=0></x-bar>
+<x-baz tabindex=0 disabled></x-baz>
+<script>
+  test(() => {
+    customElements.define(
+        'x-foo',
+        class Foo extends HTMLElement {
+            static formAssociated = true;
+        }
+    );
+    const foo = document.querySelector('x-foo');
+    foo.focus();
+    assert_false(document.activeElement === foo,
+      "FACE without tabindex is not focusable.");
+    customElements.define(
+        'x-bar',
+        class bar extends HTMLElement {
+            static formAssociated = true;
+        }
+    );
+    const bar = document.querySelector('x-bar');
+    bar.focus();
+    assert_true(document.activeElement === bar,
+      "FACE with tabindex is focusable.");
+    customElements.define(
+        'x-baz',
+        class baz extends HTMLElement {
+            static formAssociated = true;
+        }
+    );
+    const baz = document.querySelector('x-baz');
+    baz.focus();
+    assert_false(document.activeElement === baz,
+      "Disabled FACE with tabindex is not focusable.");
+  });
+</script>
+</html>
diff --git a/tests/wpt/tests/custom-elements/reactions/Document.html b/tests/wpt/tests/custom-elements/reactions/Document.html
index 1f05982a90c..4c5d2eb6e2e 100644
--- a/tests/wpt/tests/custom-elements/reactions/Document.html
+++ b/tests/wpt/tests/custom-elements/reactions/Document.html
@@ -61,6 +61,7 @@ test_with_window(function (contentWindow, contentDocument) {
     assert_array_equals(element.takeLog().types(), ['constructed', 'connected']);
 
     container.focus();
+    contentDocument.getSelection().collapse(container, 1);
     contentDocument.execCommand('delete', false, null);
 
     assert_array_equals(element.takeLog().types(), ['disconnected']);
diff --git a/tests/wpt/tests/custom-elements/scoped-registry/ShadowRoot-createElement.tentative.html b/tests/wpt/tests/custom-elements/scoped-registry/ShadowRoot-createElement.tentative.html
new file mode 100644
index 00000000000..335773f9c6d
--- /dev/null
+++ b/tests/wpt/tests/custom-elements/scoped-registry/ShadowRoot-createElement.tentative.html
@@ -0,0 +1,95 @@
+<!DOCTYPE html>
+<title>Tests ShadowRoot.createElement APIs work with scoped custom element registries</title>
+<meta name="author" title="Xiaocheng Hu" href="mailto:xiaochengh@chromium.org">
+<link rel="help" href="https://wicg.github.io/webcomponents/proposals/Scoped-Custom-Element-Registries">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<body>
+<script>
+class TestAutonomous extends HTMLElement {};
+class TestCustomizedBuiltIn extends HTMLParagraphElement {};
+
+function attachShadowForTest(t, registry) {
+  const host = document.createElement('div');
+  const shadow = host.attachShadow({mode: 'open', registry});
+  document.body.appendChild(host);
+  t.add_cleanup(() => host.remove());
+  return shadow;
+}
+
+test(t => {
+  const registry = new CustomElementRegistry;
+  registry.define('test-element', TestAutonomous);
+
+  const shadow = attachShadowForTest(t, registry);
+  assert_true(shadow.createElement('test-element') instanceof TestAutonomous);
+
+  // Verify that it doesn't pollute other tree scopes.
+  const shadow2 = attachShadowForTest(t);
+  assert_false(shadow2.createElement('test-element') instanceof TestAutonomous);
+
+  const shadow3 = attachShadowForTest(t, new CustomElementRegistry);
+  assert_false(shadow3.createElement('test-element') instanceof TestAutonomous);
+
+  assert_false(document.createElement('test-element') instanceof TestAutonomous);
+}, 'ShadowRoot.createElement() for autonomous custom element');
+
+test(t => {
+  const html = 'http://www.w3.org/1999/xhtml';
+
+  const registry = new CustomElementRegistry;
+  registry.define('test-element', TestAutonomous);
+
+  const shadow = attachShadowForTest(t, registry);
+  assert_true(shadow.createElementNS(html, 'test-element') instanceof TestAutonomous);
+
+  // Verify that it doesn't pollute other tree scopes.
+  const shadow2 = attachShadowForTest(t);
+  assert_false(shadow2.createElementNS(html, 'test-element') instanceof TestAutonomous);
+
+  const shadow3 = attachShadowForTest(t, new CustomElementRegistry);
+  assert_false(shadow3.createElementNS(html, 'test-element') instanceof TestAutonomous);
+
+  assert_false(document.createElementNS(html, 'test-element') instanceof TestAutonomous);
+}, 'ShadowRoot.createElementNS() for autonomous custom element');
+
+test(t => {
+  const registry = new CustomElementRegistry;
+  registry.define('test-element', TestCustomizedBuiltIn, {extends: 'p'});
+
+  const shadow = attachShadowForTest(t, registry);
+  assert_true(shadow.createElement('p', {is: 'test-element'}) instanceof TestCustomizedBuiltIn);
+
+  // Verify that it doesn't pollute other tree scopes.
+  const shadow2 = attachShadowForTest(t);
+  assert_false(shadow2.createElement('p', {is: 'test-element'}) instanceof TestCustomizedBuiltIn);
+
+  const shadow3 = attachShadowForTest(t, new CustomElementRegistry);
+  assert_false(shadow3.createElement('p', {is: 'test-element'}) instanceof TestCustomizedBuiltIn);
+
+  assert_false(document.createElement('p', {is: 'test-element'}) instanceof TestCustomizedBuiltIn);
+}, 'ShadowRoot.createElement() for customized built-in element');
+
+test(t => {
+  const html = 'http://www.w3.org/1999/xhtml';
+
+  const registry = new CustomElementRegistry;
+  registry.define('test-element', TestCustomizedBuiltIn, {extends: 'p'});
+
+  const shadow = attachShadowForTest(t, registry);
+  assert_true(shadow.createElementNS(html, 'p', {is: 'test-element'}) instanceof TestCustomizedBuiltIn);
+
+  // Verify that it doesn't pollute other tree scopes.
+  const shadow2 = attachShadowForTest(t);
+  assert_false(shadow2.createElementNS(html, 'p', {is: 'test-element'}) instanceof TestCustomizedBuiltIn);
+
+  const shadow3 = attachShadowForTest(t, new CustomElementRegistry);
+  assert_false(shadow3.createElementNS(html, 'p', {is: 'test-element'}) instanceof TestCustomizedBuiltIn);
+
+  assert_false(document.createElementNS(html, 'p', {is: 'test-element'}) instanceof TestCustomizedBuiltIn);
+}, 'ShadowRoot.createElementNS() for customized built-in element');
+
+</script>
+</body>
+
diff --git a/tests/wpt/tests/docs/Dockerfile b/tests/wpt/tests/docs/Dockerfile
index 75755268666..8732db2f7ec 100644
--- a/tests/wpt/tests/docs/Dockerfile
+++ b/tests/wpt/tests/docs/Dockerfile
@@ -1,11 +1,11 @@
-FROM ubuntu:20.04
+FROM python:3.11
 
 # No interactive frontend during docker build
 ENV DEBIAN_FRONTEND=noninteractive \
     DEBCONF_NONINTERACTIVE_SEEN=true
 
 RUN apt-get -qqy update \
-  && apt-get -qqy install git npm python3 python3-venv
+  && apt-get -qqy install git npm
 
 WORKDIR /app/
 
diff --git a/tests/wpt/tests/docs/admin/index.md b/tests/wpt/tests/docs/admin/index.md
index f42d3075b6b..e0ec8b2b26c 100644
--- a/tests/wpt/tests/docs/admin/index.md
+++ b/tests/wpt/tests/docs/admin/index.md
@@ -76,11 +76,11 @@ explicitly-managed secret.
   - kyleju@google.com
   - pastithas@google.com
 - E-mail address: wpt.pr.bot@gmail.com
-  - smcgruer@google.com
+  - jamescscott@google.com
   - boaz@bocoup.com
   - mike@bocoup.com
 - [GitHub](https://github.com/): @wpt-pr-bot account
-  - smcgruer@google.com
+  - jamescscott@google.com
   - boaz@bocoup.com
   - mike@bocoup.com
 
diff --git a/tests/wpt/tests/docs/running-tests/android_webview.md b/tests/wpt/tests/docs/running-tests/android_webview.md
index 4a86814fdf7..4e3623c664e 100644
--- a/tests/wpt/tests/docs/running-tests/android_webview.md
+++ b/tests/wpt/tests/docs/running-tests/android_webview.md
@@ -32,7 +32,7 @@ If you have an issue with ChromeDriver version mismatch, try one of the followin
 
 Configure host remap rules in the [webview commandline file](https://cs.chromium.org/chromium/src/android_webview/docs/commandline-flags.md?l=57):
 ```
-adb shell "echo '_ --host-resolver-rules=\"MAP nonexistent.*.test ~NOTFOUND, MAP *.test 127.0.0.1\"' > /data/local/tmp/webview-command-line"
+adb shell "echo '_ --host-resolver-rules=\"MAP nonexistent.*.test ^NOTFOUND, MAP *.test 127.0.0.1\"' > /data/local/tmp/webview-command-line"
 ```
 
 Ensure that `adb` can be found on your system's PATH.
diff --git a/tests/wpt/tests/docs/writing-tests/testdriver.md b/tests/wpt/tests/docs/writing-tests/testdriver.md
index e482452aef3..d5f7f8d3667 100644
--- a/tests/wpt/tests/docs/writing-tests/testdriver.md
+++ b/tests/wpt/tests/docs/writing-tests/testdriver.md
@@ -94,7 +94,7 @@ the global scope.
 
 ```
 
-### Seure Payment Confirmation ###
+### Secure Payment Confirmation ###
 ```eval_rst
 .. js:autofunction:: test_driver.set_spc_transaction_mode
 ```
@@ -102,6 +102,7 @@ the global scope.
 ### Federated Credential Management ###
 ```eval_rst
 .. js:autofunction:: test_driver.cancel_fedcm_dialog
+.. js:autofunction:: test_driver.confirm_idp_login
 .. js:autofunction:: test_driver.select_fedcm_account
 .. js:autofunction:: test_driver.get_fedcm_account_list
 .. js:autofunction:: test_driver.get_fedcm_dialog_title
@@ -158,9 +159,9 @@ The requirement to have a handle to the test window does mean it's
 currently not possible to write tests where such handles can't be
 obtained e.g. in the case of `rel=noopener`.
 
-## Actions ##
+### Actions ###
 
-### Markup ###
+#### Markup ####
 
 To use the [Actions](#Actions) API `testdriver-actions.js` must be
 included in the document, in addition to `testdriver.js`:
@@ -169,7 +170,7 @@ included in the document, in addition to `testdriver.js`:
 <script src="/resources/testdriver-actions.js"></script>
 ```
 
-### API ###
+#### API ####
 
 ```eval_rst
 .. js:autoclass:: Actions
@@ -177,7 +178,7 @@ included in the document, in addition to `testdriver.js`:
 ```
 
 
-### Using in other browsing contexts ###
+#### Using in other browsing contexts ####
 
 For the actions API, the context can be set using the `setContext`
 method on the builder:
@@ -194,53 +195,3 @@ Note that if an action uses an element reference, the context will be
 derived from that element, and must match any explicitly set
 context. Using elements in multiple contexts in a single action chain
 is not supported.
-
-### send_keys
-
-Usage: `test_driver.send_keys(element, keys)`
- * _element_: a DOM Element object
- * _keys_: string to send to the element
-
-This function causes the string _keys_ to be sent to the target
-element (an `Element` object), potentially scrolling the document to
-make it possible to send keys. It returns a promise that resolves
-after the keys have been sent, or rejects if the keys cannot be sent
-to the element.
-
-This works with elements in other frames/windows as long as they are
-same-origin with the test, and the test does not depend on the
-window.name property remaining unset on the target window.
-
-Note that if the element that the keys need to be sent to does not have
-a unique ID, the document must not have any DOM mutations made
-between the function being called and the promise settling.
-
-To send special keys, one must send the respective key's codepoint. Since this uses the WebDriver protocol, you can find a [list for code points to special keys in the spec](https://w3c.github.io/webdriver/#keyboard-actions).
-For example, to send the tab key you would send "\uE004".
-
-_Note: these special-key codepoints are not necessarily what you would expect. For example, <kbd>Esc</kbd> is the invalid Unicode character `\uE00C`, not the `\u001B` Escape character from ASCII._
-
-[activation]: https://html.spec.whatwg.org/multipage/interaction.html#activation
-
-### set_permission
-
-Usage: `test_driver.set_permission(descriptor, state, context=null)`
- * _descriptor_: a
-   [PermissionDescriptor](https://w3c.github.io/permissions/#dictdef-permissiondescriptor)
-   or derived object
- * _state_: a
-   [PermissionState](https://w3c.github.io/permissions/#enumdef-permissionstate)
-   value
- * context: a WindowProxy for the browsing context in which to perform the call
-
-This function causes permission requests and queries for the status of a
-certain permission type (e.g. "push", or "background-fetch") to always
-return _state_. It returns a promise that resolves after the permission has
-been set to be overridden with _state_.
-
-Example:
-
-``` js
-await test_driver.set_permission({ name: "background-fetch" }, "denied");
-await test_driver.set_permission({ name: "push", userVisibleOnly: true }, "granted");
-```
diff --git a/tests/wpt/tests/docs/writing-tests/testharness-api.md b/tests/wpt/tests/docs/writing-tests/testharness-api.md
index 339815c5ffe..56dc4a4417a 100644
--- a/tests/wpt/tests/docs/writing-tests/testharness-api.md
+++ b/tests/wpt/tests/docs/writing-tests/testharness-api.md
@@ -247,7 +247,7 @@ as resetting global state that need to happen consistently before the
 next test starts.
 
 To test that a promise rejects with a specified exception see [promise
-rejection].
+rejection](#promise-rejection).
 
 ### Single Page Tests ###
 
diff --git a/tests/wpt/tests/dom/META.yml b/tests/wpt/tests/dom/META.yml
index 6fd5b12664d..fb6dd26bd3a 100644
--- a/tests/wpt/tests/dom/META.yml
+++ b/tests/wpt/tests/dom/META.yml
@@ -1,5 +1,4 @@
 spec: https://dom.spec.whatwg.org/
 suggested_reviewers:
   - jdm
-  - zqzhang
   - annevk
diff --git a/tests/wpt/tests/dom/events/Event-dispatch-single-activation-behavior.html b/tests/wpt/tests/dom/events/Event-dispatch-single-activation-behavior.html
new file mode 100644
index 00000000000..2b6568a60af
--- /dev/null
+++ b/tests/wpt/tests/dom/events/Event-dispatch-single-activation-behavior.html
@@ -0,0 +1,164 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<title> Only one activation behavior is executed during dispatch</title>
+<link rel="author" title="Vincent Hilla" href="mailto:vhilla@mozilla.com">
+<link rel="help" href="https://dom.spec.whatwg.org/#eventtarget-activation-behavior">
+<link rel="help" href="https://dom.spec.whatwg.org/#concept-event-dispatch">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id=log></div>
+
+<div id=test_container></div>
+
+<!--
+    Three classes:
+    click
+        Element to be clicked to cause activation behavior
+    activates
+        Element that registers the activation behavior
+    container
+        Element in which other elements with activation behavior are placed.
+        We test that those won't be activated too.
+-->
+<template>
+    <!--input, change event bubble, so have to check if checked is true-->
+    <input class="click activates container" type="checkbox" oninput="this.checked ? activated(this) : null">
+    <input class="click activates container" type="radio" oninput="this.checked ? activated(this) : null">
+    <form onsubmit="activated(this); return false" class="activates">
+        <input class="click container" type="submit">
+    </form>
+    <form onsubmit="activated(this); return false" class="activates">
+        <input class="click container" type="image">
+    </form>
+    <form onreset="activated(this)" class="activates">
+        <input class="click container" type="reset">
+    </form>
+    <form onsubmit="activated(this); return false" class="activates">
+        <button class="click container" type="submit"></button>
+    </form>
+    <form onreset="activated(this)" class="activates">
+        <button class="click container" type="reset"></button>
+    </form>
+    <a href="#link" class="click container activates"></a>
+    <area href="#link" class="click container activates">
+    <details ontoggle="activated(this)" class="activates">
+        <summary class="click container"></summary>
+    </details>
+    <label>
+      <input type=checkbox onclick="this.checked ? activated(this) : null" class="activates">
+      <span class="click container">label</span>
+    </label>
+    <!--activation behavior of label for event targeted at interactive content descendant is to do nothing-->
+    <label class="container">
+        <button class="click" type="button"></button>
+    </label>
+</template>
+
+<script>
+let activations = [];
+function activated(e) {
+    activations.push(e);
+}
+
+function getActivations(testidx) {
+    return activations.filter(a =>
+        (a.endsWith && a.endsWith("test"+testidx+"_link"))
+        || (a.classList && a.classList.contains("test"+testidx))
+    );
+}
+
+// for a and area elements
+window.onhashchange = function(e) {
+    if (e.newURL.endsWith("link")) {
+        activated(e.newURL);
+    }
+    window.location.hash = "";
+};
+
+function getElementsByClassNameInclusive(e, clsname) {
+    let ls = Array.from(e.getElementsByClassName(clsname));
+    if (e.classList.contains(clsname)) ls.push(e);
+    return ls;
+}
+
+function getClickTarget(e) {
+    return getElementsByClassNameInclusive(e, "click")[0];
+}
+
+function getContainer(e) {
+    return getElementsByClassNameInclusive(e, "container")[0];
+}
+
+function getExpectedActivations(e) {
+    let ls = getElementsByClassNameInclusive(e, "activates");
+
+    // special case, for a and area the window registers the activation
+    // have to use string, as testrunner cannot stringify the window object
+    ls = ls.map(e => e.tagName === "A" || e.tagName === "AREA" ? e.href : e);
+
+    return ls;
+}
+
+function toString(e) {
+    const children = Array.from(e.children);
+    const childstr = (children.map(toString)).join("");
+    const tag = e.tagName;
+    const typestr = e.type ? " type="+e.type : "";
+    return `<${tag}${typestr}>${childstr}</${tag}>`;
+}
+
+// generate O(n^2) test combinations
+const template = document.querySelector("template");
+const elements = Array.from(template.content.children);
+const tests = []
+for (const target of elements) {
+    for (const parent of elements) {
+        if (target === parent) continue;
+        tests.push([target.cloneNode(true), parent.cloneNode(true)])
+    }
+}
+
+const test_container = document.getElementById("test_container");
+
+/**
+ * Test that if two elements in an event target chain have activation behavior,
+ * only one of them will be activated.
+ *
+ * Each child of <template> represents one case of activation behavior.
+ * The behavior should be triggered by clicking the element of class click
+ * and will manifest as a call to activated().
+ *
+ * For each [target, parent] in tests, we make target a descendant of parent
+ * and test that only target gets activated when dispatching a click.
+ */
+for (let i = 0; i < tests.length; i++) {
+    let [target, parent] = tests[i];
+    async_test(function(t) {
+        let test = document.createElement("div");
+        test_container.appendChild(test);
+        test.appendChild(parent);
+        getContainer(parent).appendChild(target);
+
+        // for later filtering out the activations belonging to this test
+        for (let e of test.getElementsByClassName("activates")) {
+            e.classList.add("test"+i);
+        }
+        for (let e of test.querySelectorAll("a, area")) {
+            e.href = "#test"+i+"_link";
+        }
+
+        getClickTarget(target).click();
+
+        // Need to spin event loop twice, as some clicks might dispatch another task
+        t.step_timeout(() => {
+            t.step_timeout(t.step_func_done(() => {
+                    assert_array_equals(getActivations(i), getExpectedActivations(target));
+            }), 0);
+        }, 0);
+
+        t.add_cleanup(function() {
+            test_container.removeChild(test);
+        });
+    }, `When clicking child ${toString(target)} of parent ${toString(parent)}, only child should be activated.`);
+}
+</script>
diff --git a/tests/wpt/tests/dom/events/scrolling/overscroll-deltas.html b/tests/wpt/tests/dom/events/scrolling/overscroll-deltas.html
index 6574a56a1e6..e13e9f1cce5 100644
--- a/tests/wpt/tests/dom/events/scrolling/overscroll-deltas.html
+++ b/tests/wpt/tests/dom/events/scrolling/overscroll-deltas.html
@@ -62,8 +62,18 @@
     overscrolled_y_deltas = [];
   }
 
-  function fail() {
-    assert_true(false);
+  function waitForOverscrollEventWithMinDelta(target, min_x = 0, min_y = 0) {
+    return new Promise((resolve) => {
+      target.addEventListener("overscroll", (evt) => {
+        if (evt.deltaX >= min_x && evt.deltaY >= min_y) {
+          resolve();
+        }
+      });
+    });
+  }
+
+  function unreachedScrollendListener() {
+    assert_unreached('Unexpected scrollend event');
   }
 
   document.addEventListener("overscroll", onOverscroll);
@@ -84,25 +94,25 @@
       assert_equals(target_div.scrollTop, max_target_div_scroll_top,
       "target_div should be fully scrolled down");
 
-      let overscroll_promise = waitForOverscrollEvent(t, document, 2000);
+      // Even though we request 300 extra pixels of scroll, the API above doesn't
+      // guarantee how much scroll delta will be generated - different browsers
+      // can consume different amounts for "touch slop" (for example). Ensure the
+      // overscroll reaches at least 250 pixels which is a fairly conservative
+      // value.
+      let overscroll_promise = waitForOverscrollEventWithMinDelta(document,
+          /*min_x*/0, /*min_y*/250);
       scrollend_promise = waitForScrollendEvent(t, document, 2000);
-      target_div.addEventListener("scrollend", fail);
+      target_div.addEventListener("scrollend", unreachedScrollendListener);
       // Scroll target div vertically and wait for the doc to get scrollend event.
       await scrollElementDown(target_div, target_div.clientHeight + 300);
       await waitForCompositorCommit();
       await overscroll_promise;
       await scrollend_promise;
 
-      target_div.removeEventListener("scrollend", fail);
-      // Even though we request 300 extra pixels of scroll, the API above doesn't
-      // guarantee how much scroll delta will be generated - different browsers
-      // can consume different amounts for "touch slop" (for example). Ensure the
-      // overscroll reaches at least 250 pixels which is a fairly conservative
-      // value.
+      target_div.removeEventListener("scrollend", unreachedScrollendListener);
       assert_greater_than(overscrolled_y_deltas.length, 0, "There should be at least one overscroll events when overscrolling.");
       assert_equals(overscrolled_x_deltas.filter(function (x) { return x != 0; }).length, 0, "The deltaX attribute must be 0 when there is no scrolling in x direction.");
       assert_less_than_equal(Math.max(...overscrolled_y_deltas), 300, "The deltaY attribute must be <= the number of pixels overscrolled (300)");
-      assert_greater_than_equal(Math.max(...overscrolled_y_deltas), 250, "The deltaY attribute should be reasonably close to number of pixels overscrolled (300)");
       assert_greater_than(document.scrollingElement.scrollTop, target_div.clientHeight - 1,
         "document is scrolled by the height of target_div");
     }, "testing, vertical");
@@ -122,16 +132,17 @@
       assert_equals(target_div.scrollLeft, max_target_div_scroll_left,
         "target_div should be fully scrolled right");
 
-      let overscroll_promise = waitForOverscrollEvent(t, document, 2000);
+      let overscroll_promise = waitForOverscrollEventWithMinDelta(document,
+          /*min_x*/250, /*min_y*/ 0);
       scrollend_promise = waitForScrollendEvent(t, document, 2000);
-      target_div.addEventListener("scrollend", fail);
+      target_div.addEventListener("scrollend", unreachedScrollendListener);
       // Scroll target div horizontally and wait for the doc to get scrollend event.
       await scrollElementLeft(target_div, target_div.clientWidth + 300);
       await waitForCompositorCommit();
       await overscroll_promise;
       await scrollend_promise;
 
-      target_div.removeEventListener("scrollend", fail);
+      target_div.removeEventListener("scrollend", unreachedScrollendListener);
       assert_greater_than(document.scrollingElement.scrollLeft, target_div.clientWidth - 1,
         "document is scrolled by the height of target_div");
       // TODO(bokan): It looks like Chrome inappropriately filters some scroll
@@ -141,7 +152,6 @@
       assert_greater_than(overscrolled_x_deltas.length, 0, "There should be at least one overscroll events when overscrolling.");
       assert_equals(overscrolled_y_deltas.filter(function(x){ return x!=0; }).length, 0, "The deltaY attribute must be 0 when there is no scrolling in y direction.");
       assert_less_than_equal(Math.max(...overscrolled_x_deltas), 300, "The deltaX attribute must be <= number of pixels overscrolled (300)");
-      assert_greater_than_equal(Math.max(...overscrolled_x_deltas), 250, "The deltaX attribute should be reasonably close to the number of pixels overscrolled (300)");
     }, "testing, horizontal");
   }
 </script>
diff --git a/tests/wpt/tests/dom/events/scrolling/scroll_support.js b/tests/wpt/tests/dom/events/scrolling/scroll_support.js
index 52c2f58723a..f05251ce21a 100644
--- a/tests/wpt/tests/dom/events/scrolling/scroll_support.js
+++ b/tests/wpt/tests/dom/events/scrolling/scroll_support.js
@@ -14,8 +14,10 @@ async function waitForScrollendEvent(test, target, timeoutMs = 500) {
   return waitForEvent("scrollend", test, target, timeoutMs);
 }
 
-async function waitForOverscrollEvent(test, target, timeoutMs = 500) {
-  return waitForEvent("overscroll", test, target, timeoutMs);
+async function waitForScrollendEventNoTimeout(target) {
+  return new Promise((resolve) => {
+    target.addEventListener("scrollend", resolve);
+  });
 }
 
 async function waitForPointercancelEvent(test, target, timeoutMs = 500) {
diff --git a/tests/wpt/tests/dom/events/scrolling/scrollend-event-fires-to-iframe-inner-frame.html b/tests/wpt/tests/dom/events/scrolling/scrollend-event-fires-to-iframe-inner-frame.html
index 3657a8b8771..115e583c067 100644
--- a/tests/wpt/tests/dom/events/scrolling/scrollend-event-fires-to-iframe-inner-frame.html
+++ b/tests/wpt/tests/dom/events/scrolling/scrollend-event-fires-to-iframe-inner-frame.html
@@ -22,7 +22,7 @@
     }
   </style>
   <body>
-    <div id="scroller">
+    <div id="scroller" tabindex=0>
       <div id="inner-spacer"></div>
     </div>
     <div id="spacer"></div>
diff --git a/tests/wpt/tests/dom/events/scrolling/scrollend-event-fires-to-iframe-window.html b/tests/wpt/tests/dom/events/scrolling/scrollend-event-fires-to-iframe-window.html
index 1a20751bd53..4e531580870 100644
--- a/tests/wpt/tests/dom/events/scrolling/scrollend-event-fires-to-iframe-window.html
+++ b/tests/wpt/tests/dom/events/scrolling/scrollend-event-fires-to-iframe-window.html
@@ -71,7 +71,7 @@
       await waitForScrollReset(t, scroller);
       await waitForCompositorReady();
 
-      const targetScrollendPromise = waitForScrollendEvent(t, frame.contentDocument);
+      const targetScrollendPromise = waitForScrollendEventNoTimeout(frame.contentDocument);
       verifyNoScrollendOnDocument(t);
 
       let x = target_div.getBoundingClientRect().width + 20;
diff --git a/tests/wpt/tests/dom/events/scrolling/scrollend-user-scroll-common.js b/tests/wpt/tests/dom/events/scrolling/scrollend-user-scroll-common.js
index 34af4ce921e..5c278784d83 100644
--- a/tests/wpt/tests/dom/events/scrolling/scrollend-user-scroll-common.js
+++ b/tests/wpt/tests/dom/events/scrolling/scrollend-user-scroll-common.js
@@ -8,8 +8,7 @@ async function test_scrollend_on_touch_drag(t, target_div) {
   await resetTargetScrollState(t, target_div);
   await waitForCompositorReady();
 
-  const timeout = 3000; // Because we have two pauses we need longer timeout
-  const targetScrollendPromise = createScrollendPromiseForTarget(t, target_div, timeout);
+  const targetScrollendPromise = waitForScrollendEventNoTimeout(target_div);
   verifyNoScrollendOnDocument(t);
 
   let scrollend_count = 0;
@@ -54,7 +53,7 @@ async function test_scrollend_on_scrollbar_gutter_click(t, target_div) {
   await resetTargetScrollState(t, target_div);
   await waitForCompositorReady();
 
-  const targetScrollendPromise = createScrollendPromiseForTarget(t, target_div, 1000);
+  const targetScrollendPromise = waitForScrollendEventNoTimeout(target_div);
   verifyNoScrollendOnDocument(t);
 
   const bounds = target_div.getBoundingClientRect();
@@ -86,7 +85,7 @@ async function test_scrollend_on_scrollbar_thumb_drag(t, target_div) {
   await resetTargetScrollState(t, target_div);
   await waitForCompositorReady();
 
-  const targetScrollendPromise = createScrollendPromiseForTarget(t, target_div, 1000);
+  const targetScrollendPromise = waitForScrollendEventNoTimeout(target_div);
   verifyNoScrollendOnDocument(t);
 
   const bounds = target_div.getBoundingClientRect();
@@ -113,7 +112,7 @@ async function test_scrollend_on_mousewheel_scroll(t, target_div) {
   await resetTargetScrollState(t, target_div);
   await waitForCompositorReady();
 
-  const targetScrollendPromise = createScrollendPromiseForTarget(t, target_div);
+  const targetScrollendPromise = waitForScrollendEventNoTimeout(target_div);
   verifyNoScrollendOnDocument(t);
 
   const x = 0;
@@ -135,7 +134,7 @@ async function test_scrollend_on_keyboard_scroll(t, target_div) {
   await waitForCompositorReady();
 
   verifyNoScrollendOnDocument(t);
-  const targetScrollendPromise = createScrollendPromiseForTarget(t, target_div);
+  const targetScrollendPromise = waitForScrollendEventNoTimeout(target_div);
 
   target_div.focus();
   window.test_driver.send_keys(target_div, '\ue015');
diff --git a/tests/wpt/tests/dom/events/scrolling/scrollend-with-snap-on-fractional-offset.html b/tests/wpt/tests/dom/events/scrolling/scrollend-with-snap-on-fractional-offset.html
index 74dcb0f0bd0..d1f50304add 100644
--- a/tests/wpt/tests/dom/events/scrolling/scrollend-with-snap-on-fractional-offset.html
+++ b/tests/wpt/tests/dom/events/scrolling/scrollend-with-snap-on-fractional-offset.html
@@ -16,7 +16,7 @@
 
       .box {
         scroll-snap-align: start;
-        width: 600px;
+        width: 400px;
         position: absolute;
         top: 200px;
       }
diff --git a/tests/wpt/tests/dom/parts/basic-dom-part-declarative-brace-syntax.tentative.html b/tests/wpt/tests/dom/parts/basic-dom-part-declarative-brace-syntax.tentative.html
new file mode 100644
index 00000000000..dd5f1ba7b10
--- /dev/null
+++ b/tests/wpt/tests/dom/parts/basic-dom-part-declarative-brace-syntax.tentative.html
@@ -0,0 +1,235 @@
+<!DOCTYPE html>
+<title>DOM Parts: Basic object structure, {{}} declarative API</title>
+<meta name="author" href="mailto:masonf@chromium.org">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="./resources/domparts-utils.js"></script>
+
+<div>
+  <!-- Note - the test will remove this chunk of DOM once the test completes -->
+  <div id=target2>
+    Declarative syntax - The *two* templates below should have IDENTICAL STRUCTURE
+    to this one. There are four cases to test:
+      1. Main document parsing (this chunk)
+      2. Template parsing (the template below with id=declarative)
+      3. Template/fragment cloning (a clone of the template with id=declarative)
+      4. Declarative Shadow DOM parsing (template with id=declarative_shadow_dom and shadowrootmode attribute)
+    <h1 id="name" parseparts>
+      {{#}}
+        First
+        {{#}} <span {{}}>Middle</span> {{/}}
+        Last
+      {{/}}
+      <a foo {{}} id=nodepart1>content</a>
+      <a {{}} id=nodepart2>content</a>
+      <a {{}}id=nodepart3>content</a>
+      <a id=nodepart4 {{}}>content</a>
+      <a id=nodepart5 foo {{}}>content</a>
+      <a id=nodepart6 foo {{}} >content</a>
+    </h1>
+  </div>
+</div>
+<template id=declarative>
+  <div>
+    <div id=target3>Declarative syntax
+      <h1 id="name" parseparts>
+        {{#}}
+          First
+          {{#}} <span {{}}>Middle</span> {{/}}
+          Last
+        {{/}}
+        <a foo {{}} id=nodepart1>content</a>
+        <a {{}} id=nodepart2>content</a>
+        <a {{}}id=nodepart3>content</a>
+        <a id=nodepart4 {{}}>content</a>
+        <a id=nodepart5 foo {{}}>content</a>
+        <a id=nodepart6 foo {{}} >content</a>
+      </h1>
+    </div>
+  </div>
+</template>
+
+<!-- TODO: This test should look at declarative shadow DOM behavior. -->
+
+<script> {
+function addPartsCleanup(t,partRoot) {
+  t.add_cleanup(() => partRoot.getParts().forEach(part => part.disconnect()));
+}
+
+const template = document.getElementById('declarative');
+['Main Document','Template','Clone','PartClone'].forEach(testCase => {
+  function assertIsComment(node,commentText) {
+    assert_true(node instanceof Comment);
+    assert_equals(node.textContent,commentText);
+  }
+
+  test((t) => {
+    let doc,target,wrapper,cleanup;
+    let expectDOMParts = true;
+    switch (testCase) {
+      case 'Main Document':
+        doc = document;
+        target = doc.querySelector('#target2');
+        cleanup = [target.parentElement];
+        break;
+      case 'Template':
+        doc = template.content;
+        target = doc.querySelector('#target3');
+        cleanup = [];
+        break;
+      case 'Clone':
+        doc = document;
+        wrapper = document.body.appendChild(document.createElement('div'));
+        wrapper.appendChild(template.content.cloneNode(true));
+        target = wrapper.querySelector('#target3');
+        // A "normal" tree clone should not keep DOM Parts:
+        expectDOMParts = false;
+        cleanup = [wrapper];
+        break;
+      case 'PartClone':
+        doc = document;
+        wrapper = document.body.appendChild(document.createElement('div'));
+        wrapper.appendChild(template.content.getPartRoot().clone().rootContainer);
+        target = wrapper.querySelector('#target3');
+        // Even a PartRoot clone should not add parts to the document, when that
+        // clone is appendChilded to the document.
+        expectDOMParts = false;
+        cleanup = [wrapper];
+        break;
+      default:
+        assert_unreached('Invalid test case');
+    }
+    assert_true(!!(doc && target && target.parentElement));
+
+    const root = doc.getPartRoot();
+    t.add_cleanup(() => cleanup.forEach(el => el.remove())); // Cleanup
+    addPartsCleanup(t,root); // Clean up all Parts when this test ends.
+
+    assert_true(root instanceof DocumentPartRoot);
+    if (expectDOMParts) {
+      let expectedRootParts = [{type:'ChildNodePart',metadata:[]}];
+      for(let i=0;i<6;++i) {
+        expectedRootParts.push({type:'NodePart',metadata:[]});
+      }
+      assertEqualParts(root.getParts(),expectedRootParts,0,'declarative root missing parts');
+      for(let i=1;i<=6;++i) {
+        assert_equals(root.getParts()[i].node,target.querySelector(`#nodepart${i}`));
+      }
+      const childPart1 = root.getParts()[0];
+      assertIsComment(childPart1.previousSibling,'');
+      assertIsComment(childPart1.nextSibling,'');
+      const expectedChild1Parts = [{type:'ChildNodePart',metadata:[]}];
+      assertEqualParts(childPart1.getParts(),expectedChild1Parts,0,'First level childpart should just have one child part');
+      const childPart2 = childPart1.getParts()[0];
+      assertIsComment(childPart2.previousSibling,'');
+      assertIsComment(childPart2.nextSibling,'');
+      const expectedChild2Parts = [{type:'NodePart',metadata:[]}];
+      assertEqualParts(childPart2.getParts(),expectedChild2Parts,0,'Second level childpart should have just the node part');
+      assert_true(childPart2.getParts()[0].node instanceof HTMLSpanElement);
+      assert_equals(childPart2.getParts()[0].node.textContent,'Middle');
+    } else {
+      assertEqualParts(root.getParts(),[],[]);
+    }
+  }, `Basic declarative DOM Parts (${testCase})`);
+});
+
+}</script>
+
+<div parseparts>Before {{#}}Parts{{/}} After</div>
+<script>
+  test((t) => {
+    const target = document.currentScript.previousElementSibling;
+    t.add_cleanup(() => target.remove());
+    const root = document.getPartRoot();
+    addPartsCleanup(t,root);
+    assert_equals(root.getParts().length,1);
+    assert_equals(target.innerHTML,'Before <!---->Parts<!----> After');
+
+    // Verify that removing the parseparts attribute does nothing.
+    target.removeAttribute('parseparts');
+    assert_equals(root.getParts().length,1);
+    assert_equals(target.innerHTML,'Before <!---->Parts<!----> After');
+  }, 'Post-parsing structure of child parts, and stickiness');
+</script>
+
+<div>Before {{#}}Parts{{/}} After</div>
+<script>{
+  test((t) => {
+    const target = document.currentScript.previousElementSibling;
+    t.add_cleanup(() => target.remove());
+    const root = document.getPartRoot();
+    addPartsCleanup(t,root);
+    assert_equals(root.getParts().length,0);
+    assert_equals(target.innerHTML,'Before {{#}}Parts{{/}} After');
+    target.setAttribute('parseparts','');
+    assert_equals(root.getParts().length,0);
+    assert_equals(target.innerHTML,'Before {{#}}Parts{{/}} After');
+  }, 'Parser only behavior - adding parseparts does nothing');
+}</script>
+
+<div parseparts>{{#}}{{/}}</div>
+<script>{
+  test((t) => {
+    const target = document.currentScript.previousElementSibling;
+    t.add_cleanup(() => target.remove());
+    const root = document.getPartRoot();
+    addPartsCleanup(t,root);
+    assert_equals(root.getParts().length,1);
+    assert_equals(target.innerHTML,'<!----><!---->');
+  }, 'Just parts, no text before');
+}</script>
+
+<div><input parseparts>{{#}}{{/}}</input></div>
+<script>{
+  test((t) => {
+    const target = document.currentScript.previousElementSibling;
+    t.add_cleanup(() => target.remove());
+    const root = document.getPartRoot();
+    addPartsCleanup(t,root);
+    assert_equals(root.getParts().length,0);
+    assert_equals(target.innerHTML,'<input parseparts=\"\">{{#}}{{/}}');
+  }, 'Self closing elements can\'t use parseparts');
+}</script>
+
+<div><head parseparts>{{#}}{{/}}</head></div>
+<script>{
+  test((t) => {
+    const target = document.currentScript.previousElementSibling;
+    t.add_cleanup(() => target.remove());
+    const root = document.getPartRoot();
+    addPartsCleanup(t,root);
+    assert_equals(root.getParts().length,0);
+    assert_equals(target.innerHTML,'{{#}}{{/}}');
+  }, 'Second head element can\'t use parseparts');
+}</script>
+
+<div parseparts><svg>{{#}}<circle/>{{/}}</svg></div>
+
+<script>{
+  test((t) => {
+    const target = document.currentScript.previousElementSibling;
+    t.add_cleanup(() => target.remove());
+    const root = document.getPartRoot();
+    addPartsCleanup(t,root);
+    assert_equals(root.getParts().length,1);
+    assert_equals(target.innerHTML,'<svg><!----><circle/><!----></svg>');
+  }, 'Foreign content should support Parts');
+}</script>
+
+<div>
+  <div parseparts>{{}}{{ }}{{ #}}{{ /}}{{{}}}</div>
+  <div>{{}}{{ }}{{ #}}{{ /}}{{{}}}</div>
+</div>
+<script>{
+  test((t) => {
+    const target = document.currentScript.previousElementSibling;
+    t.add_cleanup(() => target.remove());
+    const root = document.getPartRoot();
+    addPartsCleanup(t,root);
+    assert_equals(root.getParts().length,0);
+    assert_equals(target.childElementCount,2);
+    Array.from(target.children).forEach(el => {
+      assert_equals(el.innerHTML,'{{}}{{ }}{{ #}}{{ /}}{{{}}}');
+    })
+  }, 'Not quite parts syntax - none should become parts, and nothing should crash');
+}</script>
diff --git a/tests/wpt/tests/dom/parts/basic-dom-part-declarative-pi-syntax.tentative.html b/tests/wpt/tests/dom/parts/basic-dom-part-declarative-pi-syntax.tentative.html
new file mode 100644
index 00000000000..f6460353949
--- /dev/null
+++ b/tests/wpt/tests/dom/parts/basic-dom-part-declarative-pi-syntax.tentative.html
@@ -0,0 +1,129 @@
+<!DOCTYPE html>
+<title>DOM Parts: Basic object structure, &lt;?child-node-part?> declarative API</title>
+<meta name="author" href="mailto:masonf@chromium.org">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="./resources/domparts-utils.js"></script>
+
+<div>
+  <!-- Note - the test will remove this chunk of DOM once the test completes -->
+  <div id=target2>
+    Declarative syntax - The *two* templates below should have IDENTICAL STRUCTURE
+    to this one. There are four cases to test:
+      1. Main document parsing (this chunk)
+      2. Template parsing (the template below with id=declarative)
+      3. Template/fragment cloning (a clone of the template with id=declarative)
+      4. Declarative Shadow DOM parsing (template with id=declarative_shadow_dom and shadowrootmode attribute)
+    <h1 id="name">
+      <?child-node-part fullname?>
+        First
+        <!--?child-node-part middle?--> <?node-part middle-node?>Middle <?/child-node-part middle?>
+        Last
+    <!-- ?/child-node-part foobar? -->
+    </h1>
+    Email: <?node-part email-link?><a id="link"></a>
+
+    Here are some invalid parts that should not get parsed:
+    <!--child-node-part test comment without leading ?-->
+    <child-node-part test PI without leading ?>
+    <!--?child-node-partfoobar?-->
+    <?child-node-partfoobar?>
+  </div>
+</div>
+<template id=declarative>
+  <div>
+    <div id=target3>Declarative syntax
+      <h1 id="name">
+        <?child-node-part fullname?>
+          First
+          <!--?child-node-part middle?--> <?node-part middle-node?>Middle <?/child-node-part middle?>
+          Last
+        <!-- ?/child-node-part foobar? -->
+      </h1>
+      Email: <?node-part email-link?><a id="link"></a>
+
+      Here are some invalid parts that should not get parsed:
+      <!--child-node-part test comment without leading ?-->
+      <child-node-part test PI without leading ?>
+      <!--?child-node-partfoobar?-->
+      <?child-node-partfoobar?>
+    </div>
+  </div>
+</template>
+
+<!-- TODO: This test should look at declarative shadow DOM behavior. -->
+
+<script> {
+const template = document.getElementById('declarative');
+['Main Document','Template','Clone','PartClone'].forEach(testCase => {
+  function assertIsComment(node,commentText) {
+    assert_true(node instanceof Comment);
+    assert_equals(node.textContent,commentText);
+  }
+
+  test((t) => {
+    let doc,target,wrapper,cleanup;
+    let expectDOMParts = true;
+    switch (testCase) {
+      case 'Main Document':
+        doc = document;
+        target = doc.querySelector('#target2');
+        cleanup = [target.parentElement];
+        break;
+      case 'Template':
+        doc = template.content;
+        target = doc.querySelector('#target3');
+        cleanup = [];
+        break;
+      case 'Clone':
+        doc = document;
+        wrapper = document.body.appendChild(document.createElement('div'));
+        wrapper.appendChild(template.content.cloneNode(true));
+        target = wrapper.querySelector('#target3');
+        // A "normal" tree clone should not keep DOM Parts:
+        expectDOMParts = false;
+        cleanup = [wrapper];
+        break;
+      case 'PartClone':
+        doc = document;
+        wrapper = document.body.appendChild(document.createElement('div'));
+        assert_true(template.content.getPartRoot().getParts().length != 0);
+        wrapper.appendChild(template.content.getPartRoot().clone().rootContainer);
+        target = wrapper.querySelector('#target3');
+        // Even a PartRoot clone should not add parts to the document, when that
+        // clone is appendChilded to the document.
+        expectDOMParts = false;
+        cleanup = [wrapper];
+        break;
+      default:
+        assert_unreached('Invalid test case');
+    }
+    assert_true(!!(doc && target && target.parentElement));
+    const root = doc.getPartRoot();
+    t.add_cleanup(() => cleanup.forEach(el => el.remove())); // Cleanup
+    t.add_cleanup(() => root.getParts().forEach(part => part.disconnect()));
+
+    assert_true(root instanceof DocumentPartRoot);
+    if (expectDOMParts) {
+      const expectedRootParts = [{type:'ChildNodePart',metadata:['fullname']},{type:'NodePart',metadata:['email-link']}];
+      assertEqualParts(root.getParts(),expectedRootParts,0,'declarative root should have two parts');
+      assert_equals(root.getParts()[1].node,target.querySelector('#link'));
+      const childPart1 = root.getParts()[0];
+      assertIsComment(childPart1.previousSibling,'?child-node-part fullname?');
+      assertIsComment(childPart1.nextSibling,' ?/child-node-part foobar? ');
+      const expectedChild1Parts = [{type:'ChildNodePart',metadata:['middle']}];
+      assertEqualParts(childPart1.getParts(),expectedChild1Parts,0,'First level childpart should just have one child part');
+      const childPart2 = childPart1.getParts()[0];
+      assertIsComment(childPart2.previousSibling,'?child-node-part middle?');
+      assertIsComment(childPart2.nextSibling,'?/child-node-part middle?');
+      const expectedChild2Parts = [{type:'NodePart',metadata:['middle-node']}];
+      assertEqualParts(childPart2.getParts(),expectedChild2Parts,0,'Second level childpart should have just the node part');
+      assert_true(childPart2.getParts()[0].node instanceof Text);
+      assert_equals(childPart2.getParts()[0].node.textContent,'Middle ');
+    } else {
+      assertEqualParts(root.getParts(),[],[]);
+    }
+  }, `Basic declarative DOM Parts (${testCase})`);
+});
+
+}</script>
diff --git a/tests/wpt/tests/dom/parts/basic-dom-part-objects.tentative.html b/tests/wpt/tests/dom/parts/basic-dom-part-objects.tentative.html
index 3dda4e492c2..af77b28b02f 100644
--- a/tests/wpt/tests/dom/parts/basic-dom-part-objects.tentative.html
+++ b/tests/wpt/tests/dom/parts/basic-dom-part-objects.tentative.html
@@ -1,26 +1,11 @@
 <!DOCTYPE html>
-<title>DOM Parts: Basic object structure</title>
+<title>DOM Parts: Basic object structure, imperative API</title>
 <meta name="author" href="mailto:masonf@chromium.org">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+<script src="./resources/domparts-utils.js"></script>
 
 <body>
-
-<script>
-  function assertEqualParts(parts,partDescriptions,expectedParts,description) {
-    assert_equals(parts.length,partDescriptions.length,`${description}: lengths differ`);
-    for(let i=0;i<parts.length;++i) {
-      assert_true(parts[i] instanceof Part,`${description}: not a Part`);
-      assert_true(parts[i] instanceof window[partDescriptions[i].type],`${description}: index ${i} expected ${partDescriptions[i].type}`);
-      assert_array_equals(parts[i].metadata,partDescriptions[i].metadata,`${description}: index ${i} wrong metadata`);
-      if (expectedParts) {
-        assert_equals(parts[i],expectedParts[i],`${description}: index ${i} object equality`);
-      }
-    }
-  }
-</script>
-
-
 <template id=imperative>
   <div>
     <div id=target1 style="display:none">
@@ -34,7 +19,7 @@
   <span id=direct_child_2></span>
 </template>
 
-<script>{
+<script>
 const template = document.getElementById('imperative');
 function addCleanup(t, part) {
   t.add_cleanup(() => part.disconnect());
@@ -85,19 +70,19 @@ function addCleanup(t, part) {
 
     const nodeBefore = target.previousSibling || target.parentNode;
     const nodePartBefore = addCleanup(t,new NodePart(root,nodeBefore));
-    runningPartsExpectation.unshift({type:'NodePart',metadata:[]});
-    assertEqualParts(root.getParts(),runningPartsExpectation,[nodePartBefore,nodePart,childNodePart],'getParts() for the root should now have this nodePart, in tree order');
+    runningPartsExpectation.push({type:'NodePart',metadata:[]});
+    assertEqualParts(root.getParts(),runningPartsExpectation,[nodePart,childNodePart,nodePartBefore],'getParts() for the root should now have this nodePart, in construction order');
 
     const nodePart2 = addCleanup(t,new NodePart(childNodePart,target.children[2],{metadata:['blah']}));
     assert_equals(nodePart2.root,childNodePart);
-    assertEqualParts(root.getParts(),runningPartsExpectation,[nodePartBefore,nodePart,childNodePart],'getParts() for the root DocumentPartRoot shouldn\'t change');
+    assertEqualParts(root.getParts(),runningPartsExpectation,[nodePart,childNodePart,nodePartBefore],'getParts() for the root DocumentPartRoot shouldn\'t change');
     assertEqualParts(childNodePart.getParts(),[{type:'NodePart',metadata:['blah']}],[nodePart2],'getParts() for the childNodePart should have it');
 
     nodePart2.disconnect();
     assert_equals(nodePart2.root,null,'root should be null after disconnect');
     assert_equals(nodePart2.node,null,'node should be null after disconnect');
     assert_equals(childNodePart.getParts().length,0,'calling disconnect() should remove the part from root.getParts()');
-    assertEqualParts(root.getParts(),runningPartsExpectation,[nodePartBefore,nodePart,childNodePart],'getParts() for the root DocumentPartRoot still shouldn\'t change');
+    assertEqualParts(root.getParts(),runningPartsExpectation,[nodePart,childNodePart,nodePartBefore],'getParts() for the root DocumentPartRoot still shouldn\'t change');
     nodePart2.disconnect(); // Calling twice should be ok.
 
     childNodePart.disconnect();
@@ -197,41 +182,41 @@ function addCleanup(t, part) {
     const nodePartB = addCleanup(t,new NodePart(root,b));
     const nodePartA = addCleanup(t,new NodePart(root,a));
     const nodePartC = addCleanup(t,new NodePart(root,c));
-    assert_array_equals(root.getParts(),[nodePartA,nodePartB,nodePartC]);
+    assert_array_equals(root.getParts(),[nodePartB,nodePartA,nodePartC],'Parts can be out of order, if added out of order');
     b.remove();
-    assert_array_equals(root.getParts(),[nodePartA,nodePartC]);
+    assert_array_equals(root.getParts(),[nodePartB,nodePartA,nodePartC],'Removals are not tracked');
     target.parentElement.insertBefore(b,target);
-    assert_array_equals(root.getParts(),[nodePartB,nodePartA,nodePartC]);
+    assert_array_equals(root.getParts(),[nodePartB,nodePartA,nodePartC],'Insertions are not tracked');
     target.insertBefore(b,c);
-    assert_array_equals(root.getParts(),[nodePartA,nodePartB,nodePartC]);
+    assert_array_equals(root.getParts(),[nodePartB,nodePartA,nodePartC],'Nothing is tracked');
     nodePartA.disconnect();
     nodePartB.disconnect();
     nodePartC.disconnect();
-    assert_array_equals(root.getParts(),[]);
+    assert_array_equals(root.getParts(),[],'disconnections are tracked');
 
     const childPartAC = addCleanup(t,new ChildNodePart(root,a,c));
     assert_array_equals(root.getParts(),[childPartAC]);
     a.remove();
     assert_array_equals(root.getParts(),[],'Removing endpoints invalidates the part');
     target.insertBefore(a,b); // Restore
-    assert_array_equals(root.getParts(),[childPartAC]);
+    assert_array_equals(root.getParts(),[],'Insertions are not tracked');
 
     target.insertBefore(c,a);
     assert_array_equals(root.getParts(),[],'Endpoints out of order');
     target.appendChild(c); // Restore
-    assert_array_equals(root.getParts(),[childPartAC]);
+    assert_array_equals(root.getParts(),[],'Insertions are not tracked');
 
     document.body.appendChild(c);
-    assert_array_equals(root.getParts(),[],'Children need to have same parent');
+    assert_array_equals(root.getParts(),[],'Parts are\'t invalidated when endpoints have different parents');
     target.appendChild(c); // Restore
-    assert_array_equals(root.getParts(),[childPartAC]);
+    assert_array_equals(root.getParts(),[],'Insertions are not tracked');
 
     const oldParent = target.parentElement;
     target.remove();
-    assert_array_equals(root.getParts(),[],'Parent needs to be connected');
+    assert_array_equals(root.getParts(),[],'Parts are\'t invalidated when disconnected');
     oldParent.appendChild(target); // Restore
-    assert_array_equals(root.getParts(),[childPartAC]);
-  }, `DOM mutation support (${description})`);
+    assert_array_equals(root.getParts(),[]);
+  }, `DOM mutations are not tracked (${description})`);
 
   test((t) => {
     const root = doc.getPartRoot();
@@ -276,149 +261,4 @@ function addCleanup(t, part) {
 
   wrapper?.remove(); // Cleanup
 });
-}</script>
-
-<div>
-  <!-- Note - the test will remove this chunk of DOM once the test completes -->
-  <div id=target2>
-    Declarative syntax - The *two* templates below should have IDENTICAL STRUCTURE
-    to this one. There are four cases to test:
-      1. Main document parsing (this chunk)
-      2. Template parsing (the template below with id=declarative)
-      3. Template/fragment cloning (a clone of the template with id=declarative)
-      4. Declarative Shadow DOM parsing (template with id=declarative_shadow_dom and shadowrootmode attribute)
-    <h1 id="name">
-      <?child-node-part fullname?>
-        First
-        <!--?child-node-part middle?--> <?node-part middle-node?>Middle <?/child-node-part middle?>
-        Last
-    <!-- ?/child-node-part foobar? -->
-    </h1>
-    Email: <?node-part email-link?><a id="link"></a>
-
-    Here are some invalid parts that should not get parsed:
-    <!--child-node-part test comment without leading ?-->
-    <child-node-part test PI without leading ?>
-    <!--?child-node-partfoobar?-->
-    <?child-node-partfoobar?>
-  </div>
-</div>
-<template id=declarative>
-  <div>
-    <div id=target3>Declarative syntax
-      <h1 id="name">
-        <?child-node-part fullname?>
-          First
-          <!--?child-node-part middle?--> <?node-part middle-node?>Middle <?/child-node-part middle?>
-          Last
-        <!-- ?/child-node-part foobar? -->
-      </h1>
-      Email: <?node-part email-link?><a id="link"></a>
-
-      Here are some invalid parts that should not get parsed:
-      <!--child-node-part test comment without leading ?-->
-      <child-node-part test PI without leading ?>
-      <!--?child-node-partfoobar?-->
-      <?child-node-partfoobar?>
-    </div>
-  </div>
-</template>
-<div id=declarative_shadow_dom>
-  <template shadowrootmode="open">
-    <div>
-      <div id=target3>Declarative syntax
-        <h1 id="name">
-          <?child-node-part fullname?>
-            First
-            <!--?child-node-part middle?--> <?node-part middle-node?>Middle <?/child-node-part middle?>
-            Last
-          <!-- ?/child-node-part foobar? -->
-        </h1>
-        Email: <?node-part email-link?><a id="link"></a>
-
-        Here are some invalid parts that should not get parsed:
-        <!--child-node-part test comment without leading ?-->
-        <child-node-part test PI without leading ?>
-        <!--?child-node-partfoobar?-->
-        <?child-node-partfoobar?>
-      </div>
-    </div>
-  </template>
-</div>
-
-<script> {
-const template = document.getElementById('declarative');
-['Main Document','Template','Clone','PartClone','DeclarativeShadowDOM'].forEach(testCase => {
-  function assertIsComment(node,commentText) {
-    assert_true(node instanceof Comment);
-    assert_equals(node.textContent,commentText);
-  }
-
-  test((t) => {
-    let doc,target,wrapper,cleanup;
-    let expectDOMParts = true;
-    switch (testCase) {
-      case 'Main Document':
-        doc = document;
-        target = doc.querySelector('#target2');
-        cleanup = [target.parentElement];
-        break;
-      case 'Template':
-        doc = template.content;
-        target = doc.querySelector('#target3');
-        cleanup = [];
-        break;
-      case 'Clone':
-        doc = document;
-        wrapper = document.body.appendChild(document.createElement('div'));
-        wrapper.appendChild(template.content.cloneNode(true));
-        target = wrapper.querySelector('#target3');
-        // A "normal" tree clone should not keep DOM Parts:
-        expectDOMParts = false;
-        cleanup = [wrapper];
-        break;
-      case 'PartClone':
-        doc = document;
-        wrapper = document.body.appendChild(document.createElement('div'));
-        wrapper.appendChild(template.content.getPartRoot().clone().rootContainer);
-        target = wrapper.querySelector('#target3');
-        cleanup = [wrapper];
-        break;
-      case 'DeclarativeShadowDOM': {
-        const host = document.getElementById('declarative_shadow_dom');
-        doc = host.shadowRoot;
-        target = doc.querySelector('#target3'); // Shadow isolated
-        cleanup = [host];
-        break;
-      }
-      default:
-        assert_unreached('Invalid test case');
-    }
-    assert_true(!!(doc && target && target.parentElement));
-    t.add_cleanup(() => cleanup.forEach(el => el.remove())); // Cleanup
-
-    const root = doc.getPartRoot();
-    assert_true(root instanceof DocumentPartRoot);
-    if (expectDOMParts) {
-      const expectedRootParts = [{type:'ChildNodePart',metadata:['fullname']},{type:'NodePart',metadata:['email-link']}];
-      assertEqualParts(root.getParts(),expectedRootParts,0,'declarative root should have two parts');
-      assert_equals(root.getParts()[1].node,target.querySelector('#link'));
-      const childPart1 = root.getParts()[0];
-      assertIsComment(childPart1.previousSibling,'?child-node-part fullname?');
-      assertIsComment(childPart1.nextSibling,' ?/child-node-part foobar? ');
-      const expectedChild1Parts = [{type:'ChildNodePart',metadata:['middle']}];
-      assertEqualParts(childPart1.getParts(),expectedChild1Parts,0,'First level childpart should just have one child part');
-      const childPart2 = childPart1.getParts()[0];
-      assertIsComment(childPart2.previousSibling,'?child-node-part middle?');
-      assertIsComment(childPart2.nextSibling,'?/child-node-part middle?');
-      const expectedChild2Parts = [{type:'NodePart',metadata:['middle-node']}];
-      assertEqualParts(childPart2.getParts(),expectedChild2Parts,0,'Second level childpart should have just the node part');
-      assert_true(childPart2.getParts()[0].node instanceof Text);
-      assert_equals(childPart2.getParts()[0].node.textContent,'Middle ');
-    } else {
-      assertEqualParts(root.getParts(),[],[]);
-    }
-  }, `Basic declarative DOM Parts (${testCase})`);
-});
-
-}</script>
+</script>
diff --git a/tests/wpt/tests/dom/parts/dom-parts-parseparts-on-body.tentative.html b/tests/wpt/tests/dom/parts/dom-parts-parseparts-on-body.tentative.html
new file mode 100644
index 00000000000..542c7b2881a
--- /dev/null
+++ b/tests/wpt/tests/dom/parts/dom-parts-parseparts-on-body.tentative.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+<title>DOM Parts: parseparts on body</title>
+<meta name="author" href="mailto:masonf@chromium.org">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="./resources/domparts-utils.js"></script>
+
+<body parseparts>
+<div>{{#}}Parts{{/}}</div>
+
+<script>
+  test(() => {
+    const target = document.currentScript.previousElementSibling;
+    assert_true(document.body.hasAttribute('parseparts'));
+    const root = document.getPartRoot();
+    const expectedRootParts = [{type:'ChildNodePart',metadata:[]}];
+    assertEqualParts(root.getParts(),expectedRootParts,0,'declarative syntax should be recognized');
+    target.remove();
+  }, 'It is possible to put parseparts on the body element');
+</script>
diff --git a/tests/wpt/tests/dom/parts/dom-parts-parseparts-on-head.tentative.html b/tests/wpt/tests/dom/parts/dom-parts-parseparts-on-head.tentative.html
new file mode 100644
index 00000000000..e65c0d728fe
--- /dev/null
+++ b/tests/wpt/tests/dom/parts/dom-parts-parseparts-on-head.tentative.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html>
+<head parseparts>
+  <title>{{#}}{{/}}DOM Parts: parseparts on head</title>
+
+<meta name="author" href="mailto:masonf@chromium.org">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="./resources/domparts-utils.js"></script>
+
+<!-- no explicit body element-->
+<div>{{#}}Parts{{/}}</div>
+
+<script>
+  test(() => {
+    const target = document.currentScript.previousElementSibling;
+    assert_true(document.head.hasAttribute('parseparts'));
+    assert_false(document.body.hasAttribute('parseparts'));
+    assert_equals(target.previousSibling,null,'The div is the first thing in body, everything else in head');
+    const root = document.getPartRoot();
+    assert_equals(root.getParts().length,0,'No parts should be recognized');
+    assert_equals(target.innerHTML,'{{#}}Parts{{/}}');
+    const titleElement = document.head.querySelector('title');
+    assert_true(titleElement instanceof HTMLTitleElement);
+    assert_equals(titleElement.innerHTML,'{{#}}{{/}}DOM Parts: parseparts on head');
+    target.remove();
+  }, 'It is not possible to put parseparts on the head element');
+</script>
diff --git a/tests/wpt/tests/dom/parts/dom-parts-parseparts-on-root.tentative.html b/tests/wpt/tests/dom/parts/dom-parts-parseparts-on-root.tentative.html
new file mode 100644
index 00000000000..f3ba3eaf6bf
--- /dev/null
+++ b/tests/wpt/tests/dom/parts/dom-parts-parseparts-on-root.tentative.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html parseparts>
+<title>DOM Parts: parseparts on root</title>
+<meta name="author" href="mailto:masonf@chromium.org">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="./resources/domparts-utils.js"></script>
+
+<div>{{#}}Parts{{/}}</div>
+
+<script>
+  test(() => {
+    const target = document.currentScript.previousElementSibling;
+    assert_true(document.documentElement.hasAttribute('parseparts'));
+    const root = document.getPartRoot();
+    assert_equals(root.getParts().length,0);
+    assert_equals(target.innerHTML,'{{#}}Parts{{/}}');
+    target.remove();
+  }, 'It is not possible to put parseparts on the root element');
+</script>
diff --git a/tests/wpt/tests/dom/parts/resources/domparts-utils.js b/tests/wpt/tests/dom/parts/resources/domparts-utils.js
new file mode 100644
index 00000000000..5deeec80a35
--- /dev/null
+++ b/tests/wpt/tests/dom/parts/resources/domparts-utils.js
@@ -0,0 +1,12 @@
+function assertEqualParts(parts,partDescriptions,expectedParts,description) {
+  assert_equals(parts.length,partDescriptions.length,`${description}: lengths differ`);
+  for(let i=0;i<parts.length;++i) {
+    assert_true(parts[i] instanceof Part,`${description}: not a Part`);
+    assert_true(parts[i] instanceof window[partDescriptions[i].type],`${description}: index ${i} expected ${partDescriptions[i].type}`);
+    assert_array_equals(parts[i].metadata,partDescriptions[i].metadata,`${description}: index ${i} wrong metadata`);
+    if (expectedParts) {
+      assert_equals(parts[i],expectedParts[i],`${description}: index ${i} object equality`);
+      assert_equals(parts[i].root.getPartNode(i),parts[i].node || parts[i].previousSibling,'getPartNode() should return the same node as getParts().node/previousSibling');
+    }
+  }
+}
diff --git a/tests/wpt/tests/domxpath/META.yml b/tests/wpt/tests/domxpath/META.yml
index 39abd8e7065..eedf09861f9 100644
--- a/tests/wpt/tests/domxpath/META.yml
+++ b/tests/wpt/tests/domxpath/META.yml
@@ -1,4 +1,3 @@
 spec: https://www.w3.org/TR/DOM-Level-3-XPath/
 suggested_reviewers:
-  - zqzhang
   - deniak
diff --git a/tests/wpt/tests/ecmascript/README.md b/tests/wpt/tests/ecmascript/README.md
new file mode 100644
index 00000000000..d005bf654d3
--- /dev/null
+++ b/tests/wpt/tests/ecmascript/README.md
@@ -0,0 +1,8 @@
+# ECMAScript tests
+
+This directory contains tests related to the [ECMA-262](https://tc39.es/ecma262/) and [ECMA-402](https://tc39.es/ecma402/) specifications.
+
+Although these specifications are already covered through [Test262](https://github.com/tc39/test262), occasionally it’s useful to have Web Platform Tests coverage for a subset of ECMAScript functionality. Examples include:
+
+- Any functionality that ECMAScript specifies as “implementation-defined” despite Web Compatibility requiring specific semantics. ([example](https://github.com/web-platform-tests/wpt/pull/41760))
+- Any ECMAScript functionality that needs to be reported via wpt.fyi (for [example](https://github.com/web-platform-tests/wpt/pull/37928), because it’s included in Interop 2023).
diff --git a/tests/wpt/tests/ecmascript/locale-compat.html b/tests/wpt/tests/ecmascript/locale-compat.html
new file mode 100644
index 00000000000..d1d2f78c67f
--- /dev/null
+++ b/tests/wpt/tests/ecmascript/locale-compat.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<!--
+Copyright (C) 2023 the V8 project authors. All rights reserved.
+This code is governed by the BSD license found in the LICENSE file.
+-->
+<title>Web Compatibility requirements for implementation-defined locale-specific JavaScript APIs</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+
+test(t => { // https://bugs.chromium.org/p/chromium/issues/detail?id=1414292
+
+  const date = new Date('2022-12-31T23:59:42');
+  const localeString = date.toLocaleString('en-US');
+
+  // No U+202F NARROW NO-BREAK SPACE must be present.
+  assert_false(localeString.includes('\u202F'));
+  // The character between the time and AM/PM should be U+0020 SPACE.
+  assert_regexp_match(localeString, /:\d\d:\d\d\x20[AP]M/);
+
+}, '`Date.prototype.toLocaleString` produces U+0020 instead of U+202F for `en-US` locale');
+
+test(t => { // https://bugs.chromium.org/p/chromium/issues/detail?id=1414292
+
+  const date = new Date('2022-12-31T23:59:42');
+  const formatter = new Intl.DateTimeFormat('en', {timeStyle: 'long'})
+  const formattedString = formatter.format(date);
+
+  // No U+202F NARROW NO-BREAK SPACE must be present.
+  assert_false(formattedString.includes('\u202F'));
+  // The character between the time and AM/PM should be U+0020 SPACE.
+  assert_regexp_match(formattedString, /:\d\d:\d\d\x20[AP]M/);
+
+}, '`Intl.DateTimeFormat.prototype.format` produces U+0020 instead of U+202F for `en` locale');
+
+test(t => { // https://bugs.chromium.org/p/chromium/issues/detail?id=1418727
+
+  const date = new Date('2022-03-31T23:59:42');
+
+  assert_true(date.toLocaleString('en-CA').includes('2022-03-31'));
+  assert_equals(date.toLocaleString('en-CA', {dateStyle: 'short'}), '2022-03-31');
+
+}, '`Date.prototype.toLocaleString` produces `yyyy-mm-dd` instead of `m/d/yyyy` for `en-CA` locale');
+
+</script>
diff --git a/tests/wpt/tests/editing/crashtests/insertAdjacentElement-with-DOMSubtreeModified.html b/tests/wpt/tests/editing/crashtests/insertAdjacentElement-with-DOMSubtreeModified.html
new file mode 100644
index 00000000000..4b9533282d1
--- /dev/null
+++ b/tests/wpt/tests/editing/crashtests/insertAdjacentElement-with-DOMSubtreeModified.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<head>
+<script src="../resources/js-test.js"></script>
+<script>
+function onLoad() {
+    const x1 = document.getElementById('x1');
+    x1.addEventListener('DOMSubtreeModified', () => {
+        const x2 = document.getElementById('x2');
+        x2.contentDocument;
+    });
+    x1.setAttribute('inputmode', 'url');
+}
+function insertAdjacent() {
+    const x2 = document.getElementById('x2');
+    const x3 = document.getElementById('x3');
+    document.onreadystatechange = insertAdjacent;
+    x3.insertAdjacentElement('beforebegin', x2);
+}
+</script>
+</head>
+<body onload="onLoad()">
+<div id="x1"></div>
+<object id="x2" data="invalid-url" onerror="insertAdjacent()"></object>
+<div id="x3"></div>
+</body>
+</html>
diff --git a/tests/wpt/tests/editing/crashtests/mozilla-bug-1851730.html b/tests/wpt/tests/editing/crashtests/mozilla-bug-1851730.html
new file mode 100644
index 00000000000..ee11f767924
--- /dev/null
+++ b/tests/wpt/tests/editing/crashtests/mozilla-bug-1851730.html
@@ -0,0 +1,11 @@
+<script>
+document.addEventListener("DOMContentLoaded", () => {
+  document.execCommand("selectAll", false)
+  a.wrap = "hard"
+  a.value = "A"
+  b.style.cssFloat = "left"
+})
+</script>
+<textarea id="a" autofocus="autofocus">&quot;</textarea>
+<font id="b">
+<pre>
diff --git a/tests/wpt/tests/editing/other/editable-state-and-focus-in-assigned-slot-dom.tentative.html b/tests/wpt/tests/editing/other/editable-state-and-focus-in-assigned-slot-dom.tentative.html
new file mode 100644
index 00000000000..ae8b1452832
--- /dev/null
+++ b/tests/wpt/tests/editing/other/editable-state-and-focus-in-assigned-slot-dom.tentative.html
@@ -0,0 +1,31 @@
+<!doctype html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>Testing editable state and focus in slotted editable element</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<div id="host">
+<div contenteditable></div>
+</div>
+<script>
+const text = 'A';
+test(() => {
+  const host = document.querySelector('#host');
+  const shadowRoot = host.attachShadow({ mode: "open" });
+  const slot = document.createElement("slot");
+  shadowRoot.appendChild(slot);
+  const editable = document.querySelector('div[contenteditable]');
+  editable.focus();
+  document.execCommand('insertText', false, text);
+  editable.blur();
+  assert_equals(editable.innerText, text);
+  editable.focus();
+  document.execCommand('insertText', false, text);
+  assert_equals(editable.innerText, text + text);
+});
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/tests/editing/other/insertparagraph-in-non-splittable-element.html b/tests/wpt/tests/editing/other/insertparagraph-in-non-splittable-element.html
index 21aa495bd67..c77862fecb2 100644
--- a/tests/wpt/tests/editing/other/insertparagraph-in-non-splittable-element.html
+++ b/tests/wpt/tests/editing/other/insertparagraph-in-non-splittable-element.html
@@ -26,10 +26,7 @@ const tests = [
     selector: "caption",
     initial: "<div><table><caption>abc</caption><tbody><tr><td>abc</td></tr></tbody></table></div>",
     // <caption> can have paragraphs so that it should be handled as in a block.
-    expected: [
-      "<div><table><caption><br><div>abc</div></caption><tbody><tr><td>abc</td></tr></tbody></table></div>",
-      "<div><table><caption><div><br></div><div>abc</div></caption><tbody><tr><td>abc</td></tr></tbody></table></div>",
-    ],
+    expected: "<div><table><caption><br>abc</caption><tbody><tr><td>abc</td></tr></tbody></table></div>",
   },
   {
     selector: "col",
diff --git a/tests/wpt/tests/editing/other/insertparagraph-with-white-space-style.tentative.html b/tests/wpt/tests/editing/other/insertparagraph-with-white-space-style.tentative.html
index 496c073b5f8..3c9f1848f50 100644
--- a/tests/wpt/tests/editing/other/insertparagraph-with-white-space-style.tentative.html
+++ b/tests/wpt/tests/editing/other/insertparagraph-with-white-space-style.tentative.html
@@ -17,14 +17,15 @@
 <body><div contenteditable></div></body>
 <script>
 /**
- * The expected behavior is based on Chrome 91.
+ * This test checks how insertParagraph command and insertText of "\n" works
+ * in valid styles of parent (editing host itself or in an splittable element).
  */
 const params = new URLSearchParams(location.search);
 const style = params.get("white-space");
 const isNewLineSignificant = style == "pre" || style == "pre-wrap" || style == "pre-line";
 const command = params.get("command");
 const editingHost = document.querySelector("div[contenteditable]");
-function doIt() {
+function execInsertTextOrParagraphCommand() {
   if (command == "insertParagraph") {
     document.execCommand(command);
   } else {
@@ -33,18 +34,19 @@ function doIt() {
   }
 }
 for (const defaultParagraphSeparator of ["div", "p"]) {
-  document.execCommand("defaultparagraphseparator", false, defaultParagraphSeparator);
+  document.execCommand("defaultParagraphSeparator", false, defaultParagraphSeparator);
   for (const display of ["block", "inline", "inline-block"]) {
-    // insertparagraph at direct child of editing host.
-    // XXX Oddly, if the outside display value is "block", `white-space`
-    //     does not affect to the insertparagraph command.
+    // Inserting paragraph or inserting a linefeed in a text node which is
+    // a direct child of the editing host.
     test(() => {
       editingHost.style.whiteSpace = style;
       editingHost.style.display = display;
       const utils = new EditorTestUtils(editingHost);
       utils.setupEditingHost(`abc[]`);
       editingHost.getBoundingClientRect();
-      doIt();
+      execInsertTextOrParagraphCommand();
+      // If the editing host is a block, at least the new paragraph should be
+      // the default paragraph separator element.
       if (display == "block") {
         assert_in_array(
           editingHost.innerHTML,
@@ -54,7 +56,14 @@ for (const defaultParagraphSeparator of ["div", "p"]) {
           ],
           "New paragraph should be inserted at end of the editing host"
         );
-      } else if (isNewLineSignificant) {
+      }
+      // Otherwise, i.e., the editing host is inline, insert a line break (a
+      // linefeed or <br>) should be inserted instead because it's better
+      // look for the users.
+      // Note that an extra line break is required for making the last line
+      // visible because the editing host is the last visible inline in the
+      // parent block (<body>).
+      else if (isNewLineSignificant) {
         assert_in_array(
           editingHost.innerHTML,
           [
@@ -70,15 +79,16 @@ for (const defaultParagraphSeparator of ["div", "p"]) {
           "A <br> should be inserted at end"
         );
       }
-    }, `<div contenteditable style="white-space:${style}; display:${display}">abc[]</div> (defaultparagraphseparator: ${defaultParagraphSeparator})`);
+    }, `<div contenteditable style="white-space:${style}; display:${display}">abc[]</div> (defaultParagraphSeparator: ${defaultParagraphSeparator})`);
 
+    // Same as above test except the caret position.
     test(() => {
       editingHost.style.whiteSpace = style;
       editingHost.style.display = display;
       const utils = new EditorTestUtils(editingHost);
       utils.setupEditingHost(`[]abc`);
       editingHost.getBoundingClientRect();
-      doIt();
+      execInsertTextOrParagraphCommand();
       if (display == "block") {
         assert_in_array(
           editingHost.innerHTML,
@@ -107,15 +117,16 @@ for (const defaultParagraphSeparator of ["div", "p"]) {
           "A <br> should be inserted at start"
         );
       }
-    }, `<div contenteditable style="white-space:${style}; display:${display}">[]abc</div> (defaultparagraphseparator: ${defaultParagraphSeparator})`);
+    }, `<div contenteditable style="white-space:${style}; display:${display}">[]abc</div> (defaultParagraphSeparator: ${defaultParagraphSeparator})`);
 
+    // Same as above test except the caret position.
     test(() => {
       editingHost.style.whiteSpace = style;
       editingHost.style.display = display;
       const utils = new EditorTestUtils(editingHost);
       utils.setupEditingHost(`a[]bc`);
       editingHost.getBoundingClientRect();
-      doIt();
+      execInsertTextOrParagraphCommand();
       if (display == "block") {
         assert_in_array(
           editingHost.innerHTML,
@@ -144,9 +155,12 @@ for (const defaultParagraphSeparator of ["div", "p"]) {
           "A <br> should be inserted"
         );
       }
-    }, `<div contenteditable style="white-space:${style}; display:${display}">a[]bc</div> (defaultparagraphseparator: ${defaultParagraphSeparator})`);
+    }, `<div contenteditable style="white-space:${style}; display:${display}">a[]bc</div> (defaultParagraphSeparator: ${defaultParagraphSeparator})`);
 
-    // inline styles should be preserved.
+    // Inserting paragraph or inserting a linefeed in a text node after
+    // executing the "italic" command.  The paragraph or line break result
+    // should be same as above, but the text in the new paragraph or new line
+    // should be wrapped in <i>.
     test(() => {
       editingHost.style.whiteSpace = style;
       editingHost.style.display = display;
@@ -154,7 +168,7 @@ for (const defaultParagraphSeparator of ["div", "p"]) {
       utils.setupEditingHost(`abc[]`);
       editingHost.getBoundingClientRect();
       document.execCommand("italic");
-      doIt();
+      execInsertTextOrParagraphCommand();
       document.execCommand("inserttext", false, "def");
       if (display == "block") {
         assert_in_array(
@@ -190,15 +204,19 @@ for (const defaultParagraphSeparator of ["div", "p"]) {
           "The new line should be italic"
         );
       }
-    }, `<div contenteditable style="white-space:${style}; display:${display}">abc[]</div> (defaultparagraphseparator: ${defaultParagraphSeparator}) (preserving temporary inline style test)`);
+    }, `<div contenteditable style="white-space:${style}; display:${display}">abc[]</div> (defaultParagraphSeparator: ${defaultParagraphSeparator}) (preserving temporary inline style test)`);
 
+    // Inserting paragraph or inserting a linefeed in a text node which is
+    // wrapped in a <b>.  The paragraph or line break result should be same as
+    // above, but the <b> element should be duplicated in the new paragraph
+    // or shouldn't be split if inserting a line break.
     test(() => {
       editingHost.style.whiteSpace = style;
       editingHost.style.display = display;
       const utils = new EditorTestUtils(editingHost);
       utils.setupEditingHost(`<b>abc[]</b>`);
       editingHost.getBoundingClientRect();
-      doIt();
+      execInsertTextOrParagraphCommand();
       document.execCommand("inserttext", false, "def");
       if (display == "block") {
         assert_in_array(
@@ -234,33 +252,37 @@ for (const defaultParagraphSeparator of ["div", "p"]) {
           "The new line should be bold"
         );
       }
-    }, `<div contenteditable style="white-space:${style}; display:${display}"><b>abc[]</b></div> (defaultparagraphseparator: ${defaultParagraphSeparator}) (preserving inline style test)`);
+    }, `<div contenteditable style="white-space:${style}; display:${display}"><b>abc[]</b></div> (defaultParagraphSeparator: ${defaultParagraphSeparator}) (preserving inline style test)`);
 
     for (const paragraph of ["div", "p"]) {
-      // insertparagraph in existing paragraph whose `white-space` is specified.
-      // XXX Oddly, the white-space style of the ancestor block/inline is
-      //     ignored.
+      // Inserting paragraph or inserting a linefeed in a splittable paragraph
+      // (<p> or <div>) whose `white-space` is specified.
       test(() => {
         editingHost.style.whiteSpace = "normal";
         editingHost.style.display = display;
         const utils = new EditorTestUtils(editingHost);
         utils.setupEditingHost(`<${paragraph} style="white-space:${style}">abc[]</${paragraph}>`);
         editingHost.getBoundingClientRect();
-        doIt();
+        execInsertTextOrParagraphCommand();
+        // Even if the editing host is inline, the command should be handled
+        // with in the splittable paragraph.  Therefore, the paragraph should
+        // be just split and the style attribute should be cloned to keep same
+        // style in the new paragraph.
         assert_equals(
           editingHost.innerHTML,
           `<${paragraph} style="white-space:${style}">abc</${paragraph}><${paragraph} style="white-space:${style}"><br></${paragraph}>`,
           "New paragraph should be inserted at end of the paragraph"
         );
-      }, `<div contenteditable style="display:${display}"><${paragraph} style="white-space:${style}">abc[]</${paragraph}></div> (defaultparagraphseparator: ${defaultParagraphSeparator})`);
+      }, `<div contenteditable style="display:${display}"><${paragraph} style="white-space:${style}">abc[]</${paragraph}></div> (defaultParagraphSeparator: ${defaultParagraphSeparator})`);
 
+      // Same as above test except the caret position.
       test(() => {
         editingHost.style.whiteSpace = "normal";
         editingHost.style.display = display;
         const utils = new EditorTestUtils(editingHost);
         utils.setupEditingHost(`<${paragraph} style="white-space:${style}">[]abc</${paragraph}>`);
         editingHost.getBoundingClientRect();
-        doIt();
+        execInsertTextOrParagraphCommand();
         assert_in_array(
           editingHost.innerHTML,
           [
@@ -269,15 +291,16 @@ for (const defaultParagraphSeparator of ["div", "p"]) {
           ],
           "New paragraph should be inserted at start of the paragraph"
         );
-      }, `<div contenteditable style="display:${display}"><${paragraph} style="white-space:${style}">[]abc</${paragraph}></div> (defaultparagraphseparator: ${defaultParagraphSeparator})`);
+      }, `<div contenteditable style="display:${display}"><${paragraph} style="white-space:${style}">[]abc</${paragraph}></div> (defaultParagraphSeparator: ${defaultParagraphSeparator})`);
 
+      // Same as above test except the caret position.
       test(() => {
         editingHost.style.whiteSpace = "normal";
         editingHost.style.display = display;
         const utils = new EditorTestUtils(editingHost);
         utils.setupEditingHost(`<${paragraph} style="white-space:${style}">a[]bc</${paragraph}>`);
         editingHost.getBoundingClientRect();
-        doIt();
+        execInsertTextOrParagraphCommand();
         assert_in_array(
           editingHost.innerHTML,
           [
@@ -286,32 +309,36 @@ for (const defaultParagraphSeparator of ["div", "p"]) {
           ],
           "The paragraph should be split"
         );
-      }, `<div contenteditable style="display:${display}"><${paragraph} style="white-space:${style}">a[]bc</${paragraph}></div> (defaultparagraphseparator: ${defaultParagraphSeparator})`);
+      }, `<div contenteditable style="display:${display}"><${paragraph} style="white-space:${style}">a[]bc</${paragraph}></div> (defaultParagraphSeparator: ${defaultParagraphSeparator})`);
 
-      // insertparagraph in existing paragraph.
-      // XXX Oddly, the white-space style of the ancestor block/inline is
-      //     ignored.
+      // Inserting paragraph or inserting a linefeed in a splittable paragraph
+      // in the editing host whose `white-space` is specified.
       test(() => {
         editingHost.style.whiteSpace = style;
         editingHost.style.display = display;
         const utils = new EditorTestUtils(editingHost);
         utils.setupEditingHost(`<${paragraph}>abc[]</${paragraph}>`);
         editingHost.getBoundingClientRect();
-        doIt();
+        execInsertTextOrParagraphCommand();
+        // Same as previous tests, the splittable paragraph should be split.
+        // The `white-space` style of the ancestor block or the inline editing
+        // host should not affect to the behavior because we can just split
+        // the paragraph.
         assert_equals(
           editingHost.innerHTML,
           `<${paragraph}>abc</${paragraph}><${paragraph}><br></${paragraph}>`,
           "New paragraph should be inserted at end of the paragraph"
         );
-      }, `<div contenteditable style="display:${display}; white-space:${style}"><${paragraph}>abc[]</${paragraph}></div> (defaultparagraphseparator: ${defaultParagraphSeparator})`);
+      }, `<div contenteditable style="display:${display}; white-space:${style}"><${paragraph}>abc[]</${paragraph}></div> (defaultParagraphSeparator: ${defaultParagraphSeparator})`);
 
+      // Same as above test except the caret position.
       test(() => {
         editingHost.style.whiteSpace = style;
         editingHost.style.display = display;
         const utils = new EditorTestUtils(editingHost);
         utils.setupEditingHost(`<${paragraph}>[]abc</${paragraph}>`);
         editingHost.getBoundingClientRect();
-        doIt();
+        execInsertTextOrParagraphCommand();
         assert_in_array(
           editingHost.innerHTML,
           [
@@ -320,15 +347,16 @@ for (const defaultParagraphSeparator of ["div", "p"]) {
           ],
           "New paragraph should be inserted at start of the paragraph"
         );
-      }, `<div contenteditable style="display:${display}; white-space:${style}"><${paragraph}>[]abc</${paragraph}></div> (defaultparagraphseparator: ${defaultParagraphSeparator})`);
+      }, `<div contenteditable style="display:${display}; white-space:${style}"><${paragraph}>[]abc</${paragraph}></div> (defaultParagraphSeparator: ${defaultParagraphSeparator})`);
 
+      // Same as above test except the caret position.
       test(() => {
         editingHost.style.whiteSpace = style;
         editingHost.style.display = display;
         const utils = new EditorTestUtils(editingHost);
         utils.setupEditingHost(`<${paragraph}>a[]bc</${paragraph}>`);
         editingHost.getBoundingClientRect();
-        doIt();
+        execInsertTextOrParagraphCommand();
         assert_in_array(
           editingHost.innerHTML,
           [
@@ -337,12 +365,10 @@ for (const defaultParagraphSeparator of ["div", "p"]) {
           ],
           "The paragraph should be split"
         );
-      }, `<div contenteditable style="display:${display}; white-space:${style}"><${paragraph}>a[]bc</${paragraph}></div> (defaultparagraphseparator: ${defaultParagraphSeparator})`);
+      }, `<div contenteditable style="display:${display}; white-space:${style}"><${paragraph}>a[]bc</${paragraph}></div> (defaultParagraphSeparator: ${defaultParagraphSeparator})`);
 
-      // Styling the existing paragraph instead of editing host.
-      // XXX Oddly, new or right paragraph is wrapped by default paragraph
-      //     separator, and even if the default paragraph separator is "p",
-      //     the `<p>` element wraps the new block element!
+      // Inserting paragraph or inserting a linefeed in a splittable paragraph
+      // element whose `display` and `white-space` are specified.
       test(() => {
         editingHost.style.whiteSpace = "normal";
         editingHost.style.display = "block";
@@ -350,22 +376,36 @@ for (const defaultParagraphSeparator of ["div", "p"]) {
         const styleAttr = `style="display:${display}; white-space:${style}"`;
         utils.setupEditingHost(`<${paragraph} ${styleAttr}>abc[]</${paragraph}>`);
         editingHost.getBoundingClientRect();
-        doIt();
-        if (display != "block") {
-          assert_equals(
-            editingHost.innerHTML,
-            `<${paragraph} ${styleAttr}>abc</${paragraph}><${defaultParagraphSeparator}><${paragraph} ${styleAttr}><br></${paragraph}></${defaultParagraphSeparator}>`,
-            "New paragraph should be inserted at end of the paragraph which is wrapped by a default paragraph"
-          );
-        } else {
+        execInsertTextOrParagraphCommand();
+        // If the paragraph is a normal block, we can just split the paragraph.
+        if (display == "block") {
           assert_equals(
             editingHost.innerHTML,
             `<${paragraph} ${styleAttr}>abc</${paragraph}><${paragraph} ${styleAttr}><br></${paragraph}>`,
             "New paragraph should be inserted at end of the paragraph"
           );
         }
-      }, `<div contenteditable><${paragraph} style="display:${display}; white-space:${style}">abc[]</${paragraph}></div> (defaultparagraphseparator: ${defaultParagraphSeparator})`);
+        // Otherwise, the paragraph is an inline, splitting the paragraph
+        // element does not look like inserting paragraph for the users
+        // because it would just duplicate the inlined element.
+        // Therefore, the split paragraph should be wrapped into the new
+        // paragraph (considered with the default paragraph separator) at
+        // least.  However, <p> cannot contain <p> nor <div> which may be
+        // styled as inline.  Therefore, <div> should be used for the new
+        // paragraph even if the default paragraph separator is <p>.
+        else {
+          assert_in_array(
+            editingHost.innerHTML,
+            [
+              `<${paragraph} ${styleAttr}>abc</${paragraph}><div><${paragraph} ${styleAttr}><br></${paragraph}></div>`,
+              `<div><${paragraph} ${styleAttr}>abc</${paragraph}></div><div><${paragraph} ${styleAttr}><br></${paragraph}></div>`,
+            ],
+            "New paragraph should be inserted at end of the paragraph which is wrapped by a new <div>"
+          );
+        }
+      }, `<div contenteditable><${paragraph} style="display:${display}; white-space:${style}">abc[]</${paragraph}></div> (defaultParagraphSeparator: ${defaultParagraphSeparator})`);
 
+      // Same as above test except the caret position.
       test(() => {
         editingHost.style.whiteSpace = "normal";
         editingHost.style.display = "block";
@@ -373,17 +413,8 @@ for (const defaultParagraphSeparator of ["div", "p"]) {
         const styleAttr = `style="display:${display}; white-space:${style}"`;
         utils.setupEditingHost(`<${paragraph} ${styleAttr}>[]abc</${paragraph}>`);
         editingHost.getBoundingClientRect();
-        doIt();
-        if (display != "block") {
-          assert_in_array(
-            editingHost.innerHTML,
-            [
-              `<${defaultParagraphSeparator}><${paragraph} ${styleAttr}><br></${paragraph}></${defaultParagraphSeparator}><${paragraph} ${styleAttr}>abc</${paragraph}>`,
-              `<${defaultParagraphSeparator}><${paragraph} ${styleAttr}><br></${paragraph}></${defaultParagraphSeparator}><${paragraph} ${styleAttr}>abc<br></${paragraph}>`,
-            ],
-            "New paragraph should be inserted at start of the paragraph which is wrapped by a default paragraph"
-          );
-        } else {
+        execInsertTextOrParagraphCommand();
+        if (display == "block") {
           assert_in_array(
             editingHost.innerHTML,
             [
@@ -392,9 +423,22 @@ for (const defaultParagraphSeparator of ["div", "p"]) {
             ],
             "New paragraph should be inserted at start of the paragraph"
           );
+        } else {
+          assert_in_array(
+            editingHost.innerHTML,
+            [
+              `<div><${paragraph} ${styleAttr}><br></${paragraph}></div><${paragraph} ${styleAttr}>abc</${paragraph}>`,
+              `<div><${paragraph} ${styleAttr}><br></${paragraph}></div><${paragraph} ${styleAttr}>abc<br></${paragraph}>`,
+              `<div><${paragraph} ${styleAttr}><br></${paragraph}></div><div><${paragraph} ${styleAttr}>abc</${paragraph}></div>`,
+              `<div><${paragraph} ${styleAttr}><br></${paragraph}></div><div><${paragraph} ${styleAttr}>abc<br></${paragraph}></div>`,
+            ],
+            "New paragraph should be inserted at start of the paragraph which is wrapped by a new <div>"
+          );
         }
-      }, `<div contenteditable><${paragraph} style="display:${display}; white-space:${style}">[]abc</${paragraph}></div> (defaultparagraphseparator: ${defaultParagraphSeparator})`);
 
+      }, `<div contenteditable><${paragraph} style="display:${display}; white-space:${style}">[]abc</${paragraph}></div> (defaultParagraphSeparator: ${defaultParagraphSeparator})`);
+
+      // Same as above test except the caret position.
       test(() => {
         editingHost.style.whiteSpace = "normal";
         editingHost.style.display = "block";
@@ -402,17 +446,8 @@ for (const defaultParagraphSeparator of ["div", "p"]) {
         const utils = new EditorTestUtils(editingHost);
         utils.setupEditingHost(`<${paragraph} ${styleAttr}>a[]bc</${paragraph}>`);
         editingHost.getBoundingClientRect();
-        doIt();
-        if (display != "block") {
-          assert_in_array(
-            editingHost.innerHTML,
-            [
-              `<${paragraph} ${styleAttr}>a</${paragraph}><${defaultParagraphSeparator}><${paragraph} ${styleAttr}>bc</${paragraph}></${defaultParagraphSeparator}>`,
-              `<${paragraph} ${styleAttr}>a</${paragraph}><${defaultParagraphSeparator}><${paragraph} ${styleAttr}>bc<br></${paragraph}></${defaultParagraphSeparator}>`,
-            ],
-            "The paragraph should be split and the latter one should be wrapped by a default paragraph"
-          );
-        } else {
+        execInsertTextOrParagraphCommand();
+        if (display == "block") {
           assert_in_array(
             editingHost.innerHTML,
             [
@@ -421,8 +456,19 @@ for (const defaultParagraphSeparator of ["div", "p"]) {
             ],
             "The paragraph should be split"
           );
+        } else {
+          assert_in_array(
+            editingHost.innerHTML,
+            [
+              `<${paragraph} ${styleAttr}>a</${paragraph}><div><${paragraph} ${styleAttr}>bc</${paragraph}></div>`,
+              `<${paragraph} ${styleAttr}>a</${paragraph}><div><${paragraph} ${styleAttr}>bc<br></${paragraph}></div>`,
+              `<div><${paragraph} ${styleAttr}>a</${paragraph}></div><div><${paragraph} ${styleAttr}>bc</${paragraph}></div>`,
+              `<div><${paragraph} ${styleAttr}>a</${paragraph}></div><div><${paragraph} ${styleAttr}>bc<br></${paragraph}></div>`,
+            ],
+            "The paragraph should be split and the latter one should be wrapped by a new <div>"
+          );
         }
-      }, `<div contenteditable><${paragraph} style="display:${display}; white-space:${style}">a[]bc</${paragraph}></div> (defaultparagraphseparator: ${defaultParagraphSeparator})`);
+      }, `<div contenteditable><${paragraph} style="display:${display}; white-space:${style}">a[]bc</${paragraph}></div> (defaultParagraphSeparator: ${defaultParagraphSeparator})`);
     }
   }
 }
diff --git a/tests/wpt/tests/encoding/api-basics.any.js b/tests/wpt/tests/encoding/api-basics.any.js
index 941b878738c..768f8159313 100644
--- a/tests/wpt/tests/encoding/api-basics.any.js
+++ b/tests/wpt/tests/encoding/api-basics.any.js
@@ -1,3 +1,4 @@
+// META: global=window,dedicatedworker,shadowrealm
 // META: title=Encoding API: Basics
 
 test(function() {
diff --git a/tests/wpt/tests/encoding/api-surrogates-utf8.any.js b/tests/wpt/tests/encoding/api-surrogates-utf8.any.js
index a4ced03d428..52d29731494 100644
--- a/tests/wpt/tests/encoding/api-surrogates-utf8.any.js
+++ b/tests/wpt/tests/encoding/api-surrogates-utf8.any.js
@@ -1,3 +1,4 @@
+// META: global=window,dedicatedworker,shadowrealm
 // META: title=Encoding API: Invalid UTF-16 surrogates with UTF-8 encoding
 
 var badStrings = [
diff --git a/tests/wpt/tests/encoding/iso-2022-jp-decoder.any.js b/tests/wpt/tests/encoding/iso-2022-jp-decoder.any.js
index b02259b9600..f9915a2fcf6 100644
--- a/tests/wpt/tests/encoding/iso-2022-jp-decoder.any.js
+++ b/tests/wpt/tests/encoding/iso-2022-jp-decoder.any.js
@@ -1,3 +1,5 @@
+// META: global=window,dedicatedworker,shadowrealm
+//
 function decode(input, output, desc) {
   test(function() {
     var d = new TextDecoder("iso-2022-jp"),
diff --git a/tests/wpt/tests/encoding/streams/backpressure.any.js b/tests/wpt/tests/encoding/streams/backpressure.any.js
index 22f7f0aa2bc..0f67e335841 100644
--- a/tests/wpt/tests/encoding/streams/backpressure.any.js
+++ b/tests/wpt/tests/encoding/streams/backpressure.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 
 'use strict';
 
diff --git a/tests/wpt/tests/encoding/streams/decode-attributes.any.js b/tests/wpt/tests/encoding/streams/decode-attributes.any.js
index 0843cc665fd..f64f45b56ac 100644
--- a/tests/wpt/tests/encoding/streams/decode-attributes.any.js
+++ b/tests/wpt/tests/encoding/streams/decode-attributes.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 
 'use strict';
 
diff --git a/tests/wpt/tests/encoding/streams/decode-bad-chunks.any.js b/tests/wpt/tests/encoding/streams/decode-bad-chunks.any.js
index b7b2dd58459..21d61427a2b 100644
--- a/tests/wpt/tests/encoding/streams/decode-bad-chunks.any.js
+++ b/tests/wpt/tests/encoding/streams/decode-bad-chunks.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 
 'use strict';
 
diff --git a/tests/wpt/tests/encoding/streams/decode-non-utf8.any.js b/tests/wpt/tests/encoding/streams/decode-non-utf8.any.js
index 2950a9e58ed..effdee3b430 100644
--- a/tests/wpt/tests/encoding/streams/decode-non-utf8.any.js
+++ b/tests/wpt/tests/encoding/streams/decode-non-utf8.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 
 'use strict';
 
diff --git a/tests/wpt/tests/encoding/streams/readable-writable-properties.any.js b/tests/wpt/tests/encoding/streams/readable-writable-properties.any.js
index 234649209cf..8084cb99421 100644
--- a/tests/wpt/tests/encoding/streams/readable-writable-properties.any.js
+++ b/tests/wpt/tests/encoding/streams/readable-writable-properties.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 
 // This just tests that the "readable" and "writable" properties pass the brand
 // checks. All other relevant attributes are covered by the IDL tests.
diff --git a/tests/wpt/tests/encoding/textdecoder-arguments.any.js b/tests/wpt/tests/encoding/textdecoder-arguments.any.js
index f469dcd30ea..2d137b7aa37 100644
--- a/tests/wpt/tests/encoding/textdecoder-arguments.any.js
+++ b/tests/wpt/tests/encoding/textdecoder-arguments.any.js
@@ -1,3 +1,4 @@
+// META: global=window,dedicatedworker,shadowrealm
 // META: title=Encoding API: TextDecoder decode() optional arguments
 
 test(t => {
diff --git a/tests/wpt/tests/encoding/textdecoder-byte-order-marks.any.js b/tests/wpt/tests/encoding/textdecoder-byte-order-marks.any.js
index 9ef0d73141a..31350fdf689 100644
--- a/tests/wpt/tests/encoding/textdecoder-byte-order-marks.any.js
+++ b/tests/wpt/tests/encoding/textdecoder-byte-order-marks.any.js
@@ -1,3 +1,4 @@
+// META: global=window,dedicatedworker,shadowrealm
 // META: title=Encoding API: Byte-order marks
 
 var testCases = [
diff --git a/tests/wpt/tests/encoding/textdecoder-fatal-streaming.any.js b/tests/wpt/tests/encoding/textdecoder-fatal-streaming.any.js
index 0d58b2e1d7d..9043b43eae2 100644
--- a/tests/wpt/tests/encoding/textdecoder-fatal-streaming.any.js
+++ b/tests/wpt/tests/encoding/textdecoder-fatal-streaming.any.js
@@ -1,3 +1,4 @@
+// META: global=window,dedicatedworker,shadowrealm
 // META: title=Encoding API: End-of-file
 
 test(function() {
diff --git a/tests/wpt/tests/encoding/textdecoder-fatal.any.js b/tests/wpt/tests/encoding/textdecoder-fatal.any.js
index f9ccb2dfa76..054b35f21f4 100644
--- a/tests/wpt/tests/encoding/textdecoder-fatal.any.js
+++ b/tests/wpt/tests/encoding/textdecoder-fatal.any.js
@@ -1,3 +1,4 @@
+// META: global=window,dedicatedworker,shadowrealm
 // META: title=Encoding API: Fatal flag
 
 var bad = [
diff --git a/tests/wpt/tests/encoding/textdecoder-ignorebom.any.js b/tests/wpt/tests/encoding/textdecoder-ignorebom.any.js
index 81f210eec89..e825698ba40 100644
--- a/tests/wpt/tests/encoding/textdecoder-ignorebom.any.js
+++ b/tests/wpt/tests/encoding/textdecoder-ignorebom.any.js
@@ -1,3 +1,4 @@
+// META: global=window,dedicatedworker,shadowrealm
 // META: title=Encoding API: TextDecoder ignoreBOM option
 
 var cases = [
diff --git a/tests/wpt/tests/encoding/textdecoder-utf16-surrogates.any.js b/tests/wpt/tests/encoding/textdecoder-utf16-surrogates.any.js
index b08ea56cee3..7e8322cd19c 100644
--- a/tests/wpt/tests/encoding/textdecoder-utf16-surrogates.any.js
+++ b/tests/wpt/tests/encoding/textdecoder-utf16-surrogates.any.js
@@ -1,3 +1,4 @@
+// META: global=window,dedicatedworker,shadowrealm
 // META: title=Encoding API: UTF-16 surrogate handling
 
 var bad = [
diff --git a/tests/wpt/tests/encoding/textencoder-utf16-surrogates.any.js b/tests/wpt/tests/encoding/textencoder-utf16-surrogates.any.js
index 014a0ebb12d..31657516455 100644
--- a/tests/wpt/tests/encoding/textencoder-utf16-surrogates.any.js
+++ b/tests/wpt/tests/encoding/textencoder-utf16-surrogates.any.js
@@ -1,3 +1,4 @@
+// META: global=window,dedicatedworker,shadowrealm
 // META: title=Encoding API: USVString surrogate handling when encoding
 
 var bad = [
diff --git a/tests/wpt/tests/eventsource/META.yml b/tests/wpt/tests/eventsource/META.yml
index 92f10363385..437da600931 100644
--- a/tests/wpt/tests/eventsource/META.yml
+++ b/tests/wpt/tests/eventsource/META.yml
@@ -1,6 +1,5 @@
 spec: https://html.spec.whatwg.org/multipage/server-sent-events.html
 suggested_reviewers:
-  - zqzhang
   - odinho
   - Yaffle
   - annevk
diff --git a/tests/wpt/tests/fenced-frame/automatic-beacon-no-destination.https.html b/tests/wpt/tests/fenced-frame/automatic-beacon-no-destination.https.html
new file mode 100644
index 00000000000..bf1c56ad9ee
--- /dev/null
+++ b/tests/wpt/tests/fenced-frame/automatic-beacon-no-destination.https.html
@@ -0,0 +1,52 @@
+<!DOCTYPE html>
+<title>Test window.fence.setReportEventDataForAutomaticBeacons</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/utils.js"></script>
+<script src="/common/dispatcher/dispatcher.js"></script>
+<script src="resources/utils.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+
+<body>
+<script>
+promise_test(async (t) => {
+  const actions = new test_driver.Actions();
+  const fencedframe = await attachFencedFrameContext({
+    generator_api: "fledge",
+    automatic_beacon: true,
+  });
+  const new_url = new URL("resources/dummy.html", location.href);
+  const beacon_data = "This is the beacon data!";
+
+  await fencedframe.execute(
+    (new_url, beacon_data) => {
+      addEventListener("click", (event) => {
+        let beacon_event = {
+          eventType: "reserved.top_navigation",
+          eventData: beacon_data,
+          destination: ["component-seller"],
+        };
+        window.fence.setReportEventDataForAutomaticBeacons(beacon_event);
+        window.open(new_url, "_blank");
+      });
+    },
+    [new_url, beacon_data]
+  );
+
+  await actions
+    .pointerMove(0, 0, { origin: fencedframe.element })
+    .pointerDown()
+    .pointerUp()
+    .send();
+
+  // An automatic beacon should be sent out, but no data should be sent as part
+  // of the beacon because the "buyer" destination was not specified in
+  // setReportEventDataForAutomaticBeacons().
+  const received_beacon_data = await nextAutomaticBeacon();
+  assert_equals(received_beacon_data, "<No data>");
+}, "Set and trigger an automatic beacon with no destination specified");
+
+</script>
+</body>
diff --git a/tests/wpt/tests/fenced-frame/automatic-beacon-two-events-clear.https.html b/tests/wpt/tests/fenced-frame/automatic-beacon-two-events-clear.https.html
index 61543ffa485..28a34bf8fbf 100644
--- a/tests/wpt/tests/fenced-frame/automatic-beacon-two-events-clear.https.html
+++ b/tests/wpt/tests/fenced-frame/automatic-beacon-two-events-clear.https.html
@@ -41,17 +41,13 @@ promise_test(async(t) => {
   assert_equals(received_beacon_data_1, beacon_data);
 
   // The second click should not have any associated automatic beacon data, so
-  // no beacon should be sent.
+  // an empty beacon should be sent.
   await actions.pointerMove(0, 0, {origin: fencedframe.element})
                .pointerDown()
                .pointerUp()
                .send();
-
-  // Set up a timeout to ensure that there's enough time to send any potential
-  // automatic beacons.
-  const timeout = new Promise(resolve => t.step_timeout(resolve, 1000));
-  const result = await Promise.race([nextAutomaticBeacon(), timeout]);
-  assert_true(typeof result === "undefined");
+  const received_beacon_data_2 = await nextAutomaticBeacon();
+  assert_equals(received_beacon_data_2, "<No data>");
 }, 'Set expiring automatic beacon but trigger two events in a click handler');
 
 </script>
diff --git a/tests/wpt/tests/fenced-frame/disallowed-navigations-dangling-markup-urn.https.html b/tests/wpt/tests/fenced-frame/disallowed-navigations-dangling-markup-urn.https.html
index eceb2a4a901..a36f98f9755 100644
--- a/tests/wpt/tests/fenced-frame/disallowed-navigations-dangling-markup-urn.https.html
+++ b/tests/wpt/tests/fenced-frame/disallowed-navigations-dangling-markup-urn.https.html
@@ -20,7 +20,7 @@ for (const substring of kDanglingMarkupSubstrings) {
     const key = token();
 
     // Copied from from `generateURNFromFlege()`, since we have to modify the
-    // final URL that goes into `interestGroup.ads[0].renderUrl` for
+    // final URL that goes into `interestGroup.ads[0].renderURL` for
     // `navigator.joinAdInterestGroup()`.
     const bidding_token = token();
     const seller_token = token();
@@ -32,8 +32,8 @@ for (const substring of kDanglingMarkupSubstrings) {
     const interestGroup = {
       name: 'testAd1',
       owner: location.origin,
-      biddingLogicUrl: new URL(FLEDGE_BIDDING_URL, location.origin),
-      ads: [{renderUrl: url_string, bid: 1}],
+      biddingLogicURL: new URL(FLEDGE_BIDDING_URL, location.origin),
+      ads: [{renderURL: url_string, bid: 1}],
       userBiddingSignals: {biddingToken: bidding_token},
       trustedBiddingSignalsKeys: ['key1'],
       adComponents: [],
@@ -46,7 +46,7 @@ for (const substring of kDanglingMarkupSubstrings) {
     const auctionConfig = {
       seller: location.origin,
       interestGroupBuyers: [location.origin],
-      decisionLogicUrl: new URL(FLEDGE_DECISION_URL, location.origin),
+      decisionLogicURL: new URL(FLEDGE_DECISION_URL, location.origin),
       auctionSignals: {biddingToken: bidding_token, sellerToken: seller_token},
     };
 
diff --git a/tests/wpt/tests/fenced-frame/navigator-subapp.https.html b/tests/wpt/tests/fenced-frame/navigator-subapp.https.html
index c5b980537b3..843d2565543 100644
--- a/tests/wpt/tests/fenced-frame/navigator-subapp.https.html
+++ b/tests/wpt/tests/fenced-frame/navigator-subapp.https.html
@@ -12,12 +12,12 @@ promise_test(async () => {
   const frame = attachFencedFrameContext();
   const result = await frame.execute(async () => {
     const expected_error_message =
-        'Failed to execute \'list\' on \'SubApps\': API is only supported in primary top-level browsing contexts.';
+        'Cannot read properties of undefined (reading \'list\')';
     try {
       const list = await navigator.subApps.list();
       return 'navigator.subApps.list() succeeded';
     } catch (e) {
-      if (e.name === 'InvalidStateError' &&
+      if (e.name === 'TypeError' &&
           e.message === expected_error_message) {
         return 'navigator.subApps.list() was disallowed';
       }
diff --git a/tests/wpt/tests/fenced-frame/resources/automatic-beacon-store.py b/tests/wpt/tests/fenced-frame/resources/automatic-beacon-store.py
index f783c8530c4..0a4af50ae69 100644
--- a/tests/wpt/tests/fenced-frame/resources/automatic-beacon-store.py
+++ b/tests/wpt/tests/fenced-frame/resources/automatic-beacon-store.py
@@ -10,16 +10,19 @@
 BEACON_KEY = "0c02dba4-f01e-11ed-a05b-0242ac120003"
 
 def main(request, response):
-    # Requests with a body imply they were sent as an automatic beacon for
-    # reserved.top_navigation. Note that this only stores the most recent beacon
-    # that was sent.
-    if request.body:
-        request.server.stash.put(BEACON_KEY, request.body)
-        return (200, [], b"")
+    stash = request.server.stash;
 
-    # Requests without a body imply they were sent as the request from
-    # nextAutomaticBeacon().
-    data = request.server.stash.take(BEACON_KEY)
-    if not data and data != "":
-        return (200, [], b"<Not set>")
-    return (200, [], data)
+    # The stash is accessed concurrently by many clients. A lock is used to
+    # avoid interleaved read/write from different clients.
+    with stash.lock:
+        # Requests with a body imply they were sent as an automatic beacon for
+        # reserved.top_navigation. Note that this only stores the most recent
+        # beacon that was sent.
+        if request.method == "POST":
+            stash.put(BEACON_KEY, request.body or "<No data>")
+            return (200, [], b"")
+
+        # Requests without a body imply they were sent as the request from
+        # nextAutomaticBeacon().
+        data = stash.take(BEACON_KEY) or "<Not set>"
+        return(200, [], data)
diff --git a/tests/wpt/tests/fenced-frame/resources/fledge-bidding-logic.py b/tests/wpt/tests/fenced-frame/resources/fledge-bidding-logic.py
index 85c78acb8bc..d1178c8a7a0 100644
--- a/tests/wpt/tests/fenced-frame/resources/fledge-bidding-logic.py
+++ b/tests/wpt/tests/fenced-frame/resources/fledge-bidding-logic.py
@@ -11,7 +11,7 @@ def main(request, response):
   # Set up response headers.
   headers = [
     ('Content-Type', 'Application/Javascript'),
-    ('X-Allow-FLEDGE', 'true')
+    ('Ad-Auction-Allowed', 'true')
   ]
 
   # Parse URL params.
@@ -37,15 +37,15 @@ def main(request, response):
       '''
     )
 
-  render_obj = 'ad.renderUrl'
+  render_obj = 'ad.renderURL'
   if ad_with_size is not None:
-    render_obj = '{ url: ad.renderUrl, width: "100px", height: "50px" }'
+    render_obj = '{ url: ad.renderURL, width: "100px", height: "50px" }'
 
-  component_render_obj = 'component.renderUrl'
+  component_render_obj = 'component.renderURL'
   if ad_with_size is not None:
     component_render_obj = (
       '''{
-          url: component.renderUrl,
+          url: component.renderURL,
           width: "100px",
           height: "50px"
          }
diff --git a/tests/wpt/tests/fenced-frame/resources/fledge-decision-logic.py b/tests/wpt/tests/fenced-frame/resources/fledge-decision-logic.py
index bd615af835b..63b544552c0 100644
--- a/tests/wpt/tests/fenced-frame/resources/fledge-decision-logic.py
+++ b/tests/wpt/tests/fenced-frame/resources/fledge-decision-logic.py
@@ -11,7 +11,7 @@ def main(request, response):
   # Set up response headers.
   headers = [
     ('Content-Type', 'Application/Javascript'),
-    ('X-Allow-FLEDGE', 'true')
+    ('Ad-Auction-Allowed', 'true')
   ]
 
   # Parse URL params.
diff --git a/tests/wpt/tests/fenced-frame/resources/utils.js b/tests/wpt/tests/fenced-frame/resources/utils.js
index a402dfdde4a..255e55dd24a 100644
--- a/tests/wpt/tests/fenced-frame/resources/utils.js
+++ b/tests/wpt/tests/fenced-frame/resources/utils.js
@@ -79,31 +79,31 @@ async function generateURNFromFledgeRawURL(
 
   const ad_components_list = nested_urls.map((url) => {
     return ad_with_size ?
-      { renderUrl: url, sizeGroup: "group1" } :
-      { renderUrl: url }
+      { renderURL: url, sizeGroup: "group1" } :
+      { renderURL: url }
   });
 
   let interestGroup =
       {
         name: 'testAd1',
         owner: location.origin,
-        biddingLogicUrl: new URL(FLEDGE_BIDDING_URL, location.origin),
-        ads: [{renderUrl: href, bid: 1}],
+        biddingLogicURL: new URL(FLEDGE_BIDDING_URL, location.origin),
+        ads: [{renderURL: href, bid: 1}],
         userBiddingSignals: {biddingToken: bidding_token},
         trustedBiddingSignalsKeys: ['key1'],
         adComponents: ad_components_list,
       };
 
-  let biddingUrlParams =
-      new URLSearchParams(interestGroup.biddingLogicUrl.search);
+  let biddingURLParams =
+      new URLSearchParams(interestGroup.biddingLogicURL.search);
   if (requested_size)
-    biddingUrlParams.set(
+    biddingURLParams.set(
         'requested-size', requested_size[0] + '-' + requested_size[1]);
   if (ad_with_size)
-    biddingUrlParams.set('ad-with-size', 1);
+    biddingURLParams.set('ad-with-size', 1);
   if (automatic_beacon)
-    biddingUrlParams.set('automatic-beacon', 1);
-  interestGroup.biddingLogicUrl.search = biddingUrlParams;
+    biddingURLParams.set('automatic-beacon', 1);
+  interestGroup.biddingLogicURL.search = biddingURLParams;
 
   if (ad_with_size) {
     interestGroup.ads[0].sizeGroup = 'group1';
@@ -118,17 +118,17 @@ async function generateURNFromFledgeRawURL(
   let auctionConfig = {
     seller: location.origin,
     interestGroupBuyers: [location.origin],
-    decisionLogicUrl: new URL(FLEDGE_DECISION_URL, location.origin),
+    decisionLogicURL: new URL(FLEDGE_DECISION_URL, location.origin),
     auctionSignals: {biddingToken: bidding_token, sellerToken: seller_token},
     resolveToConfig: resolve_to_config
   };
 
   if (requested_size) {
-    let decisionUrlParams =
-      new URLSearchParams(auctionConfig.decisionLogicUrl.search);
-    decisionUrlParams.set(
+    let decisionURLParams =
+      new URLSearchParams(auctionConfig.decisionLogicURL.search);
+    decisionURLParams.set(
         'requested-size', requested_size[0] + '-' + requested_size[1]);
-    auctionConfig.decisionLogicUrl.search = decisionUrlParams;
+    auctionConfig.decisionLogicURL.search = decisionURLParams;
 
     auctionConfig['requestedSize'] = {width: requested_size[0], height: requested_size[1]};
   }
@@ -462,8 +462,8 @@ async function readValueFromServer(key) {
   // Resolve the key if it is a Promise.
   key = await key;
 
-  const serverUrl = `${STORE_URL}?key=${key}`;
-  const response = await fetch(serverUrl);
+  const serverURL = `${STORE_URL}?key=${key}`;
+  const response = await fetch(serverURL);
   if (!response.ok)
     throw new Error('An error happened in the server');
   const value = await response.text();
@@ -496,8 +496,8 @@ async function nextValueFromServer(key) {
 
 // Reads the data from the latest automatic beacon sent to the server.
 async function readAutomaticBeaconDataFromServer() {
-  const serverUrl = `${BEACON_URL}`;
-  const response = await fetch(serverUrl);
+  const serverURL = `${BEACON_URL}`;
+  const response = await fetch(serverURL);
   if (!response.ok)
     throw new Error('An error happened in the server');
   const value = await response.text();
@@ -530,8 +530,8 @@ async function writeValueToServer(key, value, origin = '') {
   // Resolve the key if it is a Promise.
   key = await key;
 
-  const serverUrl = `${origin}${STORE_URL}?key=${key}&value=${value}`;
-  await fetch(serverUrl, {"mode": "no-cors"});
+  const serverURL = `${origin}${STORE_URL}?key=${key}&value=${value}`;
+  await fetch(serverURL, {"mode": "no-cors"});
 }
 
 // Simulates a user gesture.
diff --git a/tests/wpt/tests/fetch/api/basic/request-forbidden-headers.any.js b/tests/wpt/tests/fetch/api/basic/request-forbidden-headers.any.js
index 511ce601e7c..d7560f03a23 100644
--- a/tests/wpt/tests/fetch/api/basic/request-forbidden-headers.any.js
+++ b/tests/wpt/tests/fetch/api/basic/request-forbidden-headers.any.js
@@ -1,21 +1,6 @@
 // META: global=window,worker
 // META: script=../resources/utils.js
 
-function requestForbiddenHeaders(desc, forbiddenHeaders) {
-  var url = RESOURCES_DIR + "inspect-headers.py";
-  var requestInit = {"headers": forbiddenHeaders}
-  var urlParameters = "?headers=" + Object.keys(forbiddenHeaders).join("|");
-
-  promise_test(function(test){
-    return fetch(url + urlParameters, requestInit).then(function(resp) {
-      assert_equals(resp.status, 200, "HTTP status is 200");
-      assert_equals(resp.type , "basic", "Response's type is basic");
-      for (var header in forbiddenHeaders)
-        assert_not_equals(resp.headers.get("x-request-" + header), forbiddenHeaders[header], header + " does not have the value we defined");
-    });
-  }, desc);
-}
-
 function requestValidOverrideHeaders(desc, validHeaders) {
   var url = RESOURCES_DIR + "inspect-headers.py";
   var requestInit = {"headers": validHeaders}
@@ -36,9 +21,6 @@ requestForbiddenHeaders("Accept-Encoding is a forbidden request header", {"Accep
 
 requestForbiddenHeaders("Access-Control-Request-Headers is a forbidden request header", {"Access-Control-Request-Headers": ""});
 requestForbiddenHeaders("Access-Control-Request-Method is a forbidden request header", {"Access-Control-Request-Method": ""});
-requestForbiddenHeaders(
-    'Access-Control-Request-Private-Network is a forbidden request header',
-    {'Access-Control-Request-Private-Network': ''});
 requestForbiddenHeaders("Connection is a forbidden request header", {"Connection": "close"});
 requestForbiddenHeaders("Content-Length is a forbidden request header", {"Content-Length": "42"});
 requestForbiddenHeaders("Cookie is a forbidden request header", {"Cookie": "cookie=none"});
diff --git a/tests/wpt/tests/fetch/api/basic/request-private-network-headers.tentative.any.js b/tests/wpt/tests/fetch/api/basic/request-private-network-headers.tentative.any.js
new file mode 100644
index 00000000000..9662a91c177
--- /dev/null
+++ b/tests/wpt/tests/fetch/api/basic/request-private-network-headers.tentative.any.js
@@ -0,0 +1,18 @@
+// META: global=window,worker
+// META: script=../resources/utils.js
+
+requestForbiddenHeaders(
+    'Access-Control-Request-Private-Network is a forbidden request header',
+    {'Access-Control-Request-Private-Network': ''});
+
+var invalidRequestHeaders = [
+  ["Access-Control-Request-Private-Network", "KO"],
+];
+
+invalidRequestHeaders.forEach(function(header) {
+  test(function() {
+    var request = new Request("");
+    request.headers.set(header[0], header[1]);
+    assert_equals(request.headers.get(header[0]), null);
+  }, "Adding invalid request header \"" + header[0] + ": " + header[1] + "\"");
+});
diff --git a/tests/wpt/tests/fetch/api/basic/scheme-blob.sub.any.js b/tests/wpt/tests/fetch/api/basic/scheme-blob.sub.any.js
index a6059ea93d9..8afdc033c9d 100644
--- a/tests/wpt/tests/fetch/api/basic/scheme-blob.sub.any.js
+++ b/tests/wpt/tests/fetch/api/basic/scheme-blob.sub.any.js
@@ -57,6 +57,10 @@ let empty_data_blob = new Blob([], {type: "text/plain"});
 checkFetchResponse(URL.createObjectURL(empty_data_blob), "", "text/plain", 0,
                   "Fetching URL.createObjectURL(empty_data_blob) is OK");
 
+let invalid_type_blob = new Blob([], {type: "invalid"});
+checkFetchResponse(URL.createObjectURL(invalid_type_blob), "", "", 0,
+                  "Fetching URL.createObjectURL(invalid_type_blob) is OK");
+
 promise_test(function(test) {
   return fetch("/images/blue.png").then(function(resp) {
     return resp.arrayBuffer();
diff --git a/tests/wpt/tests/fetch/api/basic/url-parsing.sub.html b/tests/wpt/tests/fetch/api/basic/url-parsing.sub.html
new file mode 100644
index 00000000000..fa47b29473a
--- /dev/null
+++ b/tests/wpt/tests/fetch/api/basic/url-parsing.sub.html
@@ -0,0 +1,33 @@
+<!-- Based on /html/infrastructure/urls/resolving-urls/query-encoding/location.sub.html -->
+<!doctype html>
+<meta charset={{GET[encoding]}}> <!-- ends up as <meta charset> by default which is windows-1252 -->
+<meta name=variant content="?encoding=windows-1252">
+<meta name=variant content="?encoding=x-cp1251">
+<meta name=variant content="?encoding=utf8">
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<div id=log></div>
+<script>
+function expected(encoding) {
+  return {
+    "UTF-8": "%C3%BF",
+    "windows-1251": "%26%23255%3B",
+    "windows-1252": "%FF"
+  }[encoding];
+}
+
+test(() => {
+  const request = new Request("?\u00FF");
+  assert_equals(request.url.split("?")[1], expected("UTF-8"));
+}, "Request uses the UTF-8 URL parser");
+
+test(() => {
+  const request = new Request("about:blank", { referrer: "?\u00FF" });
+  assert_equals(request.referrer.split("?")[1], expected("UTF-8"));
+}, "Request's referrer uses the UTF-8 URL parser");
+
+test(() => {
+  const response = Response.redirect("?\u00FF");
+  assert_equals(response.headers.get("Location").split("?")[1], expected("UTF-8"));
+}, "Response.redirect() uses the UTF-8 URL parser");
+</script>
diff --git a/tests/wpt/tests/fetch/api/request/request-headers.any.js b/tests/wpt/tests/fetch/api/request/request-headers.any.js
index 22925e01b69..a766bcb5fff 100644
--- a/tests/wpt/tests/fetch/api/request/request-headers.any.js
+++ b/tests/wpt/tests/fetch/api/request/request-headers.any.js
@@ -18,7 +18,6 @@ var invalidRequestHeaders = [
   ["Accept-Encoding", "KO"],
   ["Access-Control-Request-Headers", "KO"],
   ["Access-Control-Request-Method", "KO"],
-  ["Access-Control-Request-Private-Network", "KO"],
   ["Connection", "KO"],
   ["Content-Length", "KO"],
   ["Cookie", "KO"],
diff --git a/tests/wpt/tests/fetch/api/resources/utils.js b/tests/wpt/tests/fetch/api/resources/utils.js
index 3b20ecc8346..3721d9bf9cc 100644
--- a/tests/wpt/tests/fetch/api/resources/utils.js
+++ b/tests/wpt/tests/fetch/api/resources/utils.js
@@ -103,3 +103,18 @@ function delay(milliseconds)
     step_timeout(resolve, milliseconds);
   });
 }
+
+function requestForbiddenHeaders(desc, forbiddenHeaders) {
+  var url = RESOURCES_DIR + "inspect-headers.py";
+  var requestInit = {"headers": forbiddenHeaders}
+  var urlParameters = "?headers=" + Object.keys(forbiddenHeaders).join("|");
+
+  promise_test(function(test){
+    return fetch(url + urlParameters, requestInit).then(function(resp) {
+      assert_equals(resp.status, 200, "HTTP status is 200");
+      assert_equals(resp.type , "basic", "Response's type is basic");
+      for (var header in forbiddenHeaders)
+        assert_not_equals(resp.headers.get("x-request-" + header), forbiddenHeaders[header], header + " does not have the value we defined");
+    });
+  }, desc);
+}
diff --git a/tests/wpt/tests/fetch/api/response/response-headers-guard.any.js b/tests/wpt/tests/fetch/api/response/response-headers-guard.any.js
new file mode 100644
index 00000000000..4a67d067a71
--- /dev/null
+++ b/tests/wpt/tests/fetch/api/response/response-headers-guard.any.js
@@ -0,0 +1,8 @@
+// META: global=window,worker
+// META: title=Response: error static method
+
+promise_test (async () => {
+  const response = await fetch("../resources/data.json");
+  assert_throws_js(TypeError, () => { response.headers.append("name", "value"); });
+  assert_not_equals(response.headers.get("name"), "value", "response headers should be immutable");
+}, "Ensure response headers are immutable");
diff --git a/tests/wpt/tests/fetch/api/response/response-static-error.any.js b/tests/wpt/tests/fetch/api/response/response-static-error.any.js
index 1f8c49ab006..4097eab37b4 100644
--- a/tests/wpt/tests/fetch/api/response/response-static-error.any.js
+++ b/tests/wpt/tests/fetch/api/response/response-static-error.any.js
@@ -11,18 +11,6 @@ test(function() {
   assert_true(responseError.headers.entries().next().done, "Headers should be empty");
 }, "Check response returned by static method error()");
 
-promise_test (async function() {
-  let response = await fetch("../resources/data.json");
-
-  try {
-    response.headers.append('name', 'value');
-  } catch (e) {
-    assert_equals(e.constructor.name, "TypeError");
-  }
-
-  assert_not_equals(response.headers.get("name"), "value", "response headers should be immutable");
-}, "Ensure response headers are immutable");
-
 test(function() {
   const headers = Response.error().headers;
 
diff --git a/tests/wpt/tests/fetch/fetch-later/basic.tentative.https.window.js b/tests/wpt/tests/fetch/fetch-later/basic.tentative.https.window.js
index a8ca011a7c9..0870f1c273a 100644
--- a/tests/wpt/tests/fetch/fetch-later/basic.tentative.https.window.js
+++ b/tests/wpt/tests/fetch/fetch-later/basic.tentative.https.window.js
@@ -7,7 +7,43 @@ test(() => {
   assert_throws_js(TypeError, () => fetchLater());
 }, `fetchLater() cannot be called without request.`);
 
+test(() => {
+  assert_throws_js(TypeError, () => fetchLater('http://www.google.com'));
+  assert_throws_js(TypeError, () => fetchLater('file://tmp'));
+  assert_throws_js(TypeError, () => fetchLater('ssh://example.com'));
+  assert_throws_js(TypeError, () => fetchLater('wss://example.com'));
+  assert_throws_js(TypeError, () => fetchLater('about:blank'));
+  assert_throws_js(TypeError, () => fetchLater(`javascript:alert('');`));
+}, `fetchLater() throws TypeError on non-HTTPS URL.`);
+
+test(() => {
+  assert_throws_js(
+      RangeError,
+      () => fetchLater('https://www.google.com', {activationTimeout: -1}));
+}, `fetchLater() throws RangeError on negative activationTimeout.`);
+
 test(() => {
   const result = fetchLater('/');
-  assert_false(result.sent);
+  assert_false(result.activated);
 }, `fetchLater()'s return tells the deferred request is not yet sent.`);
+
+test(() => {
+  const result = fetchLater('/');
+  assert_throws_js(TypeError, () => result.activated = true);
+}, `fetchLater() throws TypeError when mutating its returned state.`);
+
+test(() => {
+  const controller = new AbortController();
+  // Immediately aborts the controller.
+  controller.abort();
+  assert_throws_dom(
+      'AbortError', () => fetchLater('/', {signal: controller.signal}));
+}, `fetchLater() throws AbortError when its initial abort signal is aborted.`);
+
+test(() => {
+  const controller = new AbortController();
+  const result = fetchLater('/', {signal: controller.signal});
+  assert_false(result.activated);
+  controller.abort();
+  assert_false(result.activated);
+}, `fetchLater() does not throw error when it is aborted before sending.`);
diff --git a/tests/wpt/tests/fetch/fetch-later/quota.tentative.https.window.js b/tests/wpt/tests/fetch/fetch-later/quota.tentative.https.window.js
new file mode 100644
index 00000000000..4fc5979374c
--- /dev/null
+++ b/tests/wpt/tests/fetch/fetch-later/quota.tentative.https.window.js
@@ -0,0 +1,130 @@
+// META: script=/resources/testharness.js
+// META: script=/resources/testharnessreport.js
+// META: script=/common/get-host-info.sub.js
+// META: script=/common/utils.js
+// META: script=/pending-beacon/resources/pending_beacon-helper.js
+
+'use strict';
+
+const kQuotaPerOrigin = 64 * 1024;  // 64 kilobytes per spec.
+const {ORIGIN, HTTPS_NOTSAMESITE_ORIGIN} = get_host_info();
+
+// Runs a test case that cover a single fetchLater() call with `body` in its
+// request payload. The call is not expected to throw any errors.
+function fetchLaterPostTest(body, description) {
+  test(() => {
+    const controller = new AbortController();
+    const result = fetchLater(
+        '/fetch-later',
+        {method: 'POST', signal: controller.signal, body: body});
+    assert_false(result.activated);
+    // Release quota taken by the pending request for subsequent tests.
+    controller.abort();
+  }, description);
+}
+
+// Test small payload for each supported data types.
+for (const [dataType, skipCharset] of Object.entries(
+         BeaconDataTypeToSkipCharset)) {
+  fetchLaterPostTest(
+      makeBeaconData(generateSequentialData(0, 1024, skipCharset), dataType),
+      `A fetchLater() call accept small data in POST request of ${dataType}.`);
+}
+
+// Test various size of payloads for the same origin.
+for (const dataType in BeaconDataType) {
+  if (dataType !== BeaconDataType.FormData &&
+      dataType !== BeaconDataType.URLSearchParams) {
+    // Skips FormData & URLSearchParams, as browser adds extra bytes to them
+    // in addition to the user-provided content. It is difficult to test a
+    // request right at the quota limit.
+    fetchLaterPostTest(
+        // Generates data that is exactly 64 kilobytes.
+        makeBeaconData(generatePayload(kQuotaPerOrigin), dataType),
+        `A single fetchLater() call takes up the per-origin quota for its ` +
+            `body of ${dataType}.`);
+  }
+}
+
+// Test empty payload.
+for (const dataType in BeaconDataType) {
+  test(
+      () => {
+        assert_throws_js(
+            TypeError, () => fetchLater('/', {method: 'POST', body: ''}));
+      },
+      `A single fetchLater() call does not accept empty data in POST request ` +
+          `of ${dataType}.`);
+}
+
+// Test oversized payload.
+for (const dataType in BeaconDataType) {
+  test(
+      () => {
+        assert_throws_dom(
+            'QuotaExceededError',
+            () => fetchLater('/fetch-later', {
+              method: 'POST',
+              // Generates data that exceeds 64 kilobytes.
+              body:
+                  makeBeaconData(generatePayload(kQuotaPerOrigin + 1), dataType)
+            }));
+      },
+      `A single fetchLater() call is not allowed to exceed per-origin quota ` +
+          `for its body of ${dataType}.`);
+}
+
+// Test accumulated oversized request.
+for (const dataType in BeaconDataType) {
+  test(
+      () => {
+        const controller = new AbortController();
+        // Makes the 1st call that sends only half of allowed quota.
+        fetchLater('/fetch-later', {
+          method: 'POST',
+          signal: controller.signal,
+          body: makeBeaconData(generatePayload(kQuotaPerOrigin / 2), dataType)
+        });
+
+        // Makes the 2nd call that sends half+1 of allowed quota.
+        assert_throws_dom('QuotaExceededError', () => {
+          fetchLater('/fetch-later', {
+            method: 'POST',
+            signal: controller.signal,
+            body: makeBeaconData(
+                generatePayload(kQuotaPerOrigin / 2 + 1), dataType)
+          });
+        });
+        // Release quota taken by the pending requests for subsequent tests.
+        controller.abort();
+      },
+      `The 2nd fetchLater() call is not allowed to exceed per-origin quota ` +
+          `for its body of ${dataType}.`);
+}
+
+// Test various size of payloads across different origins.
+for (const dataType in BeaconDataType) {
+  test(
+      () => {
+        const controller = new AbortController();
+        // Makes the 1st call that sends only half of allowed quota.
+        fetchLater('/fetch-later', {
+          method: 'POST',
+          signal: controller.signal,
+          body: makeBeaconData(generatePayload(kQuotaPerOrigin / 2), dataType)
+        });
+
+        // Makes the 2nd call that sends half+1 of allowed quota, but to a
+        // different origin.
+        fetchLater(`${HTTPS_NOTSAMESITE_ORIGIN}/fetch-later`, {
+          method: 'POST',
+          signal: controller.signal,
+          body:
+              makeBeaconData(generatePayload(kQuotaPerOrigin / 2 + 1), dataType)
+        });
+        // Release quota taken by the pending requests for subsequent tests.
+        controller.abort();
+      },
+      `The 2nd fetchLater() call to another origin does not exceed per-origin` +
+          ` quota for its body of ${dataType}.`);
+}
diff --git a/tests/wpt/tests/fetch/fetch-later/send-on-deactivate.tentative.https.window.js b/tests/wpt/tests/fetch/fetch-later/send-on-deactivate.tentative.https.window.js
new file mode 100644
index 00000000000..4fbea12bfec
--- /dev/null
+++ b/tests/wpt/tests/fetch/fetch-later/send-on-deactivate.tentative.https.window.js
@@ -0,0 +1,103 @@
+// META: script=/resources/testharness.js
+// META: script=/resources/testharnessreport.js
+// META: script=/common/dispatcher/dispatcher.js
+// META: script=/common/get-host-info.sub.js
+// META: script=/common/utils.js
+// META: script=/html/browsers/browsing-the-web/remote-context-helper/resources/remote-context-helper.js
+// META: script=/html/browsers/browsing-the-web/back-forward-cache/resources/rc-helper.js
+// META: script=/pending-beacon/resources/pending_beacon-helper.js
+
+'use strict';
+
+parallelPromiseTest(async t => {
+  const uuid = token();
+  const url = generateSetBeaconURL(uuid);
+  // Sets no option to test the default behavior when a document enters BFCache.
+  const helper = new RemoteContextHelper();
+  // Opens a window with noopener so that BFCache will work.
+  const rc1 = await helper.addWindow(
+      /*config=*/ null, /*options=*/ {features: 'noopener'});
+
+  // Creates a fetchLater request with default config in remote, which should
+  // only be sent on page discarded (not on entering BFCache).
+  await rc1.executeScript(url => {
+    fetchLater(url);
+    // Add a pageshow listener to stash the BFCache event.
+    window.addEventListener('pageshow', e => {
+      window.pageshowEvent = e;
+    });
+  }, [url]);
+  // Navigates away to let page enter BFCache.
+  const rc2 = await rc1.navigateToNew();
+  // Navigate back.
+  await rc2.historyBack();
+  // Verify that the page was BFCached.
+  assert_true(await rc1.executeScript(() => {
+    return window.pageshowEvent.persisted;
+  }));
+
+  await expectBeacon(uuid, {count: 0});
+}, `fetchLater() does not send on page entering BFCache.`);
+
+parallelPromiseTest(async t => {
+  const uuid = token();
+  const url = generateSetBeaconURL(uuid);
+  const helper = new RemoteContextHelper();
+  // Opens a window with noopener so that BFCache will work.
+  const rc1 = await helper.addWindow(
+      /*config=*/ null, /*options=*/ {features: 'noopener'});
+
+  // When the remote is BFCached, creates a fetchLater request w/
+  // activationTimeout = 0s. It should be sent out immediately.
+  await rc1.executeScript(url => {
+    window.addEventListener('pagehide', e => {
+      if (e.persisted) {
+        fetchLater(url, {activationTimeout: 0});
+      }
+    });
+    // Add a pageshow listener to stash the BFCache event.
+    window.addEventListener('pageshow', e => {
+      window.pageshowEvent = e;
+    });
+  }, [url]);
+  // Navigates away to trigger request sending.
+  const rc2 = await rc1.navigateToNew();
+  // Navigate back.
+  await rc2.historyBack();
+  // Verify that the page was BFCached.
+  assert_true(await rc1.executeScript(() => {
+    return window.pageshowEvent.persisted;
+  }));
+
+  await expectBeacon(uuid, {count: 1});
+}, `Call fetchLater() when BFCached with activationTimeout=0 sends immediately.`);
+
+parallelPromiseTest(async t => {
+  const uuid = token();
+  const url = generateSetBeaconURL(uuid);
+  // Sets no option to test the default behavior when a document gets discarded
+  // on navigated away.
+  const helper = new RemoteContextHelper();
+  // Opens a window without BFCache.
+  const rc1 = await helper.addWindow();
+
+  // Creates a fetchLater request in remote which should only be sent on
+  // navigating away.
+  await rc1.executeScript(url => {
+    fetchLater(url);
+    // Add a pageshow listener to stash the BFCache event.
+    window.addEventListener('pageshow', e => {
+      window.pageshowEvent = e;
+    });
+  }, [url]);
+  // Navigates away to trigger request sending.
+  const rc2 = await rc1.navigateToNew();
+  // Navigate back.
+  await rc2.historyBack();
+  // Verify that the page was NOT BFCached.
+  assert_equals(undefined, await rc1.executeScript(() => {
+    return window.pageshowEvent;
+  }));
+
+  await expectBeacon(uuid, {count: 1});
+}, `fetchLater() sends on navigating away a page w/o BFCache.`);
diff --git a/tests/wpt/tests/fetch/fetch-later/send-on-discard.tentative.https.window.js b/tests/wpt/tests/fetch/fetch-later/send-on-discard.tentative.https.window.js
new file mode 100644
index 00000000000..8a39458f9b2
--- /dev/null
+++ b/tests/wpt/tests/fetch/fetch-later/send-on-discard.tentative.https.window.js
@@ -0,0 +1,68 @@
+// META: script=/resources/testharness.js
+// META: script=/resources/testharnessreport.js
+// META: script=/common/utils.js
+// META: script=/pending-beacon/resources/pending_beacon-helper.js
+
+'use strict';
+
+parallelPromiseTest(async t => {
+  const uuid = token();
+  const url = generateSetBeaconURL(uuid);
+  const numPerMethod = 20;
+  const total = numPerMethod * 2;
+
+  // Loads an iframe that creates `numPerMethod` GET & POST fetchLater requests.
+  const iframe = await loadScriptAsIframe(`
+    const url = "${url}";
+    for (let i = 0; i < ${numPerMethod}; i++) {
+      fetchLater(url);
+      fetchLater(url, {method: 'POST'});
+    }
+  `);
+  // Delete the iframe to trigger deferred request sending.
+  document.body.removeChild(iframe);
+
+  // The iframe should have sent all requests.
+  await expectBeacon(uuid, {count: total});
+}, 'A discarded document sends all its fetchLater requests.');
+
+parallelPromiseTest(async t => {
+  const uuid = token();
+  const url = generateSetBeaconURL(uuid);
+  const numPerMethod = 20;
+  const total = numPerMethod * 2;
+
+  // Loads an iframe that creates `numPerMethod` GET & POST fetchLater requests.
+  const iframe = await loadScriptAsIframe(`
+    const url = "${url}";
+    for (let i = 0; i < ${numPerMethod}; i++) {
+      fetchLater(url, {method: 'GET', activationTimeout: 10000});  // 10s
+      fetchLater(url, {method: 'POST', activationTimeout: 8000});  // 8s
+    }
+  `);
+  // Delete the iframe to trigger deferred request sending.
+  document.body.removeChild(iframe);
+
+  // The iframe should have sent all requests.
+  await expectBeacon(uuid, {count: total});
+}, 'A discarded document sends all its fetchLater requests, no matter how much their timeout remain.');
+
+parallelPromiseTest(async t => {
+  const uuid = token();
+  const url = generateSetBeaconURL(uuid);
+
+  // Loads an iframe that creates 2 fetchLater requests. One of them is aborted.
+  const iframe = await loadScriptAsIframe(`
+    const url = "${url}";
+    const controller = new AbortController();
+    fetchLater(url, {signal: controller.signal});
+    fetchLater(url, {method: 'POST'});
+    controller.abort();
+  `);
+  // Delete the iframe to trigger deferred request sending.
+  document.body.removeChild(iframe);
+
+  // The iframe should not send the aborted request.
+  // TODO(crbug.com/1465781): Fix this after implementing abort function.
+  await expectBeacon(uuid, {count: 1});
+}, 'A discarded document does not send an already aborted fetchLater request.');
diff --git a/tests/wpt/tests/fetch/fetch-later/sendondiscard.tentative.https.window.js b/tests/wpt/tests/fetch/fetch-later/sendondiscard.tentative.https.window.js
deleted file mode 100644
index 0613d18dffb..00000000000
--- a/tests/wpt/tests/fetch/fetch-later/sendondiscard.tentative.https.window.js
+++ /dev/null
@@ -1,28 +0,0 @@
-// META: script=/resources/testharness.js
-// META: script=/resources/testharnessreport.js
-// META: script=/common/utils.js
-// META: script=/pending-beacon/resources/pending_beacon-helper.js
-
-'use strict';
-
-parallelPromiseTest(async t => {
-  const uuid = token();
-  const url = generateSetBeaconURL(uuid);
-  const numPerMethod = 20;
-  const total = numPerMethod * 2;
-
-  // Loads an iframe that creates `numPerMethod` GET & POST fetchLater requests.
-  const iframe = await loadScriptAsIframe(`
-    const url = "${url}";
-    for (let i = 0; i < ${numPerMethod}; i++) {
-      let get = fetchLater(url);
-      let post = fetchLater(url, {method: 'POST'});
-    }
-  `);
-
-  // Delete the iframe to trigger deferred request sending.
-  document.body.removeChild(iframe);
-
-  // The iframe should have sent all requests.
-  await expectBeacon(uuid, {count: total});
-}, 'A discarded document sends all its fetchLater requests with default config.');
diff --git a/tests/wpt/tests/fetch/fetch-later/timeout.tentative.https.window.js b/tests/wpt/tests/fetch/fetch-later/timeout.tentative.https.window.js
new file mode 100644
index 00000000000..ec47e756abe
--- /dev/null
+++ b/tests/wpt/tests/fetch/fetch-later/timeout.tentative.https.window.js
@@ -0,0 +1,56 @@
+// META: script=/resources/testharness.js
+// META: script=/resources/testharnessreport.js
+// META: script=/common/dispatcher/dispatcher.js
+// META: script=/common/get-host-info.sub.js
+// META: script=/common/utils.js
+// META: script=/html/browsers/browsing-the-web/remote-context-helper/resources/remote-context-helper.js
+// META: script=/html/browsers/browsing-the-web/back-forward-cache/resources/rc-helper.js
+// META: script=/pending-beacon/resources/pending_beacon-helper.js
+
+'use strict';
+
+parallelPromiseTest(async t => {
+  const uuid = token();
+  const url = generateSetBeaconURL(uuid);
+
+  // Loads an iframe that creates a fetchLater request w/ short timeout.
+  const iframe = await loadScriptAsIframe(`
+    fetchLater("${url}", {activationTimeout: 1000});  // 1s
+  `);
+  // Deletes the iframe to trigger deferred request sending.
+  document.body.removeChild(iframe);
+
+  // The iframe should have sent all requests.
+  await expectBeacon(uuid, {count: 1});
+}, 'fetchLater() sends out based on activationTimeout.');
+
+parallelPromiseTest(async t => {
+  const uuid = token();
+  const url = generateSetBeaconURL(uuid);
+  // Sets no option to test the default behavior when a document enters BFCache.
+  const helper = new RemoteContextHelper();
+  // Opens a window with noopener so that BFCache will work.
+  const rc1 = await helper.addWindow(
+      /*config=*/ null, /*options=*/ {features: 'noopener'});
+
+  // Creates a fetchLater request with short timeout. It should be sent out
+  // even if the document is then put into BFCache.
+  // only be sent on page discarded (not on entering BFCache).
+  await rc1.executeScript(url => {
+    fetchLater(url, {activationTimeout: 1000});  // 1.
+    // Add a pageshow listener to stash the BFCache event.
+    window.addEventListener('pageshow', e => {
+      window.pageshowEvent = e;
+    });
+  }, [url]);
+  // Navigates away to let page enter BFCache.
+  const rc2 = await rc1.navigateToNew();
+  // Navigate back.
+  await rc2.historyBack();
+  // Verify that the page was BFCached.
+  assert_true(await rc1.executeScript(() => {
+    return window.pageshowEvent.persisted;
+  }));
+
+  await expectBeacon(uuid, {count: 1});
+}, 'fetchLater() sends out based on activationTimeout, even if document is in BFCache.');
diff --git a/tests/wpt/tests/fetch/orb/resources/utils.js b/tests/wpt/tests/fetch/orb/resources/utils.js
index 94a2177f079..45fbc4cb38e 100644
--- a/tests/wpt/tests/fetch/orb/resources/utils.js
+++ b/tests/wpt/tests/fetch/orb/resources/utils.js
@@ -10,9 +10,92 @@ function contentTypeOptions(type) {
   return header("X-Content-Type-Options", type);
 }
 
-function fetchORB(file, options, ...pipe) {
-  return fetch(`${file}${pipe.length ? `?pipe=${pipe.join("|")}` : ""}`, {
-    ...(options || {}),
+function testFetchNoCors(_t, path, { headers }) {
+  return fetch(path, {
+    ...(headers ? { headers } : {}),
     mode: "no-cors",
   });
 }
+
+function testElementInitiator(t, path, name) {
+  let element = document.createElement(name);
+  element.src = path;
+  t.add_cleanup(() => element.remove());
+  return new Promise((resolve, reject) => {
+    element.onerror = e => reject(new TypeError());
+    element.onload = resolve;
+
+    document.body.appendChild(element);
+  });
+}
+
+function testImageInitiator(t, path) {
+  return testElementInitiator(t, path, "img");
+}
+
+function testAudioInitiator(t, path) {
+  return testElementInitiator(t, path, "audio");
+}
+
+function testVideoInitiator(t, path) {
+  return testElementInitiator(t, path, "video");
+}
+
+function testScriptInitiator(t, path) {
+  return testElementInitiator(t, path, "script");
+}
+
+function runTest(t, test, file, options, ...pipe) {
+  const path = `${file}${pipe.length ? `?pipe=${pipe.join("|")}` : ""}`;
+  return test(t, path, options)
+}
+
+function testRunAll(file, testCallback, adapter, options) {
+  let testcase = function (test, message, skip) {
+    return {test, message, skip};
+  };
+
+  const name = "...";
+  [ testcase(testFetchNoCors, `fetch(${name}, {mode: "no-cors"})`, false || options.skip.includes("fetch")),
+    testcase(testImageInitiator, `<img src=${name}>`,  options.onlyFetch || options.skip.includes("image")),
+    testcase(testAudioInitiator, `<audio src=${name}>`, options.onlyFetch || options.skip.includes("audio")),
+    testcase(testVideoInitiator, `<video src=${name}>`, options.onlyFetch || options.skip.includes("video")),
+    testcase(testScriptInitiator, `<script src=${name}>`, options.onlyFetch || options.skip.includes("script")),
+  ].filter(({skip}) => !skip)
+  .forEach(({test, message}) => {
+    testCallback((t, ...args) => adapter(t, runTest(t, test, file, options, ...args), message), header => `${header}: ${message}`);
+  });
+}
+
+function expected_block(file, testCallback, options = {}) {
+  let defaultOptions = {
+    onlyFetch: !self.GLOBAL.isWindow(),
+    skip: []
+  };
+  testRunAll(file, testCallback, (t, promise, message) => promise_rejects_js(t, TypeError, promise, message), { ...defaultOptions, ...options });
+}
+
+function expected_allow(file, testCallback, options = {}) {
+  let defaultOptions = {
+    onlyFetch: !self.GLOBAL.isWindow(),
+    skip: [],
+    headers: null
+  };
+  testRunAll(file, testCallback, (_t, promise, _message) => promise, { ...defaultOptions, ...options });
+}
+
+function expected_allow_fetch(file, testCallback, options = {}) {
+  let defaultOptions = {
+    skip: [],
+    headers: null,
+  };
+  testRunAll(file, testCallback, (_t, promise, _message) => promise, { ...defaultOptions, ...options, onlyFetch: true });
+}
+
+function expected_block_fetch(file, testCallback, options = {}) {
+  let defaultOptions = {
+    skip: [],
+    headers: null,
+  };
+  testRunAll(file, testCallback, (t, promise, message) => promise_rejects_js(t, TypeError, promise, message), { ...defaultOptions, ...options, onlyFetch: true });
+}
diff --git a/tests/wpt/tests/fetch/orb/tentative/content-range.sub.any.js b/tests/wpt/tests/fetch/orb/tentative/content-range.sub.any.js
index ee97521a55c..c965aea4f8d 100644
--- a/tests/wpt/tests/fetch/orb/tentative/content-range.sub.any.js
+++ b/tests/wpt/tests/fetch/orb/tentative/content-range.sub.any.js
@@ -3,29 +3,18 @@
 const url =
   "http://{{domains[www1]}}:{{ports[http][0]}}/fetch/orb/resources/image.png";
 
-promise_test(async () => {
-  let headers = new Headers([["Range", "bytes=0-99"]]);
-  await fetchORB(
-    url,
-    { headers },
-    header("Content-Range", "bytes 0-99/1010"),
-    "slice(null,100)",
-    "status(206)"
-  );
-}, "ORB shouldn't block opaque range of image/png starting at zero");
+expected_allow_fetch(
+  url,
+  (orb_test, message) =>
+    promise_test(
+      t => orb_test(t, header("Content-Range", "bytes 0-99/1010"), "slice(null,100)", "status(206)"),
+      message("ORB shouldn't block opaque range of image/png starting at zero")),
+  { headers: new Headers([["Range", "bytes=0-99"]]) });
 
-promise_test(
-  t =>
-    promise_rejects_js(
-      t,
-      TypeError,
-      fetchORB(
-        url,
-        { headers: new Headers([["Range", "bytes 10-99"]]) },
-        header("Content-Range", "bytes 10-99/1010"),
-        "slice(10,100)",
-        "status(206)"
-      )
-    ),
-  "ORB should block opaque range of image/png not starting at zero, that isn't subsequent"
-);
+expected_block_fetch(
+  url,
+  (orb_test, message) =>
+    promise_test(
+      t => orb_test(t, header("Content-Range", "bytes 10-99/1010"), "slice(10,100)", "status(206)"),
+      message("ORB should block opaque range of image/png not starting at zero, that isn't subsequent")),
+  { headers: new Headers([["Range", "bytes 10-99"]]) });
diff --git a/tests/wpt/tests/fetch/orb/tentative/known-mime-type.sub.any.js b/tests/wpt/tests/fetch/orb/tentative/known-mime-type.sub.any.js
index b0521e8b363..cc6d208fd3f 100644
--- a/tests/wpt/tests/fetch/orb/tentative/known-mime-type.sub.any.js
+++ b/tests/wpt/tests/fetch/orb/tentative/known-mime-type.sub.any.js
@@ -2,85 +2,98 @@
 
 const path = "http://{{domains[www1]}}:{{ports[http][0]}}/fetch/orb/resources";
 
-promise_test(
-  t =>
-    promise_rejects_js(
-      t,
-      TypeError,
-      fetchORB(`${path}/font.ttf`, null, contentType("font/ttf"))
-    ),
-  "ORB should block opaque font/ttf"
-);
+expected_block(
+  `${path}/font.ttf`,
+  (orb_test, message) =>
+    promise_test(
+      t => orb_test(t, contentType("font/ttf")),
+      message("ORB should block opaque font/ttf")));
 
-promise_test(
-  t =>
-    promise_rejects_js(
-      t,
-      TypeError,
-      fetchORB(`${path}/text.txt`, null, contentType("text/plain"))
-    ),
-  "ORB should block opaque text/plain"
-);
+expected_block(
+  `${path}/text.txt`,
+  (orb_test, message) =>
+    promise_test(
+      t => orb_test(t, contentType("text/plain")),
+      message("ORB should block opaque text/plain")));
 
-promise_test(
-  t =>
-    promise_rejects_js(
-      t,
-      TypeError,
-      fetchORB(`${path}/data.json`, null, contentType("application/json"))
-    ),
-  "ORB should block opaque application/json (non-empty)"
-);
+expected_block(
+  `${path}/data.json`,
+  (orb_test, message) =>
+    promise_test(
+      t => orb_test(t, contentType("application/json")),
+      message("ORB should block opaque application/json (non-empty)")));
 
-promise_test(
-  t =>
-    promise_rejects_js(
-      t,
-      TypeError,
-      fetchORB(`${path}/empty.json`, null, contentType("application/json"))
-    ),
-  "ORB should block opaque application/json (empty)"
-);
+expected_block(
+  `${path}/empty.json`,
+  (orb_test, message) =>
+    promise_test(
+      t => orb_test(t, contentType("application/json")),
+      message("ORB should block opaque application/json (empty)")));
 
-promise_test(
-  t =>
-    promise_rejects_js(
-      t,
-      TypeError,
-      fetchORB(`${path}/data_non_ascii.json`, null, contentType("application/json"))
-    ),
-  "ORB should block opaque application/json which contains non ascii characters"
-);
+expected_block(
+  `${path}/data_non_ascii.json`,
+  (orb_test, message) =>
+    promise_test(
+      t => orb_test(t, contentType("application/json")),
+      message("ORB should block opaque application/json which contains non ascii characters")));
 
-promise_test(async () => {
-  fetchORB(`${path}/image.png`, null, contentType("image/png"));
-}, "ORB shouldn't block opaque image/png");
+expected_allow(
+  `${path}/image.png`,
+  (orb_test, message) =>
+    promise_test(
+      t => orb_test(t, contentType("image/png")),
+      message("ORB shouldn't block opaque image/png")),
+  { skip: ["audio", "video", "script"] });
 
-promise_test(async () => {
-  await fetchORB(`${path}/script.js`, null, contentType("text/javascript"));
-}, "ORB shouldn't block opaque text/javascript");
+expected_allow(
+  `${path}/script.js`,
+  (orb_test, message) =>
+    promise_test(
+      t => orb_test(t, contentType("text/javascript")),
+      message("ORB shouldn't block opaque text/javascript")),
+  { skip: ["image", "audio", "video"] });
 
 // Test javascript validation can correctly decode the content with BOM.
-promise_test(async () => {
-  await fetchORB(`${path}/script-utf16-bom.js`, null, contentType("application/json"));
-}, "ORB shouldn't block opaque text/javascript (utf16 encoded with BOM)");
+expected_allow(
+  `${path}/script-utf16-bom.js`,
+  (orb_test, message) =>
+    promise_test(
+      t => orb_test(t, contentType("application/json")),
+      message("ORB shouldn't block opaque text/javascript (utf16 encoded with BOM)")),
+  { skip: ["image", "audio", "video"] });
 
 // Test javascript validation can correctly decode the content with the http charset hint.
-promise_test(async () => {
-  await fetchORB(`${path}/script-utf16-without-bom.js`, null, contentType("application/json; charset=utf-16"));
-}, "ORB shouldn't block opaque text/javascript (utf16 encoded without BOM but charset is provided in content-type)");
+expected_allow(
+  `${path}/script-utf16-without-bom.js`,
+  (orb_test, message) =>
+    promise_test(
+      t => orb_test(t, contentType("application/json; charset=utf-16")),
+      message("ORB shouldn't block opaque text/javascript (utf16 encoded without BOM but charset is provided in content-type)")),
+  { skip: ["image", "audio", "video"] });
 
 // Test javascript validation can correctly decode the content for iso-8559-1 (fallback decoder in Firefox).
-promise_test(async () => {
-  await fetchORB(`${path}/script-iso-8559-1.js`, null, contentType("application/json"));
-}, "ORB shouldn't block opaque text/javascript (iso-8559-1 encoded)");
+expected_allow(
+  `${path}/script-iso-8559-1.js`,
+  (orb_test, message) =>
+    promise_test(
+      t => orb_test(t, contentType("application/json")),
+      message("ORB shouldn't block opaque text/javascript (iso-8559-1 encoded)")),
+  { skip: ["image", "audio", "video"] });
 
 // Test javascript validation can correctly parse asm.js.
-promise_test(async () => {
-  await fetchORB(`${path}/script-asm-js-valid.js`, null, contentType("application/json"));
-}, "ORB shouldn't block text/javascript with valid asm.js");
+expected_allow(
+  `${path}/script-asm-js-valid.js`,
+  (orb_test, message) =>
+    promise_test(
+      t => orb_test(t, contentType("application/json")),
+      message("ORB shouldn't block text/javascript with valid asm.js")),
+  { skip: ["image", "audio", "video"] });
 
 // Test javascript validation can correctly parse invalid asm.js with valid JS syntax.
-promise_test(async () => {
-  await fetchORB(`${path}/script-asm-js-invalid.js`, null, contentType("application/json"));
-}, "ORB shouldn't block text/javascript with invalid asm.js");
+expected_allow(
+  `${path}/script-asm-js-invalid.js`,
+  (orb_test, message) =>
+    promise_test(
+      t => orb_test(t, contentType("application/json")),
+      message("ORB shouldn't block text/javascript with invalid asm.js")),
+  { skip: ["image", "audio", "video"] });
diff --git a/tests/wpt/tests/fetch/orb/tentative/nosniff.sub.any.js b/tests/wpt/tests/fetch/orb/tentative/nosniff.sub.any.js
index 3df9d22e0b7..d1e01fd87b5 100644
--- a/tests/wpt/tests/fetch/orb/tentative/nosniff.sub.any.js
+++ b/tests/wpt/tests/fetch/orb/tentative/nosniff.sub.any.js
@@ -2,58 +2,31 @@
 
 const path = "http://{{domains[www1]}}:{{ports[http][0]}}/fetch/orb/resources";
 
-promise_test(
-  t =>
-    promise_rejects_js(
-      t,
-      TypeError,
-      fetchORB(
-        `${path}/text.txt`,
-        null,
-        contentType("text/plain"),
-        contentTypeOptions("nosniff")
-      )
-    ),
-  "ORB should block opaque text/plain with nosniff"
-);
+expected_block(
+  `${path}/text.txt`,
+  (orb_test, message) =>
+    promise_test(
+      t => orb_test(t, contentType("text/plain"), contentTypeOptions("nosniff")),
+      message("ORB should block opaque text/plain with nosniff")));
 
-promise_test(
-  t =>
-    promise_rejects_js(
-      t,
-      TypeError,
-      fetchORB(
-        `${path}/data.json`,
-        null,
-        contentType("application/json"),
-        contentTypeOptions("nosniff")
-      )
-    ),
-  "ORB should block opaque-response-blocklisted MIME type with nosniff"
-);
+expected_block(
+  `${path}/data.json`,
+  (orb_test, message) =>
+    promise_test(
+      t => orb_test(t, contentType("application/json"), contentTypeOptions("nosniff")),
+      message("ORB should block opaque-response-blocklisted MIME type with nosniff")));
 
-promise_test(
-  t =>
-    promise_rejects_js(
-      t,
-      TypeError,
-      fetchORB(
-        `${path}/data.json`,
-        null,
-        contentType(""),
-        contentTypeOptions("nosniff")
-      )
-    ),
-  "ORB should block opaque response with empty Content-Type and nosniff"
-);
+expected_block(
+  `${path}/data.json`,
+  (orb_test, message) =>
+    promise_test(
+      t => orb_test(t, contentTypeOptions("nosniff")),
+      message("ORB should block opaque response with empty Content-Type and nosniff")));
 
-promise_test(
-  () =>
-    fetchORB(
-      `${path}/image.png`,
-      null,
-      contentType(""),
-      contentTypeOptions("nosniff")
-    ),
-  "ORB shouldn't block opaque image with empty Content-Type and nosniff"
-);
+expected_allow(
+  `${path}/image.png`,
+  (orb_test, message) =>
+    promise_test(
+      t => orb_test(t, contentType(""), contentType("text/javascript")),
+      message("ORB shouldn't block opaque image with empty Content-Type and nosniff")),
+  { skip: ["audio", "video", "script"] });
diff --git a/tests/wpt/tests/fetch/orb/tentative/status.sub.any.js b/tests/wpt/tests/fetch/orb/tentative/status.sub.any.js
index b94d8b7f635..e281ca6f533 100644
--- a/tests/wpt/tests/fetch/orb/tentative/status.sub.any.js
+++ b/tests/wpt/tests/fetch/orb/tentative/status.sub.any.js
@@ -2,32 +2,15 @@
 
 const path = "http://{{domains[www1]}}:{{ports[http][0]}}/fetch/orb/resources";
 
-promise_test(
-  t =>
-    promise_rejects_js(
-      t,
-      TypeError,
-      fetchORB(
-        `${path}/data.json`,
-        null,
-        contentType("application/json"),
-        "status(206)"
-      )
-    ),
-  "ORB should block opaque-response-blocklisted MIME type with status 206"
-);
+expected_block(
+  `${path}/data.json`,
+  (orb_test, message) => promise_test(
+    t => orb_test(t, contentType("application/json"), "status(206)"),
+    message("ORB should block opaque-response-blocklisted MIME type with status 206")));
 
-promise_test(
-  t =>
-    promise_rejects_js(
-      t,
-      TypeError,
-      fetchORB(
-        `${path}/data.json`,
-        null,
-        contentType("application/json"),
-        "status(302)"
-      )
-    ),
-  "ORB should block opaque response with non-ok status"
-);
+expected_block(
+  `${path}/data.json`,
+  (orb_test, message) =>
+    promise_test(
+      t => orb_test(t, contentType("application/json"), "status(302)"),
+      message("ORB should block opaque response with non-ok status")));
diff --git a/tests/wpt/tests/fetch/orb/tentative/unknown-mime-type.sub.any.js b/tests/wpt/tests/fetch/orb/tentative/unknown-mime-type.sub.any.js
index f72ff928adb..268ebb0258d 100644
--- a/tests/wpt/tests/fetch/orb/tentative/unknown-mime-type.sub.any.js
+++ b/tests/wpt/tests/fetch/orb/tentative/unknown-mime-type.sub.any.js
@@ -2,27 +2,39 @@
 
 const path = "http://{{domains[www1]}}:{{ports[http][0]}}/fetch/orb/resources";
 
-promise_test(
-  () => fetchORB(`${path}/font.ttf`, null, contentType("")),
-  "ORB shouldn't block opaque failed missing MIME type (font/ttf)"
-);
+expected_allow_fetch(
+  `${path}/font.ttf`,
+  (promise, message) =>
+    promise_test(
+      t => promise(t, contentType("")),
+      message("ORB shouldn't block opaque failed missing MIME type (font/ttf)")));
 
-promise_test(
-  () => fetchORB(`${path}/text.txt`, null, contentType("")),
-  "ORB shouldn't block opaque failed missing MIME type (text/plain)"
-);
+expected_allow_fetch(
+  `${path}/text.ttf`,
+  (promise, message) =>
+    promise_test(
+      t => promise(t, contentType("")),
+      message("ORB shouldn't block opaque failed missing MIME type (text/plain)")));
 
-promise_test(
-  t => fetchORB(`${path}/data.json`, null, contentType("")),
-  "ORB shouldn't block opaque failed missing MIME type (application/json)"
-);
+expected_allow_fetch(
+  `${path}/data.json`,
+  (promise, message) =>
+    promise_test(
+      t => promise(t, contentType("")),
+      message("ORB shouldn't block opaque failed missing MIME type (application/json)")));
 
-promise_test(
-  () => fetchORB(`${path}/image.png`, null, contentType("")),
-  "ORB shouldn't block opaque failed missing MIME type (image/png)"
-);
+expected_allow(
+  `${path}/image.png`,
+  (promise, message) =>
+    promise_test(
+      t => promise(t, contentType("")),
+      message("ORB shouldn't block opaque failed missing MIME type (image/png)")),
+  { skip: ["audio", "video", "script"] });
 
-promise_test(
-  () => fetchORB(`${path}/script.js`, null, contentType("")),
-  "ORB shouldn't block opaque failed missing MIME type (text/javascript)"
-);
+expected_allow(
+  `${path}/script.js`,
+  (promise, message) =>
+    promise_test(
+      t => promise(t, contentType("")),
+      message("ORB shouldn't block opaque failed missing MIME type (text/javascript)")),
+      { skip: ["image", "audio", "video"] });
diff --git a/tests/wpt/tests/fetch/private-network-access/resources/support.sub.js b/tests/wpt/tests/fetch/private-network-access/resources/support.sub.js
index 27d733d8b7f..f8621338cc2 100644
--- a/tests/wpt/tests/fetch/private-network-access/resources/support.sub.js
+++ b/tests/wpt/tests/fetch/private-network-access/resources/support.sub.js
@@ -456,7 +456,7 @@ async function iframeTest(t, { source, target, expected }) {
   const result = await Promise.race([
       messagePromise.then((data) => data.message),
       new Promise((resolve) => {
-        t.step_timeout(() => resolve("timeout"), 500 /* ms */);
+        t.step_timeout(() => resolve("timeout"), 2000 /* ms */);
       }),
   ]);
 
diff --git a/tests/wpt/tests/fledge/tentative/TODO b/tests/wpt/tests/fledge/tentative/TODO
index fc2c296762c..7ec6d880801 100644
--- a/tests/wpt/tests/fledge/tentative/TODO
+++ b/tests/wpt/tests/fledge/tentative/TODO
@@ -3,22 +3,33 @@ Need tests for (likely not a complete list):
 * directFromSellerSignals.
 * All generateBid() and scoreAd() input parameters.
 * All interest group fields (passed to auction, have effect on auction).
-    Validation when joining/leaving interest group is already covered.
+    Very few fields covered.
+    Should be sure to cover buyerAndSellerReportingId and buyerReportingId for
+        component ads, as they should not be settable.
+    Already covered:
+        Validation when joining/leaving interest group.
+        renderURL and metadata for component ads (only integers covered, but
+            probably not worth covering all types, if we have coverage for the
+            main renderURL).
 * Filtering/prioritization (including bidding signals influencing priorities)
 * Size restrictions.
+* additionalBids.
+* adCost.
+* bidCurrency.
+* modellingSignals.
+* Ad and component ad sizes.
 * Updates (both after auction and triggered).
 * All auctionConfig parameters (including invalid auctionConfigs, and ones
     with no buyers).
 * Joining interest group with duration of 0 should just leave the IG (not
     currently guaranteed to work, due to potential time skew between processes).
 * Multiple buyers.
-* Multiple interest group with same owner.
+* Multiple interest groups with same owner.
 * Multiple origin auctions (buyer != publisher != seller).
 * Multiple frame tests (including join IG policy, run auction policy,
     loading URNs in fencedframes in other frames, loading component
     ad URNs in fenced frames of other frames, etc)
 * adAuctionConfig passed to reportResult().
-* Component ads (including scoring signals fetches).
 * Component auctions.
 * browserSignals fields in scoring/bidding methods.
 * In reporting methods, browserSignals fields: dataVersion, topLevelSeller,
diff --git a/tests/wpt/tests/fledge/tentative/auction-config.https.sub.window.js b/tests/wpt/tests/fledge/tentative/auction-config.https.sub.window.js
index 537f3267838..347f9eb5613 100644
--- a/tests/wpt/tests/fledge/tentative/auction-config.https.sub.window.js
+++ b/tests/wpt/tests/fledge/tentative/auction-config.https.sub.window.js
@@ -1,6 +1,13 @@
 // META: script=/resources/testdriver.js
 // META: script=/common/utils.js
 // META: script=resources/fledge-util.js
+// META: script=/common/subset-tests.js
+// META: timeout=long
+// META: variant=?1-5
+// META: variant=?6-10
+// META: variant=?11-15
+// META: variant=?16-20
+// META: variant=?21-last
 
 "use strict;"
 
@@ -43,7 +50,7 @@ const makeTest = ({
   // Expectation for a promise error.
   expectPromiseError,
 }) => {
-  promise_test(async test => {
+  subsetTest(promise_test, async test => {
     let waitPromiseError, dontExpectPromiseError;
     if (expectPromiseError) {
       waitPromiseError = interceptUnhandledRejection();
@@ -104,27 +111,27 @@ makeTest({
 });
 
 makeTest({
-  name: 'decisionLogicUrl is invalid',
+  name: 'decisionLogicURL is invalid',
   expect: EXPECT_EXCEPTION(TypeError),
-  auctionConfigOverrides: { decisionLogicUrl: "https://foo:99999999999" },
+  auctionConfigOverrides: { decisionLogicURL: "https://foo:99999999999" },
 });
 
 makeTest({
-  name: 'decisionLogicUrl is cross-origin with seller',
+  name: 'decisionLogicURL is cross-origin with seller',
   expect: EXPECT_EXCEPTION(TypeError),
-  auctionConfigOverrides: { decisionLogicUrl: "https://example.com" },
+  auctionConfigOverrides: { decisionLogicURL: "https://example.com" },
 });
 
 makeTest({
-  name: 'trustedScoringSignalsUrl is invalid',
+  name: 'trustedScoringSignalsURL is invalid',
   expect: EXPECT_EXCEPTION(TypeError),
-  auctionConfigOverrides: { trustedScoringSignalsUrl: "https://foo:99999999999" },
+  auctionConfigOverrides: { trustedScoringSignalsURL: "https://foo:99999999999" },
 });
 
 makeTest({
-  name: 'trustedScoringSignalsUrl is cross-origin with seller',
+  name: 'trustedScoringSignalsURL is cross-origin with seller',
   expect: EXPECT_EXCEPTION(TypeError),
-  auctionConfigOverrides: { trustedScoringSignalsUrl: "https://example.com" },
+  auctionConfigOverrides: { trustedScoringSignalsURL: "https://example.com" },
 });
 
 makeTest({
@@ -242,12 +249,12 @@ makeTest({
     componentAuctions: [
       {
         seller: window.location.origin,
-        decisionLogicUrl: window.location.origin,
+        decisionLogicURL: window.location.origin,
         interestGroupBuyers: undefined,
         componentAuctions: [
           {
             seller: window.location.origin,
-            decisionLogicUrl: window.location.origin,
+            decisionLogicURL: window.location.origin,
           }
         ],
       },
@@ -263,7 +270,7 @@ makeTest({
     componentAuctions: [
       {
         seller: window.location.origin,
-        decisionLogicUrl: window.location.origin,
+        decisionLogicURL: window.location.origin,
         interestGroupBuyers: [],
       },
     ],
diff --git a/tests/wpt/tests/fledge/tentative/component-ads.https.sub.window.js b/tests/wpt/tests/fledge/tentative/component-ads.https.sub.window.js
new file mode 100644
index 00000000000..ae639d7b20e
--- /dev/null
+++ b/tests/wpt/tests/fledge/tentative/component-ads.https.sub.window.js
@@ -0,0 +1,440 @@
+// META: script=/resources/testdriver.js
+// META: script=/common/utils.js
+// META: script=/common/subset-tests.js
+// META: script=resources/fledge-util.js
+// META: timeout=long
+// META: variant=?1-5
+// META: variant=?6-10
+// META: variant=?11-15
+// META: variant=?16-last
+
+"use strict";
+
+// Creates a tracker URL for a component ad. These are fetched from component ad URLs.
+function createComponentAdTrackerURL(uuid, id) {
+  return createTrackerURL(window.location.origin, uuid, 'track_get',
+                          `component_ad_${id}`)
+}
+
+// Returns a component ad render URL that fetches the correspondinding component ad
+// tracker URL.
+function createComponentAdRenderURL(uuid, id) {
+  return createRenderURL(
+      uuid,
+      `fetch("${createComponentAdTrackerURL(uuid, id)}");`);
+}
+
+// Runs a generic component ad loading test. It joins an interest group with a
+// "numComponentAdsInInterestGroup" component ads. The IG will make a bid that
+// potentially includes some of them. Then an auction will be run, component
+// ads potentially will be loaded in nested fenced frame within the main frame,
+// and the test will make sure that each component ad render URL that should have
+// been loaded in an iframe was indeed loaded.
+//
+// Joins an interest group that has "numComponentAdsInInterestGroup" component ads.
+//
+// "componentAdsInBid" is a list of 0-based indices of which of those ads will be
+// included in the bid. It may contain duplicate component ads. If it's null then the
+// bid will have no adComponents field, while if it is empty, the bid will have an empty
+// adComponents field.
+//
+// "componentAdsToLoad" is another list of 0-based ad components, but it's the index of
+// fenced frame configs in the top frame ad's getNestedConfigs(). It may also contain
+// duplicates to load a particular ad twice.
+//
+// If "adMetadata" is true, metadata is added to each component ad. Only integer metadata
+// is used, relying on renderURL tests to cover other types of renderURL metadata.
+async function runComponentAdLoadingTest(test, uuid, numComponentAdsInInterestGroup,
+                                         componentAdsInBid, componentAdsToLoad,
+                                         adMetadata = false) {
+  let interestGroupAdComponents = [];
+  for (let i = 0; i < numComponentAdsInInterestGroup; ++i) {
+    const componentRenderURL = createComponentAdRenderURL(uuid, i);
+    let adComponent = {renderURL: componentRenderURL};
+    if (adMetadata)
+      adComponent.metadata = i;
+    interestGroupAdComponents.push(adComponent);
+  }
+
+  const renderURL = createRenderURL(
+      uuid,
+      `// "status" is passed to the beacon URL, to be verified by waitForObservedRequests().
+       let status = "ok";
+       const componentAds = window.fence.getNestedConfigs()
+       if (componentAds.length != 20)
+         status = "unexpected getNestedConfigs() length";
+       for (let i of ${JSON.stringify(componentAdsToLoad)}) {
+         let fencedFrame = document.createElement("fencedframe");
+         fencedFrame.mode = "opaque-ads";
+         fencedFrame.config = componentAds[i];
+         document.body.appendChild(fencedFrame);
+       }
+
+       window.fence.reportEvent({eventType: "beacon",
+                                 eventData: status,
+                                 destination: ["buyer"]});`
+      );
+
+  let bid = {bid:1, render: renderURL};
+  if (componentAdsInBid) {
+    bid.adComponents = [];
+    for (let index of componentAdsInBid) {
+      bid.adComponents.push(interestGroupAdComponents[index].renderURL);
+    }
+  }
+
+  // In these tests, the bidder should always request a beacon URL.
+  let expectedTrackerURLs = [`${createBidderBeaconURL(uuid)}, body: ok`];
+  // Figure out which, if any, elements of "componentAdsToLoad" correspond to
+  // component ads listed in bid.adComponents, and for those ads, add a tracker URL
+  // to "expectedTrackerURLs".
+  if (componentAdsToLoad && bid.adComponents) {
+    for (let index of componentAdsToLoad) {
+      if (index < componentAdsInBid.length)
+        expectedTrackerURLs.push(createComponentAdTrackerURL(uuid, componentAdsInBid[index]));
+    }
+  }
+
+  await joinInterestGroup(
+      test, uuid,
+      { biddingLogicURL:
+          createBiddingScriptURL({
+              generateBid:
+                  `let expectedAdComponents = ${JSON.stringify(interestGroupAdComponents)};
+                   let adComponents = interestGroup.adComponents;
+                   if (adComponents.length !== expectedAdComponents.length)
+                     throw "Unexpected adComponents";
+                   for (let i = 0; i < adComponents.length; ++i) {
+                    if (adComponents[i].renderURL !== expectedAdComponents[i].renderURL ||
+                        adComponents[i].metadata !== expectedAdComponents[i].metadata) {
+                      throw "Unexpected adComponents";
+                    }
+                   }
+                   return ${JSON.stringify(bid)}`,
+              reportWin:
+                  `registerAdBeacon({beacon: '${createBidderBeaconURL(uuid)}'});` }),
+        ads: [{renderURL: renderURL}],
+        adComponents: interestGroupAdComponents});
+
+  if (!bid.adComponents || bid.adComponents.length === 0) {
+    await runBasicFledgeAuctionAndNavigate(
+      test, uuid,
+      {decisionLogicURL: createDecisionScriptURL(
+        uuid,
+        { scoreAd: `if (browserSignals.adComponents !== undefined)
+                      throw "adComponents should be undefined"`})});
+  } else {
+    await runBasicFledgeAuctionAndNavigate(
+      test, uuid,
+      {decisionLogicURL: createDecisionScriptURL(
+        uuid,
+        { scoreAd:
+              `if (JSON.stringify(browserSignals.adComponents) !==
+                       '${JSON.stringify(bid.adComponents)}') {
+                 throw "Unexpected adComponents: " + JSON.stringify(browserSignals.adComponents);
+               }`})});
+  }
+
+  await waitForObservedRequests(uuid, expectedTrackerURLs);
+}
+
+subsetTest(promise_test, async test => {
+  const uuid = generateUuid(test);
+
+  const renderURL = createRenderURL(
+    uuid,
+    `let status = "ok";
+     const nestedConfigsLength = window.fence.getNestedConfigs().length
+     // "getNestedConfigs()" should return a list of 20 configs, to avoid leaking
+     // whether there were any component URLs to the page.
+     if (nestedConfigsLength != 20)
+       status = "unexpected getNestedConfigs() length: " + nestedConfigsLength;
+     window.fence.reportEvent({eventType: "beacon",
+                               eventData: status,
+                               destination: ["buyer"]});`);
+  await joinInterestGroup(
+      test, uuid,
+      { biddingLogicURL:
+          createBiddingScriptURL({
+              generateBid:
+                  'if (interestGroup.componentAds !== undefined) throw "unexpected componentAds"',
+              reportWin:
+                  `registerAdBeacon({beacon: "${createBidderBeaconURL(uuid)}"});` }),
+        ads: [{renderUrl: renderURL}]});
+  await runBasicFledgeAuctionAndNavigate(
+      test, uuid,
+      {decisionLogicURL: createDecisionScriptURL(
+        uuid,
+        { scoreAd: `if (browserSignals.adComponents !== undefined)
+                      throw "adComponents should be undefined"`})});
+  await waitForObservedRequests(uuid, [`${createBidderBeaconURL(uuid)}, body: ok`]);
+}, 'Group has no component ads, no adComponents in bid.');
+
+subsetTest(promise_test, async test => {
+  const uuid = generateUuid(test);
+
+  await joinGroupAndRunBasicFledgeTestExpectingNoWinner(
+      test,
+      {uuid: uuid,
+       interestGroupOverrides: {
+           biddingLogicURL:
+           createBiddingScriptURL({
+               generateBid:
+                   `return {bid: 1,
+                            render: interestGroup.ads[0].renderUrl,
+                            adComponents: []};`})}});
+}, 'Group has no component ads, adComponents in bid is empty array.');
+
+subsetTest(promise_test, async test => {
+  const uuid = generateUuid(test);
+  await runComponentAdLoadingTest(
+      test, uuid, /*numComponentAdsInInterestGroup=*/2, /*componentAdsInBid=*/null,
+      // Try to load ad components, even though there are none. This should load
+      // about:blank in those frames, though that's not testible.
+      // The waitForObservedRequests() call may see extra requests, racily, if
+      // component ads not found in the bid are used.
+      /*componentAdsToLoad=*/[0, 1]);
+}, 'Group has component ads, but not used in bid (no adComponents field).');
+
+subsetTest(promise_test, async test => {
+  const uuid = generateUuid(test);
+  await runComponentAdLoadingTest(
+      test, uuid, /*numComponentAdsInInterestGroup=*/2, /*componentAdsInBid=*/[],
+      // Try to load ad components, even though there are none. This should load
+      // about:blank in those frames, though that's not testible.
+      // The waitForObservedRequests() call may see extra requests, racily, if
+      // component ads not found in the bid are used.
+      /*componentAdsToLoad=*/[0, 1]);
+}, 'Group has component ads, but not used in bid (adComponents field empty array).');
+
+subsetTest(promise_test, async test => {
+  const uuid = generateUuid(test);
+  await runComponentAdLoadingTest(
+      test, uuid, /*numComponentAdsInInterestGroup=*/2, /*componentAdsInBid=*/null,
+      // Try to load ad components, even though there are none. This should load
+      // about:blank in those frames, though that's not testible.
+      // The waitForObservedRequests() call may see extra requests, racily, if
+      // component ads not found in the bid are used.
+      /*componentAdsToLoad=*/[0, 1], /*adMetadata=*/true);
+}, 'Unused component ads with metadata.');
+
+subsetTest(promise_test, async test => {
+  const uuid = generateUuid(test);
+
+  await joinGroupAndRunBasicFledgeTestExpectingNoWinner(
+      test,
+      { uuid: uuid,
+        interestGroupOverrides: {
+            biddingLogicURL:
+                createBiddingScriptURL({
+                    generateBid:
+                        `return {bid: 1,
+                                 render: interestGroup.ads[0].renderUrl,
+                                 adComponents: ["https://random.url.test/"]};`}),
+            adComponents: [{renderURL: createComponentAdRenderURL(uuid, 0)}]}});
+}, 'Unknown component ad URL in bid.');
+
+subsetTest(promise_test, async test => {
+  const uuid = generateUuid(test);
+
+  await joinGroupAndRunBasicFledgeTestExpectingNoWinner(
+      test,
+      { uuid: uuid,
+        interestGroupOverrides: {
+            biddingLogicURL:
+                createBiddingScriptURL({
+                    generateBid:
+                        `return {bid: 1,
+                                 render: interestGroup.ads[0].renderUrl,
+                                 adComponents: [interestGroup.ads[0].renderUrl]};`}),
+            adComponents: [{renderURL: createComponentAdRenderURL(uuid, 0)}]}});
+}, 'Render URL used as component ad URL in bid.');
+
+subsetTest(promise_test, async test => {
+  const uuid = generateUuid(test);
+
+  await joinGroupAndRunBasicFledgeTestExpectingNoWinner(
+      test,
+      { uuid: uuid,
+        interestGroupOverrides: {
+            biddingLogicURL:
+                createBiddingScriptURL({
+                    generateBid:
+                        `return {bid: 1, render: interestGroup.adComponents[0].renderURL};`}),
+            adComponents: [{renderURL: createComponentAdRenderURL(uuid, 0)}]}});
+}, 'Component ad URL used as render URL.');
+
+subsetTest(promise_test, async test => {
+  const uuid = generateUuid(test);
+  await runComponentAdLoadingTest(test, uuid, /*numComponentAdsInInterestGroup=*/2,
+                                  /*componentAdsInBid=*/[0, 1], /*componentAdsToLoad=*/[0, 1]);
+}, '2 of 2 component ads in bid and then shown.');
+
+subsetTest(promise_test, async test => {
+  const uuid = generateUuid(test);
+  await runComponentAdLoadingTest(test, uuid, /*numComponentAdsInInterestGroup=*/2,
+                                  /*componentAdsInBid=*/[0, 1], /*componentAdsToLoad=*/[0, 1],
+                                  /*adMetadata=*/true);
+}, '2 of 2 component ads in bid and then shown, with metadata.');
+
+subsetTest(promise_test, async test => {
+  const uuid = generateUuid(test);
+  await runComponentAdLoadingTest(test, uuid, /*numComponentAdsInInterestGroup=*/20,
+                                  /*componentAdsInBid=*/[3, 10], /*componentAdsToLoad=*/[0, 1]);
+}, '2 of 20 component ads in bid and then shown.');
+
+subsetTest(promise_test, async test => {
+  const uuid = generateUuid(test);
+  const intsUpTo19 = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19];
+  await runComponentAdLoadingTest(test, uuid, /*numComponentAdsInInterestGroup=*/20,
+                                  /*componentAdsInBid=*/intsUpTo19,
+                                  /*componentAdsToLoad=*/intsUpTo19);
+}, '20 of 20 component ads in bid and then shown.');
+
+subsetTest(promise_test, async test => {
+  const uuid = generateUuid(test);
+  await runComponentAdLoadingTest(test, uuid, /*numComponentAdsInInterestGroup=*/20,
+                                  /*componentAdsInBid=*/[1, 2, 3, 4, 5, 6],
+                                  /*componentAdsToLoad=*/[1, 3]);
+}, '6 of 20 component ads in bid, 2 shown.');
+
+subsetTest(promise_test, async test => {
+  const uuid = generateUuid(test);
+  // It should be possible to load ads multiple times. Each loaded ad should request a new tracking
+  // URLs, as they're fetched via XHRs, rather than reporting.
+  await runComponentAdLoadingTest(test, uuid, /*numComponentAdsInInterestGroup=*/4,
+                                  /*componentAdsInBid=*/[0, 1, 2, 3],
+                                  /*componentAdsToLoad=*/[0, 1, 1, 0, 3, 3, 2, 2, 1, 0]);
+}, '4 of 4 component ads shown multiple times.');
+
+subsetTest(promise_test, async test => {
+  const uuid = generateUuid(test);
+  await runComponentAdLoadingTest(test, uuid, /*numComponentAdsInInterestGroup=*/2,
+                                  /*componentAdsInBid=*/[0, 0, 0, 0],
+                                  /*componentAdsToLoad=*/[0, 1, 2, 3]);
+}, 'Same component ad used multiple times in bid.');
+
+subsetTest(promise_test, async test => {
+  const uuid = generateUuid(test);
+  // The bid only has one component ad, but the renderURL tries to load 5 component ads.
+  // The others should all be about:blank. Can't test that, so just make sure there aren't
+  // more requests than expected, and there's no crash.
+  await runComponentAdLoadingTest(test, uuid, /*numComponentAdsInInterestGroup=*/2,
+                                  /*componentAdsInBid=*/[0],
+                                  /*componentAdsToLoad=*/[4, 3, 2, 1, 0]);
+}, 'Load component ads not in bid.');
+
+subsetTest(promise_test, async test => {
+  const uuid = generateUuid(test);
+  const renderURL = createRenderURL(uuid);
+
+  let adComponents = [];
+  let adComponentsList = [];
+  for (let i = 0; i < 21; ++i) {
+    let componentRenderURL = createComponentAdTrackerURL(uuid, i);
+    adComponents.push({renderURL: componentRenderURL});
+    adComponentsList.push(componentRenderURL);
+  }
+
+  await joinGroupAndRunBasicFledgeTestExpectingNoWinner(
+      test,
+      { uuid: uuid,
+        interestGroupOverrides: {
+            biddingLogicURL:
+                createBiddingScriptURL({
+                    generateBid:
+                        `return {bid: 1,
+                                 render: "${renderURL}",
+                                 adComponents: ${JSON.stringify(adComponentsList)}};`}),
+            ads: [{renderURL: renderURL}],
+            adComponents: adComponents}});
+}, '21 component ads not allowed in bid.');
+
+subsetTest(promise_test, async test => {
+  const uuid = generateUuid(test);
+  const renderURL = createRenderURL(uuid);
+
+  let adComponents = [];
+  let adComponentsList = [];
+  for (let i = 0; i < 21; ++i) {
+    let componentRenderURL = createComponentAdTrackerURL(uuid, i);
+    adComponents.push({renderURL: componentRenderURL});
+    adComponentsList.push(adComponents[0].renderURL);
+  }
+
+  await joinGroupAndRunBasicFledgeTestExpectingNoWinner(
+      test,
+      { uuid: uuid,
+        interestGroupOverrides: {
+            biddingLogicURL:
+                createBiddingScriptURL({
+            generateBid:
+                `return {bid: 1,
+                         render: "${renderURL}",
+                         adComponents: ${JSON.stringify(adComponentsList)}};`}),
+            ads: [{renderURL: renderURL}],
+            adComponents: adComponents}});
+}, 'Same component ad not allowed 21 times in bid.');
+
+subsetTest(promise_test, async test => {
+  const uuid = generateUuid(test);
+
+  // The component ad's render URL will try to send buyer and seller reports,
+  // which should not be sent (but not throw an exception), and then request a
+  // a tracker URL via fetch, which should be requested from the server.
+  const componentRenderURL =
+      createRenderURL(
+        uuid,
+        `window.fence.reportEvent({eventType: "beacon",
+                                   eventData: "Should not be sent",
+                                   destination: ["buyer", "seller"]});
+         fetch("${createComponentAdTrackerURL(uuid, 0)}");`);
+
+  const renderURL = createRenderURL(
+      uuid,
+      `let fencedFrame = document.createElement("fencedframe");
+       fencedFrame.mode = "opaque-ads";
+       fencedFrame.config = window.fence.getNestedConfigs()[0];
+       document.body.appendChild(fencedFrame);
+
+       async function waitForRequestAndSendBeacons() {
+         // Wait for the nested fenced frame to request its tracker URL.
+         await waitForObservedRequests("${uuid}", ["${createComponentAdTrackerURL(uuid, 0)}"]);
+
+         // Now that the tracker URL has been received, the component ad has tried to
+         // send a beacon, so have the main renderURL send a beacon, which should succeed
+         // and should hopefully be sent after the component ad's beacon, if it was
+         // going to (incorrectly) send one.
+         window.fence.reportEvent({eventType: "beacon",
+                                   eventData: "top-ad",
+                                   destination: ["buyer", "seller"]});
+       }
+       waitForRequestAndSendBeacons();`);
+
+  await joinInterestGroup(
+      test, uuid,
+      { biddingLogicURL:
+          createBiddingScriptURL({
+              generateBid:
+                  `return {bid: 1,
+                           render: "${renderURL}",
+                           adComponents: ["${componentRenderURL}"]};`,
+              reportWin:
+                  `registerAdBeacon({beacon: '${createBidderBeaconURL(uuid)}'});` }),
+        ads: [{renderURL: renderURL}],
+        adComponents: [{renderURL: componentRenderURL}]});
+
+  await runBasicFledgeAuctionAndNavigate(
+    test, uuid,
+    {decisionLogicURL: createDecisionScriptURL(
+        uuid,
+        { reportResult: `registerAdBeacon({beacon: '${createSellerBeaconURL(uuid)}'});` }) });
+
+  // Only the renderURL should have sent any beacons, though the component ad should have sent
+  // a tracker URL fetch request.
+  await waitForObservedRequests(uuid, [createComponentAdTrackerURL(uuid, 0),
+                                       `${createBidderBeaconURL(uuid)}, body: top-ad`,
+                                       `${createSellerBeaconURL(uuid)}, body: top-ad`]);
+
+
+}, 'Reports not sent from component ad.');
diff --git a/tests/wpt/tests/fledge/tentative/cross-origin.https.sub.window.js b/tests/wpt/tests/fledge/tentative/cross-origin.https.sub.window.js
new file mode 100644
index 00000000000..1c1d5f2f6b7
--- /dev/null
+++ b/tests/wpt/tests/fledge/tentative/cross-origin.https.sub.window.js
@@ -0,0 +1,347 @@
+// META: script=/resources/testdriver.js
+// META: script=/common/utils.js
+// META: script=/common/subset-tests.js
+// META: script=resources/fledge-util.js
+// META: timeout=long
+// META: variant=?1-4
+// META: variant=?5-8
+// META: variant=?9-12
+// META: variant=?13-last
+
+"use strict;"
+
+const OTHER_ORIGIN1 = 'https://{{hosts[alt][]}}:{{ports[https][0]}}';
+const OTHER_ORIGIN2 = 'https://{{hosts[alt][]}}:{{ports[https][1]}}';
+
+// Runs "script" in "iframe" via an eval call. The iframe must have been
+// created by calling "createIframe()" below. "param" is passed to the
+// context "script" is run in, so can be used to pass objects that
+// "script" references that can't be serialized to a string, like
+// fencedFrameConfigs.
+async function runInIframe(test, iframe, script, param) {
+  const messageUuid = generateUuid(test);
+  let receivedResponse = {};
+
+  let promise = new Promise(function(resolve, reject) {
+    function WaitForMessage(event) {
+      if (event.data.messageUuid != messageUuid)
+        return;
+      receivedResponse = event.data;
+      if (event.data.result === 'success') {
+        resolve();
+      } else {
+        reject(event.data.result);
+      }
+    }
+    window.addEventListener('message', WaitForMessage);
+    iframe.contentWindow.postMessage(
+        {messageUuid: messageUuid, script: script, param: param}, '*');
+  });
+  await promise;
+  return receivedResponse.returnValue;
+}
+
+// Creates an iframe and navigates to a URL on "origin", and waits for the URL
+// to finish loading by waiting for the iframe to send an event. Then returns
+// the iframe.
+//
+// Also adds a cleanup callback to "test", which runs all cleanup functions
+// added to the iframe and waits for them to complete, and then destroys the
+// iframe.
+async function createIframe(test, origin, permissions) {
+  const iframeUuid = generateUuid(test);
+  const iframeUrl = `${origin}${RESOURCE_PATH}iframe.sub.html?uuid=${iframeUuid}`;
+  let iframe = document.createElement('iframe');
+  await new Promise(function(resolve, reject) {
+    function WaitForMessage(event) {
+      if (event.data.messageUuid != iframeUuid)
+        return;
+      if (event.data.result === 'load complete') {
+        resolve();
+      } else {
+        reject(event.data.result);
+      }
+    }
+    window.addEventListener('message', WaitForMessage);
+    if (permissions)
+      iframe.allow = permissions;
+    iframe.src = iframeUrl;
+    document.body.appendChild(iframe);
+
+    test.add_cleanup(async () => {
+      await runInIframe(test, iframe, "await test_instance.do_cleanup();");
+      document.body.removeChild(iframe);
+    });
+  });
+  return iframe;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// Join interest group in iframe tests.
+////////////////////////////////////////////////////////////////////////////////
+
+subsetTest(promise_test, async test => {
+  const uuid = generateUuid(test);
+  let iframe = await createIframe(test, document.location.origin);
+
+  // Join a same-origin InterestGroup in a iframe navigated to its origin.
+  await runInIframe(test, iframe, `await joinInterestGroup(test_instance, "${uuid}");`);
+
+  // Run an auction using window.location.origin as a bidder. The IG should
+  // make a bid and win an auction.
+  await runBasicFledgeTestExpectingWinner(test, uuid);
+}, 'Join interest group in same-origin iframe, default permissions.');
+
+subsetTest(promise_test, async test => {
+  const uuid = generateUuid(test);
+  let iframe = await createIframe(test, OTHER_ORIGIN1);
+
+  // Join a cross-origin InterestGroup in a iframe navigated to its origin.
+  await runInIframe(test, iframe, `await joinInterestGroup(test_instance, "${uuid}");`);
+
+  // Run an auction in this frame using the other origin as a bidder. The IG should
+  // make a bid and win an auction.
+  //
+  // TODO: Once the permission defaults to not being able to join InterestGroups in
+  // cross-origin iframes, this auction should have no winner.
+  await runBasicFledgeTestExpectingWinner(
+      test, uuid,
+      { interestGroupBuyers: [OTHER_ORIGIN1],
+        scoreAd: `if (browserSignals.interestGroupOwner !== "${OTHER_ORIGIN1}")
+                    throw "Wrong owner: " + browserSignals.interestGroupOwner`
+      });
+}, 'Join interest group in cross-origin iframe, default permissions.');
+
+subsetTest(promise_test, async test => {
+  const uuid = generateUuid(test);
+  let iframe = await createIframe(test, OTHER_ORIGIN1, 'join-ad-interest-group');
+
+  // Join a cross-origin InterestGroup in a iframe navigated to its origin.
+  await runInIframe(test, iframe, `await joinInterestGroup(test_instance, "${uuid}");`);
+
+  // Run an auction in this frame using the other origin as a bidder. The IG should
+  // make a bid and win an auction.
+  await runBasicFledgeTestExpectingWinner(
+      test, uuid,
+      { interestGroupBuyers: [OTHER_ORIGIN1],
+        scoreAd: `if (browserSignals.interestGroupOwner !== "${OTHER_ORIGIN1}")
+                    throw "Wrong owner: " + browserSignals.interestGroupOwner`
+      });
+}, 'Join interest group in cross-origin iframe with join-ad-interest-group permission.');
+
+subsetTest(promise_test, async test => {
+  const uuid = generateUuid(test);
+  let iframe = await createIframe(test, OTHER_ORIGIN1, "join-ad-interest-group 'none'");
+
+  // Try to join an InterestGroup in a cross-origin iframe whose permissions policy
+  // blocks joining interest groups. An exception should be thrown, and the interest
+  // group should not be joined.
+  await runInIframe(test, iframe,
+                    `try {
+                       await joinInterestGroup(test_instance, "${uuid}");
+                     } catch (e) {
+                       assert_true(e instanceof DOMException, "DOMException thrown");
+                       assert_equals(e.name, "NotAllowedError", "NotAllowedError DOMException thrown");
+                       return {result: "success"};
+                     }
+                     return "exception unexpectedly not thrown";`);
+
+  // Run an auction in this frame using the other origin as a bidder. Since the join
+  // should have failed, the auction should have no winner.
+  await runBasicFledgeTestExpectingNoWinner(
+      test, uuid,
+      { interestGroupBuyers: [OTHER_ORIGIN1] });
+}, 'Join interest group in cross-origin iframe with join-ad-interest-group permission denied.');
+
+subsetTest(promise_test, async test => {
+  const uuid = generateUuid(test);
+  let iframe = await createIframe(test, OTHER_ORIGIN1, 'join-ad-interest-group');
+
+  // Try to join an IG with the parent's origin as an owner in a cross-origin iframe.
+  // This should require a .well-known fetch to the parents origin, which will not
+  // grant permission. The case where permission is granted is not yet testable.
+  let interestGroup = JSON.stringify(createInterestGroupForOrigin(uuid, window.location.origin));
+  await runInIframe(test, iframe,
+                    `joinInterestGroup(test_instance, "${uuid}", ${interestGroup})`);
+
+  // Run an auction with this page's origin as a bidder. Since the join
+  // should have failed, the auction should have no winner.
+  await runBasicFledgeTestExpectingNoWinner(test, uuid);
+}, "Join interest group owned by parent's origin in cross-origin iframe.");
+
+////////////////////////////////////////////////////////////////////////////////
+// Run auction in iframe tests.
+////////////////////////////////////////////////////////////////////////////////
+
+subsetTest(promise_test, async test => {
+  const uuid = generateUuid(test);
+  await joinInterestGroup(test, uuid);
+
+  let iframe = await createIframe(test, document.location.origin);
+
+  // Join a same-origin InterestGroup in a iframe navigated to its origin.
+  await runInIframe(test, iframe, `await joinInterestGroup(test_instance, "${uuid}");`);
+
+  // Run auction in same-origin iframe. This should succeed, by default.
+  await runInIframe(
+    test, iframe,
+    `await runBasicFledgeTestExpectingWinner(test_instance, "${uuid}");`);
+}, 'Run auction in same-origin iframe, default permissions.');
+
+subsetTest(promise_test, async test => {
+  const uuid = generateUuid(test);
+  // Join an interest group owned by the the main frame's origin.
+  await joinInterestGroup(test, uuid);
+
+  let iframe = await createIframe(test, OTHER_ORIGIN1);
+
+  // Run auction in cross-origin iframe. Currently, this is allowed by default.
+  await runInIframe(
+      test, iframe,
+      `await runBasicFledgeTestExpectingWinner(
+           test_instance, "${uuid}",
+           {interestGroupBuyers: ["${window.location.origin}"]});`);
+}, 'Run auction in cross-origin iframe, default permissions.');
+
+subsetTest(promise_test, async test => {
+  const uuid = generateUuid(test);
+  // Join an interest group owned by the the main frame's origin.
+  await joinInterestGroup(test, uuid);
+
+  let iframe = await createIframe(test, OTHER_ORIGIN1, "run-ad-auction");
+
+  // Run auction in cross-origin iframe that should allow the auction to occur.
+  await runInIframe(
+      test, iframe,
+      `await runBasicFledgeTestExpectingWinner(
+           test_instance, "${uuid}",
+           {interestGroupBuyers: ["${window.location.origin}"]});`);
+}, 'Run auction in cross-origin iframe with run-ad-auction permission.');
+
+subsetTest(promise_test, async test => {
+  const uuid = generateUuid(test);
+  // No need to join any interest groups in this case - running an auction
+  // should only throw an exception based on permissions policy, regardless
+  // of whether there are any interest groups can participate.
+
+  let iframe = await createIframe(test, OTHER_ORIGIN1, "run-ad-auction 'none'");
+
+  // Run auction in cross-origin iframe that should not allow the auction to occur.
+  await runInIframe(
+      test, iframe,
+      `try {
+         await runBasicFledgeAuction(test_instance, "${uuid}");
+       } catch (e) {
+         assert_true(e instanceof DOMException, "DOMException thrown");
+         assert_equals(e.name, "NotAllowedError", "NotAllowedError DOMException thrown");
+         return {result: "success"};
+       }
+       throw "Attempting to run auction unexpectedly did not throw"`);
+}, 'Run auction in cross-origin iframe with run-ad-auction permission denied.');
+
+subsetTest(promise_test, async test => {
+  const uuid = generateUuid(test);
+  // Join an interest group owned by the the main frame's origin.
+  await joinInterestGroup(test, uuid);
+
+  let iframe = await createIframe(test, OTHER_ORIGIN1, `run-ad-auction ${OTHER_ORIGIN1}`);
+
+  await runInIframe(
+      test, iframe,
+      `await runBasicFledgeTestExpectingWinner(
+        test_instance, "${uuid}",
+        { interestGroupBuyers: ["${window.location.origin}"],
+          seller: "${OTHER_ORIGIN2}",
+          decisionLogicURL: createDecisionScriptURL("${uuid}", {origin: "${OTHER_ORIGIN2}"})
+        });`);
+}, 'Run auction in cross-origin iframe with run-ad-auction for iframe origin, which is different from seller origin.');
+
+////////////////////////////////////////////////////////////////////////////////
+// Navigate fenced frame iframe tests.
+////////////////////////////////////////////////////////////////////////////////
+
+subsetTest(promise_test, async test => {
+  const uuid = generateUuid(test);
+
+  // Join an interest group and run an auction with a winner.
+  await joinInterestGroup(test, uuid);
+  let config = await runBasicFledgeTestExpectingWinner(test, uuid);
+
+  // Try to navigate a fenced frame to the winning ad in a cross-origin iframe
+  // with no fledge-related permissions.
+  let iframe = await createIframe(
+      test, OTHER_ORIGIN1, "join-ad-interest-group 'none'; run-ad-auction 'none'");
+  await runInIframe(
+      test, iframe,
+      `await createAndNavigateFencedFrame(test_instance, param);`,
+      /*param=*/config);
+  await waitForObservedRequests(
+      uuid, [createBidderReportURL(uuid), createSellerReportURL(uuid)]);
+}, 'Run auction main frame, open winning ad in cross-origin iframe.');
+
+subsetTest(promise_test, async test => {
+  const uuid = generateUuid(test);
+
+  let iframe = await createIframe(
+      test, OTHER_ORIGIN1, "join-ad-interest-group; run-ad-auction");
+  await runInIframe(
+      test, iframe,
+      `await joinInterestGroup(test_instance, "${uuid}");
+       await runBasicFledgeAuctionAndNavigate(test_instance, "${uuid}");
+       await waitForObservedRequests(
+         "${uuid}", [createBidderReportURL("${uuid}"), createSellerReportURL("${uuid}")])`);
+}, 'Run auction in cross-origin iframe and open winning ad in nested fenced frame.');
+
+subsetTest(promise_test, async test => {
+  const uuid = generateUuid(test);
+
+  // Run an auction in an cross-origin iframe, and get the resulting FencedFrameConfig.
+  let iframe = await createIframe(
+      test, OTHER_ORIGIN1, "join-ad-interest-group; run-ad-auction");
+  let config = await runInIframe(
+      test, iframe,
+      `await joinInterestGroup(test_instance, "${uuid}");
+       let config = await runBasicFledgeTestExpectingWinner(test_instance, "${uuid}");
+       return {result: "success", returnValue: config};`);
+  assert_true(config != null, "Value not returned from auction in iframe");
+  assert_true(config instanceof FencedFrameConfig,
+    `Wrong value type returned from auction: ${config.constructor.type}`);
+
+  // Loading the winning ad in a fenced frame that's a child of the main frame should
+  // succeed.
+  await createAndNavigateFencedFrame(test, config);
+  await waitForObservedRequests(
+      uuid,
+      [ createBidderReportURL(uuid, '1', OTHER_ORIGIN1),
+        createSellerReportURL(uuid, '1', OTHER_ORIGIN1)]);
+}, 'Run auction in cross-origin iframe and open winning ad in a fenced frame child of the main frame.');
+
+subsetTest(promise_test, async test => {
+  const uuid = generateUuid(test);
+
+  // Run an auction in an cross-origin iframe, and get the resulting FencedFrameConfig.
+  let iframe = await createIframe(
+      test, OTHER_ORIGIN1, "join-ad-interest-group; run-ad-auction");
+  let config = await runInIframe(
+      test, iframe,
+      `await joinInterestGroup(test_instance, "${uuid}");
+       let config = await runBasicFledgeTestExpectingWinner(test_instance, "${uuid}");
+       return {result: "success", returnValue: config};`);
+  assert_true(config != null, "Value not returned from auction in iframe");
+  assert_true(config instanceof FencedFrameConfig,
+    `Wrong value type returned from auction: ${config.constructor.type}`);
+
+  // Try to navigate a fenced frame to the winning ad in a cross-origin iframe
+  // with no fledge-related permissions. The iframe is a different origin from the
+  // first cross-origin iframe.
+  let iframe2 = await createIframe(
+    test, OTHER_ORIGIN2, "join-ad-interest-group 'none'; run-ad-auction 'none'");
+  await runInIframe(
+      test, iframe2,
+      `await createAndNavigateFencedFrame(test_instance, param);`,
+      /*param=*/config);
+  await waitForObservedRequests(
+      uuid,
+      [ createBidderReportURL(uuid, '1', OTHER_ORIGIN1),
+        createSellerReportURL(uuid, '1', OTHER_ORIGIN1)]);
+}, 'Run auction in cross-origin iframe and open winning ad in a fenced frame child of another cross-origin iframe.');
diff --git a/tests/wpt/tests/fledge/tentative/generate-bid-recency.https.sub.window.js b/tests/wpt/tests/fledge/tentative/generate-bid-recency.https.sub.window.js
index ed431820d30..b4c059820ed 100644
--- a/tests/wpt/tests/fledge/tentative/generate-bid-recency.https.sub.window.js
+++ b/tests/wpt/tests/fledge/tentative/generate-bid-recency.https.sub.window.js
@@ -23,11 +23,12 @@ promise_test(async test => {
            throw new Error("Recency is not rounded to multiple of 100 milliseconds.")
 
          return {'bid': 9,
-                 'render': interestGroup.ads[0].renderUrl};`,
+                 'render': interestGroup.ads[0].renderURL};`,
       reportWin:
-        `sendReportTo('${createBidderReportUrl(uuid)}');` },
+        `sendReportTo('${createBidderReportURL(uuid)}');`
+    },
     // expectedReportUrls
-    [createBidderReportUrl(uuid)]
+    [createBidderReportURL(uuid)]
   );
 }, 'Check recency in generateBid() is below a certain threshold and rounded ' +
    'to multiple of 100 milliseconds.');
diff --git a/tests/wpt/tests/fledge/tentative/join-leave-ad-interest-group.https.sub.window.js b/tests/wpt/tests/fledge/tentative/join-leave-ad-interest-group.https.sub.window.js
index 9b2b501fc72..85e172ed6f8 100644
--- a/tests/wpt/tests/fledge/tentative/join-leave-ad-interest-group.https.sub.window.js
+++ b/tests/wpt/tests/fledge/tentative/join-leave-ad-interest-group.https.sub.window.js
@@ -1,7 +1,17 @@
 // META: script=/resources/testdriver.js
 // META: script=/common/utils.js
 // META: script=resources/fledge-util.js
+// META: script=/common/subset-tests.js
 // META: timeout=long
+// META: variant=?1-10
+// META: variant=?11-20
+// META: variant=?21-30
+// META: variant=?31-40
+// META: variant=?41-50
+// META: variant=?51-60
+// META: variant=?61-70
+// META: variant=?71-80
+// META: variant=?81-last
 
 "use strict;"
 
@@ -167,58 +177,58 @@ const SIMPLE_JOIN_LEAVE_TEST_CASES = [
                      enableBiddingSignalsPrioritization: false}
   },
 
-  // "biddingLogicUrl" tests
+  // "biddingLogicURL" tests
   { expectJoinSucces: true,
     expectLeaveSucces: true,
     interestGroup: { ...BASE_INTEREST_GROUP,
-                     biddingLogicUrl: null }
+                     biddingLogicURL: null }
   },
   { expectJoinSucces: false,
     expectLeaveSucces: true,
     interestGroup: { ...BASE_INTEREST_GROUP,
-                     biddingLogicUrl: 'https://{{hosts[][www]}}/foo.js' }
+                     biddingLogicURL: 'https://{{hosts[][www]}}/foo.js' }
   },
   { expectJoinSucces: false,
     expectLeaveSucces: true,
     interestGroup: { ...BASE_INTEREST_GROUP,
-                     biddingLogicUrl: 'data:text/javascript,Foo' }
+                     biddingLogicURL: 'data:text/javascript,Foo' }
   },
   { expectJoinSucces: true,
     expectLeaveSucces: true,
     interestGroup: { ...BASE_INTEREST_GROUP,
-                     biddingLogicUrl: `${window.location.origin}/foo.js`}
+                     biddingLogicURL: `${window.location.origin}/foo.js`}
   },
   { expectJoinSucces: true,
     expectLeaveSucces: true,
     interestGroup: { ...BASE_INTEREST_GROUP,
-                     biddingLogicUrl: 'relative/path' }
+                     biddingLogicURL: 'relative/path' }
   },
 
-  // "biddingWasmHelperUrl" tests
+  // "biddingWasmHelperURL" tests
   { expectJoinSucces: true,
     expectLeaveSucces: true,
     interestGroup: { ...BASE_INTEREST_GROUP,
-                     biddingWasmHelperUrl: null }
+                     biddingWasmHelperURL: null }
   },
   { expectJoinSucces: false,
     expectLeaveSucces: true,
     interestGroup: { ...BASE_INTEREST_GROUP,
-                     biddingWasmHelperUrl: 'https://{{hosts[][www]}}/foo.js' }
+                     biddingWasmHelperURL: 'https://{{hosts[][www]}}/foo.js' }
   },
   { expectJoinSucces: false,
     expectLeaveSucces: true,
     interestGroup: { ...BASE_INTEREST_GROUP,
-                     biddingWasmHelperUrl: 'data:application/wasm,Foo' }
+                     biddingWasmHelperURL: 'data:application/wasm,Foo' }
   },
   { expectJoinSucces: true,
     expectLeaveSucces: true,
     interestGroup: { ...BASE_INTEREST_GROUP,
-                     biddingWasmHelperUrl: `${window.location.origin}/foo.js`}
+                     biddingWasmHelperURL: `${window.location.origin}/foo.js`}
   },
   { expectJoinSucces: true,
     expectLeaveSucces: true,
     interestGroup: { ...BASE_INTEREST_GROUP,
-                     biddingWasmHelperUrl: 'relative/path' }
+                     biddingWasmHelperURL: 'relative/path' }
   },
 
   // "dailyUpdateUrl" tests
@@ -265,31 +275,31 @@ const SIMPLE_JOIN_LEAVE_TEST_CASES = [
                      executionMode: 'unknownValuesAreValid' }
   },
 
-  // "trustedBiddingSignalsUrl" tests
+  // "trustedBiddingSignalsURL" tests
   { expectJoinSucces: true,
     expectLeaveSucces: true,
     interestGroup: { ...BASE_INTEREST_GROUP,
-                     trustedBiddingSignalsUrl: null }
+                     trustedBiddingSignalsURL: null }
   },
   { expectJoinSucces: false,
     expectLeaveSucces: true,
     interestGroup: { ...BASE_INTEREST_GROUP,
-                     trustedBiddingSignalsUrl: 'https://{{hosts[][www]}}/foo.js' }
+                     trustedBiddingSignalsURL: 'https://{{hosts[][www]}}/foo.js' }
   },
   { expectJoinSucces: false,
     expectLeaveSucces: true,
     interestGroup: { ...BASE_INTEREST_GROUP,
-                     trustedBiddingSignalsUrl: 'data:application/json,{}' }
+                     trustedBiddingSignalsURL: 'data:application/json,{}' }
   },
   { expectJoinSucces: true,
     expectLeaveSucces: true,
     interestGroup: { ...BASE_INTEREST_GROUP,
-                     trustedBiddingSignalsUrl: `${window.location.origin}/foo.js`}
+                     trustedBiddingSignalsURL: `${window.location.origin}/foo.js`}
   },
   { expectJoinSucces: true,
     expectLeaveSucces: true,
     interestGroup: { ...BASE_INTEREST_GROUP,
-                     trustedBiddingSignalsUrl: 'relative/path' }
+                     trustedBiddingSignalsURL: 'relative/path' }
   },
 
   // "trustedBiddingSignalsKeys" tests
@@ -375,24 +385,24 @@ const SIMPLE_JOIN_LEAVE_TEST_CASES = [
   { expectJoinSucces: true,
     expectLeaveSucces: true,
     interestGroup: { ...BASE_INTEREST_GROUP,
-                     ads: [{renderUrl: 'https://somewhere.test/'}] }
+                     ads: [{renderURL: 'https://somewhere.test/'}] }
   },
   { expectJoinSucces: true,
     expectLeaveSucces: true,
     interestGroup: { ...BASE_INTEREST_GROUP,
-                     ads: [{renderUrl: 'https://somewhere.test/'},
-                           {renderUrl: 'https://somewhere-else.test/'}] }
+                     ads: [{renderURL: 'https://somewhere.test/'},
+                           {renderURL: 'https://somewhere-else.test/'}] }
   },
   { expectJoinSucces: true,
     expectLeaveSucces: true,
     interestGroup: { ...BASE_INTEREST_GROUP,
-                     ads: [{renderUrl: 'https://somewhere.test/',
+                     ads: [{renderURL: 'https://somewhere.test/',
                             metadata: null}] }
   },
   { expectJoinSucces: true,
     expectLeaveSucces: true,
     interestGroup: { ...BASE_INTEREST_GROUP,
-                     ads: [{renderUrl: 'https://somewhere.test/',
+                     ads: [{renderURL: 'https://somewhere.test/',
                             metadata: null,
                             someOtherField: 'foo'}] }
   },
@@ -431,24 +441,24 @@ const SIMPLE_JOIN_LEAVE_TEST_CASES = [
   { expectJoinSucces: true,
     expectLeaveSucces: true,
     interestGroup: { ...BASE_INTEREST_GROUP,
-                     adComponents: [{renderUrl: 'https://somewhere.test/'}] }
+                     adComponents: [{renderURL: 'https://somewhere.test/'}] }
   },
   { expectJoinSucces: true,
     expectLeaveSucces: true,
     interestGroup: { ...BASE_INTEREST_GROUP,
-                     adComponents: [{renderUrl: 'https://somewhere.test/'},
-                                    {renderUrl: 'https://elsewhere.test/'}] }
+                     adComponents: [{renderURL: 'https://somewhere.test/'},
+                                    {renderURL: 'https://elsewhere.test/'}] }
   },
   { expectJoinSucces: true,
     expectLeaveSucces: true,
     interestGroup: { ...BASE_INTEREST_GROUP,
-                     adComponents: [{renderUrl: 'https://somewhere.test/',
+                     adComponents: [{renderURL: 'https://somewhere.test/',
                                      metadata: null}] }
   },
   { expectJoinSucces: true,
     expectLeaveSucces: true,
     interestGroup: { ...BASE_INTEREST_GROUP,
-                     adComponents: [{renderUrl: 'https://somewhere.test/',
+                     adComponents: [{renderURL: 'https://somewhere.test/',
                                      metadata: null,
                                      someOtherField: 'foo'}] }
   },
@@ -492,7 +502,7 @@ for (testCase of SIMPLE_JOIN_LEAVE_TEST_CASES) {
     test_name += JSON.stringify(testCase);
   }
 
-  promise_test((async (testCase) => {
+  subsetTest(promise_test, (async (testCase) => {
     const INTEREST_GROUP_LIFETIME_SECS = 1;
 
     let join_promise = navigator.joinAdInterestGroup(testCase.interestGroup,
@@ -526,12 +536,12 @@ for (testCase of SIMPLE_JOIN_LEAVE_TEST_CASES) {
   }).bind(undefined, testCase), test_name);
 }
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
 
   // Joining an interest group without a bidding script and run an auction.
   // There should be no winner.
-  await joinInterestGroup(test, uuid, { biddingLogicUrl: null });
+  await joinInterestGroup(test, uuid, { biddingLogicURL: null });
   assert_equals(null, await runBasicFledgeAuction(test, uuid),
                 'Auction unexpectedly had a winner');
 
@@ -546,12 +556,12 @@ promise_test(async test => {
 
   // Re-join the first interest group, and re-run the auction. The interest
   // group should be overwritten again, and there should be no winner.
-  await joinInterestGroup(test, uuid, { biddingLogicUrl: null });
+  await joinInterestGroup(test, uuid, { biddingLogicURL: null });
   assert_equals(null, await runBasicFledgeAuction(test, uuid),
                 'Auction unexpectedly had a winner');
 }, 'Join same interest group overwrites old matching group.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
 
   // Join an interest group, run an auction to make sure it was joined.
@@ -567,7 +577,7 @@ promise_test(async test => {
                 'Auction unexpectedly had a winner');
 }, 'Leaving interest group actually leaves interest group.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   // This should not throw.
   await leaveInterestGroup({ name: 'Never join group' });
 }, 'Leave an interest group that was never joined.');
@@ -576,7 +586,7 @@ promise_test(async test => {
 // Expiration tests
 ///////////////////////////////////////////////////////////////////////////////
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
 
   // Joins the default interest group, with a 0.2 second duration.
@@ -590,7 +600,7 @@ promise_test(async test => {
   while (await runBasicFledgeAuction(test, uuid) !== null);
 }, 'Interest group duration.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
 
   // Join interest group with a duration of -600. The interest group should
@@ -599,7 +609,7 @@ promise_test(async test => {
   assert_true(await runBasicFledgeAuction(test, uuid) === null);
 }, 'Interest group duration of -600.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
 
   // Join a long-lived interest group.
@@ -615,7 +625,7 @@ promise_test(async test => {
   while (await runBasicFledgeAuction(test, uuid) !== null);
 }, 'Interest group test with overwritten duration.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
 
   // Join a long-lived interest group.
diff --git a/tests/wpt/tests/fledge/tentative/no-winner.https.sub.window.js b/tests/wpt/tests/fledge/tentative/no-winner.https.sub.window.js
index 8fd7df50cde..229a707b099 100644
--- a/tests/wpt/tests/fledge/tentative/no-winner.https.sub.window.js
+++ b/tests/wpt/tests/fledge/tentative/no-winner.https.sub.window.js
@@ -1,7 +1,16 @@
 // META: script=/resources/testdriver.js
 // META: script=/common/utils.js
 // META: script=resources/fledge-util.js
+// META: script=/common/subset-tests.js
 // META: timeout=long
+// META: variant=?1-5
+// META: variant=?6-10
+// META: variant=?11-15
+// META: variant=?16-20
+// META: variant=?21-25
+// META: variant=?26-30
+// META: variant=?31-35
+// META: variant=?36-last
 
 "use strict;"
 
@@ -33,13 +42,13 @@ const BIDDING_LOGIC_SCRIPT_ERRORS = [
   // Bad return values:
   'generateBid=return 5;',
   'generateBid=return "Foo";',
-  'generateBid=return interestGroup.ads[0].renderUrl;',
+  'generateBid=return interestGroup.ads[0].renderURL;',
   'generateBid=return {bid: 1, render: "https://not-in-ads-array.test/"};',
   'generateBid=return {bid: 1};',
-  'generateBid=return {render: interestGroup.ads[0].renderUrl};',
+  'generateBid=return {render: interestGroup.ads[0].renderURL};',
   // These are not bidding rather than errors.
-  'generateBid=return {bid:0, render: interestGroup.ads[0].renderUrl};',
-  'generateBid=return {bid:-1, render: interestGroup.ads[0].renderUrl};',
+  'generateBid=return {bid:0, render: interestGroup.ads[0].renderURL};',
+  'generateBid=return {bid:-1, render: interestGroup.ads[0].renderURL};',
 ];
 
 const DECISION_LOGIC_SCRIPT_ERRORS = [
@@ -60,21 +69,21 @@ const DECISION_LOGIC_SCRIPT_ERRORS = [
 ];
 
 for (error of BIDDING_LOGIC_SCRIPT_ERRORS) {
-  promise_test((async (error, test) => {
-    let biddingLogicUrl = `${BASE_URL}resources/bidding-logic.sub.py?${error}`;
-    await runBasicFledgeTestExpectingNoWinner(
+  subsetTest(promise_test, (async (error, test) => {
+    let biddingLogicURL = `${BASE_URL}resources/bidding-logic.sub.py?${error}`;
+    await joinGroupAndRunBasicFledgeTestExpectingNoWinner(
       test,
-      {interestGroupOverrides: {biddingLogicUrl: biddingLogicUrl}}
+      {interestGroupOverrides: {biddingLogicURL: biddingLogicURL}}
     );
   }).bind(undefined, error), `Bidding logic script: ${error}`);
 }
 
 for (error of DECISION_LOGIC_SCRIPT_ERRORS) {
-  promise_test((async (error, test) => {
-    let decisionLogicUrl =
+  subsetTest(promise_test, (async (error, test) => {
+    let decisionLogicURL =
         `${BASE_URL}resources/decision-logic.sub.py?${error}`;
-    await runBasicFledgeTestExpectingNoWinner(
-      test, {auctionConfigOverrides: {decisionLogicUrl: decisionLogicUrl}}
+    await joinGroupAndRunBasicFledgeTestExpectingNoWinner(
+      test, { auctionConfigOverrides: { decisionLogicURL: decisionLogicURL } }
     );
   }).bind(undefined, error), `Decision logic script: ${error}`);
 }
diff --git a/tests/wpt/tests/fledge/tentative/register-ad-beacon.https.sub.window.js b/tests/wpt/tests/fledge/tentative/register-ad-beacon.https.sub.window.js
index 48ce1fa2636..7f9053d5244 100644
--- a/tests/wpt/tests/fledge/tentative/register-ad-beacon.https.sub.window.js
+++ b/tests/wpt/tests/fledge/tentative/register-ad-beacon.https.sub.window.js
@@ -1,22 +1,26 @@
 // META: script=/resources/testdriver.js
 // META: script=/common/utils.js
 // META: script=resources/fledge-util.js
+// META: script=/common/subset-tests.js
 // META: timeout=long
+// META: variant=?1-5
+// META: variant=?6-10
+// META: variant=?11-last
 
 "use strict;"
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
   await runReportTest(
       test, uuid,
       { reportResult:
-          `registerAdBeacon({beacon: '${createSellerBeaconUrl(uuid)}'});`,
+          `registerAdBeacon({beacon: '${createSellerBeaconURL(uuid)}'});`,
         reportWin:
           '' },
       // expectedReportUrls:
-      [`${createSellerBeaconUrl(uuid)}, body: `],
+      [`${createSellerBeaconURL(uuid)}, body: `],
       // renderUrlOverride:
-      createRenderUrl(
+      createRenderURL(
           uuid,
           `window.fence.reportEvent({
               eventType: "beacon",
@@ -26,18 +30,19 @@ promise_test(async test => {
   );
 }, 'Seller calls registerAdBeacon().');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
   await runReportTest(
       test, uuid,
       { reportResult:
           '',
         reportWin:
-          `registerAdBeacon({beacon: '${createBidderBeaconUrl(uuid)}'});` },
+          `registerAdBeacon({beacon: '${createBidderBeaconURL(uuid)}'});`
+      },
       // expectedReportUrls:
-      [`${createBidderBeaconUrl(uuid)}, body: `],
+      [`${createBidderBeaconURL(uuid)}, body: `],
       // renderUrlOverride:
-      createRenderUrl(
+      createRenderURL(
           uuid,
           `window.fence.reportEvent({
               eventType: "beacon",
@@ -47,18 +52,18 @@ promise_test(async test => {
   );
 }, 'Buyer calls registerAdBeacon().');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
   await runReportTest(
       test, uuid,
       { reportResult:
-          `registerAdBeacon({beacon: '${createSellerBeaconUrl(uuid)}'});`,
+          `registerAdBeacon({beacon: '${createSellerBeaconURL(uuid)}'});`,
         reportWin:
           '' },
       // expectedReportUrls:
-      [`${createSellerBeaconUrl(uuid)}, body: body`],
+      [`${createSellerBeaconURL(uuid)}, body: body`],
       // renderUrlOverride:
-      createRenderUrl(
+      createRenderURL(
           uuid,
           `window.fence.reportEvent({
               eventType: "beacon",
@@ -68,18 +73,18 @@ promise_test(async test => {
   );
 }, 'Seller calls registerAdBeacon(), beacon sent with body.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
   await runReportTest(
       test, uuid,
       { reportResult:
           '',
         reportWin:
-          `registerAdBeacon({beacon: '${createBidderBeaconUrl(uuid)}'});` },
+          `registerAdBeacon({beacon: '${createBidderBeaconURL(uuid)}'});` },
       // expectedReportUrls:
-      [`${createBidderBeaconUrl(uuid)}, body: body`],
+      [`${createBidderBeaconURL(uuid)}, body: body`],
       // renderUrlOverride:
-      createRenderUrl(
+      createRenderURL(
           uuid,
           `window.fence.reportEvent({
               eventType: "beacon",
@@ -89,19 +94,19 @@ promise_test(async test => {
   );
 }, 'Buyer calls registerAdBeacon(), beacon sent with body.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
   await runReportTest(
       test, uuid,
       { reportResult:
-          `registerAdBeacon({beacon: '${createSellerBeaconUrl(uuid)}'});`,
+          `registerAdBeacon({beacon: '${createSellerBeaconURL(uuid)}'});`,
         reportWin:
           '' },
       // expectedReportUrls:
-      [`${createSellerBeaconUrl(uuid)}, body: body1`,
-       `${createSellerBeaconUrl(uuid)}, body: body2`],
+      [`${createSellerBeaconURL(uuid)}, body: body1`,
+      `${createSellerBeaconURL(uuid)}, body: body2`],
       // renderUrlOverride:
-      createRenderUrl(
+      createRenderURL(
           uuid,
           `window.fence.reportEvent({
               eventType: "beacon",
@@ -116,19 +121,19 @@ promise_test(async test => {
   );
 }, 'Seller calls registerAdBeacon(). reportEvent() called twice.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
   await runReportTest(
       test, uuid,
       { reportResult:
           '',
         reportWin:
-          `registerAdBeacon({beacon: '${createBidderBeaconUrl(uuid)}'});` },
+          `registerAdBeacon({beacon: '${createBidderBeaconURL(uuid)}'});` },
       // expectedReportUrls:
-      [`${createBidderBeaconUrl(uuid)}, body: body1`,
-       `${createBidderBeaconUrl(uuid)}, body: body2`],
+      [`${createBidderBeaconURL(uuid)}, body: body1`,
+       `${createBidderBeaconURL(uuid)}, body: body2`],
       // renderUrlOverride:
-      createRenderUrl(
+      createRenderURL(
           uuid,
           `window.fence.reportEvent({
               eventType: "beacon",
@@ -143,20 +148,20 @@ promise_test(async test => {
   );
 }, 'Buyer calls registerAdBeacon(). reportEvent() called twice.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
   await runReportTest(
       test, uuid,
       { reportResult:
-          `registerAdBeacon({beacon1: '${createSellerBeaconUrl(uuid, '1')}',
-                             beacon2: '${createSellerBeaconUrl(uuid, '2')}'});`,
+        `registerAdBeacon({beacon1: '${createSellerBeaconURL(uuid, '1')}',
+                             beacon2: '${createSellerBeaconURL(uuid, '2')}'});`,
         reportWin:
           '' },
       // expectedReportUrls:
-      [`${createSellerBeaconUrl(uuid, '1')}, body: body1`,
-       `${createSellerBeaconUrl(uuid, '2')}, body: body2`],
+      [`${createSellerBeaconURL(uuid, '1')}, body: body1`,
+       `${createSellerBeaconURL(uuid, '2')}, body: body2`],
       // renderUrlOverride:
-      createRenderUrl(
+      createRenderURL(
           uuid,
           `window.fence.reportEvent({
               eventType: "beacon1",
@@ -171,21 +176,21 @@ promise_test(async test => {
   );
 }, 'Seller calls registerAdBeacon() with multiple beacons.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
   await runReportTest(
       test, uuid,
       { reportResult:
           '',
         reportWin:
-          `registerAdBeacon({beacon1: '${createBidderBeaconUrl(uuid, '1')}',
-                             beacon2: '${createBidderBeaconUrl(uuid, '2')}'});`
+          `registerAdBeacon({beacon1: '${createBidderBeaconURL(uuid, '1')}',
+                             beacon2: '${createBidderBeaconURL(uuid, '2')}'});`
       },
       // expectedReportUrls:
-      [`${createBidderBeaconUrl(uuid, '1')}, body: body1`,
-       `${createBidderBeaconUrl(uuid, '2')}, body: body2`],
+      [`${createBidderBeaconURL(uuid, '1')}, body: body1`,
+       `${createBidderBeaconURL(uuid, '2')}, body: body2`],
       // renderUrlOverride:
-      createRenderUrl(
+      createRenderURL(
           uuid,
           `window.fence.reportEvent({
               eventType: "beacon1",
@@ -200,19 +205,19 @@ promise_test(async test => {
   );
 }, 'Buyer calls registerAdBeacon() with multiple beacons.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
   await runReportTest(
       test, uuid,
       { reportResult:
-          `registerAdBeacon({beacon: '${createSellerBeaconUrl(uuid)}'});`,
+          `registerAdBeacon({beacon: '${createSellerBeaconURL(uuid)}'});`,
         reportWin:
-          `registerAdBeacon({beacon: '${createBidderBeaconUrl(uuid)}'});` },
+          `registerAdBeacon({beacon: '${createBidderBeaconURL(uuid)}'});` },
       // expectedReportUrls:
-      [`${createSellerBeaconUrl(uuid)}, body: body`,
-       `${createBidderBeaconUrl(uuid)}, body: body`],
+      [`${createSellerBeaconURL(uuid)}, body: body`,
+       `${createBidderBeaconURL(uuid)}, body: body`],
       // renderUrlOverride:
-      createRenderUrl(
+      createRenderURL(
           uuid,
           `window.fence.reportEvent({
               eventType: "beacon",
@@ -222,19 +227,19 @@ promise_test(async test => {
   );
 }, 'Seller and buyer call registerAdBeacon() with shared reportEvent() call.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
   await runReportTest(
       test, uuid,
       { reportResult:
-          `registerAdBeacon({beacon: '${createSellerBeaconUrl(uuid)}'});`,
+          `registerAdBeacon({beacon: '${createSellerBeaconURL(uuid)}'});`,
         reportWin:
-          `registerAdBeacon({beacon: '${createBidderBeaconUrl(uuid)}'});` },
+          `registerAdBeacon({beacon: '${createBidderBeaconURL(uuid)}'});` },
       // expectedReportUrls:
-      [`${createSellerBeaconUrl(uuid)}, body: body1`,
-       `${createBidderBeaconUrl(uuid)}, body: body2`],
+      [`${createSellerBeaconURL(uuid)}, body: body1`,
+       `${createBidderBeaconURL(uuid)}, body: body2`],
       // renderUrlOverride:
-      createRenderUrl(
+      createRenderURL(
           uuid,
           `window.fence.reportEvent({
             eventType: "beacon",
@@ -249,24 +254,24 @@ promise_test(async test => {
   );
 }, 'Seller and buyer call registerAdBeacon() with separate reportEvent() calls.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
   await runReportTest(
       test, uuid,
       { reportResult:
           // Multiple registerAdBeacon() call should result in an exception,
           // throwing away all beacons and other types of reports.
-          `sendReportTo('${createSellerReportUrl(uuid)}');
-           registerAdBeacon({beacon: '${createSellerBeaconUrl(uuid)}'});
-           registerAdBeacon({beacon1: '${createSellerBeaconUrl(uuid)}'});`,
+          `sendReportTo('${createSellerReportURL(uuid)}');
+           registerAdBeacon({beacon: '${createSellerBeaconURL(uuid)}'});
+           registerAdBeacon({beacon1: '${createSellerBeaconURL(uuid)}'});`,
         reportWinSuccessCondition:
           'sellerSignals === null',
         reportWin:
-          `registerAdBeacon({beacon: '${createBidderBeaconUrl(uuid)}'});` },
+          `registerAdBeacon({beacon: '${createBidderBeaconURL(uuid)}'});` },
       // expectedReportUrls:
-      [`${createBidderBeaconUrl(uuid)}, body: body`],
+      [`${createBidderBeaconURL(uuid)}, body: body`],
       // renderUrlOverride:
-      createRenderUrl(
+      createRenderURL(
           uuid,
           `window.fence.reportEvent({
               eventType: "beacon",
@@ -276,22 +281,22 @@ promise_test(async test => {
   );
 }, 'Seller calls registerAdBeacon() multiple times.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
   await runReportTest(
       test, uuid,
       { reportResult:
-          `registerAdBeacon({beacon: '${createSellerBeaconUrl(uuid)}'});`,
+          `registerAdBeacon({beacon: '${createSellerBeaconURL(uuid)}'});`,
         reportWin:
           // Multiple registerAdBeacon() call should result in an exception,
           // throwing away all beacons and other types of reports.
-          `sendReportTo('${createBidderReportUrl(uuid)}');
-           registerAdBeacon({beacon: '${createBidderBeaconUrl(uuid)}'});
-           registerAdBeacon({beacon1: '${createBidderBeaconUrl(uuid)}'});` },
+          `sendReportTo('${createBidderReportURL(uuid)}');
+           registerAdBeacon({beacon: '${createBidderBeaconURL(uuid)}'});
+           registerAdBeacon({beacon1: '${createBidderBeaconURL(uuid)}'});` },
       // expectedReportUrls:
-      [`${createSellerBeaconUrl(uuid)}, body: body`],
+      [`${createSellerBeaconURL(uuid)}, body: body`],
       // renderUrlOverride:
-      createRenderUrl(
+      createRenderURL(
           uuid,
           `window.fence.reportEvent({
               eventType: "beacon",
diff --git a/tests/wpt/tests/fledge/tentative/reporting-arguments.https.sub.window.js b/tests/wpt/tests/fledge/tentative/reporting-arguments.https.sub.window.js
index 3b03d29bcf5..b68341c62a1 100644
--- a/tests/wpt/tests/fledge/tentative/reporting-arguments.https.sub.window.js
+++ b/tests/wpt/tests/fledge/tentative/reporting-arguments.https.sub.window.js
@@ -1,7 +1,12 @@
 // META: script=/resources/testdriver.js
 // META: script=/common/utils.js
 // META: script=resources/fledge-util.js
+// META: script=/common/subset-tests.js
 // META: timeout=long
+// META: variant=?1-5
+// META: variant=?6-10
+// META: variant=?11-15
+// META: variant=?16-last
 
 "use strict;"
 
@@ -17,12 +22,12 @@ async function runReportArgumentValidationTest(
       { reportResultSuccessCondition:
           reportResultSuccessCondition,
         reportResult:
-          `sendReportTo('${createSellerReportUrl(uuid)}');`,
+          `sendReportTo('${createSellerReportURL(uuid)}');`,
         reportWinSuccessCondition:
           reportWinSuccessCondition,
         reportWin:
-          `sendReportTo('${createBidderReportUrl(uuid)}');` },
-      [createSellerReportUrl(uuid), createBidderReportUrl(uuid)]
+          `sendReportTo('${createBidderReportURL(uuid)}');` },
+      [createSellerReportURL(uuid), createBidderReportURL(uuid)]
   );
 }
 
@@ -30,67 +35,67 @@ async function runReportArgumentValidationTest(
 // reportResult() to reportWin() message passing tests
 /////////////////////////////////////////////////////////////////////
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
   await runReportTest(
       test, uuid,
       { reportResult:
-          `sendReportTo('${createSellerReportUrl(uuid)}');
+          `sendReportTo('${createSellerReportURL(uuid)}');
            return 45;`,
         reportWinSuccessCondition:
           'sellerSignals === 45',
         reportWin:
-          `sendReportTo('${createBidderReportUrl(uuid)}');` },
+          `sendReportTo('${createBidderReportURL(uuid)}');` },
       // expectedReportUrls:
-      [createSellerReportUrl(uuid), createBidderReportUrl(uuid)]
+      [createSellerReportURL(uuid), createBidderReportURL(uuid)]
   );
 }, 'Seller passes number to bidder.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
   await runReportTest(
       test, uuid,
       { reportResult:
-          `sendReportTo('${createSellerReportUrl(uuid)}');
+          `sendReportTo('${createSellerReportURL(uuid)}');
            return 'foo';`,
         reportWinSuccessCondition:
           'sellerSignals === "foo"',
         reportWin:
-          `sendReportTo('${createBidderReportUrl(uuid)}');` },
+          `sendReportTo('${createBidderReportURL(uuid)}');` },
       // expectedReportUrls:
-      [createSellerReportUrl(uuid), createBidderReportUrl(uuid)]
+      [createSellerReportURL(uuid), createBidderReportURL(uuid)]
   );
 }, 'Seller passes string to bidder.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
   await runReportTest(
       test, uuid,
       { reportResult:
-          `sendReportTo('${createSellerReportUrl(uuid)}');
+          `sendReportTo('${createSellerReportURL(uuid)}');
            return [3, 1, 2];`,
         reportWinSuccessCondition:
           'JSON.stringify(sellerSignals) === "[3,1,2]"',
         reportWin:
-          `sendReportTo('${createBidderReportUrl(uuid)}');` },
+          `sendReportTo('${createBidderReportURL(uuid)}');` },
       // expectedReportUrls:
-      [createSellerReportUrl(uuid), createBidderReportUrl(uuid)]
+      [createSellerReportURL(uuid), createBidderReportURL(uuid)]
   );
 }, 'Seller passes array to bidder.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
   await runReportTest(
       test, uuid,
       { reportResult:
-          `sendReportTo('${createSellerReportUrl(uuid)}');
+          `sendReportTo('${createSellerReportURL(uuid)}');
            return {a: 4, b:['c', null, {}]};`,
         reportWinSuccessCondition:
           `JSON.stringify(sellerSignals) === '{"a":4,"b":["c",null,{}]}'`,
         reportWin:
-          `sendReportTo('${createBidderReportUrl(uuid)}');` },
+          `sendReportTo('${createBidderReportURL(uuid)}');` },
       // expectedReportUrls:
-      [createSellerReportUrl(uuid), createBidderReportUrl(uuid)]
+      [createSellerReportURL(uuid), createBidderReportURL(uuid)]
   );
 }, 'Seller passes object to bidder.');
 
@@ -98,7 +103,7 @@ promise_test(async test => {
 // reportResult() / reportWin() browserSignals tests.
 /////////////////////////////////////////////////////////////////////
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   await runReportArgumentValidationTest(
     test,
     // reportResultSuccessCondition:
@@ -108,7 +113,7 @@ promise_test(async test => {
   );
 }, 'browserSignals.topWindowHostname test.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   await runReportArgumentValidationTest(
     test,
     // reportResultSuccessCondition:
@@ -118,7 +123,7 @@ promise_test(async test => {
   );
 }, 'browserSignals.seller test.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   await runReportArgumentValidationTest(
     test,
     // reportResultSuccessCondition:
@@ -130,19 +135,19 @@ promise_test(async test => {
   );
 }, 'browserSignals.topLevelSeller and browserSignals.componentSeller test.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
   await runReportArgumentValidationTest(
     test,
     // reportResultSuccessCondition:
-    `browserSignals.renderUrl === "${createRenderUrl(uuid)}"`,
+    `browserSignals.renderURL === "${createRenderURL(uuid)}"`,
     // reportWinSuccessCondition:
-    `browserSignals.renderUrl === "${createRenderUrl(uuid)}"`,
+    `browserSignals.renderURL === "${createRenderURL(uuid)}"`,
     uuid
   );
-}, 'browserSignals.renderUrl test.');
+}, 'browserSignals.renderURL test.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   await runReportArgumentValidationTest(
     test,
     // reportResultSuccessCondition:
@@ -152,7 +157,7 @@ promise_test(async test => {
   );
 }, 'browserSignals.bid test.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   await runReportArgumentValidationTest(
     test,
     // reportResultSuccessCondition:
@@ -162,7 +167,7 @@ promise_test(async test => {
   );
 }, 'browserSignals.desirability test.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   await runReportArgumentValidationTest(
     test,
     // reportResultSuccessCondition:
@@ -172,7 +177,7 @@ promise_test(async test => {
   );
 }, 'browserSignals.topLevelSellerSignals test.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   await runReportArgumentValidationTest(
     test,
     // reportResultSuccessCondition:
@@ -182,7 +187,7 @@ promise_test(async test => {
   );
 }, 'browserSignals.dataVersion test.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   await runReportArgumentValidationTest(
     test,
     // reportResultSuccessCondition:
@@ -192,7 +197,7 @@ promise_test(async test => {
   );
 }, 'browserSignals.modifiedBid test.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
   await runReportArgumentValidationTest(
     test,
@@ -204,13 +209,15 @@ promise_test(async test => {
   );
 }, 'browserSignals.highestScoringOtherBid with no other interest groups test.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
   await joinInterestGroup(test, uuid,
-                          { biddingLogicUrl: createBiddingScriptUrl({bid: -2}),
+    {
+      biddingLogicURL: createBiddingScriptURL({ bid: -2 }),
                             name: 'other interest group 1' });
   await joinInterestGroup(test, uuid,
-                          { biddingLogicUrl: createBiddingScriptUrl({bid: -1}),
+    {
+      biddingLogicURL: createBiddingScriptURL({ bid: -1 }),
                             name: 'other interest group 2' });
   await runReportArgumentValidationTest(
     test,
@@ -222,16 +229,19 @@ promise_test(async test => {
   );
 }, 'browserSignals.highestScoringOtherBid with other groups that do not bid.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
   await joinInterestGroup(test, uuid,
-                          { biddingLogicUrl: createBiddingScriptUrl({bid: 2}),
+    {
+      biddingLogicURL: createBiddingScriptURL({ bid: 2 }),
                             name: 'other interest group 1' });
   await joinInterestGroup(test, uuid,
-                          { biddingLogicUrl: createBiddingScriptUrl({bid: 5}),
+    {
+      biddingLogicURL: createBiddingScriptURL({ bid: 5 }),
                             name: 'other interest group 2' });
   await joinInterestGroup(test, uuid,
-                          { biddingLogicUrl: createBiddingScriptUrl({bid: 2}),
+    {
+      biddingLogicURL: createBiddingScriptURL({ bid: 2 }),
                             name: 'other interest group 3' });
   await runReportArgumentValidationTest(
     test,
@@ -243,7 +253,7 @@ promise_test(async test => {
   );
 }, 'browserSignals.highestScoringOtherBid with other bids.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   await runReportArgumentValidationTest(
     test,
     // reportResultSuccessCondition:
@@ -253,7 +263,7 @@ promise_test(async test => {
   );
 }, 'browserSignals.interestGroupName test.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   await runReportArgumentValidationTest(
     test,
     // reportResultSuccessCondition:
@@ -263,10 +273,11 @@ promise_test(async test => {
   );
 }, 'browserSignals.madeHighestScoringOtherBid with no other bids.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
   await joinInterestGroup(test, uuid,
-                          { biddingLogicUrl: createBiddingScriptUrl({bid: -1}),
+    {
+      biddingLogicURL: createBiddingScriptURL({ bid: -1 }),
                             name: 'other interest group 2' });
   await runReportArgumentValidationTest(
     test,
@@ -277,10 +288,11 @@ promise_test(async test => {
   );
 }, 'browserSignals.madeHighestScoringOtherBid with group that did not bid.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
   await joinInterestGroup(test, uuid,
-    { biddingLogicUrl: createBiddingScriptUrl({bid: 1}),
+    {
+      biddingLogicURL: createBiddingScriptURL({ bid: 1 }),
       name: 'other interest group 2' });
 await runReportArgumentValidationTest(
     test,
diff --git a/tests/wpt/tests/fledge/tentative/resources/bidding-logic.sub.py b/tests/wpt/tests/fledge/tentative/resources/bidding-logic.sub.py
index 6b4e179cff9..89707470d25 100644
--- a/tests/wpt/tests/fledge/tentative/resources/bidding-logic.sub.py
+++ b/tests/wpt/tests/fledge/tentative/resources/bidding-logic.sub.py
@@ -24,11 +24,11 @@ def main(request, response):
         response.headers.set(b"Content-Type", b"application/javascript")
 
     if error == b"bad-allow-fledge":
-        response.headers.set(b"X-Allow-FLEDGE", b"sometimes")
+        response.headers.set(b"Ad-Auction-Allowed", b"sometimes")
     elif error == b"fledge-not-allowed":
-        response.headers.set(b"X-Allow-FLEDGE", b"false")
+        response.headers.set(b"Ad-Auction-Allowed", b"false")
     elif error != b"no-allow-fledge":
-        response.headers.set(b"X-Allow-FLEDGE", b"true")
+        response.headers.set(b"Ad-Auction-Allowed", b"true")
 
     body = b''
     if error == b"no-body":
@@ -41,7 +41,7 @@ def main(request, response):
               {{GET[generateBid]}};
               return {
                 'bid': 9,
-                'render': interestGroup.ads[0].renderUrl
+                'render': interestGroup.ads[0].renderURL
               };
             }"""
     bid = request.GET.first(b"bid", None)
@@ -54,4 +54,3 @@ def main(request, response):
               {{GET[reportWin]}};
             }"""
     return body
-
diff --git a/tests/wpt/tests/fledge/tentative/resources/decision-logic.sub.py b/tests/wpt/tests/fledge/tentative/resources/decision-logic.sub.py
index 9a97d45bd12..165d9840028 100644
--- a/tests/wpt/tests/fledge/tentative/resources/decision-logic.sub.py
+++ b/tests/wpt/tests/fledge/tentative/resources/decision-logic.sub.py
@@ -24,11 +24,11 @@ def main(request, response):
         response.headers.set(b"Content-Type", b"application/javascript")
 
     if error == b"bad-allow-fledge":
-        response.headers.set(b"X-Allow-FLEDGE", b"sometimes")
+        response.headers.set(b"Ad-Auction-Allowed", b"sometimes")
     elif error == b"fledge-not-allowed":
-        response.headers.set(b"X-Allow-FLEDGE", b"false")
+        response.headers.set(b"Ad-Auction-Allowed", b"false")
     elif error != b"no-allow-fledge":
-        response.headers.set(b"X-Allow-FLEDGE", b"true")
+        response.headers.set(b"Ad-Auction-Allowed", b"true")
 
     body = b''
     if error == b"no-body":
diff --git a/tests/wpt/tests/fledge/tentative/resources/fenced-frame.sub.py b/tests/wpt/tests/fledge/tentative/resources/fenced-frame.sub.py
index c29bb6feccc..a3cc488a058 100644
--- a/tests/wpt/tests/fledge/tentative/resources/fenced-frame.sub.py
+++ b/tests/wpt/tests/fledge/tentative/resources/fenced-frame.sub.py
@@ -8,6 +8,13 @@ def main(request, response):
     return """
         <!DOCTYPE html>
         <html>
+        <head>
+        <!--- Allow injected scripts to use functions in fledge-util.js --->
+        <base href="..">
+        <script src="/resources/testharness.js"></script>
+        <script src="/common/utils.js"></script>
+        <script src="resources/fledge-util.js"></script>
+        </head>
         <body>
         <script>
         {{GET[script]}}
diff --git a/tests/wpt/tests/fledge/tentative/resources/fledge-util.js b/tests/wpt/tests/fledge/tentative/resources/fledge-util.js
index f941d2285d2..7ed5b13f8d9 100644
--- a/tests/wpt/tests/fledge/tentative/resources/fledge-util.js
+++ b/tests/wpt/tests/fledge/tentative/resources/fledge-util.js
@@ -1,8 +1,8 @@
 "use strict;"
 
-const FULL_URL = window.location.href;
-const BASE_URL = FULL_URL.substring(0, FULL_URL.lastIndexOf('/') + 1);
+const BASE_URL = document.baseURI.substring(0, document.baseURI.lastIndexOf('/') + 1);
 const BASE_PATH = (new URL(BASE_URL)).pathname;
+const RESOURCE_PATH = `${BASE_PATH}resources/`
 
 const DEFAULT_INTEREST_GROUP_NAME = 'default name';
 
@@ -21,7 +21,7 @@ const TRUSTED_SCORING_SIGNALS_URL =
 // `dispatch` affects what the tracker script does.
 // `id` can be used to uniquely identify tracked requests. It has no effect
 //     on behavior of the script; it only serves to make the URL unique.
-function createTrackerUrl(origin, uuid, dispatch, id = null) {
+function createTrackerURL(origin, uuid, dispatch, id = null) {
   let url = new URL(`${origin}${BASE_PATH}resources/request-tracker.py`);
   url.searchParams.append('uuid', uuid);
   url.searchParams.append('dispatch', dispatch);
@@ -31,26 +31,22 @@ function createTrackerUrl(origin, uuid, dispatch, id = null) {
 }
 
 // Create tracked bidder/seller URLs. The only difference is the prefix added
-// to the `id` passed to createTrackerUrl. The optional `id` field allows
+// to the `id` passed to createTrackerURL. The optional `id` field allows
 // multiple bidder/seller report URLs to be distinguishable from each other.
-function createBidderReportUrl(uuid, id = '1') {
-  return createTrackerUrl(window.location.origin, uuid, `track_get`,
-                          `bidder_report_${id}`);
+function createBidderReportURL(uuid, id = '1', origin = window.location.origin) {
+  return createTrackerURL(origin, uuid, `track_get`, `bidder_report_${id}`);
 }
-function createSellerReportUrl(uuid, id = '1') {
-  return createTrackerUrl(window.location.origin, uuid, `track_get`,
-                          `seller_report_${id}`);
+function createSellerReportURL(uuid, id = '1', origin = window.location.origin) {
+  return createTrackerURL(origin, uuid, `track_get`, `seller_report_${id}`);
 }
 
-// Much like above ReportUrl methods, except designed for beacons, which
+// Much like above ReportURL methods, except designed for beacons, which
 // are expected to be POSTs.
-function createBidderBeaconUrl(uuid, id = '1') {
-  return createTrackerUrl(window.location.origin, uuid, `track_post`,
-                          `bidder_beacon_${id}`);
+function createBidderBeaconURL(uuid, id = '1', origin = window.location.origin) {
+  return createTrackerURL(origin, uuid, `track_post`, `bidder_beacon_${id}`);
 }
-function createSellerBeaconUrl(uuid, id = '1') {
-  return createTrackerUrl(window.location.origin, uuid, `track_post`,
-                          `seller_beacon_${id}`);
+function createSellerBeaconURL(uuid, id = '1', origin = window.location.origin) {
+  return createTrackerURL(origin, uuid, `track_post`, `seller_beacon_${id}`);
 }
 
 // Generates a UUID and registers a cleanup method with the test fixture to
@@ -59,8 +55,8 @@ function createSellerBeaconUrl(uuid, id = '1') {
 function generateUuid(test) {
   let uuid = token();
   test.add_cleanup(async () => {
-    let cleanupUrl = createTrackerUrl(window.location.origin, uuid, 'clean_up');
-    let response = await fetch(cleanupUrl, {credentials: 'omit', mode: 'cors'});
+    let cleanupURL = createTrackerURL(window.location.origin, uuid, 'clean_up');
+    let response = await fetch(cleanupURL, {credentials: 'omit', mode: 'cors'});
     assert_equals(await response.text(), 'cleanup complete',
                   `Sever state cleanup failed`);
   });
@@ -77,18 +73,18 @@ function generateUuid(test) {
 // If any other strings are received from the tracking script, or the tracker
 // script reports an error, fails the test.
 async function waitForObservedRequests(uuid, expectedRequests) {
-  let trackedRequestsUrl = createTrackerUrl(window.location.origin, uuid,
+  let trackedRequestsURL = createTrackerURL(window.location.origin, uuid,
                                             'request_list');
   // Sort array for easier comparison, since order doesn't matter.
   expectedRequests.sort();
   while (true) {
-    let response = await fetch(trackedRequestsUrl,
+    let response = await fetch(trackedRequestsURL,
                                {credentials: 'omit', mode: 'cors'});
     let trackerData = await response.json();
 
     // Fail on fetch error.
     if (trackerData.error) {
-      throw trackedRequestsUrl + ' fetch failed:' +
+      throw trackedRequestsURL + ' fetch failed:' +
           JSON.stringify(trackerData);
     }
 
@@ -127,8 +123,9 @@ async function waitForObservedRequests(uuid, expectedRequests) {
 // run, unless it returns something or throws.
 //
 // The default reportWin() method is empty.
-function createBiddingScriptUrl(params = {}) {
-  let url = new URL(`${BASE_URL}resources/bidding-logic.sub.py`);
+function createBiddingScriptURL(params = {}) {
+  let origin = params.origin ? params.origin : new URL(BASE_URL).origin;
+  let url = new URL(`${origin}${RESOURCE_PATH}bidding-logic.sub.py`);
   if (params.generateBid)
     url.searchParams.append('generateBid', params.generateBid);
   if (params.reportWin)
@@ -141,14 +138,15 @@ function createBiddingScriptUrl(params = {}) {
 }
 
 // Creates a decision script with the provided code in the method bodies. The
-// decision script's scoreAd() method will reject ads with renderUrls that
+// decision script's scoreAd() method will reject ads with renderURLs that
 // don't ends with "uuid", and will return a score equal to the bid, after the
 // passed in code in the "scoreAd" input argument has been run, unless it
 // returns something or throws.
 //
 // The default reportResult() method is empty.
-function createDecisionScriptUrl(uuid, params = {}) {
-  let url = new URL(`${BASE_URL}resources/decision-logic.sub.py`);
+function createDecisionScriptURL(uuid, params = {}) {
+  let origin = params.origin ? params.origin : new URL(BASE_URL).origin;
+  let url = new URL(`${origin}${RESOURCE_PATH}decision-logic.sub.py`);
   url.searchParams.append('uuid', uuid);
   if (params.scoreAd)
     url.searchParams.append('scoreAd', params.scoreAd);
@@ -159,12 +157,12 @@ function createDecisionScriptUrl(uuid, params = {}) {
   return url.toString();
 }
 
-// Creates a renderUrl for an ad that runs the passed in "script". "uuid" has
+// Creates a renderURL for an ad that runs the passed in "script". "uuid" has
 // no effect, beyond making the URL distinct between tests, and being verified
 // by the decision logic script before accepting a bid. "uuid" is expected to
 // be last.  "signalsParams" also has no effect, but is used by
 // trusted-scoring-signals.py to affect the response.
-function createRenderUrl(uuid, script, signalsParams) {
+function createRenderURL(uuid, script, signalsParams) {
   let url = new URL(`${BASE_URL}resources/fenced-frame.sub.py`);
   if (script)
     url.searchParams.append('script', script);
@@ -174,10 +172,27 @@ function createRenderUrl(uuid, script, signalsParams) {
   return url.toString();
 }
 
+// Creates an interest group owned by "origin" with a bidding logic URL located
+// on "origin" as well. Uses standard render and report URLs, which are not
+// necessarily on "origin". "interestGroupOverrides" may be used to override any
+// field of the created interest group.
+function createInterestGroupForOrigin(uuid, origin,
+                                      interestGroupOverrides = {}) {
+  return {
+    owner: origin,
+    name: DEFAULT_INTEREST_GROUP_NAME,
+    biddingLogicURL: createBiddingScriptURL(
+        { origin: origin,
+          reportWin: `sendReportTo('${createBidderReportURL(uuid)}');` }),
+    ads: [{ renderURL: createRenderURL(uuid) }],
+    ...interestGroupOverrides
+  };
+}
+
 // Joins an interest group that, by default, is owned by the current frame's
 // origin, is named DEFAULT_INTEREST_GROUP_NAME, has a bidding script that
-// issues a bid of 9 with a renderUrl of "https://not.checked.test/${uuid}",
-// and sends a report to createBidderReportUrl(uuid) if it wins. Waits for the
+// issues a bid of 9 with a renderURL of "https://not.checked.test/${uuid}",
+// and sends a report to createBidderReportURL(uuid) if it wins. Waits for the
 // join command to complete. Adds cleanup command to `test` to leave the
 // interest group when the test completes.
 //
@@ -185,14 +200,8 @@ function createRenderUrl(uuid, script, signalsParams) {
 // interest group.
 async function joinInterestGroup(test, uuid, interestGroupOverrides = {},
                                  durationSeconds = 60) {
-  let interestGroup = {
-    owner: window.location.origin,
-    name: DEFAULT_INTEREST_GROUP_NAME,
-    biddingLogicUrl: createBiddingScriptUrl(
-        { reportWin: `sendReportTo('${createBidderReportUrl(uuid)}');` }),
-    ads: [{renderUrl: createRenderUrl(uuid)}],
-    ...interestGroupOverrides
-  };
+  let interestGroup = createInterestGroupForOrigin(uuid, window.location.origin,
+                                                   interestGroupOverrides);
 
   await navigator.joinAdInterestGroup(interestGroup, durationSeconds);
   test.add_cleanup(
@@ -216,16 +225,16 @@ async function leaveInterestGroup(interestGroupOverrides = {}) {
 // current frame's origin, and the only buyer is as well. The seller script
 // rejects bids for URLs that don't contain "uuid" (to avoid running into issues
 // with any interest groups from other tests), and reportResult() sends a report
-// to createSellerReportUrl(uuid).
+// to createSellerReportURL(uuid).
 //
 // `auctionConfigOverrides` may be used to override fields in the auction
 // configuration.
 async function runBasicFledgeAuction(test, uuid, auctionConfigOverrides = {}) {
   let auctionConfig = {
     seller: window.location.origin,
-    decisionLogicUrl: createDecisionScriptUrl(
+    decisionLogicURL: createDecisionScriptURL(
         uuid,
-        { reportResult: `sendReportTo('${createSellerReportUrl(uuid)}');` }),
+        { reportResult: `sendReportTo('${createSellerReportURL(uuid)}');` }),
     interestGroupBuyers: [window.location.origin],
     resolveToConfig: true,
     ...auctionConfigOverrides
@@ -233,44 +242,62 @@ async function runBasicFledgeAuction(test, uuid, auctionConfigOverrides = {}) {
   return await navigator.runAdAuction(auctionConfig);
 }
 
+// Wrapper around runBasicFledgeAuction() that runs an auction with the specified
+// arguments, expecting the auction to have a winner. Returns the FencedFrameConfig
+// from the auction.
+async function runBasicFledgeTestExpectingWinner(test, uuid, auctionConfigOverrides = {}) {
+  let config = await runBasicFledgeAuction(test, uuid, auctionConfigOverrides);
+  assert_true(config !== null, `Auction unexpectedly had no winner`);
+  assert_true(config instanceof FencedFrameConfig,
+      `Wrong value type returned from auction: ${config.constructor.type}`);
+  return config;
+}
+
+// Wrapper around runBasicFledgeAuction() that runs an auction with the specified
+// arguments, expecting the auction to have no winner.
+async function runBasicFledgeTestExpectingNoWinner(
+    test, uuid, auctionConfigOverrides = {}) {
+  let result = await runBasicFledgeAuction(test, uuid, auctionConfigOverrides);
+  assert_true(result === null, 'Auction unexpectedly had a winner');
+}
+
+// Creates a fenced frame and applies fencedFrameConfig to it. Also adds a cleanup
+// method to destroy the fenced frame at the end of the current test.
+function createAndNavigateFencedFrame(test, fencedFrameConfig) {
+  let fencedFrame = document.createElement('fencedframe');
+  fencedFrame.mode = 'opaque-ads';
+  fencedFrame.config = fencedFrameConfig;
+  document.body.appendChild(fencedFrame);
+  test.add_cleanup(() => { document.body.removeChild(fencedFrame); });
+}
+
 // Calls runBasicFledgeAuction(), expecting the auction to have a winner.
 // Creates a fenced frame that will be destroyed on completion of "test", and
 // navigates it to the URN URL returned by the auction. Does not wait for the
 // fenced frame to finish loading, since there's no API that can do that.
 async function runBasicFledgeAuctionAndNavigate(test, uuid,
                                                 auctionConfigOverrides = {}) {
-  let config = await runBasicFledgeAuction(test, uuid, auctionConfigOverrides);
-  assert_true(config instanceof FencedFrameConfig,
-      `Wrong value type returned from auction: ${config.constructor.type}`);
-
-  let fencedFrame = document.createElement('fencedframe');
-  fencedFrame.mode = 'opaque-ads';
-  fencedFrame.config = config;
-  document.body.appendChild(fencedFrame);
-  test.add_cleanup(() => { document.body.removeChild(fencedFrame); });
+  let config = await runBasicFledgeTestExpectingWinner(test, uuid,
+                                                       auctionConfigOverrides);
+  createAndNavigateFencedFrame(test, config);
 }
 
 // Joins an interest group and runs an auction, expecting a winner to be
 // returned. "testConfig" can optionally modify the uuid, interest group or
 // auctionConfig.
-async function runBasicFledgeTestExpectingWinner(test, testConfig = {}) {
+async function joinGroupAndRunBasicFledgeTestExpectingWinner(test, testConfig = {}) {
   const uuid = testConfig.uuid ? testConfig.uuid : generateUuid(test);
   await joinInterestGroup(test, uuid, testConfig.interestGroupOverrides);
-  let config = await runBasicFledgeAuction(
-      test, uuid, testConfig.auctionConfigOverrides);
-  assert_true(config instanceof FencedFrameConfig,
-      `Wrong value type returned from auction: ${config.constructor.type}`);
+  await runBasicFledgeTestExpectingWinner(test, uuid, testConfig.auctionConfigOverrides);
 }
 
 // Joins an interest group and runs an auction, expecting no winner to be
 // returned. "testConfig" can optionally modify the uuid, interest group or
 // auctionConfig.
-async function runBasicFledgeTestExpectingNoWinner(test, testConfig = {}) {
+async function joinGroupAndRunBasicFledgeTestExpectingNoWinner(test, testConfig = {}) {
   const uuid = testConfig.uuid ? testConfig.uuid : generateUuid(test);
   await joinInterestGroup(test, uuid, testConfig.interestGroupOverrides);
-  let result = await runBasicFledgeAuction(
-      test, uuid, testConfig.auctionConfigOverrides);
-  assert_true(result === null, 'Auction unexpectedly had a winner');
+  await runBasicFledgeTestExpectingNoWinner(test, uuid, testConfig.auctionConfigOverrides);
 }
 
 // Test helper for report phase of auctions that lets the caller specify the
@@ -296,13 +323,13 @@ async function runBasicFledgeTestExpectingNoWinner(test, testConfig = {}) {
 // the seller worklet that triggers a sendReportTo() to an 'error' URL if not
 // met.
 //
-// `renderUrlOverride` allows the ad URL of the joined InterestGroup to
+// `renderURLOverride` allows the ad URL of the joined InterestGroup to
 // to be set by the caller.
 //
 // Requesting error report URLs causes waitForObservedRequests() to throw
 // rather than hang.
-async function runReportTest(test, uuid, codeToInsert, expectedReportUrls,
-                             renderUrlOverride) {
+async function runReportTest(test, uuid, codeToInsert, expectedReportURLs,
+                             renderURLOverride) {
   let scoreAd = codeToInsert.scoreAd;
   let reportResultSuccessCondition = codeToInsert.reportResultSuccessCondition;
   let reportResult = codeToInsert.reportResult;
@@ -312,49 +339,48 @@ async function runReportTest(test, uuid, codeToInsert, expectedReportUrls,
 
   if (reportResultSuccessCondition) {
     reportResult = `if (!(${reportResultSuccessCondition})) {
-                      sendReportTo('${createSellerReportUrl(uuid, 'error')}');
+                      sendReportTo('${createSellerReportURL(uuid, 'error')}');
                       return false;
                     }
                     ${reportResult}`;
   }
-  let decisionScriptUrlParams = {};
+  let decisionScriptURLParams = {};
 
   if (scoreAd !== undefined) {
-    decisionScriptUrlParams.scoreAd = scoreAd;
+    decisionScriptURLParams.scoreAd = scoreAd;
   }
 
   if (reportResult !== null)
-    decisionScriptUrlParams.reportResult = reportResult;
+    decisionScriptURLParams.reportResult = reportResult;
   else
-    decisionScriptUrlParams.error = 'no-reportResult';
+    decisionScriptURLParams.error = 'no-reportResult';
 
   if (reportWinSuccessCondition) {
     reportWin = `if (!(${reportWinSuccessCondition})) {
-                   sendReportTo('${createSellerReportUrl(uuid, 'error')}');
+                   sendReportTo('${createSellerReportURL(uuid, 'error')}');
                    return false;
                  }
                  ${reportWin}`;
   }
-  let biddingScriptUrlParams = {};
+  let biddingScriptURLParams = {};
 
   if (generateBid !== undefined) {
-    biddingScriptUrlParams.generateBid = generateBid;
+    biddingScriptURLParams.generateBid = generateBid;
   }
 
   if (reportWin !== null)
-    biddingScriptUrlParams.reportWin = reportWin;
+    biddingScriptURLParams.reportWin = reportWin;
   else
-    biddingScriptUrlParams.error = 'no-reportWin';
+    biddingScriptURLParams.error = 'no-reportWin';
 
   let interestGroupOverrides =
-      { biddingLogicUrl: createBiddingScriptUrl(biddingScriptUrlParams) };
-  if (renderUrlOverride)
-    interestGroupOverrides.ads = [{renderUrl: renderUrlOverride}]
+      { biddingLogicURL: createBiddingScriptURL(biddingScriptURLParams) };
+  if (renderURLOverride)
+    interestGroupOverrides.ads = [{ renderURL: renderURLOverride }]
 
   await joinInterestGroup(test, uuid, interestGroupOverrides);
   await runBasicFledgeAuctionAndNavigate(
       test, uuid,
-      { decisionLogicUrl: createDecisionScriptUrl(
-                              uuid, decisionScriptUrlParams) });
-  await waitForObservedRequests(uuid, expectedReportUrls);
+      { decisionLogicURL: createDecisionScriptURL(uuid, decisionScriptURLParams) });
+  await waitForObservedRequests(uuid, expectedReportURLs);
 }
diff --git a/tests/wpt/tests/fledge/tentative/resources/iframe.sub.html b/tests/wpt/tests/fledge/tentative/resources/iframe.sub.html
new file mode 100644
index 00000000000..0bc0ea357f6
--- /dev/null
+++ b/tests/wpt/tests/fledge/tentative/resources/iframe.sub.html
@@ -0,0 +1,78 @@
+<!DOCTYPE html>
+<html>
+<head>
+<!--- Allow injected scripts to use functions in fledge-util.js --->
+<base href="..">
+<script src="/resources/testharness.js"></script>
+<script src="/common/utils.js"></script>
+<script src="resources/fledge-util.js"></script>
+</head>
+<body>
+<script>
+
+  // Fake Test class that only supports adding cleanup callbacks,
+  // primarily to leave interest groups once the test is complete.
+  function Test() {
+    this.cleanup_callbacks = [];
+  }
+
+  // Registers a cleanup method with Test.
+  Test.prototype.add_cleanup = function(callback) {
+    this.cleanup_callbacks.push(callback);
+  };
+
+  // Runs all previously registered cleanup methods, waiting for
+  // them all to complete.
+  Test.prototype.do_cleanup = async function() {
+    while (this.cleanup_callbacks.length > 0) {
+      await this.cleanup_callbacks[0]();
+      this.cleanup_callbacks = this.cleanup_callbacks.slice(1);
+    }
+  };
+
+  // Create a bogus test instance that tracks cleanup callbacks. The
+  // parent frame is expected to run test_instance.do_cleanup() and
+  // wait for it to complete before destroying the frame.
+  let test_instance = new Test();
+
+  // Register a message event listener that listens for events with data
+  // in the format {messageUuid: <uuid>, script: <script>}, and when such
+  // a message is received, tries to eval the script and then returns a
+  // message in the format:
+  //   {messageUuid: <uuid>, result: <result>, returnValue: <returnValue>}
+  //
+  // On success, <result> is "success", while on failure, it's an error
+  // message. <script> is interpreted as a possibly asynchronous function
+  // body. Exceptions are caught and their stringified value is returned
+  // as <result>. <returnValue> is a value returned to the caller of
+  // the function that sent the message. It's up to the received script
+  // to set it, if a return value is needed.
+  //
+  // "messageUuid" serves to allow the listener to make sure the message
+  // is intended for it.
+  window.addEventListener('message', async function(event) {
+    // If not a message for this listener, do nothing.
+    if (!event.data.messageUuid)
+      return;
+    let message = {result: 'unexpected'};
+    try {
+      let param = event.data.param;
+      message = await eval(
+          `(async () => {
+            ${event.data.script};
+            return {result: 'success'};
+          })()`);
+    } catch (e) {
+      message.result = e.toString();
+    }
+    message.messageUuid = event.data.messageUuid;
+    window.parent.postMessage(message, '*');
+  });
+
+  // Inform parent that the iframe has finished loading.
+  window.parent.postMessage(
+      {messageUuid: '{{GET[uuid]}}', result: 'load complete'},
+      '*');
+</script>
+</body>
+</html>
diff --git a/tests/wpt/tests/fledge/tentative/resources/trusted-bidding-signals.py b/tests/wpt/tests/fledge/tentative/resources/trusted-bidding-signals.py
index 9602bd22f96..86e4db8ad44 100644
--- a/tests/wpt/tests/fledge/tentative/resources/trusted-bidding-signals.py
+++ b/tests/wpt/tests/fledge/tentative/resources/trusted-bidding-signals.py
@@ -110,7 +110,7 @@ def main(request, response):
         response.headers.set("Ad-Auction-Allowed", adAuctionAllowed)
     if dataVersion:
         response.headers.set("Data-Version", dataVersion)
-    response.headers.set("X-fledge-bidding-signals-format-version", "2")
+    response.headers.set("Ad-Auction-Bidding-Signals-Format-Version", "2")
 
     if body != None:
         return body
diff --git a/tests/wpt/tests/fledge/tentative/resources/trusted-scoring-signals.py b/tests/wpt/tests/fledge/tentative/resources/trusted-scoring-signals.py
index 6036d2ef4d1..43ff772a0e3 100644
--- a/tests/wpt/tests/fledge/tentative/resources/trusted-scoring-signals.py
+++ b/tests/wpt/tests/fledge/tentative/resources/trusted-scoring-signals.py
@@ -10,7 +10,12 @@ from urllib.parse import unquote_plus, urlparse
 def main(request, response):
     hostname = None
     renderUrls = None
-    adComponentRenderUrls = None
+    adComponentRenderURLs = None
+    # List of {type: <render URL type>, urls: <render URL list>} pairs, where <render URL type> is
+    # one of the two render URL dictionary keys used in the response ("renderUrls" or
+    # "adComponentRenderURLs"). May be of length 1 or 2, depending on whether there
+    # are any component URLs.
+    urlLists = []
 
     # Manually parse query params. Can't use request.GET because it unescapes as well as splitting,
     # and commas mean very different things from escaped commas.
@@ -28,9 +33,11 @@ def main(request, response):
             continue
         if pair[0] == "renderUrls" and renderUrls == None:
             renderUrls = list(map(unquote_plus, pair[1].split(",")))
+            urlLists.append({"type":"renderUrls", "urls":renderUrls})
             continue
-        if pair[0] == "adComponentRenderUrls" and adComponentRenderUrls == None:
-            adComponentRenderUrls = list(map(unquote_plus, pair[1].split(",")))
+        if pair[0] == "adComponentRenderUrls" and adComponentRenderURLs == None:
+            adComponentRenderURLs = list(map(unquote_plus, pair[1].split(",")))
+            urlLists.append({"type":"adComponentRenderURLs", "urls":adComponentRenderURLs})
             continue
         return fail(response, "Unexpected query parameter: " + param)
 
@@ -52,9 +59,10 @@ def main(request, response):
     contentType = "application/json"
     adAuctionAllowed = "true"
     dataVersion = None
-    if renderUrls:
-        for renderUrl in renderUrls:
+    for urlList in urlLists:
+        for renderUrl in urlList["urls"]:
             value = "default value"
+            addValue = True
 
             signalsParams = None
             for param in urlparse(renderUrl).query.split("&"):
@@ -93,8 +101,10 @@ def main(request, response):
                         adAuctionAllowed = "false"
                     elif signalsParam == "no-ad-auction-allow":
                         adAuctionAllowed = None
+                    elif signalsParam == "wrong-url":
+                        renderUrl = "https://wrong-url.test/"
                     elif signalsParam == "no-value":
-                        continue
+                        addValue = False
                     elif signalsParam == "null-value":
                         value = None
                     elif signalsParam == "num-value":
@@ -107,8 +117,10 @@ def main(request, response):
                         value = {"a":"b", "c":["d"]}
                     elif signalsParam == "hostname":
                         value = request.GET.first(b"hostname", b"not-found").decode("ASCII")
-            if value != None:
-                responseBody["renderUrls"][renderUrl] = value
+            if addValue:
+                if urlList["type"] not in responseBody:
+                    responseBody[urlList["type"]] = {}
+                responseBody[urlList["type"]][renderUrl] = value
 
     if contentType:
         response.headers.set("Content-Type", contentType)
diff --git a/tests/wpt/tests/fledge/tentative/round-a-value.https.sub.window.js b/tests/wpt/tests/fledge/tentative/round-a-value.https.sub.window.js
index 252e4db00fb..3eb0f5f359d 100644
--- a/tests/wpt/tests/fledge/tentative/round-a-value.https.sub.window.js
+++ b/tests/wpt/tests/fledge/tentative/round-a-value.https.sub.window.js
@@ -12,14 +12,14 @@ promise_test(async test => {
     { generateBid:
         `return {'adCost': 1.99,
                  'bid': 9,
-                 'render': interestGroup.ads[0].renderUrl};`,
+                 'render': interestGroup.ads[0].renderURL};`,
       reportWinSuccessCondition:
         // Possible stochastic rounding results for 1.99
         `browserSignals.adCost === 1.9921875 || browserSignals.adCost === 1.984375`,
       reportWin:
-        `sendReportTo('${createBidderReportUrl(uuid)}');` },
+        `sendReportTo('${createBidderReportURL(uuid)}');` },
     // expectedReportUrls
-    [createBidderReportUrl(uuid)]
+    [createBidderReportURL(uuid)]
   );
 }, 'Check adCost is stochastically rounded with 8 bit mantissa and exponent.');
 
@@ -29,14 +29,14 @@ promise_test(async test => {
     test, uuid,
     { generateBid:
         `return {'bid': 1.99,
-                 'render': interestGroup.ads[0].renderUrl};`,
+                 'render': interestGroup.ads[0].renderURL};`,
       reportWinSuccessCondition:
         // Possible stochastic rounding results for 1.99
         `browserSignals.bid === 1.9921875 || browserSignals.bid === 1.984375`,
       reportWin:
-        `sendReportTo('${createBidderReportUrl(uuid)}');` },
+        `sendReportTo('${createBidderReportURL(uuid)}');` },
     // expectedReportUrls
-    [createBidderReportUrl(uuid)]
+    [createBidderReportURL(uuid)]
   );
 }, 'Check bid is stochastically rounded with 8 bit mantissa and exponent.');
 
@@ -51,16 +51,17 @@ promise_test(async test => {
         // Possible stochastic rounding results for 1.99
         `browserSignals.desirability === 1.9921875 || browserSignals.desirability === 1.984375`,
       reportResult:
-        `sendReportTo('${createBidderReportUrl(uuid)}');` },
+        `sendReportTo('${createBidderReportURL(uuid)}');` },
     // expectedReportUrls
-    [createBidderReportUrl(uuid)]
+    [createBidderReportURL(uuid)]
   );
 }, 'Check desirability is stochastically rounded with 8 bit mantissa and exponent.');
 
 promise_test(async test => {
   const uuid = generateUuid(test);
   await joinInterestGroup(test, uuid,
-    { biddingLogicUrl: createBiddingScriptUrl({ bid: 1.99 }),
+    {
+      biddingLogicURL: createBiddingScriptURL({ bid: 1.99 }),
       name: 'other interest group 1' });
   await runReportTest(
     test, uuid,
@@ -68,9 +69,9 @@ promise_test(async test => {
         // Possible stochastic rounding results for 1.99
         `browserSignals.highestScoringOtherBid === 1.9921875 || browserSignals.highestScoringOtherBid === 1.984375`,
       reportResult:
-      `sendReportTo('${createBidderReportUrl(uuid)}');` },
+      `sendReportTo('${createBidderReportURL(uuid)}');` },
     // expectedReportUrls
-    [createBidderReportUrl(uuid)]
+    [createBidderReportURL(uuid)]
   );
 }, 'Check highestScoringOtherBid is stochastically rounded with 8 bit mantissa and exponent.');
 
@@ -81,13 +82,13 @@ promise_test(async test => {
     { generateBid:
         `return {'adCost': 2,
                  'bid': 9,
-                 'render': interestGroup.ads[0].renderUrl};`,
+                 'render': interestGroup.ads[0].renderURL};`,
       reportWinSuccessCondition:
         `browserSignals.adCost === 2`,
       reportWin:
-        `sendReportTo('${createBidderReportUrl(uuid)}');` },
+        `sendReportTo('${createBidderReportURL(uuid)}');` },
     // expectedReportUrls
-    [createBidderReportUrl(uuid)]
+    [createBidderReportURL(uuid)]
   );
 }, 'Value is ignored as a non-valid floating-point number.');
 
@@ -98,13 +99,13 @@ promise_test(async test => {
     { generateBid:
         `return {'adCost': 1E-46,
                  'bid': 9,
-                 'render': interestGroup.ads[0].renderUrl};`,
+                 'render': interestGroup.ads[0].renderURL};`,
       reportWinSuccessCondition:
         `browserSignals.adCost === 0`,
       reportWin:
-        `sendReportTo('${createBidderReportUrl(uuid)}');` },
+        `sendReportTo('${createBidderReportURL(uuid)}');` },
     // expectedReportUrls
-    [createBidderReportUrl(uuid)]
+    [createBidderReportURL(uuid)]
   );
 }, 'Value is rounded to 0 if value is greater than 0 and its exponent is less than -128.');
 
@@ -115,13 +116,13 @@ promise_test(async test => {
     { generateBid:
         `return {'adCost': -1E-46,
                  'bid': 9,
-                 'render': interestGroup.ads[0].renderUrl};`,
+                 'render': interestGroup.ads[0].renderURL};`,
       reportWinSuccessCondition:
         `browserSignals.adCost === -0`,
       reportWin:
-        `sendReportTo('${createBidderReportUrl(uuid)}');` },
+        `sendReportTo('${createBidderReportURL(uuid)}');` },
     // expectedReportUrls
-    [createBidderReportUrl(uuid)]
+    [createBidderReportURL(uuid)]
   );
 }, 'Value is rounded to -0 if value is greater than 0 and its exponent is less than -128.');
 
@@ -132,13 +133,13 @@ promise_test(async test => {
     { generateBid:
         `return {'adCost': 1E+39,
                  'bid': 9,
-                 'render': interestGroup.ads[0].renderUrl};`,
+                 'render': interestGroup.ads[0].renderURL};`,
       reportWinSuccessCondition:
         `browserSignals.adCost === Infinity`,
       reportWin:
-        `sendReportTo('${createBidderReportUrl(uuid)}');` },
+        `sendReportTo('${createBidderReportURL(uuid)}');` },
     // expectedReportUrls
-    [createBidderReportUrl(uuid)]
+    [createBidderReportURL(uuid)]
   );
 }, 'Value is rounded to Infinity if value is greater than 0 and its exponent is greater than 127.');
 
@@ -149,12 +150,12 @@ promise_test(async test => {
     { generateBid:
         `return {'adCost': -1E+39,
                  'bid': 9,
-                 'render': interestGroup.ads[0].renderUrl};`,
+                 'render': interestGroup.ads[0].renderURL};`,
       reportWinSuccessCondition:
         `browserSignals.adCost === -Infinity`,
       reportWin:
-        `sendReportTo('${createBidderReportUrl(uuid)}');` },
+        `sendReportTo('${createBidderReportURL(uuid)}');` },
     // expectedReportUrls
-    [createBidderReportUrl(uuid)]
+    [createBidderReportURL(uuid)]
   );
 }, 'Value is rounded to -Infinity if value is less than 0 and its exponent is greater than 127.');
diff --git a/tests/wpt/tests/fledge/tentative/send-report-to.https.sub.window.js b/tests/wpt/tests/fledge/tentative/send-report-to.https.sub.window.js
index 087140af3ef..e97545985c4 100644
--- a/tests/wpt/tests/fledge/tentative/send-report-to.https.sub.window.js
+++ b/tests/wpt/tests/fledge/tentative/send-report-to.https.sub.window.js
@@ -1,63 +1,66 @@
 // META: script=/resources/testdriver.js
 // META: script=/common/utils.js
 // META: script=resources/fledge-util.js
+// META: script=/common/subset-tests.js
 // META: timeout=long
+// META: variant=?1-5
+// META: variant=?6-last
 
 "use strict;"
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
   await runReportTest(
       test, uuid,
       { reportResult:
-          `sendReportTo('${createSellerReportUrl(uuid)}');`,
+          `sendReportTo('${createSellerReportURL(uuid)}');`,
         reportWinSuccessCondition:
           'sellerSignals === null',
         reportWin:
-          `sendReportTo('${createBidderReportUrl(uuid)}');` },
+          `sendReportTo('${createBidderReportURL(uuid)}');` },
       // expectedReportUrls:
-      [createSellerReportUrl(uuid), createBidderReportUrl(uuid)]
+      [createSellerReportURL(uuid), createBidderReportURL(uuid)]
   );
 }, 'Both send reports, seller passes nothing to bidder.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
   await runReportTest(
       test, uuid,
       { reportResult:
-          `sendReportTo('${createSellerReportUrl(uuid)}');`,
+          `sendReportTo('${createSellerReportURL(uuid)}');`,
         reportWin:
           '' },
       // expectedReportUrls:
-      [createSellerReportUrl(uuid)]
+      [createSellerReportURL(uuid)]
   );
 }, 'Only seller sends a report');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
   await runReportTest(
       test, uuid,
       { reportResult:
-          `sendReportTo('${createSellerReportUrl(uuid)}');`,
+          `sendReportTo('${createSellerReportURL(uuid)}');`,
         reportWin:
           'throw new Error("Very serious exception")' },
       // expectedReportUrls:
-      [createSellerReportUrl(uuid)]
+      [createSellerReportURL(uuid)]
   );
 }, 'Only seller sends a report, bidder throws an exception');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
   await runReportTest(
       test, uuid,
       { reportResult:
-          `sendReportTo('${createSellerReportUrl(uuid)}');` },
+          `sendReportTo('${createSellerReportURL(uuid)}');` },
       // expectedReportUrls:
-      [createSellerReportUrl(uuid)]
+      [createSellerReportURL(uuid)]
   );
 }, 'Only seller sends a report, bidder has no reportWin() method');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
   await runReportTest(
       test, uuid,
@@ -66,13 +69,13 @@ promise_test(async test => {
         reportWinSuccessCondition:
           'sellerSignals === null',
         reportWin:
-          `sendReportTo('${createBidderReportUrl(uuid)}');` },
+          `sendReportTo('${createBidderReportURL(uuid)}');` },
       // expectedReportUrls:
-      [createBidderReportUrl(uuid)]
+      [createBidderReportURL(uuid)]
   );
 }, 'Only bidder sends a report');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
   await runReportTest(
       test, uuid,
@@ -81,13 +84,13 @@ promise_test(async test => {
         reportWinSuccessCondition:
           'sellerSignals === "foo"',
         reportWin:
-          `sendReportTo('${createBidderReportUrl(uuid)}');` },
+          `sendReportTo('${createBidderReportURL(uuid)}');` },
       // expectedReportUrls:
-      [createBidderReportUrl(uuid)]
+      [createBidderReportURL(uuid)]
   );
 }, 'Only bidder sends a report, seller passes a message to bidder');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
   await runReportTest(
       test, uuid,
@@ -96,57 +99,57 @@ promise_test(async test => {
         reportWinSuccessCondition:
           'sellerSignals === null',
         reportWin:
-          `sendReportTo('${createBidderReportUrl(uuid)}');` },
+          `sendReportTo('${createBidderReportURL(uuid)}');` },
       // expectedReportUrls:
-      [createBidderReportUrl(uuid)]
+      [createBidderReportURL(uuid)]
   );
 }, 'Only bidder sends a report, seller throws an exception');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
   await runReportTest(
       test, uuid,
       { reportWinSuccessCondition:
           'sellerSignals === null',
         reportWin:
-          `sendReportTo('${createBidderReportUrl(uuid)}');` },
+          `sendReportTo('${createBidderReportURL(uuid)}');` },
       // expectedReportUrls:
-      [createBidderReportUrl(uuid)]
+      [createBidderReportURL(uuid)]
   );
 }, 'Only bidder sends a report, seller has no reportResult() method');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
   await runReportTest(
       test, uuid,
       { reportResult:
-          `sendReportTo('${createSellerReportUrl(uuid)}');
-           sendReportTo('${createSellerReportUrl(uuid)}');
+          `sendReportTo('${createSellerReportURL(uuid)}');
+           sendReportTo('${createSellerReportURL(uuid)}');
            return 5;`,
         reportWinSuccessCondition:
           'sellerSignals === null',
         reportWin:
-          `sendReportTo('${createBidderReportUrl(uuid)}');` },
+          `sendReportTo('${createBidderReportURL(uuid)}');` },
       // expectedReportUrls:
-      [createBidderReportUrl(uuid)]
+      [createBidderReportURL(uuid)]
   );
 }, 'Seller calls sendReportTo() twice, which throws an exception.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
   await runReportTest(
       test, uuid,
       { reportResult:
-          `sendReportTo('${createSellerReportUrl(uuid)}');`,
+          `sendReportTo('${createSellerReportURL(uuid)}');`,
         reportWin:
-          `sendReportTo('${createBidderReportUrl(uuid)}');
-           sendReportTo('${createBidderReportUrl(uuid)}');` },
+          `sendReportTo('${createBidderReportURL(uuid)}');
+           sendReportTo('${createBidderReportURL(uuid)}');` },
       // expectedReportUrls:
-      [createSellerReportUrl(uuid)]
+      [createSellerReportURL(uuid)]
   );
   // Seller reports may be sent before bidder reports, since reportWin()
   // takes output from reportResult() as input. Wait to make sure the
   // bidder report URL really is not being requested.
   await new Promise(resolve => test.step_timeout(resolve, 200));
-  await waitForObservedRequests(uuid, [createSellerReportUrl(uuid)]);
+  await waitForObservedRequests(uuid, [createSellerReportURL(uuid)]);
 }, 'Bidder calls sendReportTo() twice, which throws an exception.');
diff --git a/tests/wpt/tests/fledge/tentative/trusted-bidding-signals.https.sub.window.js b/tests/wpt/tests/fledge/tentative/trusted-bidding-signals.https.sub.window.js
index 90c1c39fd6e..f2201456a12 100644
--- a/tests/wpt/tests/fledge/tentative/trusted-bidding-signals.https.sub.window.js
+++ b/tests/wpt/tests/fledge/tentative/trusted-bidding-signals.https.sub.window.js
@@ -1,7 +1,17 @@
 // META: script=/resources/testdriver.js
 // META: script=/common/utils.js
+// META: script=/common/subset-tests.js
 // META: script=resources/fledge-util.js
 // META: timeout=long
+// META: variant=?1-5
+// META: variant=?6-10
+// META: variant=?11-15
+// META: variant=?16-20
+// META: variant=?21-25
+// META: variant=?26-30
+// META: variant=?31-35
+// META: variant=?36-40
+// META: variant=?41-last
 
 "use strict";
 
@@ -22,10 +32,10 @@
 // fields.
 async function runTrustedBiddingSignalsTest(
     test, generateBidCheck, interestGroupOverrides = {}) {
-  interestGroupOverrides.biddingLogicUrl =
-      createBiddingScriptUrl({
+  interestGroupOverrides.biddingLogicURL =
+    createBiddingScriptURL({
           generateBid: `if (!(${generateBidCheck})) return false;` });
-  await runBasicFledgeTestExpectingWinner(
+  await joinGroupAndRunBasicFledgeTestExpectingWinner(
       test, {interestGroupOverrides: interestGroupOverrides});
 }
 
@@ -36,142 +46,141 @@ async function runTrustedBiddingSignalsTest(
 async function runTrustedBiddingSignalsDataVersionTest(
     test, check, interestGroupOverrides = {}) {
   const uuid = generateUuid(test);
-  interestGroupOverrides.biddingLogicUrl =
-      createBiddingScriptUrl({
+  interestGroupOverrides.biddingLogicURL =
+    createBiddingScriptURL({
           generateBid:
               `if (!(${check})) return false;`,
           reportWin:
               `if (!(${check}))
-                sendReportTo('${createBidderReportUrl(uuid, 'error')}');
+                sendReportTo('${createBidderReportURL(uuid, 'error')}');
               else
-                sendReportTo('${createBidderReportUrl(uuid)}');` });
+                sendReportTo('${createBidderReportURL(uuid)}');` });
   await joinInterestGroup(test, uuid, interestGroupOverrides);
 
   const auctionConfigOverrides = {
-    decisionLogicUrl: createDecisionScriptUrl(
+    decisionLogicURL: createDecisionScriptURL(
         uuid,
         { scoreAd:
               `if (browserSignals.dataVersion !== undefined)
                 return false;`,
           reportResult:
               `if (browserSignals.dataVersion !== undefined)
-                 sendReportTo('${createSellerReportUrl(uuid, 'error')}')
-               sendReportTo('${createSellerReportUrl(uuid)}')`,
-        })
+                 sendReportTo('${createSellerReportURL(uuid, 'error')}')
+               sendReportTo('${createSellerReportURL(uuid)}')`, })
   }
   await runBasicFledgeAuctionAndNavigate(test, uuid, auctionConfigOverrides);
   await waitForObservedRequests(
-      uuid, [createBidderReportUrl(uuid), createSellerReportUrl(uuid)]);
+      uuid, [createBidderReportURL(uuid), createSellerReportURL(uuid)]);
 }
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   await runTrustedBiddingSignalsTest(test, 'trustedBiddingSignals === null');
-}, 'No trustedBiddingSignalsKeys or trustedBiddingSignalsUrl.');
+}, 'No trustedBiddingSignalsKeys or trustedBiddingSignalsURL.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   await runTrustedBiddingSignalsTest(
       test, 'trustedBiddingSignals === null',
       { trustedBiddingSignalsKeys: ['numValue'] });
-}, 'trustedBiddingSignalsKeys but no trustedBiddingSignalsUrl.');
+}, 'trustedBiddingSignalsKeys but no trustedBiddingSignalsURL.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   await runTrustedBiddingSignalsTest(
       test, 'trustedBiddingSignals === null',
-      { trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
-}, 'trustedBiddingSignalsUrl without trustedBiddingSignalsKeys.');
+      { trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
+}, 'trustedBiddingSignalsURL without trustedBiddingSignalsKeys.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   await runTrustedBiddingSignalsTest(
       test, 'trustedBiddingSignals === null',
       { trustedBiddingSignalsKeys: ['close-connection'],
-        trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
-}, 'trustedBiddingSignalsUrl closes the connection without sending anything.');
+        trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
+}, 'trustedBiddingSignalsURL closes the connection without sending anything.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   await runTrustedBiddingSignalsTest(
       test, 'trustedBiddingSignals === null',
       { trustedBiddingSignalsKeys: ['http-error'],
-        trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+        trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
 }, 'Trusted bidding signals response is HTTP 404 error.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   await runTrustedBiddingSignalsTest(
       test, 'trustedBiddingSignals === null',
       { trustedBiddingSignalsKeys: ['no-content-type'],
-        trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+        trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
 }, 'Trusted bidding signals response has no content-type.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   await runTrustedBiddingSignalsTest(
       test, 'trustedBiddingSignals === null',
       { trustedBiddingSignalsKeys: ['wrong-content-type'],
-        trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+        trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
 }, 'Trusted bidding signals response has wrong content-type.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   await runTrustedBiddingSignalsTest(
       test, 'trustedBiddingSignals === null',
       { trustedBiddingSignalsKeys: ['ad-auction-not-allowed'],
-        trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+        trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
 }, 'Trusted bidding signals response does not allow fledge.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   await runTrustedBiddingSignalsTest(
       test, 'trustedBiddingSignals === null',
       { trustedBiddingSignalsKeys: ['bad-ad-auction-allowed'],
-        trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+        trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
 }, 'Trusted bidding signals response has wrong Ad-Auction-Allowed header.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   await runTrustedBiddingSignalsTest(
       test, 'trustedBiddingSignals === null',
       { trustedBiddingSignalsKeys: ['no-ad-auction-allow'],
-        trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+        trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
 }, 'Trusted bidding signals response has no Ad-Auction-Allowed header.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   await runTrustedBiddingSignalsTest(
       test, 'trustedBiddingSignals === null',
       { trustedBiddingSignalsKeys: ['replace-body:'],
-        trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+        trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
 }, 'Trusted bidding signals response has no body.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   await runTrustedBiddingSignalsTest(
       test, 'trustedBiddingSignals === null',
       { trustedBiddingSignalsKeys: ['replace-body:Not JSON'],
-        trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+        trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
 }, 'Trusted bidding signals response is not JSON.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   await runTrustedBiddingSignalsTest(
       test, 'trustedBiddingSignals === null',
       { trustedBiddingSignalsKeys: ['replace-body:[]'],
-        trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+        trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
 }, 'Trusted bidding signals response is a JSON array.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   await runTrustedBiddingSignalsTest(
       test, 'trustedBiddingSignals === null',
       { trustedBiddingSignalsKeys: ['replace-body:{JSON_keys_need_quotes: 1}'],
-        trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+        trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
 }, 'Trusted bidding signals response in invalid JSON object.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   await runTrustedBiddingSignalsTest(
       test, 'trustedBiddingSignals["replace-body:{}"] === null',
       { trustedBiddingSignalsKeys: ['replace-body:{}'],
-        trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+        trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
 }, 'Trusted bidding signals response has no keys object.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   await runTrustedBiddingSignalsTest(
       test, `trustedBiddingSignals['replace-body:{"keys":{}}'] === null`,
       { trustedBiddingSignalsKeys: ['replace-body:{"keys":{}}'],
-        trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+        trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
 }, 'Trusted bidding signals response has no keys.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   await runTrustedBiddingSignalsTest(
       test,
       `trustedBiddingSignals["0"] === null &&
@@ -180,66 +189,66 @@ promise_test(async test => {
        trustedBiddingSignals["length"] === null`,
       { trustedBiddingSignalsKeys:
             ['replace-body:{"keys":[1,2,3]}', "0", "1", "2", "length"],
-        trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+        trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
 }, 'Trusted bidding signals response keys is incorrectly an array.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   await runTrustedBiddingSignalsTest(
       test,
       `trustedBiddingSignals["wrong-value"] === null &&
       trustedBiddingSignals["another-value"] === undefined`,
       { trustedBiddingSignalsKeys: ['wrong-value'],
-        trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+        trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
 }, 'Trusted bidding signals response has key not in trustedBiddingSignalsKeys.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
     await runTrustedBiddingSignalsTest(
       test, 'trustedBiddingSignals["null-value"] === null',
       { trustedBiddingSignalsKeys: ['null-value'],
-        trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+        trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
 }, 'Trusted bidding signals response has null value for key.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   await runTrustedBiddingSignalsTest(
       test, 'trustedBiddingSignals["num-value"] === 1',
       { trustedBiddingSignalsKeys: ['num-value'],
-        trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+        trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
 }, 'Trusted bidding signals response has a number value for key.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   await runTrustedBiddingSignalsTest(
       test, 'trustedBiddingSignals["string-value"] === "1"',
       { trustedBiddingSignalsKeys: ['string-value'],
-        trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+        trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
 }, 'Trusted bidding signals response has string value for key.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   await runTrustedBiddingSignalsTest(
       test,
       `JSON.stringify(trustedBiddingSignals["array-value"]) === '[1,"foo",null]'`,
       { trustedBiddingSignalsKeys: ['array-value'],
-        trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+        trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
 }, 'Trusted bidding signals response has array value for key.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   await runTrustedBiddingSignalsTest(
       test,
       `Object.keys(trustedBiddingSignals["object-value"]).length  === 2 &&
        trustedBiddingSignals["object-value"]["a"] === "b" &&
        JSON.stringify(trustedBiddingSignals["object-value"]["c"]) === '["d"]'`,
       { trustedBiddingSignalsKeys: ['object-value'],
-        trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+        trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
 }, 'Trusted bidding signals response has object value for key.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   await runTrustedBiddingSignalsTest(
       test,
       'trustedBiddingSignals[""] === "default value"',
       { trustedBiddingSignalsKeys: [''],
-        trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+        trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
 }, 'Trusted bidding signals receives empty string key.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   await runTrustedBiddingSignalsTest(
       test,
       `Object.keys(trustedBiddingSignals).length === 6 &&
@@ -251,34 +260,34 @@ promise_test(async test => {
        trustedBiddingSignals[""] === "default value"`,
       { trustedBiddingSignalsKeys: ['wrong-value', 'null-value', 'num-value',
                                     'string-value', 'array-value', ''],
-        trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+        trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
 }, 'Trusted bidding signals response has multiple keys.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   await runTrustedBiddingSignalsTest(
       test,
       'trustedBiddingSignals["+%20 \x00?,3#&"] === "default value"',
       { trustedBiddingSignalsKeys: ['+%20 \x00?,3#&'],
-        trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+        trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
 }, 'Trusted bidding signals receives escaped key.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   await runTrustedBiddingSignalsTest(
       test,
       'trustedBiddingSignals["\x00"] === "default value"',
       { trustedBiddingSignalsKeys: ['\x00'],
-        trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+        trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
 }, 'Trusted bidding signals receives null key.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   await runTrustedBiddingSignalsTest(
       test,
       `trustedBiddingSignals["interest-group-names"] === '["${DEFAULT_INTEREST_GROUP_NAME}"]'`,
       { trustedBiddingSignalsKeys: ['interest-group-names'],
-        trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+        trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
 }, 'Trusted bidding signals receives interest group name.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   await runTrustedBiddingSignalsTest(
       test,
       // Interest group names is a JSONified list of JSONified names, so the
@@ -286,146 +295,146 @@ promise_test(async test => {
       `trustedBiddingSignals["interest-group-names"] === '["+%20 \\\\u0000?,3#&"]'`,
       { name: '+%20 \x00?,3#&',
         trustedBiddingSignalsKeys: ['interest-group-names'],
-        trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+        trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
 }, 'Trusted bidding signals receives escaped interest group name.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   await runTrustedBiddingSignalsTest(
       test,
       `trustedBiddingSignals["interest-group-names"] === '[""]'`,
       { name: '',
         trustedBiddingSignalsKeys: ['interest-group-names'],
-        trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+        trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
 }, 'Trusted bidding signals receives empty interest group name.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   await runTrustedBiddingSignalsTest(
       test,
       `trustedBiddingSignals["hostname"] === "${window.location.hostname}"`,
       { trustedBiddingSignalsKeys: ['hostname'],
-        trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+        trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
 }, 'Trusted bidding signals receives hostname field.');
 
 /////////////////////////////////////////////////////////////////////////////
 // Data-Version tests
 /////////////////////////////////////////////////////////////////////////////
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   await runTrustedBiddingSignalsDataVersionTest(
       test,
       'browserSignals.dataVersion === undefined',
       { trustedBiddingSignalsKeys: ['num-value'],
-        trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+        trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
 }, 'Trusted bidding signals response has no Data-Version.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   await runTrustedBiddingSignalsDataVersionTest(
       test,
       'browserSignals.dataVersion === 3',
       { trustedBiddingSignalsKeys: ['data-version:3'],
-        trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+        trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
 }, 'Trusted bidding signals response has numeric Data-Version.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   await runTrustedBiddingSignalsDataVersionTest(
       test,
       'browserSignals.dataVersion === 0',
       { trustedBiddingSignalsKeys: ['data-version:0'],
-        trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+        trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
 }, 'Trusted bidding signals response has min Data-Version.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   await runTrustedBiddingSignalsDataVersionTest(
       test,
       'browserSignals.dataVersion === 4294967295',
       { trustedBiddingSignalsKeys: ['data-version:4294967295'],
-        trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+        trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
 }, 'Trusted bidding signals response has max Data-Version.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   await runTrustedBiddingSignalsDataVersionTest(
       test,
       'browserSignals.dataVersion === undefined',
       { trustedBiddingSignalsKeys: ['data-version:4294967296'],
-        trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+        trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
 }, 'Trusted bidding signals response has too large Data-Version.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   await runTrustedBiddingSignalsDataVersionTest(
       test,
       'browserSignals.dataVersion === undefined',
       { trustedBiddingSignalsKeys: ['data-version:03'],
-        trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+        trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
 }, 'Trusted bidding signals response has Data-Version with leading 0.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   await runTrustedBiddingSignalsDataVersionTest(
       test,
       'browserSignals.dataVersion === undefined',
       { trustedBiddingSignalsKeys: ['data-version:-1'],
-        trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+        trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
 }, 'Trusted bidding signals response has negative Data-Version.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   await runTrustedBiddingSignalsDataVersionTest(
       test,
       'browserSignals.dataVersion === undefined',
       { trustedBiddingSignalsKeys: ['data-version:1.3'],
-        trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+        trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
 }, 'Trusted bidding signals response has decimal in Data-Version.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   await runTrustedBiddingSignalsDataVersionTest(
       test,
       'browserSignals.dataVersion === undefined',
       { trustedBiddingSignalsKeys: ['data-version:2 2'],
-        trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+        trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
 }, 'Trusted bidding signals response has space in Data-Version.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   await runTrustedBiddingSignalsDataVersionTest(
       test,
       'browserSignals.dataVersion === undefined',
       { trustedBiddingSignalsKeys: ['data-version:0x4'],
-        trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+        trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
 }, 'Trusted bidding signals response has hex Data-Version.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   await runTrustedBiddingSignalsDataVersionTest(
       test,
       'browserSignals.dataVersion === 4',
       { name: 'data-version',
-        trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+        trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
 }, 'Trusted bidding signals response has Data-Version and no trustedBiddingSignalsKeys.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   await runTrustedBiddingSignalsDataVersionTest(
       test,
       'browserSignals.dataVersion === undefined',
       { trustedBiddingSignalsKeys: ['data-version:3', 'replace-body:'],
-        trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+        trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
 }, 'Trusted bidding signals response with Data-Version and empty body.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   await runTrustedBiddingSignalsDataVersionTest(
       test,
       'browserSignals.dataVersion === undefined',
       { trustedBiddingSignalsKeys: ['data-version:3', 'replace-body:[]'],
-        trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+        trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
 }, 'Trusted bidding signals response with Data-Version and JSON array body.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   await runTrustedBiddingSignalsDataVersionTest(
       test,
       'browserSignals.dataVersion === undefined',
       { trustedBiddingSignalsKeys: ['data-version:3', 'replace-body:{} {}'],
-        trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+        trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
 }, 'Trusted bidding signals response with Data-Version and double JSON object body.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   await runTrustedBiddingSignalsDataVersionTest(
       test,
       'browserSignals.dataVersion === 3',
       { trustedBiddingSignalsKeys: ['data-version:3', 'replace-body:{"keys":5}'],
-        trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
+        trustedBiddingSignalsURL: TRUSTED_BIDDING_SIGNALS_URL });
 }, 'Trusted bidding signals response with Data-Version and invalid keys entry');
diff --git a/tests/wpt/tests/fledge/tentative/trusted-scoring-signals.https.sub.window.js b/tests/wpt/tests/fledge/tentative/trusted-scoring-signals.https.sub.window.js
index 94385fd731a..422994b8202 100644
--- a/tests/wpt/tests/fledge/tentative/trusted-scoring-signals.https.sub.window.js
+++ b/tests/wpt/tests/fledge/tentative/trusted-scoring-signals.https.sub.window.js
@@ -1,7 +1,17 @@
 // META: script=/resources/testdriver.js
 // META: script=/common/utils.js
 // META: script=resources/fledge-util.js
+// META: script=/common/subset-tests.js
 // META: timeout=long
+// META: variant=?1-5
+// META: variant=?6-10
+// META: variant=?11-15
+// META: variant=?16-20
+// META: variant=?21-25
+// META: variant=?26-30
+// META: variant=?31-35
+// META: variant=?36-40
+// META: variant=?41-last
 
 "use strict";
 
@@ -14,16 +24,19 @@
 // if there's no winner. "scoreAdCheck" is an expression that should be true
 // when evaluated in scoreAd(). "renderURL" can be used to control the response
 // given for TRUSTED_SCORING_SIGNALS_URL.
-async function runTrustedScoringSignalsTest(test, uuid, renderURL, scoreAdCheck) {
+async function runTrustedScoringSignalsTest(test, uuid, renderURL, scoreAdCheck,
+                                            additionalInterestGroupOverrides) {
   const auctionConfigOverrides = {
-      trustedScoringSignalsUrl: TRUSTED_SCORING_SIGNALS_URL,
-      decisionLogicUrl:
-          createDecisionScriptUrl(uuid, {
-              scoreAd: `if (!(${scoreAdCheck})) throw "error";` })};
-  await runBasicFledgeTestExpectingWinner(
+      trustedScoringSignalsURL: TRUSTED_SCORING_SIGNALS_URL,
+      decisionLogicURL:
+          createDecisionScriptURL(uuid, {
+                  scoreAd: `if (!(${scoreAdCheck})) throw "error";` })};
+  await joinGroupAndRunBasicFledgeTestExpectingWinner(
       test,
-      { uuid: uuid,
-        interestGroupOverrides: {ads: [{renderUrl: renderURL}]},
+      {
+        uuid: uuid,
+        interestGroupOverrides: {ads: [{ renderURL: renderURL }],
+                                 ...additionalInterestGroupOverrides},
         auctionConfigOverrides: auctionConfigOverrides
       });
 }
@@ -35,41 +48,42 @@ async function runTrustedScoringSignalsTest(test, uuid, renderURL, scoreAdCheck)
 async function runTrustedScoringSignalsDataVersionTest(
     test, uuid, renderURL, check) {
   const interestGroupOverrides = {
-      biddingLogicUrl :
-          createBiddingScriptUrl({
+      biddingLogicURL:
+      createBiddingScriptURL({
               generateBid:
                   `if (browserSignals.dataVersion !== undefined)
                       throw "Bad browserSignals.dataVersion"`,
               reportWin:
                   `if (browserSignals.dataVersion !== undefined)
-                     sendReportTo('${createSellerReportUrl(uuid, '1-error')}');
+                     sendReportTo('${createSellerReportURL(uuid, '1-error')}');
                    else
-                     sendReportTo('${createSellerReportUrl(uuid, '1')}');`}),
-      ads: [{renderUrl: renderURL}]};
+                     sendReportTo('${createSellerReportURL(uuid, '1')}');` }),
+      ads: [{ renderURL: renderURL }]
+  };
   await joinInterestGroup(test, uuid, interestGroupOverrides);
 
   const auctionConfigOverrides = {
-    decisionLogicUrl: createDecisionScriptUrl(
+    decisionLogicURL: createDecisionScriptURL(
         uuid,
         { scoreAd:
               `if (!(${check})) return false;`,
           reportResult:
               `if (!(${check}))
-                 sendReportTo('${createSellerReportUrl(uuid, '2-error')}')
-               sendReportTo('${createSellerReportUrl(uuid, '2')}')`,
+                 sendReportTo('${createSellerReportURL(uuid, '2-error')}')
+               sendReportTo('${createSellerReportURL(uuid, '2')}')`,
         }),
-        trustedScoringSignalsUrl: TRUSTED_SCORING_SIGNALS_URL
+        trustedScoringSignalsURL: TRUSTED_SCORING_SIGNALS_URL
   }
   await runBasicFledgeAuctionAndNavigate(test, uuid, auctionConfigOverrides);
   await waitForObservedRequests(
-      uuid, [createSellerReportUrl(uuid, '1'), createSellerReportUrl(uuid, '2')]);
+      uuid, [createSellerReportURL(uuid, '1'), createSellerReportURL(uuid, '2')]);
 }
 
 // Creates a render URL that, when sent to the trusted-scoring-signals.py,
 // results in a trusted scoring signals response with the provided response
 // body.
 function createScoringSignalsRenderUrlWithBody(uuid, responseBody) {
-  return createRenderUrl(uuid, /*script=*/null,
+  return createRenderURL(uuid, /*script=*/null,
                          /*signalsParam=*/`replace-body:${responseBody}`);
 }
 
@@ -77,176 +91,174 @@ function createScoringSignalsRenderUrlWithBody(uuid, responseBody) {
 // Tests where no renderURL value is received for the passed in renderURL.
 /////////////////////////////////////////////////////////////////////////////
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
-  const decisionLogicScriptUrl = createDecisionScriptUrl(
+  const decisionLogicScriptUrl = createDecisionScriptURL(
       uuid,
-      { scoreAd: 'if (trustedScoringSignals !== null) throw "error";'});
-  await runBasicFledgeTestExpectingWinner(
+      { scoreAd: 'if (trustedScoringSignals !== null) throw "error";' });
+  await joinGroupAndRunBasicFledgeTestExpectingWinner(
       test,
       { uuid: uuid,
-        auctionConfigOverrides: { decisionLogicUrl: decisionLogicScriptUrl }
+        auctionConfigOverrides: { decisionLogicURL: decisionLogicScriptUrl }
       });
-}, 'No trustedScoringSignalsUrl.');
+}, 'No trustedScoringSignalsURL.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
-  const renderURL = createRenderUrl(uuid, /*script=*/null, /*signalsParam=*/'close-connection');
+  const renderURL = createRenderURL(uuid, /*script=*/null, /*signalsParam=*/'close-connection');
   await runTrustedScoringSignalsTest(
       test, uuid, renderURL,
       'trustedScoringSignals === null');
 }, 'Trusted scoring signals closes the connection without sending anything.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
-  const renderURL = createRenderUrl(uuid, /*script=*/null, /*signalsParam=*/'http-error');
+  const renderURL = createRenderURL(uuid, /*script=*/null, /*signalsParam=*/'http-error');
   await runTrustedScoringSignalsTest(test, uuid, renderURL, 'trustedScoringSignals === null');
 }, 'Trusted scoring signals response is HTTP 404 error.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
-  const renderURL = createRenderUrl(uuid, /*script=*/null, /*signalsParam=*/'no-content-type');
+  const renderURL = createRenderURL(uuid, /*script=*/null, /*signalsParam=*/'no-content-type');
   await runTrustedScoringSignalsTest(test, uuid, renderURL, 'trustedScoringSignals === null');
 }, 'Trusted scoring signals response has no content-type.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
-  const renderURL = createRenderUrl(uuid, /*script=*/null, /*signalsParam=*/'wrong-content-type');
+  const renderURL = createRenderURL(uuid, /*script=*/null, /*signalsParam=*/'wrong-content-type');
   await runTrustedScoringSignalsTest(test, uuid, renderURL, 'trustedScoringSignals === null');
 }, 'Trusted scoring signals response has wrong content-type.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
-  const renderURL = createRenderUrl(uuid, /*script=*/null, /*signalsParam=*/'ad-auction-not-allowed');
+  const renderURL = createRenderURL(uuid, /*script=*/null, /*signalsParam=*/'ad-auction-not-allowed');
   await runTrustedScoringSignalsTest(test, uuid, renderURL, 'trustedScoringSignals === null');
 }, 'Trusted scoring signals response does not allow FLEDGE.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
-  const renderURL = createRenderUrl(uuid, /*script=*/null, /*signalsParam=*/'bad-ad-auction-allowed');
+  const renderURL = createRenderURL(uuid, /*script=*/null, /*signalsParam=*/'bad-ad-auction-allowed');
   await runTrustedScoringSignalsTest(test, uuid, renderURL, 'trustedScoringSignals === null');
 }, 'Trusted scoring signals response has wrong Ad-Auction-Allowed header.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
-  const renderURL = createRenderUrl(uuid, /*script=*/null, /*signalsParam=*/'no-ad-auction-allow');
-  await runTrustedScoringSignalsTest( test, uuid, renderURL, 'trustedScoringSignals === null');
+  const renderURL = createRenderURL(uuid, /*script=*/null, /*signalsParam=*/'no-ad-auction-allow');
+  await runTrustedScoringSignalsTest(test, uuid, renderURL, 'trustedScoringSignals === null');
 }, 'Trusted scoring signals response has no Ad-Auction-Allowed header.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
   const renderURL = createScoringSignalsRenderUrlWithBody(
       uuid, /*responseBody=*/'');
   await runTrustedScoringSignalsTest(test, uuid, renderURL, 'trustedScoringSignals === null');
 }, 'Trusted scoring signals response has no body.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
   const renderURL = createScoringSignalsRenderUrlWithBody(
       uuid, /*responseBody=*/'Not JSON');
   await runTrustedScoringSignalsTest(test, uuid, renderURL, 'trustedScoringSignals === null');
 }, 'Trusted scoring signals response is not JSON.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
   const renderURL = createScoringSignalsRenderUrlWithBody(
       uuid, /*responseBody=*/'[]');
   await runTrustedScoringSignalsTest(test, uuid, renderURL, 'trustedScoringSignals === null');
 }, 'Trusted scoring signals response is a JSON array.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
   const renderURL = createScoringSignalsRenderUrlWithBody(
       uuid, /*responseBody=*/'{JSON_keys_need_quotes: 1}');
   await runTrustedScoringSignalsTest(test, uuid, renderURL, 'trustedScoringSignals === null');
 }, 'Trusted scoring signals response is invalid JSON object.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
   const renderURL = createScoringSignalsRenderUrlWithBody(
       uuid, /*responseBody=*/'{}');
   await runTrustedScoringSignalsTest(
       test, uuid, renderURL,
       `trustedScoringSignals.renderURL["${renderURL}"] === null`);
-}, 'Trusted scoring signals response has no renderUrl object.');
+}, 'Trusted scoring signals response has no renderURL object.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
-  const renderURL = createScoringSignalsRenderUrlWithBody(
-      uuid, /*responseBody=*/'{"renderUrls":{}}');
+  const renderURL = createRenderURL(uuid, /*script=*/null, /*signalsParam=*/'no-value');
   await runTrustedScoringSignalsTest(
       test, uuid, renderURL,
       `trustedScoringSignals.renderURL["${renderURL}"] === null`);
-}, 'Trusted scoring signals response has no renderUrls.');
+}, 'Trusted scoring signals response has no renderURLs.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
-  const renderURL = createScoringSignalsRenderUrlWithBody(
-      uuid, /*responseBody=*/'{"renderUrls":{"https://wrong-url.test": 5}}');
+  const renderURL = createRenderURL(uuid, /*script=*/null, /*signalsParam=*/'wrong-url');
   await runTrustedScoringSignalsTest(
       test, uuid, renderURL,
       `trustedScoringSignals.renderURL["${renderURL}"] === null &&
-       trustedScoringSignals["https://wrong-url.test/"] === undefined`);
+       Object.keys(trustedScoringSignals.renderURL).length === 1`);
 }, 'Trusted scoring signals response has renderURL not in response.');
 
 /////////////////////////////////////////////////////////////////////////////
 // Tests where renderURL value is received for the passed in renderURL.
 /////////////////////////////////////////////////////////////////////////////
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
-  const renderURL = createRenderUrl(uuid, /*script=*/null, /*signalsParam=*/'null-value');
+  const renderURL = createRenderURL(uuid, /*script=*/null, /*signalsParam=*/'null-value');
   await runTrustedScoringSignalsTest(
       test, uuid, renderURL,
       `trustedScoringSignals.renderURL["${renderURL}"] === null`);
 }, 'Trusted scoring signals response has null value for renderURL.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
-  const renderURL = createRenderUrl(uuid, /*script=*/null, /*signalsParam=*/'num-value');
+  const renderURL = createRenderURL(uuid, /*script=*/null, /*signalsParam=*/'num-value');
   await runTrustedScoringSignalsTest(
       test, uuid, renderURL,
       `trustedScoringSignals.renderURL["${renderURL}"] === 1`);
 }, 'Trusted scoring signals response has a number value for renderURL.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
-  const renderURL = createRenderUrl(uuid, /*script=*/null,
+  const renderURL = createRenderURL(uuid, /*script=*/null,
       /*signalsParam=*/'string-value');
   await runTrustedScoringSignalsTest(
       test, uuid, renderURL,
       `trustedScoringSignals.renderURL["${renderURL}"] === "1"`);
 }, 'Trusted scoring signals response has a string value for renderURL.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
-  const renderURL = createRenderUrl(uuid, /*script=*/null, /*signalsParam=*/'array-value');
+  const renderURL = createRenderURL(uuid, /*script=*/null, /*signalsParam=*/'array-value');
   await runTrustedScoringSignalsTest(
       test, uuid, renderURL,
       `JSON.stringify(trustedScoringSignals.renderURL["${renderURL}"]) === '[1,"foo",null]'`);
 }, 'Trusted scoring signals response has an array value for renderURL.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
-  const renderURL = createRenderUrl(uuid, /*script=*/null, /*signalsParam=*/'object-value');
+  const renderURL = createRenderURL(uuid, /*script=*/null, /*signalsParam=*/'object-value');
   await runTrustedScoringSignalsTest(
       test, uuid, renderURL,
       `Object.keys(trustedScoringSignals.renderURL["${renderURL}"]).length  === 2 &&
-      trustedScoringSignals.renderURL["${renderURL}"]["a"] === "b" &&
+       trustedScoringSignals.renderURL["${renderURL}"]["a"] === "b" &&
        JSON.stringify(trustedScoringSignals.renderURL["${renderURL}"]["c"]) === '["d"]'`);
 }, 'Trusted scoring signals response has an object value for renderURL.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
-  const renderURL = createRenderUrl(uuid, /*script=*/null, /*signalsParam=*/'+%20 \x00?,3#&');
+  const renderURL = createRenderURL(uuid, /*script=*/null, /*signalsParam=*/'+%20 \x00?,3#&');
   await runTrustedScoringSignalsTest(
       test, uuid, renderURL,
       `trustedScoringSignals.renderURL["${renderURL}"] === "default value"`);
 }, 'Trusted scoring signals with escaped renderURL.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
-  const renderURL = createRenderUrl(uuid, /*script=*/null, /*signalsParam=*/'hostname');
+  const renderURL = createRenderURL(uuid, /*script=*/null, /*signalsParam=*/'hostname');
   await runTrustedScoringSignalsTest(
       test, uuid, renderURL,
       `trustedScoringSignals.renderURL["${renderURL}"] === "${window.location.hostname}"`);
@@ -259,17 +271,17 @@ promise_test(async test => {
 // render URLs from two different IGs, though that's the case this is trying to test -
 // browsers are not required to support batching, and even if they do, joining any two
 // particular requests may be racy.
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
-  const renderURL1 = createRenderUrl(uuid, /*script=*/null, /*signalsParam=*/'num-value');
-  const renderURL2 = createRenderUrl(uuid, /*script=*/null, /*signalsParam=*/'string-value');
-  await joinInterestGroup(test, uuid, {ads: [{renderUrl: renderURL1}], name: '1'});
-  await joinInterestGroup(test, uuid, {ads: [{renderUrl: renderURL2}], name: '2'});
-  let auctionConfigOverrides = { trustedScoringSignalsUrl: TRUSTED_SCORING_SIGNALS_URL };
+  const renderURL1 = createRenderURL(uuid, /*script=*/null, /*signalsParam=*/'num-value');
+  const renderURL2 = createRenderURL(uuid, /*script=*/null, /*signalsParam=*/'string-value');
+  await joinInterestGroup(test, uuid, { ads: [{ renderURL: renderURL1 }], name: '1' });
+  await joinInterestGroup(test, uuid, { ads: [{ renderURL: renderURL2 }], name: '2' });
+  let auctionConfigOverrides = { trustedScoringSignalsURL: TRUSTED_SCORING_SIGNALS_URL };
 
   // scoreAd() only accepts the first IG's bid, validating its trustedScoringSignals.
-  auctionConfigOverrides.decisionLogicUrl =
-        createDecisionScriptUrl(uuid, {
+  auctionConfigOverrides.decisionLogicURL =
+    createDecisionScriptURL(uuid, {
             scoreAd: `if (browserSignals.renderURL === "${renderURL1}" &&
                           trustedScoringSignals.renderURL["${renderURL1}"] !== 1 ||
                           trustedScoringSignals.renderURL["${renderURL2}"] !== undefined)
@@ -280,8 +292,8 @@ promise_test(async test => {
       `Wrong value type returned from first auction: ${config.constructor.type}`);
 
   // scoreAd() only accepts the second IG's bid, validating its trustedScoringSignals.
-  auctionConfigOverrides.decisionLogicUrl =
-        createDecisionScriptUrl(uuid, {
+  auctionConfigOverrides.decisionLogicURL =
+    createDecisionScriptURL(uuid, {
             scoreAd: `if (browserSignals.renderURL === "${renderURL2}" &&
                           trustedScoringSignals.renderURL["${renderURL1}"] !== undefined ||
                           trustedScoringSignals.renderURL["${renderURL2}"] !== '1')
@@ -296,114 +308,205 @@ promise_test(async test => {
 // Data-Version tests
 /////////////////////////////////////////////////////////////////////////////
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
-  const renderURL = createRenderUrl(uuid);
+  const renderURL = createRenderURL(uuid);
   await runTrustedScoringSignalsDataVersionTest(
       test, uuid, renderURL,
       'browserSignals.dataVersion === undefined');
 }, 'Trusted scoring signals response has no Data-Version.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
-  const renderURL = createRenderUrl(uuid, /*script=*/null, 'data-version:3');
+  const renderURL = createRenderURL(uuid, /*script=*/null, 'data-version:3');
   await runTrustedScoringSignalsDataVersionTest(
       test, uuid, renderURL,
       'browserSignals.dataVersion === 3');
 }, 'Trusted scoring signals response has valid Data-Version.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
-  const renderURL = createRenderUrl(uuid, /*script=*/null, 'data-version:0');
+  const renderURL = createRenderURL(uuid, /*script=*/null, 'data-version:0');
   await runTrustedScoringSignalsDataVersionTest(
       test, uuid, renderURL,
       'browserSignals.dataVersion === 0');
 }, 'Trusted scoring signals response has min Data-Version.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
-  const renderURL = createRenderUrl(uuid, /*script=*/null, 'data-version:4294967295');
+  const renderURL = createRenderURL(uuid, /*script=*/null, 'data-version:4294967295');
   await runTrustedScoringSignalsDataVersionTest(
       test, uuid, renderURL,
       'browserSignals.dataVersion === 4294967295');
 }, 'Trusted scoring signals response has max Data-Version.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
-  const renderURL = createRenderUrl(uuid, /*script=*/null, 'data-version:4294967296');
+  const renderURL = createRenderURL(uuid, /*script=*/null, 'data-version:4294967296');
   await runTrustedScoringSignalsDataVersionTest(
       test, uuid, renderURL,
       'browserSignals.dataVersion === undefined');
 }, 'Trusted scoring signals response has too large Data-Version.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
-  const renderURL = createRenderUrl(uuid, /*script=*/null, 'data-version:03');
+  const renderURL = createRenderURL(uuid, /*script=*/null, 'data-version:03');
   await runTrustedScoringSignalsDataVersionTest(
       test, uuid, renderURL,
       'browserSignals.dataVersion === undefined');
 }, 'Trusted scoring signals response has data-version with leading 0.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
-  const renderURL = createRenderUrl(uuid, /*script=*/null, 'data-version:-1');
+  const renderURL = createRenderURL(uuid, /*script=*/null, 'data-version:-1');
   await runTrustedScoringSignalsDataVersionTest(
       test, uuid, renderURL,
       'browserSignals.dataVersion === undefined');
 }, 'Trusted scoring signals response has negative Data-Version.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
-  const renderURL = createRenderUrl(uuid, /*script=*/null, 'data-version:1.3');
+  const renderURL = createRenderURL(uuid, /*script=*/null, 'data-version:1.3');
   await runTrustedScoringSignalsDataVersionTest(
       test, uuid, renderURL,
       'browserSignals.dataVersion === undefined');
 }, 'Trusted scoring signals response has decimal in Data-Version.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
-  const renderURL = createRenderUrl(uuid, /*script=*/null, 'data-version:2 2');
+  const renderURL = createRenderURL(uuid, /*script=*/null, 'data-version:2 2');
   await runTrustedScoringSignalsDataVersionTest(
       test, uuid, renderURL,
       'browserSignals.dataVersion === undefined');
 }, 'Trusted scoring signals response has space in Data-Version.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
-  const renderURL = createRenderUrl(uuid, /*script=*/null, 'data-version:0x4');
+  const renderURL = createRenderURL(uuid, /*script=*/null, 'data-version:0x4');
   await runTrustedScoringSignalsDataVersionTest(
       test, uuid, renderURL,
       'browserSignals.dataVersion === undefined');
 }, 'Trusted scoring signals response has hex Data-Version.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
-  const renderURL = createRenderUrl(uuid, /*script=*/null, 'data-version:3,replace-body:');
+  const renderURL = createRenderURL(uuid, /*script=*/null, 'data-version:3,replace-body:');
   await runTrustedScoringSignalsDataVersionTest(
       test, uuid, renderURL,
       'browserSignals.dataVersion === undefined');
 }, 'Trusted scoring signals response has data-version and empty body.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
-  const renderURL = createRenderUrl(uuid, /*script=*/null, 'data-version:3,replace-body:[]');
+  const renderURL = createRenderURL(uuid, /*script=*/null, 'data-version:3,replace-body:[]');
   await runTrustedScoringSignalsDataVersionTest(
       test, uuid, renderURL,
       'browserSignals.dataVersion === undefined');
 }, 'Trusted scoring signals response has data-version and JSON array body.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
-  const renderURL = createRenderUrl(uuid, /*script=*/null, 'data-version:3,replace-body:{} {}');
+  const renderURL = createRenderURL(uuid, /*script=*/null, 'data-version:3,replace-body:{} {}');
   await runTrustedScoringSignalsDataVersionTest(
       test, uuid, renderURL,
       'browserSignals.dataVersion === undefined');
 }, 'Trusted scoring signals response has data-version and double JSON object body.');
 
-promise_test(async test => {
+subsetTest(promise_test, async test => {
   const uuid = generateUuid(test);
-  const renderURL = createRenderUrl(uuid, /*script=*/null, 'data-version:3,replace-body:{}');
+  const renderURL = createRenderURL(uuid, /*script=*/null, 'data-version:3,replace-body:{}');
   await runTrustedScoringSignalsDataVersionTest(
       test, uuid, renderURL,
       'browserSignals.dataVersion === 3');
 }, 'Trusted scoring signals response has data-version and no renderURLs.');
+
+/////////////////////////////////////////////////////////////////////////////
+// Trusted scoring signals + component ad tests.
+/////////////////////////////////////////////////////////////////////////////
+
+subsetTest(promise_test, async test => {
+  const uuid = generateUuid(test);
+  const renderURL = createRenderURL(uuid, /*script=*/null, /*signalsParam=*/'close-connection');
+  const componentURL = createRenderURL(uuid, /*script=*/null);
+  await runTrustedScoringSignalsTest(
+      test, uuid, renderURL,
+      `trustedScoringSignals === null`,
+      {adComponents: [{ renderURL: componentURL }],
+        biddingLogicURL: createBiddingScriptURL({
+        generateBid: `return {bid: 1,
+                              render: interestGroup.ads[0].renderURL,
+                              adComponents: [interestGroup.adComponents[0].renderURL]};`})
+      });
+}, 'Component ads trusted scoring signals, server closes the connection without sending anything.');
+
+subsetTest(promise_test, async test => {
+  const uuid = generateUuid(test);
+  const renderURL = createRenderURL(uuid, /*script=*/null, /*signalsParam=*/'num-value');
+  // This should not be sent. If it is, it will take precedence over the "num-value" parameter
+  // from "renderURL", resulting in the "renderURL" having a null "trustedScoringSignals" value.
+  const componentURL = createScoringSignalsRenderUrlWithBody(
+    uuid, /*responseBody=*/'{}');
+  await runTrustedScoringSignalsTest(
+      test, uuid, renderURL,
+      `Object.keys(trustedScoringSignals.renderURL).length === 1 &&
+       trustedScoringSignals.renderURL["${renderURL}"] === 1 &&
+       trustedScoringSignals.adComponentRenderURLs === undefined`,
+      { adComponents: [{ renderURL: componentURL }] });
+}, 'Trusted scoring signals request without component ads in bid.');
+
+subsetTest(promise_test, async test => {
+  const uuid = generateUuid(test);
+  const renderURL = createScoringSignalsRenderUrlWithBody(
+    uuid, /*responseBody=*/'{}');
+  const componentURL = createRenderURL(uuid, /*script=*/null);
+  await runTrustedScoringSignalsTest(
+      test, uuid, renderURL,
+      `Object.keys(trustedScoringSignals.renderURL).length === 1 &&
+       trustedScoringSignals.renderURL["${renderURL}"] === null &&
+       Object.keys(trustedScoringSignals.adComponentRenderURLs).length === 1 &&
+       trustedScoringSignals.adComponentRenderURLs["${componentURL}"] === null`,
+      {adComponents: [{ renderURL: componentURL }],
+       biddingLogicURL: createBiddingScriptURL({
+       generateBid: `return {bid: 1,
+                             render: interestGroup.ads[0].renderURL,
+                             adComponents: [interestGroup.adComponents[0].renderURL]};`})
+      });
+}, 'Component ads trusted scoring signals trusted scoring signals response is empty JSON object.');
+
+subsetTest(promise_test, async test => {
+  const uuid = generateUuid(test);
+  const renderURL = createRenderURL(uuid, /*script=*/null, /*signalsParam=*/'hostname');
+  const componentURL1 = createRenderURL(uuid, /*script=*/null, /*signalsParam=*/'null-value');
+  const componentURL2 = createRenderURL(uuid, /*script=*/null, /*signalsParam=*/'num-value');
+  const componentURL3 = createRenderURL(uuid, /*script=*/null, /*signalsParam=*/'string-value');
+  const componentURL4 = createRenderURL(uuid, /*script=*/null, /*signalsParam=*/'array-value');
+  const componentURL5 = createRenderURL(uuid, /*script=*/null, /*signalsParam=*/'object-value');
+  const componentURL6 = createRenderURL(uuid, /*script=*/null, /*signalsParam=*/'wrong-url');
+
+  await runTrustedScoringSignalsTest(
+      test, uuid, renderURL,
+      `Object.keys(trustedScoringSignals.renderURL).length === 1 &&
+       trustedScoringSignals.renderURL["${renderURL}"] === "${window.location.hostname}" &&
+
+       Object.keys(trustedScoringSignals.adComponentRenderURLs).length === 6 &&
+       trustedScoringSignals.adComponentRenderURLs["${componentURL1}"] === null &&
+       trustedScoringSignals.adComponentRenderURLs["${componentURL2}"] === 1 &&
+       trustedScoringSignals.adComponentRenderURLs["${componentURL3}"] === "1" &&
+       JSON.stringify(trustedScoringSignals.adComponentRenderURLs["${componentURL4}"]) === '[1,"foo",null]' &&
+       Object.keys(trustedScoringSignals.adComponentRenderURLs["${componentURL5}"]).length === 2 &&
+       trustedScoringSignals.adComponentRenderURLs["${componentURL5}"]["a"] === "b" &&
+       JSON.stringify(trustedScoringSignals.adComponentRenderURLs["${componentURL5}"]["c"]) === '["d"]' &&
+       trustedScoringSignals.adComponentRenderURLs["${componentURL6}"] === null`,
+
+      {adComponents: [{ renderURL: componentURL1 }, { renderURL: componentURL2 },
+                      { renderURL: componentURL3 }, { renderURL: componentURL4 },
+                      { renderURL: componentURL5 }, { renderURL: componentURL6 }],
+      biddingLogicURL: createBiddingScriptURL({
+          generateBid: `return {bid: 1,
+                                render: interestGroup.ads[0].renderURL,
+                                adComponents: ["${componentURL1}", "${componentURL2}",
+                                               "${componentURL3}", "${componentURL4}",
+                                               "${componentURL5}", "${componentURL6}"]};`
+      })
+    });
+}, 'Component ads trusted scoring signals.');
diff --git a/tests/wpt/tests/fonts/CanvasTest-ascent256.ttf b/tests/wpt/tests/fonts/CanvasTest-ascent256.ttf
index d5924fc2194..84ce51dee71 100644
Binary files a/tests/wpt/tests/fonts/CanvasTest-ascent256.ttf and b/tests/wpt/tests/fonts/CanvasTest-ascent256.ttf differ
diff --git a/tests/wpt/tests/fonts/CanvasTest-descent0.ttf b/tests/wpt/tests/fonts/CanvasTest-descent0.ttf
index 5887c0de8dd..b0291dcf429 100644
Binary files a/tests/wpt/tests/fonts/CanvasTest-descent0.ttf and b/tests/wpt/tests/fonts/CanvasTest-descent0.ttf differ
diff --git a/tests/wpt/tests/fonts/CanvasTest-nospace.ttf b/tests/wpt/tests/fonts/CanvasTest-nospace.ttf
new file mode 100644
index 00000000000..5e586aa6beb
Binary files /dev/null and b/tests/wpt/tests/fonts/CanvasTest-nospace.ttf differ
diff --git a/tests/wpt/tests/fonts/CanvasTest.ttf b/tests/wpt/tests/fonts/CanvasTest.ttf
index 9cdd0faf108..6cdeccd10fe 100644
Binary files a/tests/wpt/tests/fonts/CanvasTest.ttf and b/tests/wpt/tests/fonts/CanvasTest.ttf differ
diff --git a/tests/wpt/tests/fonts/noto/cjk/LICENSE.txt b/tests/wpt/tests/fonts/noto/cjk/LICENSE.txt
new file mode 100644
index 00000000000..d952d62c065
--- /dev/null
+++ b/tests/wpt/tests/fonts/noto/cjk/LICENSE.txt
@@ -0,0 +1,92 @@
+This Font Software is licensed under the SIL Open Font License,
+Version 1.1.
+
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font
+creation efforts of academic and linguistic communities, and to
+provide a free and open framework in which fonts may be shared and
+improved in partnership with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply to
+any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software
+components as distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to,
+deleting, or substituting -- in part or in whole -- any of the
+components of the Original Version, by changing formats or by porting
+the Font Software to a new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed,
+modify, redistribute, and sell modified and unmodified copies of the
+Font Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components, in
+Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the
+corresponding Copyright Holder. This restriction only applies to the
+primary font name as presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created using
+the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/tests/wpt/tests/fonts/noto/cjk/NotoSansCJKjp-Regular-subset-chws.otf b/tests/wpt/tests/fonts/noto/cjk/NotoSansCJKjp-Regular-subset-chws.otf
new file mode 100644
index 00000000000..18859d5e2fe
Binary files /dev/null and b/tests/wpt/tests/fonts/noto/cjk/NotoSansCJKjp-Regular-subset-chws.otf differ
diff --git a/tests/wpt/tests/fonts/noto/cjk/NotoSansCJKjp-Regular-subset-halt.otf b/tests/wpt/tests/fonts/noto/cjk/NotoSansCJKjp-Regular-subset-halt.otf
new file mode 100644
index 00000000000..773282263e6
Binary files /dev/null and b/tests/wpt/tests/fonts/noto/cjk/NotoSansCJKjp-Regular-subset-halt.otf differ
diff --git a/tests/wpt/tests/fonts/noto/cjk/README.md b/tests/wpt/tests/fonts/noto/cjk/README.md
new file mode 100644
index 00000000000..8ff42d0f441
--- /dev/null
+++ b/tests/wpt/tests/fonts/noto/cjk/README.md
@@ -0,0 +1,29 @@
+# Fonts
+
+Fonts in this directory help testing the `text-spacing-trim` property.
+
+## NotoSansCJKjp-Regular-subset-halt.otf
+
+This font is generated by the following command:
+```
+pyftsubset NotoSansCJKjp-Regular.otf \
+  --unicodes=20-7E,2018-201F,56FD,6C34,3000-301F,30FB,FF01-FF1F,FF5B-FF65 \
+  --layout-features+=halt,vhal \
+  --output-file=NotoSansCJKjp-Regular-subset-halt.otf
+```
+where `pyftsubset` comes from https://github.com/fonttools/fonttools
+
+## NotoSansCJKjp-Regular-subset-chws.otf
+
+This font has `chws` and `vchw` in addition to the font above.
+
+This font is generated by the following command:
+```
+pyftsubset NotoSansCJKjp-Regular.otf \
+  --unicodes=20-7E,2018-201F,56FD,6C34,3000-301F,30FB,FF01-FF1F,FF5B-FF65 \
+  --layout-features+=halt,vhal,chws,vchw \
+  --output-file=NotoSansCJKjp-Regular-subset-chws.otf
+```
+Note there are two variants of Noto CJK; one with `chws` and one without.
+The input font for this command must be the one with `chws`, processed by the
+[chws_tool](https://github.com/googlefonts/chws_tool).
diff --git a/tests/wpt/tests/forced-colors-mode/forced-colors-mode-53.html b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-53.html
index 4726c4bb0a5..3b31a5999b3 100644
--- a/tests/wpt/tests/forced-colors-mode/forced-colors-mode-53.html
+++ b/tests/wpt/tests/forced-colors-mode/forced-colors-mode-53.html
@@ -4,6 +4,7 @@
 <link rel="help" href="https://www.w3.org/TR/css-color-adjust-1/#forced-color-adjust-prop">
 <link rel="help" href="https://drafts.csswg.org/css-highlight-api-1/">
 <link rel=match href="forced-colors-mode-53-ref.html">
+<meta name="fuzzy" content="0-5;0-3">
 <style>
   span {
     background-color: lightgray;
diff --git a/tests/wpt/tests/fs/FileSystemFileHandle-create-sync-access-handle.https.tentative.window.js b/tests/wpt/tests/fs/FileSystemFileHandle-create-sync-access-handle.https.window.js
similarity index 100%
rename from tests/wpt/tests/fs/FileSystemFileHandle-create-sync-access-handle.https.tentative.window.js
rename to tests/wpt/tests/fs/FileSystemFileHandle-create-sync-access-handle.https.window.js
diff --git a/tests/wpt/tests/fs/FileSystemFileHandle-cross-primitive-locking.https.tentative.worker.js b/tests/wpt/tests/fs/FileSystemFileHandle-cross-primitive-locking.https.tentative.worker.js
new file mode 100644
index 00000000000..df71082b11f
--- /dev/null
+++ b/tests/wpt/tests/fs/FileSystemFileHandle-cross-primitive-locking.https.tentative.worker.js
@@ -0,0 +1,135 @@
+importScripts('/resources/testharness.js');
+importScripts('resources/sandboxed-fs-test-helpers.js');
+importScripts('resources/test-helpers.js');
+
+'use strict';
+
+// Adds tests to test the interaction between a lock created by the move
+// operation and a lock created by `createLock`.
+function generateCrossLockMoveTests(lockName, createLock) {
+  generateCrossLockTests(createMoveWithCleanup, createLock, {
+    diffFile: `A file with an ongoing move operation does not interfere with` +
+        ` ${lockName} on another file`,
+    acquireAfterRelease: `After a file has finished moving, that file can` +
+        ` have ${lockName}`,
+    // TODO(https://github.com/whatwg/fs/pull/10): Add tests for directory moves
+    // once supported.
+  });
+
+  directory_test(async (t, rootDir) => {
+    const [fooFileHandle, barFileHandle] =
+        await createFileHandles(rootDir, 'foo.test', 'bar.test');
+
+    createLock(t, fooFileHandle);
+    await promise_rejects_dom(
+        t, 'NoModificationAllowedError',
+        createMoveWithCleanup(t, barFileHandle, 'foo.test'));
+  }, `A file cannot be moved to a location with ${lockName}`);
+}
+
+// Adds tests to test the interaction between a lock created by the remove
+// operation and a lock created by `createLock`.
+function generateCrossLockRemoveTests(lockName, createLock) {
+  generateCrossLockTests(createRemoveWithCleanup, createLock, {
+    diffFile: `A file with an ongoing remove operation does not interfere` +
+        ` with the creation of ${lockName} on another file`,
+    acquireAfterRelease: `After a file has finished being removed, that file` +
+        ` can have ${lockName}`,
+  });
+  generateCrossLockTests(createLock, createRemoveWithCleanup, {
+    takeFileThenDir: `A directory cannot be removed if it contains a file` +
+        ` that has ${lockName}.`,
+  });
+}
+
+// Gets the name of a writable file stream opened in `wfsMode` to be used in
+// tests.
+function getWFSLockName(wfsMode) {
+  return `an open writable stream in ${wfsMode} mode`
+}
+
+// Adds tests to test the interaction between a lock created by an open writable
+// and a lock created by `createLock`.
+function generateCrossLockWFSTests(lockName, createLock, wfsMode) {
+  const WFSLockName = getWFSLockName(wfsMode);
+  const tests = {
+    sameFile: `When there's ${WFSLockName} on a file, cannot have` +
+        ` ${lockName} on that same file`,
+    diffFile: `A file with ${WFSLockName} does not interfere with` +
+        ` ${lockName} on another file`,
+  };
+  if (wfsMode === 'siloed') {
+    tests.multiAcquireAfterRelease = `After all writable streams in siloed` +
+        ` mode have been closed for a file, that file can have ${lockName}`;
+  } else {
+    tests.acquireAfterRelease = `After a writable stream in exclusive mode` +
+        ` has been closed for a file, that file can have ${lockName}`;
+  }
+  generateCrossLockTests(
+      createWFSWithCleanupFactory({mode: wfsMode}), createLock, tests);
+}
+
+// Adds tests to test the interaction between a lock created by an open access
+// handle in `sahMode and locks created by other file primitives and operations.
+function generateCrossLockSAHTests(sahMode) {
+  const createSAHLock = createSAHWithCleanupFactory({mode: sahMode});
+  const SAHLockName = `an open access handle in ${sahMode} mode`;
+
+  // Test interaction between move locks and SAH locks.
+  generateCrossLockMoveTests(SAHLockName, createSAHLock);
+  generateCrossLockTests(createSAHLock, createMoveWithCleanup, {
+    sameFile: `A file with ${SAHLockName} cannot be moved`,
+    diffFile: `A file with ${SAHLockName} does not interfere with moving` +
+        ` another file`,
+    acquireAfterRelease: `After ${SAHLockName} on a file has been closed,` +
+        ` that file can be moved`,
+  });
+
+  // Test interaction between remove locks and SAH locks.
+  generateCrossLockRemoveTests(SAHLockName, createSAHLock);
+  generateCrossLockTests(createSAHLock, createRemoveWithCleanup, {
+    sameFile: `A file with ${SAHLockName} cannot be removed`,
+    diffFile: `A file with ${SAHLockName} does not interfere with removing` +
+        ` another file`,
+    acquireAfterRelease: `After ${SAHLockName} on a file has been closed,` +
+        ` that file can be removed`,
+  });
+
+  // Test interaction between WFS locks and SAH locks.
+  for (const wfsMode of WFS_MODES) {
+    const WFSLockName = getWFSLockName(wfsMode);
+    const wfsOptions = {mode: wfsMode};
+    generateCrossLockWFSTests(SAHLockName, createSAHLock, wfsMode);
+    generateCrossLockTests(
+        createSAHLock, createWFSWithCleanupFactory(wfsOptions), {
+          sameFile: `When there's ${SAHLockName} on a file, cannot open` +
+              ` ${WFSLockName} on that same file`,
+          diffFile: `A file with ${SAHLockName} does not interfere with the` +
+              ` creation of ${WFSLockName} on another file`,
+        });
+  }
+}
+
+// Test interaction for each SAH lock mode.
+for (const sahMode of SAH_MODES) {
+  generateCrossLockSAHTests(sahMode);
+}
+
+// Test interaction for each WFS lock mode.
+for (const wfsMode of WFS_MODES) {
+  const WFSLockName = getWFSLockName(wfsMode);
+  const wfsOptions = {mode: wfsMode};
+  // Test interaction between move locks and WFS locks.
+  generateCrossLockMoveTests(
+      WFSLockName, createWFSWithCleanupFactory(wfsOptions));
+  generateCrossLockWFSTests(
+      'an ongoing move operation', createMoveWithCleanup, wfsMode);
+
+  // Test interaction between remove locks and WFS locks.
+  generateCrossLockRemoveTests(
+      WFSLockName, createWFSWithCleanupFactory(wfsOptions));
+  generateCrossLockWFSTests(
+      'an ongoing remove operation', createRemoveWithCleanup, wfsMode);
+}
+
+done();
diff --git a/tests/wpt/tests/fs/FileSystemFileHandle-sync-access-handle-cross-primitive-locking.https.tentative.worker.js b/tests/wpt/tests/fs/FileSystemFileHandle-sync-access-handle-cross-primitive-locking.https.tentative.worker.js
deleted file mode 100644
index edb30186364..00000000000
--- a/tests/wpt/tests/fs/FileSystemFileHandle-sync-access-handle-cross-primitive-locking.https.tentative.worker.js
+++ /dev/null
@@ -1,128 +0,0 @@
-importScripts('/resources/testharness.js');
-importScripts('resources/sandboxed-fs-test-helpers.js');
-importScripts('resources/test-helpers.js');
-
-'use strict';
-
-// Adds tests that assert file operations which acquire a lock cannot
-// run on a file that is locked by the primitive created by running
-// and awaiting `openScopedPrimitive` on a file handle.
-// `openScopedPrimitive` must close the respective primitive during test cleanup
-function crossLockOperationTests(primitiveName, openScopedPrimitive) {
-  directory_test(async (t, rootDir) => {
-    const fileHandle = await rootDir.getFileHandle('OPFS.test', {create: true});
-
-    await openScopedPrimitive(t, fileHandle);
-
-    await promise_rejects_dom(
-        t, 'NoModificationAllowedError', fileHandle.remove());
-  }, `A file with an open ${primitiveName} cannot be removed`);
-
-  directory_test(async (t, rootDir) => {
-    const fileHandle = await rootDir.getFileHandle('OPFS.test', {create: true});
-
-    await openScopedPrimitive(t, fileHandle);
-
-    await promise_rejects_dom(
-        t, 'NoModificationAllowedError', fileHandle.move('OPFS2.test'));
-  }, `A file with an open ${primitiveName} cannot be moved`);
-
-  directory_test(async (t, rootDir) => {
-    const dirHandle =
-        await rootDir.getDirectoryHandle('foo', {create: true});
-    const fileHandle =
-        await dirHandle.getFileHandle('OPFS.test', {create: true});
-
-    await openScopedPrimitive(t, fileHandle);
-
-    await promise_rejects_dom(
-        t, 'NoModificationAllowedError', dirHandle.remove());
-  }, `A directory containing a file with an open ${primitiveName} cannot be` +
-  ` removed`);
-}
-
-// Adds tests for expected behaviors of an access handle created in `sahMode`
-// mode across primitives.
-function crossLockSAHTests(sahMode) {
-  const sahOptions = {mode: sahMode};
-
-  crossLockOperationTests(`access handle in ${sahMode} mode`,
-    async (t, fileHandle) => {
-      const syncHandle = await fileHandle.createSyncAccessHandle(sahOptions);
-      t.add_cleanup(() => syncHandle.close());
-    });
-
-  directory_test(async (t, rootDir) => {
-    const fileHandle =
-        await rootDir.getFileHandle('OPFS.test', {create: true});
-
-    const syncHandle = await fileHandle.createSyncAccessHandle(sahOptions);
-    t.add_cleanup(() => syncHandle.close());
-    await promise_rejects_dom(
-        t, 'NoModificationAllowedError', fileHandle.createWritable());
-
-    syncHandle.close();
-    const writable = await fileHandle.createWritable();
-    await writable.close();
-  }, `When there's an open access handle in ${sahMode} mode on a file, cannot` +
-  ` open a writable stream on that same file`);
-
-  directory_test(async (t, rootDir) => {
-    const fileHandle =
-        await rootDir.getFileHandle('OPFS.test', {create: true});
-
-    const writable1 = await fileHandle.createWritable();
-    const writable2 = await fileHandle.createWritable();
-    await promise_rejects_dom(
-        t, 'NoModificationAllowedError',
-        fileHandle.createSyncAccessHandle(sahOptions));
-
-    await writable1.close();
-    await promise_rejects_dom(
-        t, 'NoModificationAllowedError',
-        fileHandle.createSyncAccessHandle(sahOptions));
-
-    await writable2.close();
-    const syncHandle = await fileHandle.createSyncAccessHandle(sahOptions);
-    syncHandle.close();
-  }, `When there's an open writable stream on a file, cannot open a access` +
-  `handle in ${sahMode} mode on that same file`);
-
-  directory_test(async (t, rootDir) => {
-    const fooFileHandle =
-        await rootDir.getFileHandle('foo.test', {create: true});
-    const barFileHandle =
-        await rootDir.getFileHandle('bar.test', {create: true});
-
-    await cleanup_writable(t, await fooFileHandle.createWritable());
-
-    const barSyncHandle =
-        await barFileHandle.createSyncAccessHandle(sahOptions);
-    t.add_cleanup(() => barSyncHandle.close());
-  }, `A writable stream from one file does not interfere with the creation of` +
-  ` an access handle in ${sahMode} mode on another file`);
-
-  directory_test(async (t, rootDir) => {
-    const fooFileHandle =
-        await rootDir.getFileHandle('foo.test', {create: true});
-    const barFileHandle =
-        await rootDir.getFileHandle('bar.test', {create: true});
-
-    const fooSyncHandle =
-        await fooFileHandle.createSyncAccessHandle(sahOptions);
-    t.add_cleanup(() => fooSyncHandle.close());
-
-    await cleanup_writable(t, await barFileHandle.createWritable());
-  }, `An open access handle in ${sahMode} mode from one file does not interfere` +
-  ` with the creation of a writable stream on another file`);
-}
-
-crossLockSAHTests('readwrite');
-crossLockSAHTests('read-only');
-crossLockSAHTests('readwrite-unsafe');
-
-crossLockOperationTests('writable stream', async (t, fileHandle) => {
-  await cleanup_writable(t, await fileHandle.createWritable());
-});
-
-done();
diff --git a/tests/wpt/tests/fs/FileSystemFileHandle-sync-access-handle-lock-modes.https.tentative.worker.js b/tests/wpt/tests/fs/FileSystemFileHandle-sync-access-handle-lock-modes.https.tentative.worker.js
index c5636e7e329..bb82632e185 100644
--- a/tests/wpt/tests/fs/FileSystemFileHandle-sync-access-handle-lock-modes.https.tentative.worker.js
+++ b/tests/wpt/tests/fs/FileSystemFileHandle-sync-access-handle-lock-modes.https.tentative.worker.js
@@ -4,45 +4,13 @@ importScripts('resources/test-helpers.js');
 
 'use strict';
 
-const SAH_MODES = ['readwrite', 'read-only', 'readwrite-unsafe'];
-
-const LOCK_ACCESS = {
-  SHARED: 'shared',
-  EXCLUSIVE: 'exclusive',
-};
 const LOCK_WRITE_PERMISSION = {
   NOT_WRITABLE: 'not writable',
   WRITABLE: 'writable',
 };
 
-async function testLockAccess(t, fileHandle, sahMode) {
-  const syncHandle1 = await fileHandle.createSyncAccessHandle({mode: sahMode});
-  t.add_cleanup(() => syncHandle1.close());
-
-  let access;
-  try {
-    const syncHandle2 =
-        await fileHandle.createSyncAccessHandle({mode: sahMode});
-    syncHandle2.close();
-    access = LOCK_ACCESS.SHARED;
-  } catch (e) {
-    access = LOCK_ACCESS.EXCLUSIVE;
-    assert_throws_dom('NoModificationAllowedError', () => {
-      throw e;
-    });
-  }
-  syncHandle1.close();
-
-  // Can open another sync access handle after other handles have closed.
-  const syncHandle3 = await fileHandle.createSyncAccessHandle({mode: sahMode});
-  syncHandle3.close();
-
-  return access;
-}
-
-async function testLockWritePermission(t, fileHandle, sahMode) {
-  const syncHandle = await fileHandle.createSyncAccessHandle({mode: sahMode});
-  t.add_cleanup(() => syncHandle.close());
+async function testLockWritePermission(t, fileHandle, createSAHLock) {
+  const syncHandle = await createSAHLock(t, fileHandle);
 
   let permission;
   const writeBuffer = new TextEncoder().encode('Hello Storage Foundation');
@@ -73,86 +41,66 @@ async function testLockWritePermission(t, fileHandle, sahMode) {
 // mode.
 function lockPropertyTests(
     sahMode, expectedLockAccess, expectedLockWritePermission) {
-  const sahOptions = {mode: sahMode};
+  const createSAHLock = createSAHWithCleanupFactory({mode: sahMode});
 
   directory_test(async (t, rootDir) => {
-    const fileHandle =
-        await rootDir.getFileHandle('OPFS.test', {create: true});
+    const [fileHandle] = await createFileHandles(rootDir, 'BFS.test');
 
-    const syncHandle = await fileHandle.createSyncAccessHandle(sahOptions);
-    const {mode} = syncHandle;
-    syncHandle.close();
+    const {mode} = await createSAHLock(t, fileHandle);
     assert_equals(mode, sahMode);
   }, `An access handle in ${sahMode} mode has a mode property equal to` +
-  ` ${sahMode}`);
+    ` ${sahMode}`);
 
   directory_test(async (t, rootDir) => {
-    const fileHandle = await rootDir.getFileHandle('OPFS.test', {create: true});
+    const [fileHandle] = await createFileHandles(rootDir, 'BFS.test');
     assert_equals(
-        await testLockAccess(t, fileHandle, sahMode), expectedLockAccess);
-  }, `${sahMode} mode takes a ${expectedLockAccess}`);
+        await testLockAccess(t, fileHandle, createSAHLock), expectedLockAccess);
+  }, `An access handle in ${sahMode} mode takes a lock that is` +
+    ` ${expectedLockAccess}`);
 
   directory_test(async (t, rootDir) => {
-    const fileHandle = await rootDir.getFileHandle('OPFS.test', {create: true});
+    const [fileHandle] = await createFileHandles(rootDir, 'BFS.test');
     assert_equals(
-        await testLockWritePermission(t, fileHandle, sahMode),
+        await testLockWritePermission(t, fileHandle, createSAHLock),
         expectedLockWritePermission);
-  }, `${sahMode} mode is ${expectedLockWritePermission}`);
+  }, `An access handle in ${sahMode} mode is ${expectedLockWritePermission}`);
 
-  directory_test(async (t, rootDir) => {
-    const fileHandle =
-        await rootDir.getFileHandle('OPFS.test', {create: true});
-
-    const syncHandle = await fileHandle.createSyncAccessHandle(sahOptions);
-    t.add_cleanup(() => syncHandle.close());
-    for (const mode of SAH_MODES) {
-      if (sahMode !== mode) {
-        await promise_rejects_dom(
-            t, 'NoModificationAllowedError',
-            fileHandle.createSyncAccessHandle({mode: mode}));
-      }
+  // Test interaction with other access handle modes.
+  for (const mode of SAH_MODES) {
+    // Add tests depending on which access handle modes are being tested against
+    // each other.
+    const testingAgainstSelf = mode === sahMode;
+    const testingExclusiveLock = expectedLockAccess === 'exclusive';
+    const tests = {
+      diffFile: `When there's an open access handle in ${sahMode} mode on a` +
+          ` file, can open another access handle in ${mode} on a different` +
+          ` file`,
+    };
+    if (!testingAgainstSelf || testingExclusiveLock) {
+      tests.sameFile = `When there's an open access handle in ${sahMode} mode` +
+          ` on a file, cannot open another access handle in ${mode} on that` +
+          ` same file`;
     }
-  }, `When there's an open access handle in ${sahMode} mode on a file, cannot` +
-  ` open another access handle of another mode on that same file`);
-
-  directory_test(async (t, rootDir) => {
-    const fooFileHandle =
-        await rootDir.getFileHandle('foo.test', {create: true});
-    const barFileHandle =
-        await rootDir.getFileHandle('bar.test', {create: true});
-
-    const fooSyncHandle =
-        await fooFileHandle.createSyncAccessHandle(sahOptions);
-    t.add_cleanup(() => fooSyncHandle.close());
-
-    for (const mode of SAH_MODES) {
-      const barSyncHandle =
-          await barFileHandle.createSyncAccessHandle({mode});
-      barSyncHandle.close();
+    if (testingExclusiveLock) {
+      tests.acquireAfterRelease = `After an access handle in ${sahMode} mode` +
+          ` on a file has been closed, can open another access handle in` +
+          ` ${mode} on the same file`;
     }
-  }, `When there's an open access handle in ${sahMode} mode on a file, can` +
-  ` open another access handle of any mode on a different file`);
-
-  directory_test(async (t, rootDir) => {
-    const fileHandle =
-        await rootDir.getFileHandle('OPFS.test', {create: true});
-
-    const syncHandle1 = await fileHandle.createSyncAccessHandle(sahOptions);
-    syncHandle1.close();
-
-    for (const mode of SAH_MODES) {
-      const syncHandle2 = await fileHandle.createSyncAccessHandle({mode});
-      syncHandle2.close();
+    if (!testingExclusiveLock && !testingAgainstSelf) {
+      tests.multiAcquireAfterRelease = `After all access handles in` +
+          ` ${sahMode} mode on a file has been closed, can open another` +
+          ` access handle in ${mode} on the same file`;
     }
-  }, `After an access handle in ${sahMode} mode on a file has been closed,` +
-  ` can open another access handle of any mode on the same file`);
+
+    generateCrossLockTests(
+        createSAHLock, createSAHWithCleanupFactory({mode: mode}), tests);
+  }
 }
 
 directory_test(async (t, rootDir) => {
-  const fileHandle = await rootDir.getFileHandle('OPFS.test', {create: true});
+  const [fileHandle] = await createFileHandles(rootDir, 'BFS.test');
 
-  const syncHandle = await fileHandle.createSyncAccessHandle();
-  t.add_cleanup(() => syncHandle.close());
+  const syncHandle = await createSAHWithCleanup(t, fileHandle);
   assert_equals(syncHandle.mode, 'readwrite');
 }, 'A sync access handle opens in readwrite mode by default');
 
diff --git a/tests/wpt/tests/fs/FileSystemFileHandle-writable-file-stream-lock-modes.https.tentative.worker.js b/tests/wpt/tests/fs/FileSystemFileHandle-writable-file-stream-lock-modes.https.tentative.worker.js
new file mode 100644
index 00000000000..3e9b4334b9a
--- /dev/null
+++ b/tests/wpt/tests/fs/FileSystemFileHandle-writable-file-stream-lock-modes.https.tentative.worker.js
@@ -0,0 +1,69 @@
+importScripts('/resources/testharness.js');
+importScripts('resources/sandboxed-fs-test-helpers.js');
+importScripts('resources/test-helpers.js');
+
+'use strict';
+
+// Adds tests for expected behaviors of a writable stream created in `wfsMode`
+// mode.
+function lockPropertyTests(wfsMode, expectedLockAccess) {
+  const createWFSLock = createWFSWithCleanupFactory({mode: wfsMode});
+
+  directory_test(async (t, rootDir) => {
+    const [fileHandle] = await createFileHandles(rootDir, 'BFS.test');
+
+    const {mode} = await createWFSLock(t, fileHandle);
+    assert_equals(mode, wfsMode);
+  }, `A writable stream in ${wfsMode} mode has a mode property equal to` +
+    ` ${wfsMode}`);
+
+  directory_test(async (t, rootDir) => {
+    const [fileHandle] = await createFileHandles(rootDir, 'BFS.test');
+    assert_equals(
+        await testLockAccess(t, fileHandle, createWFSLock), expectedLockAccess);
+  }, `A writable stream in ${wfsMode} mode takes a lock that is` +
+    ` ${expectedLockAccess}`);
+
+  // Test interaction with other writable stream modes.
+  for (const mode of WFS_MODES) {
+    // Add tests depending on which writable stream modes are being tested
+    // against each other.
+    const testingAgainstSelf = mode === wfsMode;
+    const testingExclusiveLock = expectedLockAccess === 'exclusive';
+    const tests = {
+      diffFile: `When there's an open writable stream in ${wfsMode} mode on a` +
+          ` file, can open another writable stream in ${mode} on a different` +
+          ` file`,
+    };
+    if (!testingAgainstSelf || testingExclusiveLock) {
+      tests.sameFile = `When there's an open writable stream in ${wfsMode}` +
+          ` mode on a file, cannot open another writable stream in ${mode} on` +
+          ` that same file`;
+    }
+    if (testingExclusiveLock) {
+      tests.acquireAfterRelease = `After a writable stream in ${wfsMode} mode` +
+          ` on a file has been closed, can open another writable stream in` +
+          ` ${mode} on the same file`;
+    }
+    if (!testingExclusiveLock && !testingAgainstSelf) {
+      tests.multiAcquireAfterRelease = `After all writable streams in` +
+          ` ${wfsMode} mode on a file has been closed, can open another` +
+          ` writable stream in ${mode} on the same file`;
+    }
+
+    generateCrossLockTests(
+        createWFSLock, createWFSWithCleanupFactory({mode: mode}), tests);
+  }
+}
+
+directory_test(async (t, rootDir) => {
+  const [fileHandle] = await createFileHandles(rootDir, 'BFS.test');
+
+  const syncHandle = await createWFSWithCleanup(t, fileHandle);
+  assert_equals(syncHandle.mode, 'siloed');
+}, 'A writable stream opens in siloed mode by default');
+
+lockPropertyTests('siloed', LOCK_ACCESS.SHARED);
+lockPropertyTests('exclusive', LOCK_ACCESS.EXCLUSIVE);
+
+done();
diff --git a/tests/wpt/tests/fs/FileSystemSyncAccessHandle-close.https.tentative.worker.js b/tests/wpt/tests/fs/FileSystemSyncAccessHandle-close.https.worker.js
similarity index 100%
rename from tests/wpt/tests/fs/FileSystemSyncAccessHandle-close.https.tentative.worker.js
rename to tests/wpt/tests/fs/FileSystemSyncAccessHandle-close.https.worker.js
diff --git a/tests/wpt/tests/fs/FileSystemSyncAccessHandle-flush.https.tentative.worker.js b/tests/wpt/tests/fs/FileSystemSyncAccessHandle-flush.https.worker.js
similarity index 100%
rename from tests/wpt/tests/fs/FileSystemSyncAccessHandle-flush.https.tentative.worker.js
rename to tests/wpt/tests/fs/FileSystemSyncAccessHandle-flush.https.worker.js
diff --git a/tests/wpt/tests/fs/FileSystemSyncAccessHandle-getSize.https.tentative.worker.js b/tests/wpt/tests/fs/FileSystemSyncAccessHandle-getSize.https.worker.js
similarity index 100%
rename from tests/wpt/tests/fs/FileSystemSyncAccessHandle-getSize.https.tentative.worker.js
rename to tests/wpt/tests/fs/FileSystemSyncAccessHandle-getSize.https.worker.js
diff --git a/tests/wpt/tests/fs/FileSystemSyncAccessHandle-read-write.https.tentative.worker.js b/tests/wpt/tests/fs/FileSystemSyncAccessHandle-read-write.https.worker.js
similarity index 95%
rename from tests/wpt/tests/fs/FileSystemSyncAccessHandle-read-write.https.tentative.worker.js
rename to tests/wpt/tests/fs/FileSystemSyncAccessHandle-read-write.https.worker.js
index a22608a2c7d..1c8fda94bbe 100644
--- a/tests/wpt/tests/fs/FileSystemSyncAccessHandle-read-write.https.tentative.worker.js
+++ b/tests/wpt/tests/fs/FileSystemSyncAccessHandle-read-write.https.worker.js
@@ -9,6 +9,18 @@ sync_access_handle_test((t, handle) => {
   assert_equals(0, readBytes, 'Check that no bytes were read');
 }, 'Test reading an empty file through a sync access handle.');
 
+sync_access_handle_test((t, handle) => {
+  const readBuffer = new ArrayBuffer(0);
+  const readBytes = handle.read(readBuffer, {at: 0});
+  assert_equals(0, readBytes, 'Check that no bytes were read');
+}, 'Test using an empty ArrayBuffer.');
+
+sync_access_handle_test((t, handle) => {
+  const readBuffer = new ArrayBuffer(24);
+  const readBytes = handle.read(readBuffer, {at: 0});
+  assert_equals(0, readBytes, 'Check that no bytes were read');
+}, 'Test using an ArrayBuffer.');
+
 sync_access_handle_test((t, handle) => {
   if (!('TextEncoder' in self)) {
     return;
diff --git a/tests/wpt/tests/fs/FileSystemSyncAccessHandle-truncate.https.tentative.worker.js b/tests/wpt/tests/fs/FileSystemSyncAccessHandle-truncate.https.worker.js
similarity index 100%
rename from tests/wpt/tests/fs/FileSystemSyncAccessHandle-truncate.https.tentative.worker.js
rename to tests/wpt/tests/fs/FileSystemSyncAccessHandle-truncate.https.worker.js
diff --git a/tests/wpt/tests/fs/resources/test-helpers.js b/tests/wpt/tests/fs/resources/test-helpers.js
index d2e09504d3f..f185e2f48b6 100644
--- a/tests/wpt/tests/fs/resources/test-helpers.js
+++ b/tests/wpt/tests/fs/resources/test-helpers.js
@@ -4,6 +4,18 @@ const kCurrentDirectory = '.';
 // A special path component meaning "the parent directory."
 const kParentDirectory = '..';
 
+// The lock modes of a writable file stream.
+const WFS_MODES = ['siloed', 'exclusive'];
+
+// The lock modes of an access handle.
+const SAH_MODES = ['readwrite', 'read-only', 'readwrite-unsafe'];
+
+// Possible return values of testLockAccess.
+const LOCK_ACCESS = {
+  SHARED: 'shared',
+  EXCLUSIVE: 'exclusive',
+};
+
 // Array of separators used to separate components in hierarchical paths.
 let kPathSeparators;
 if (navigator.userAgent.includes('Windows NT')) {
@@ -102,3 +114,188 @@ async function cleanup_writable(test, value) {
     }
   });
 }
+
+function createFileHandles(dir, ...fileNames) {
+  return Promise.all(
+      fileNames.map(fileName => dir.getFileHandle(fileName, {create: true})));
+}
+
+// Releases a lock created by one of the create*WithCleanup functions below.
+async function releaseLock(lockPromise) {
+  const result = await lockPromise;
+  if (result?.close) {
+    await result.close();
+  }
+}
+
+function cleanupLockPromise(t, lockPromise) {
+  return cleanup(t, lockPromise, () => releaseLock(lockPromise));
+}
+
+function createWFSWithCleanup(t, fileHandle, wfsOptions) {
+  return cleanupLockPromise(t, fileHandle.createWritable(wfsOptions));
+}
+
+// Returns createWFSWithCleanup bound with wfsOptions.
+function createWFSWithCleanupFactory(wfsOptions) {
+  return (t, fileHandle) => createWFSWithCleanup(t, fileHandle, wfsOptions);
+}
+
+function createSAHWithCleanup(t, fileHandle, sahOptions) {
+  return cleanupLockPromise(t, fileHandle.createSyncAccessHandle(sahOptions));
+}
+
+// Returns createSAHWithCleanup bound with sahOptions.
+function createSAHWithCleanupFactory(sahOptions) {
+  return (t, fileHandle) => createSAHWithCleanup(t, fileHandle, sahOptions);
+}
+
+function createMoveWithCleanup(
+    t, fileHandle, fileName = 'unique-file-name.test') {
+  return cleanupLockPromise(t, fileHandle.move(fileName));
+}
+
+function createRemoveWithCleanup(t, fileHandle) {
+  return cleanupLockPromise(t, fileHandle.remove({recursive: true}));
+}
+
+// For each key in `testFuncs` if there is a matching key in `testDescs`,
+// creates a directory_test passing the respective key's value for the func and
+// description arguments. If there is not a matching key in `testDescs`, the
+// test is not created. This will throw if `testDescs` contains a key that is
+// not in `testFuncs`.
+function selectDirectoryTests(testDescs, testFuncs) {
+  for (const testDesc in testDescs) {
+    if (!testFuncs.hasOwnProperty(testDesc)) {
+      throw new Error(
+          'Passed a test description in testDescs that wasn\'t in testFuncs.');
+    }
+    directory_test(testFuncs[testDesc], testDescs[testDesc]);
+  }
+}
+
+// Adds tests to test the interaction between a lock created by `createLock1`
+// and a lock created by `createLock2`.
+//
+// The description of each test is passed in through `testDescs`. If a test
+// description is omitted, it is not run.
+//
+// For all tests, `createLock1` is called first.
+function generateCrossLockTests(createLock1, createLock2, testDescs) {
+  if (testDescs === undefined) {
+    throw new Error('Must pass testDescs.');
+  }
+  selectDirectoryTests(testDescs, {
+
+    // This tests that a lock can't be acquired on a file that already has a
+    // lock of another type.
+    sameFile: async (t, rootDir) => {
+      const [fileHandle] = await createFileHandles(rootDir, 'BFS.test');
+
+      createLock1(t, fileHandle);
+      await promise_rejects_dom(
+          t, 'NoModificationAllowedError', createLock2(t, fileHandle));
+    },
+
+    // This tests that a lock on one file does not interfere with the creation
+    // of a lock on another file.
+    diffFile: async (t, rootDir) => {
+      const [fooFileHandle, barFileHandle] =
+          await createFileHandles(rootDir, 'foo.test', 'bar.test');
+
+      createLock1(t, fooFileHandle);
+      await createLock2(t, barFileHandle);
+    },
+
+    // This tests that after a lock has been acquired on a file and then
+    // released, another lock of another type can be acquired. This will fail if
+    // `createLock1` and `createLock2` create the same shared lock.
+    acquireAfterRelease: async (t, rootDir) => {
+      let [fileHandle] = await createFileHandles(rootDir, 'BFS.test');
+
+      const lockPromise = createLock1(t, fileHandle);
+      await promise_rejects_dom(
+          t, 'NoModificationAllowedError', createLock2(t, fileHandle));
+
+      await releaseLock(lockPromise);
+      // Recreate the file in case releasing the lock moves/removes it.
+      [fileHandle] = await createFileHandles(rootDir, 'BFS.test');
+      await createLock2(t, fileHandle);
+    },
+
+    // This tests that after multiple locks of some shared lock type have been
+    // acquired on a file and then all released, another lock of another lock
+    // type can be acquired.
+    multiAcquireAfterRelease: async (t, rootDir) => {
+      const [fileHandle] = await createFileHandles(rootDir, 'BFS.test');
+
+      const lock1 = await createLock1(t, fileHandle);
+      const lock2 = await createLock1(t, fileHandle);
+
+      await promise_rejects_dom(
+          t, 'NoModificationAllowedError', createLock2(t, fileHandle));
+      await lock1.close();
+      await promise_rejects_dom(
+          t, 'NoModificationAllowedError', createLock2(t, fileHandle));
+      await lock2.close();
+
+      await createLock2(t, fileHandle);
+    },
+
+    // This tests that a lock taken on a directory prevents a lock being
+    // acquired on a file contained within that directory.
+    takeDirThenFile: async (t, rootDir) => {
+      const dirHandle = await rootDir.getDirectoryHandle('foo', {create: true});
+      const [fileHandle] = await createFileHandles(dirHandle, 'BFS.test');
+
+      createLock1(t, dirHandle);
+      await promise_rejects_dom(
+          t, 'NoModificationAllowedError', createLock2(t, fileHandle));
+    },
+
+    // This tests that a lock acquired on a file prevents a lock being acquired
+    // on an ancestor of that file.
+    takeFileThenDir: async (t, rootDir) => {
+      const grandparentHandle =
+          await rootDir.getDirectoryHandle('foo', {create: true});
+      const parentHandle =
+          await grandparentHandle.getDirectoryHandle('bar', {create: true});
+      let [fileHandle] = await createFileHandles(parentHandle, 'BFS.test');
+
+      // Test parent handle.
+      const lock1 = createLock1(t, fileHandle);
+      await promise_rejects_dom(
+          t, 'NoModificationAllowedError', createLock2(t, parentHandle));
+
+      // Release the lock so we can recreate it.
+      await releaseLock(lock1);
+      // Recreate the file in case releasing the lock moves/removes it.
+      [fileHandle] = await createFileHandles(parentHandle, 'BFS.test');
+
+      // Test grandparent handle.
+      createLock1(t, fileHandle);
+      await promise_rejects_dom(
+          t, 'NoModificationAllowedError', createLock2(t, grandparentHandle));
+    },
+  });
+}
+
+// Tests whether the multiple locks can be created by createLock on a file
+// handle or if only one can. Returns LOCK_ACCESS.SHARED for the former and
+// LOCK_ACCESS.EXCLUSIVE for the latter.
+async function testLockAccess(t, fileHandle, createLock) {
+  createLock(t, fileHandle);
+
+  let access;
+  try {
+    await createLock(t, fileHandle);
+    access = LOCK_ACCESS.SHARED;
+  } catch (e) {
+    access = LOCK_ACCESS.EXCLUSIVE;
+    assert_throws_dom('NoModificationAllowedError', () => {
+      throw e;
+    });
+  }
+
+  return access;
+}
diff --git a/tests/wpt/tests/fs/script-tests/FileSystemWritableFileStream-write.js b/tests/wpt/tests/fs/script-tests/FileSystemWritableFileStream-write.js
index a91a206b868..0b12def74c9 100644
--- a/tests/wpt/tests/fs/script-tests/FileSystemWritableFileStream-write.js
+++ b/tests/wpt/tests/fs/script-tests/FileSystemWritableFileStream-write.js
@@ -345,3 +345,20 @@ directory_test(async (t, root) => {
   assert_equals(await getFileContents(handle), '');
   assert_equals(await getFileSize(handle), 0);
 }, 'write() with an invalid blob to an empty file should reject');
+
+directory_test(async (t, root) => {
+  const handle = await createFileWithContents(t, 'file.txt', 'contents', root);
+  const stream = await handle.createWritable({mode: 'exclusive'});
+
+  await stream.write('12345');
+  await promise_rejects_js(
+      t, TypeError, stream.write({type: 'write', data: null}),
+      'write with null data');
+
+  // The file contents should not have been changed.
+  assert_equals(await getFileContents(handle), 'contents');
+
+  // The file's lock was released.
+  const newStream = await handle.createWritable({mode: 'exclusive'});
+  await newStream.close();
+}, 'an errored writable stream releases its lock');
diff --git a/tests/wpt/tests/html/META.yml b/tests/wpt/tests/html/META.yml
index 94b925cc076..7eecf519f1b 100644
--- a/tests/wpt/tests/html/META.yml
+++ b/tests/wpt/tests/html/META.yml
@@ -5,4 +5,3 @@ suggested_reviewers:
   - foolip
   - jdm
   - jgraham
-  - zqzhang
diff --git a/tests/wpt/tests/html/browsers/browsing-the-web/back-forward-cache/resources/rc-helper.js b/tests/wpt/tests/html/browsers/browsing-the-web/back-forward-cache/resources/rc-helper.js
index cb73f52e15b..9ecdc91ff14 100644
--- a/tests/wpt/tests/html/browsers/browsing-the-web/back-forward-cache/resources/rc-helper.js
+++ b/tests/wpt/tests/html/browsers/browsing-the-web/back-forward-cache/resources/rc-helper.js
@@ -25,6 +25,34 @@ async function assertImplementsBFCacheOptional(remoteContextHelper) {
   assert_implements_optional(beforeBFCache == true, 'BFCache not supported.');
 }
 
+// Subtracts set `b` from set `a` and returns the result.
+function setMinus(a, b) {
+  const minus = new Set();
+  a.forEach(e => {
+    if (!b.has(e)) {
+      minus.add(e);
+    }
+  });
+  return minus;
+}
+
+// Return a sorted Array from the iterable `s`.
+function sorted(s) {
+  return Array.from(s).sort();
+}
+
+// Assert expected reasons and the reported reasons match.
+function matchReasons(expectedNotRestoredReasonsSet, notRestoredReasonsSet) {
+  const missing = setMinus(
+    expectedNotRestoredReasonsSet, notRestoredReasonsSet, 'Missing reasons');
+  const extra = setMinus(
+      notRestoredReasonsSet, expectedNotRestoredReasonsSet, 'Extra reasons');
+  assert_true(missing.size + extra.size == 0, `Expected: ${sorted(expectedNotRestoredReasonsSet)}\n` +
+    `Got: ${sorted(notRestoredReasonsSet)}\n` +
+    `Missing: ${sorted(missing)}\n` +
+    `Extra: ${sorted(extra)}\n`);
+}
+
 // A helper function to assert that the page is not restored from BFCache by
 // checking whether the `beforeBFCache` value from `window` is undefined
 // due to page reload.
@@ -40,7 +68,7 @@ async function assertImplementsBFCacheOptional(remoteContextHelper) {
 async function assertNotRestoredFromBFCache(
     remoteContextHelper, notRestoredReasons) {
   var beforeBFCache = await getBeforeBFCache(remoteContextHelper);
-  assert_equals(beforeBFCache, undefined);
+  assert_equals(beforeBFCache, undefined, 'document unexpectedly BFCached');
 
   // The reason is optional, so skip the remaining test if the
   // `notRestoredReasons` is not set.
@@ -49,7 +77,8 @@ async function assertNotRestoredFromBFCache(
   }
 
   let isFeatureEnabled = await remoteContextHelper.executeScript(() => {
-    return 'notRestoredReasons' in performance.getEntriesByType('navigation')[0];
+    return 'notRestoredReasons' in
+        performance.getEntriesByType('navigation')[0];
   });
 
   // Return if the `notRestoredReasons` API is not available.
@@ -72,15 +101,9 @@ async function assertNotRestoredFromBFCache(
     for (let child of node.children) {
       collectReason(child);
     }
-  }
+  };
   collectReason(result);
-
-  assert_equals(notRestoredReasonsSet.size,
-      expectedNotRestoredReasonsSet.size);
-
-  for (let reason of expectedNotRestoredReasonsSet) {
-    assert_true(notRestoredReasonsSet.has(reason));
-  }
+  matchReasons(expectedNotRestoredReasonsSet, notRestoredReasonsSet);
 }
 
 // A helper function that combines the steps of setting window property,
diff --git a/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/PopStateEvent.html b/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/PopStateEvent.html
index 5774c150f42..9ee75762493 100644
--- a/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/PopStateEvent.html
+++ b/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/PopStateEvent.html
@@ -23,16 +23,25 @@ test(function () {
   assert_equals(popStateEvent.state, null, "the PopStateEvent.state");
 }, "Initial value of PopStateEvent.state must be null");
 
+test(function () {
+  var popStateEvent = new PopStateEvent("popstate");
+  assert_false(popStateEvent.hasUAVisualTransition, "the PopStateEvent.hasUAVisualTransition");
+}, "Initial value of PopStateEvent.hasUAVisualTransition must be false");
+
 test(function () {
   var state = history.state;
   var data;
+  var hasUAVisualTransition = false;
   window.addEventListener('popstate', function (e) {
     data = e.state;
+    hasUAVisualTransition = e.hasUAVisualTransition;
   });
   window.dispatchEvent(new PopStateEvent('popstate', {
-    'state': {testdata:true}
+    'state': {testdata:true},
+    'hasUAVisualTransition': true
   }));
   assert_true(data.testdata,'state data was corrupted');
   assert_equals(history.state, state, "history.state was NOT set by dispatching the event");
+  assert_true(hasUAVisualTransition, 'hasUAVisualTransition not set correctly');
 }, 'Dispatching a synthetic PopStateEvent');
 </script>
diff --git a/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/document-state.https.html b/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/document-state.https.html
index 609ce9b8503..f03efc3b658 100644
--- a/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/document-state.https.html
+++ b/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/document-state.https.html
@@ -70,15 +70,14 @@ promise_test(async t => {
   // now-same-origin document initiating this navigation via history.
   await A.historyForward();
 
-  const secFetchSite = await B.executeScript(() => window.requestHeaders['sec-fetch-site']);
-  const referrer = await B.executeScript(() => window.requestHeaders['referer']);
+  const requestHeaders = await B.getRequestHeaders();
   const documentReferrer = await B.executeScript(() => document.referrer);
 
-  assert_equals(secFetchSite, 'cross-site',
+  assert_equals(requestHeaders.get('sec-fetch-site'), 'cross-site',
       'Same-origin forward history navigation to a document whose original ' +
       'initiator was cross-site, ends up with Sec-Fetch-Dest: cross-site ' +
       'header');
-  assert_equals(referrer, originA + '/',
+  assert_equals(requestHeaders.get('referer'), originA + '/',
       'Same-origin forward history navigation to a document whose original ' +
       'initiator was cross-site ends up with the Referer header that is the ' +
       'original cross-site initiator');
@@ -113,15 +112,14 @@ promise_test(async t => {
     location.reload();
   }, []);
 
-  const secFetchSite = await B.executeScript(() => window.requestHeaders['sec-fetch-site']);
-  const referrer = await B.executeScript(() => window.requestHeaders['referer']);
+  const requestHeaders = await B.getRequestHeaders();
   const documentReferrer = await B.executeScript(() => document.referrer);
 
-  assert_equals(secFetchSite, 'cross-site',
+  assert_equals(requestHeaders.get('sec-fetch-site'), 'cross-site',
       'Same-origin forward history navigation to a document whose original ' +
       'initiator was cross-site, ends up with Sec-Fetch-Dest: cross-site ' +
       'header');
-  assert_equals(referrer, originA + '/',
+  assert_equals(requestHeaders.get('referer'), originA + '/',
       'Same-origin forward history navigation to a document whose original ' +
       'initiator was cross-site ends up with the Referer header that is the ' +
       'original cross-site initiator');
diff --git a/tests/wpt/tests/html/browsers/browsing-the-web/remote-context-helper-tests/getRequestHeaders.window.js b/tests/wpt/tests/html/browsers/browsing-the-web/remote-context-helper-tests/getRequestHeaders.window.js
new file mode 100644
index 00000000000..90610e27fb8
--- /dev/null
+++ b/tests/wpt/tests/html/browsers/browsing-the-web/remote-context-helper-tests/getRequestHeaders.window.js
@@ -0,0 +1,18 @@
+// META: title=RemoteContextHelper with defaults
+// META: script=/common/dispatcher/dispatcher.js
+// META: script=/common/get-host-info.sub.js
+// META: script=/common/utils.js
+// META: script=/html/browsers/browsing-the-web/remote-context-helper/resources/remote-context-helper.js
+// META: script=./resources/test-helper.js
+
+'use strict';
+
+promise_test(async t => {
+  const rcHelper = new RemoteContextHelper();
+  const main = await rcHelper.addWindow();
+
+  const headers = await main.getRequestHeaders();
+
+  assert_equals(headers.constructor, Headers);
+  assert_true(headers.has("user-agent"), "user-agent is present");
+});
diff --git a/tests/wpt/tests/html/browsers/browsing-the-web/remote-context-helper/resources/executor-window.py b/tests/wpt/tests/html/browsers/browsing-the-web/remote-context-helper/resources/executor-window.py
new file mode 100644
index 00000000000..3ccba723892
--- /dev/null
+++ b/tests/wpt/tests/html/browsers/browsing-the-web/remote-context-helper/resources/executor-window.py
@@ -0,0 +1,27 @@
+import json
+
+def main(request, response):
+  initRequestHeaders = ""
+  for header_name in request.headers.keys():
+    for header_value in request.headers.get_list(header_name):
+      js_name = json.dumps(header_name.lower().decode("utf-8"))
+      js_value = json.dumps(header_value.decode("utf-8"))
+      initRequestHeaders += f"window.__requestHeaders.append({js_name}, {js_value});\n"
+      if (b"status" in request.GET):
+            status = int(request.GET.first(b"status"))
+      else:
+            status = 200
+
+  return (status, [("Content-Type", "text/html")], f"""
+<!DOCTYPE HTML>
+<script src="/common/dispatcher/dispatcher.js"></script>
+<script src="./executor-common.js"></script>
+<script src="./executor-window.js"></script>
+
+<body>
+<script>
+window.__requestHeaders = new Headers();
+{initRequestHeaders}
+requestExecutor();
+</script>
+""")
diff --git a/tests/wpt/tests/html/browsers/browsing-the-web/remote-context-helper/resources/executor.sub.html b/tests/wpt/tests/html/browsers/browsing-the-web/remote-context-helper/resources/executor.sub.html
deleted file mode 100644
index 38f4429d91e..00000000000
--- a/tests/wpt/tests/html/browsers/browsing-the-web/remote-context-helper/resources/executor.sub.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE HTML>
-<script src="/common/dispatcher/dispatcher.js"></script>
-<script src="./executor-common.js"></script>
-<script src="./executor-window.js"></script>
-
-<body>
-  <script>
-    window.requestHeaders = {
-      'sec-fetch-mode': '{{header_or_default(sec-fetch-mode, absent)}}',
-      'sec-fetch-site': '{{header_or_default(sec-fetch-site, absent)}}',
-      'sec-fetch-dest': '{{header_or_default(sec-fetch-dest, absent)}}',
-      'referer': '{{header_or_default(referer, absent)}}',
-    };
-    requestExecutor();
-  </script>
-</body>
diff --git a/tests/wpt/tests/html/browsers/browsing-the-web/remote-context-helper/resources/remote-context-helper.js b/tests/wpt/tests/html/browsers/browsing-the-web/remote-context-helper/resources/remote-context-helper.js
index 047d5cf821e..b62c9ac491a 100644
--- a/tests/wpt/tests/html/browsers/browsing-the-web/remote-context-helper/resources/remote-context-helper.js
+++ b/tests/wpt/tests/html/browsers/browsing-the-web/remote-context-helper/resources/remote-context-helper.js
@@ -49,7 +49,7 @@
 {
   const RESOURCES_PATH =
       '/html/browsers/browsing-the-web/remote-context-helper/resources';
-  const WINDOW_EXECUTOR_PATH = `${RESOURCES_PATH}/executor.sub.html`;
+  const WINDOW_EXECUTOR_PATH = `${RESOURCES_PATH}/executor-window.py`;
   const WORKER_EXECUTOR_PATH = `${RESOURCES_PATH}/executor-worker.js`;
 
   /**
@@ -104,13 +104,18 @@
      *     when this event occurs, e.g. "pageshow",
      *     (@see window.addEventListener). This only makes sense for
      *     window-based executors, not worker-based.
+     * @param {string} [options.status] If supplied, the executor will pass
+     *     this value in the "status" parameter to the executor. The default
+     *     executor will default to a status code of 200, if the parameter is
+     *     not supplied.
      */
     constructor(
-        {origin, scripts = [], headers = [], startOn} = {}) {
+        {origin, scripts = [], headers = [], startOn, status} = {}) {
       this.origin = origin;
       this.scripts = scripts;
       this.headers = headers;
       this.startOn = startOn;
+      this.status = status;
     }
 
     /**
@@ -143,6 +148,10 @@
       if (extraConfig.startOn) {
         startOn = extraConfig.startOn;
       }
+      let status = this.status;
+      if (extraConfig.status) {
+        status = extraConfig.status;
+      }
       const headers = this.headers.concat(extraConfig.headers);
       const scripts = this.scripts.concat(extraConfig.scripts);
       return new RemoteContextConfig({
@@ -150,6 +159,7 @@
         headers,
         scripts,
         startOn,
+        status
       });
     }
   }
@@ -220,6 +230,10 @@
         url.searchParams.append('startOn', config.startOn);
       }
 
+      if (config.status) {
+        url.searchParams.append('status', config.status);
+      }
+
       if (executorCreator) {
         await executorCreator(url.href);
       }
@@ -383,6 +397,26 @@
       });
     }
 
+    /**
+     * Gets a `Headers` object containing the request headers that were used
+     * when the browser requested this document.
+     *
+     * Currently, this only works for `RemoteContextHelper`s representing
+     * windows, not workers.
+     * @returns {Promise<Headers>}
+     */
+    async getRequestHeaders() {
+      // This only works in window environments for now. We could make it work
+      // for workers too; if you have a need, just share or duplicate the code
+      // that's in executor-window.py. Anyway, we explicitly use `window` in
+      // the script so that we get a clear error if you try using it on a
+      // worker.
+
+      // We need to serialize and deserialize the `Headers` object manually.
+      const asNestedArrays = await this.executeScript(() => [...window.__requestHeaders]);
+      return new Headers(asNestedArrays);
+    }
+
     /**
      * Executes a script in the remote context that will perform a navigation.
      * To do this safely, we must suspend the executor and wait for that to
diff --git a/tests/wpt/tests/html/browsers/windows/dangling-markup-window-name.tentative.html b/tests/wpt/tests/html/browsers/windows/dangling-markup-window-name.html
similarity index 100%
rename from tests/wpt/tests/html/browsers/windows/dangling-markup-window-name.tentative.html
rename to tests/wpt/tests/html/browsers/windows/dangling-markup-window-name.html
diff --git a/tests/wpt/tests/html/browsers/windows/resources/window-name.sub.html b/tests/wpt/tests/html/browsers/windows/resources/window-name.sub.html
index 5bb8ebda8f8..9255ba34015 100644
--- a/tests/wpt/tests/html/browsers/windows/resources/window-name.sub.html
+++ b/tests/wpt/tests/html/browsers/windows/resources/window-name.sub.html
@@ -2,7 +2,7 @@
 <title>popup helper</title>
 <script>
 
-  const search = decodeURIComponent(window.location.search.replace("?", ""));
+const search = decodeURIComponent(window.location.search.replace("?", ""));
 const steps = search.split("|");
 
 async function proceedTest() {
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/2d.getcontext.exists.html b/tests/wpt/tests/html/canvas/element/canvas-context/2d.canvas.context.exists.html
similarity index 90%
rename from tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/2d.getcontext.exists.html
rename to tests/wpt/tests/html/canvas/element/canvas-context/2d.canvas.context.exists.html
index a26bc4040c7..1c44acbd549 100644
--- a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/2d.getcontext.exists.html
+++ b/tests/wpt/tests/html/canvas/element/canvas-context/2d.canvas.context.exists.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>Canvas test: 2d.getcontext.exists</title>
+<title>Canvas test: 2d.canvas.context.exists</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 <link rel="stylesheet" href="/html/canvas/resources/canvas-tests.css">
 <body class="show_output">
 
-<h1>2d.getcontext.exists</h1>
+<h1>2d.canvas.context.exists</h1>
 <p class="desc">The 2D context is implemented</p>
 
 
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/2d.getcontext.extraargs.cache.html b/tests/wpt/tests/html/canvas/element/canvas-context/2d.canvas.context.extraargs.cache.html
similarity index 93%
rename from tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/2d.getcontext.extraargs.cache.html
rename to tests/wpt/tests/html/canvas/element/canvas-context/2d.canvas.context.extraargs.cache.html
index eb47929a09f..f4db40815dc 100644
--- a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/2d.getcontext.extraargs.cache.html
+++ b/tests/wpt/tests/html/canvas/element/canvas-context/2d.canvas.context.extraargs.cache.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>Canvas test: 2d.getcontext.extraargs.cache</title>
+<title>Canvas test: 2d.canvas.context.extraargs.cache</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 <link rel="stylesheet" href="/html/canvas/resources/canvas-tests.css">
 <body class="show_output">
 
-<h1>2d.getcontext.extraargs.cache</h1>
+<h1>2d.canvas.context.extraargs.cache</h1>
 <p class="desc">The 2D context doesn't throw with extra getContext arguments (cached)</p>
 
 
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/2d.getcontext.extraargs.create.html b/tests/wpt/tests/html/canvas/element/canvas-context/2d.canvas.context.extraargs.create.html
similarity index 94%
rename from tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/2d.getcontext.extraargs.create.html
rename to tests/wpt/tests/html/canvas/element/canvas-context/2d.canvas.context.extraargs.create.html
index 0683e459c4b..6ae7f787c6a 100644
--- a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/2d.getcontext.extraargs.create.html
+++ b/tests/wpt/tests/html/canvas/element/canvas-context/2d.canvas.context.extraargs.create.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>Canvas test: 2d.getcontext.extraargs.create</title>
+<title>Canvas test: 2d.canvas.context.extraargs.create</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 <link rel="stylesheet" href="/html/canvas/resources/canvas-tests.css">
 <body class="show_output">
 
-<h1>2d.getcontext.extraargs.create</h1>
+<h1>2d.canvas.context.extraargs.create</h1>
 <p class="desc">The 2D context doesn't throw with extra getContext arguments (new context)</p>
 
 
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/2d.getcontext.invalid.args.html b/tests/wpt/tests/html/canvas/element/canvas-context/2d.canvas.context.invalid.args.html
similarity index 94%
rename from tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/2d.getcontext.invalid.args.html
rename to tests/wpt/tests/html/canvas/element/canvas-context/2d.canvas.context.invalid.args.html
index c3407d05003..cfa58266eac 100644
--- a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/2d.getcontext.invalid.args.html
+++ b/tests/wpt/tests/html/canvas/element/canvas-context/2d.canvas.context.invalid.args.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>Canvas test: 2d.getcontext.invalid.args</title>
+<title>Canvas test: 2d.canvas.context.invalid.args</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 <link rel="stylesheet" href="/html/canvas/resources/canvas-tests.css">
 <body class="show_output">
 
-<h1>2d.getcontext.invalid.args</h1>
+<h1>2d.canvas.context.invalid.args</h1>
 <p class="desc">Calling getContext with invalid arguments.</p>
 
 
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/2d.canvas.context.html b/tests/wpt/tests/html/canvas/element/canvas-context/2d.canvas.context.prototype.html
similarity index 91%
rename from tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/2d.canvas.context.html
rename to tests/wpt/tests/html/canvas/element/canvas-context/2d.canvas.context.prototype.html
index 51cf0a2ec6d..5d5edc6864b 100644
--- a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/2d.canvas.context.html
+++ b/tests/wpt/tests/html/canvas/element/canvas-context/2d.canvas.context.prototype.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>Canvas test: 2d.canvas.context</title>
+<title>Canvas test: 2d.canvas.context.prototype</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 <link rel="stylesheet" href="/html/canvas/resources/canvas-tests.css">
 <body class="show_output">
 
-<h1>2d.canvas.context</h1>
+<h1>2d.canvas.context.prototype</h1>
 <p class="desc">checks CanvasRenderingContext2D prototype</p>
 
 
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/2d.getcontext.shared.html b/tests/wpt/tests/html/canvas/element/canvas-context/2d.canvas.context.shared.html
similarity index 92%
rename from tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/2d.getcontext.shared.html
rename to tests/wpt/tests/html/canvas/element/canvas-context/2d.canvas.context.shared.html
index 54c1fd13fde..fd8deddec02 100644
--- a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/2d.getcontext.shared.html
+++ b/tests/wpt/tests/html/canvas/element/canvas-context/2d.canvas.context.shared.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>Canvas test: 2d.getcontext.shared</title>
+<title>Canvas test: 2d.canvas.context.shared</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 <link rel="stylesheet" href="/html/canvas/resources/canvas-tests.css">
 <body class="show_output">
 
-<h1>2d.getcontext.shared</h1>
+<h1>2d.canvas.context.shared</h1>
 <p class="desc">getContext('2d') returns objects which share canvas state</p>
 
 
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/2d.type.exists.html b/tests/wpt/tests/html/canvas/element/canvas-context/2d.canvas.context.type.exists.html
similarity index 89%
rename from tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/2d.type.exists.html
rename to tests/wpt/tests/html/canvas/element/canvas-context/2d.canvas.context.type.exists.html
index e2c09e60d74..d25f009abbd 100644
--- a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/2d.type.exists.html
+++ b/tests/wpt/tests/html/canvas/element/canvas-context/2d.canvas.context.type.exists.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>Canvas test: 2d.type.exists</title>
+<title>Canvas test: 2d.canvas.context.type.exists</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 <link rel="stylesheet" href="/html/canvas/resources/canvas-tests.css">
 <body class="show_output">
 
-<h1>2d.type.exists</h1>
+<h1>2d.canvas.context.type.exists</h1>
 <p class="desc">The 2D context interface is a property of 'window'</p>
 
 <p class="notes">Defined in "Web IDL" (draft)
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/2d.type.extend.html b/tests/wpt/tests/html/canvas/element/canvas-context/2d.canvas.context.type.extend.html
similarity index 92%
rename from tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/2d.type.extend.html
rename to tests/wpt/tests/html/canvas/element/canvas-context/2d.canvas.context.type.extend.html
index 151b40d36f4..8d34d531019 100644
--- a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/2d.type.extend.html
+++ b/tests/wpt/tests/html/canvas/element/canvas-context/2d.canvas.context.type.extend.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>Canvas test: 2d.type.extend</title>
+<title>Canvas test: 2d.canvas.context.type.extend</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 <link rel="stylesheet" href="/html/canvas/resources/canvas-tests.css">
 <body class="show_output">
 
-<h1>2d.type.extend</h1>
+<h1>2d.canvas.context.type.extend</h1>
 <p class="desc">Interface methods can be added</p>
 
 <p class="notes">Defined in "Web IDL" (draft)
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/2d.type.prototype.html b/tests/wpt/tests/html/canvas/element/canvas-context/2d.canvas.context.type.prototype.html
similarity index 94%
rename from tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/2d.type.prototype.html
rename to tests/wpt/tests/html/canvas/element/canvas-context/2d.canvas.context.type.prototype.html
index 24ee5068bd5..a537fe5106c 100644
--- a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/2d.type.prototype.html
+++ b/tests/wpt/tests/html/canvas/element/canvas-context/2d.canvas.context.type.prototype.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>Canvas test: 2d.type.prototype</title>
+<title>Canvas test: 2d.canvas.context.type.prototype</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 <link rel="stylesheet" href="/html/canvas/resources/canvas-tests.css">
 <body class="show_output">
 
-<h1>2d.type.prototype</h1>
+<h1>2d.canvas.context.type.prototype</h1>
 <p class="desc">window.CanvasRenderingContext2D.prototype are not [[Writable]] and not [[Configurable]], and its methods are [[Configurable]].</p>
 
 <p class="notes">Defined in "Web IDL" (draft)
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/2d.type.replace.html b/tests/wpt/tests/html/canvas/element/canvas-context/2d.canvas.context.type.replace.html
similarity index 92%
rename from tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/2d.type.replace.html
rename to tests/wpt/tests/html/canvas/element/canvas-context/2d.canvas.context.type.replace.html
index aa0ec1cff4d..ac3c40587d1 100644
--- a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/2d.type.replace.html
+++ b/tests/wpt/tests/html/canvas/element/canvas-context/2d.canvas.context.type.replace.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>Canvas test: 2d.type.replace</title>
+<title>Canvas test: 2d.canvas.context.type.replace</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 <link rel="stylesheet" href="/html/canvas/resources/canvas-tests.css">
 <body class="show_output">
 
-<h1>2d.type.replace</h1>
+<h1>2d.canvas.context.type.replace</h1>
 <p class="desc">Interface methods can be overridden</p>
 
 <p class="notes">Defined in "Web IDL" (draft)
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/2d.getcontext.unique.html b/tests/wpt/tests/html/canvas/element/canvas-context/2d.canvas.context.unique.html
similarity index 90%
rename from tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/2d.getcontext.unique.html
rename to tests/wpt/tests/html/canvas/element/canvas-context/2d.canvas.context.unique.html
index c6e8980a20c..c7b1803856c 100644
--- a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/2d.getcontext.unique.html
+++ b/tests/wpt/tests/html/canvas/element/canvas-context/2d.canvas.context.unique.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>Canvas test: 2d.getcontext.unique</title>
+<title>Canvas test: 2d.canvas.context.unique</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 <link rel="stylesheet" href="/html/canvas/resources/canvas-tests.css">
 <body class="show_output">
 
-<h1>2d.getcontext.unique</h1>
+<h1>2d.canvas.context.unique</h1>
 <p class="desc">getContext('2d') returns the same object</p>
 
 
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/initial.reset.2dstate.html b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.initial.reset.2dstate.html
similarity index 96%
rename from tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/initial.reset.2dstate.html
rename to tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.initial.reset.2dstate.html
index a99cb5d3898..e1940011989 100644
--- a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/initial.reset.2dstate.html
+++ b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.initial.reset.2dstate.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>Canvas test: initial.reset.2dstate</title>
+<title>Canvas test: 2d.canvas.host.initial.reset.2dstate</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 <link rel="stylesheet" href="/html/canvas/resources/canvas-tests.css">
 <body class="show_output">
 
-<h1>initial.reset.2dstate</h1>
+<h1>2d.canvas.host.initial.reset.2dstate</h1>
 <p class="desc">Resetting the canvas state resets 2D state variables</p>
 
 
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/2d.canvas.readonly.html b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.readonly.html
similarity index 91%
rename from tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/2d.canvas.readonly.html
rename to tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.readonly.html
index 4b9e68108fe..cbbf32f2e2b 100644
--- a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/2d.canvas.readonly.html
+++ b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.readonly.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>Canvas test: 2d.canvas.readonly</title>
+<title>Canvas test: 2d.canvas.host.readonly</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 <link rel="stylesheet" href="/html/canvas/resources/canvas-tests.css">
 <body class="show_output">
 
-<h1>2d.canvas.readonly</h1>
+<h1>2d.canvas.host.readonly</h1>
 <p class="desc">CanvasRenderingContext2D.canvas is readonly</p>
 
 
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/2d.canvas.reference.html b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.reference.html
similarity index 90%
rename from tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/2d.canvas.reference.html
rename to tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.reference.html
index 182a0170a67..6a4bdb65b08 100644
--- a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/2d.canvas.reference.html
+++ b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.reference.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>Canvas test: 2d.canvas.reference</title>
+<title>Canvas test: 2d.canvas.host.reference</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 <link rel="stylesheet" href="/html/canvas/resources/canvas-tests.css">
 <body class="show_output">
 
-<h1>2d.canvas.reference</h1>
+<h1>2d.canvas.host.reference</h1>
 <p class="desc">CanvasRenderingContext2D.canvas refers back to its canvas</p>
 
 
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/2d.scaled-manual.html b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.scaled-manual.html
similarity index 80%
rename from tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/2d.scaled-manual.html
rename to tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.scaled-manual.html
index 28daf0bca5e..acf3f9c7b34 100644
--- a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/2d.scaled-manual.html
+++ b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.scaled-manual.html
@@ -1,19 +1,19 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>Canvas test: 2d.scaled</title>
+<title>Canvas test: 2d.canvas.host.scaled</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 <link rel="stylesheet" href="/html/canvas/resources/canvas-tests.css">
 <body class="show_output">
 
-<h1>2d.scaled</h1>
+<h1>2d.canvas.host.scaled</h1>
 <p class="desc">CSS-scaled canvases get drawn correctly</p>
 
 
 <p class="output">Actual output:</p>
 <canvas id="c" class="output" width="50" height="25" style="width: 100px; height: 50px"><p class="fallback">FAIL (fallback content)</p></canvas>
-<p class="output expectedtext">Expected output:<p><img src="2d.scaled.png" class="output expected" id="expected" alt="">
+<p class="output expectedtext">Expected output:<p><img src="2d.canvas.host.scaled.png" class="output expected" id="expected" alt="">
 <ul id="d"></ul>
 <script>
 var t = async_test("CSS-scaled canvases get drawn correctly");
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/2d.scaled.png b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.scaled.png
similarity index 100%
rename from tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/2d.scaled.png
rename to tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.scaled.png
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.decimal.html b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.parse.decimal.html
similarity index 80%
rename from tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.decimal.html
rename to tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.parse.decimal.html
index 613cf0e11a5..0de11e235dc 100644
--- a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.decimal.html
+++ b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.parse.decimal.html
@@ -1,19 +1,19 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>Canvas test: size.attributes.parse.decimal</title>
+<title>Canvas test: 2d.canvas.host.size.attributes.parse.decimal</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 <link rel="stylesheet" href="/html/canvas/resources/canvas-tests.css">
 <body class="show_output">
 
-<h1>size.attributes.parse.decimal</h1>
+<h1>2d.canvas.host.size.attributes.parse.decimal</h1>
 <p class="desc">Parsing of non-negative integers</p>
 
 
 <p class="output">Actual output:</p>
 <canvas id="c" class="output" width="100.999" height="100.999"><p class="fallback">FAIL (fallback content)</p></canvas>
-<p class="output expectedtext">Expected output:<p><img src="size.attributes.parse.decimal.png" class="output expected" id="expected" alt="">
+<p class="output expectedtext">Expected output:<p><img src="2d.canvas.host.size.attributes.parse.decimal.png" class="output expected" id="expected" alt="">
 <ul id="d"></ul>
 <script>
 var t = async_test("Parsing of non-negative integers");
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.decimal.png b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.parse.decimal.png
similarity index 100%
rename from tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.decimal.png
rename to tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.parse.decimal.png
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.em.html b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.parse.em.html
similarity index 81%
rename from tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.em.html
rename to tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.parse.em.html
index 21d9e6ab1e8..315c8323fa2 100644
--- a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.em.html
+++ b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.parse.em.html
@@ -1,19 +1,19 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>Canvas test: size.attributes.parse.em</title>
+<title>Canvas test: 2d.canvas.host.size.attributes.parse.em</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 <link rel="stylesheet" href="/html/canvas/resources/canvas-tests.css">
 <body class="show_output">
 
-<h1>size.attributes.parse.em</h1>
+<h1>2d.canvas.host.size.attributes.parse.em</h1>
 <p class="desc">Parsing of non-negative integers</p>
 
 
 <p class="output">Actual output:</p>
 <canvas id="c" class="output" width="100em" height="100em"><p class="fallback">FAIL (fallback content)</p></canvas>
-<p class="output expectedtext">Expected output:<p><img src="size.attributes.parse.em.png" class="output expected" id="expected" alt="">
+<p class="output expectedtext">Expected output:<p><img src="2d.canvas.host.size.attributes.parse.em.png" class="output expected" id="expected" alt="">
 <ul id="d"></ul>
 <script>
 var t = async_test("Parsing of non-negative integers");
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.em.png b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.parse.em.png
similarity index 100%
rename from tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.em.png
rename to tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.parse.em.png
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.empty.html b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.parse.empty.html
similarity index 78%
rename from tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.empty.html
rename to tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.parse.empty.html
index 7198ccd3abf..b9568712e71 100644
--- a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.empty.html
+++ b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.parse.empty.html
@@ -1,19 +1,19 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>Canvas test: size.attributes.parse.empty</title>
+<title>Canvas test: 2d.canvas.host.size.attributes.parse.empty</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 <link rel="stylesheet" href="/html/canvas/resources/canvas-tests.css">
 <body class="show_output">
 
-<h1>size.attributes.parse.empty</h1>
+<h1>2d.canvas.host.size.attributes.parse.empty</h1>
 <p class="desc">Parsing of non-negative integers</p>
 
 
 <p class="output">Actual output:</p>
 <canvas id="c" class="output" width="" height=""><p class="fallback">FAIL (fallback content)</p></canvas>
-<p class="output expectedtext">Expected output:<p><img src="size.attributes.parse.empty.png" class="output expected" id="expected" alt="">
+<p class="output expectedtext">Expected output:<p><img src="2d.canvas.host.size.attributes.parse.empty.png" class="output expected" id="expected" alt="">
 <ul id="d"></ul>
 <script>
 var t = async_test("Parsing of non-negative integers");
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.empty.png b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.parse.empty.png
similarity index 100%
rename from tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.empty.png
rename to tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.parse.empty.png
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.exp.html b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.parse.exp.html
similarity index 81%
rename from tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.exp.html
rename to tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.parse.exp.html
index c609939640b..208ddeceeb0 100644
--- a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.exp.html
+++ b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.parse.exp.html
@@ -1,19 +1,19 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>Canvas test: size.attributes.parse.exp</title>
+<title>Canvas test: 2d.canvas.host.size.attributes.parse.exp</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 <link rel="stylesheet" href="/html/canvas/resources/canvas-tests.css">
 <body class="show_output">
 
-<h1>size.attributes.parse.exp</h1>
+<h1>2d.canvas.host.size.attributes.parse.exp</h1>
 <p class="desc">Parsing of non-negative integers</p>
 
 
 <p class="output">Actual output:</p>
 <canvas id="c" class="output" width="100e1" height="100e1"><p class="fallback">FAIL (fallback content)</p></canvas>
-<p class="output expectedtext">Expected output:<p><img src="size.attributes.parse.exp.png" class="output expected" id="expected" alt="">
+<p class="output expectedtext">Expected output:<p><img src="2d.canvas.host.size.attributes.parse.exp.png" class="output expected" id="expected" alt="">
 <ul id="d"></ul>
 <script>
 var t = async_test("Parsing of non-negative integers");
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.exp.png b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.parse.exp.png
similarity index 100%
rename from tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.exp.png
rename to tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.parse.exp.png
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.hex.html b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.parse.hex.html
similarity index 90%
rename from tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.hex.html
rename to tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.parse.hex.html
index a00bb3c4ea2..05f7030d47f 100644
--- a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.hex.html
+++ b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.parse.hex.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>Canvas test: size.attributes.parse.hex</title>
+<title>Canvas test: 2d.canvas.host.size.attributes.parse.hex</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 <link rel="stylesheet" href="/html/canvas/resources/canvas-tests.css">
 <body class="show_output">
 
-<h1>size.attributes.parse.hex</h1>
+<h1>2d.canvas.host.size.attributes.parse.hex</h1>
 <p class="desc">Parsing of non-negative integers</p>
 
 
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.junk.html b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.parse.junk.html
similarity index 78%
rename from tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.junk.html
rename to tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.parse.junk.html
index 7b4f837600d..3a55fd13dd0 100644
--- a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.junk.html
+++ b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.parse.junk.html
@@ -1,19 +1,19 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>Canvas test: size.attributes.parse.junk</title>
+<title>Canvas test: 2d.canvas.host.size.attributes.parse.junk</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 <link rel="stylesheet" href="/html/canvas/resources/canvas-tests.css">
 <body class="show_output">
 
-<h1>size.attributes.parse.junk</h1>
+<h1>2d.canvas.host.size.attributes.parse.junk</h1>
 <p class="desc">Parsing of non-negative integers</p>
 
 
 <p class="output">Actual output:</p>
 <canvas id="c" class="output" width="#!?" height="#!?"><p class="fallback">FAIL (fallback content)</p></canvas>
-<p class="output expectedtext">Expected output:<p><img src="size.attributes.parse.junk.png" class="output expected" id="expected" alt="">
+<p class="output expectedtext">Expected output:<p><img src="2d.canvas.host.size.attributes.parse.junk.png" class="output expected" id="expected" alt="">
 <ul id="d"></ul>
 <script>
 var t = async_test("Parsing of non-negative integers");
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.junk.png b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.parse.junk.png
similarity index 100%
rename from tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.junk.png
rename to tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.parse.junk.png
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.minus.html b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.parse.minus.html
similarity index 78%
rename from tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.minus.html
rename to tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.parse.minus.html
index 6d6560b8db9..da5f21ad045 100644
--- a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.minus.html
+++ b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.parse.minus.html
@@ -1,19 +1,19 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>Canvas test: size.attributes.parse.minus</title>
+<title>Canvas test: 2d.canvas.host.size.attributes.parse.minus</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 <link rel="stylesheet" href="/html/canvas/resources/canvas-tests.css">
 <body class="show_output">
 
-<h1>size.attributes.parse.minus</h1>
+<h1>2d.canvas.host.size.attributes.parse.minus</h1>
 <p class="desc">Parsing of non-negative integers</p>
 
 
 <p class="output">Actual output:</p>
 <canvas id="c" class="output" width="-100" height="-100"><p class="fallback">FAIL (fallback content)</p></canvas>
-<p class="output expectedtext">Expected output:<p><img src="size.attributes.parse.minus.png" class="output expected" id="expected" alt="">
+<p class="output expectedtext">Expected output:<p><img src="2d.canvas.host.size.attributes.parse.minus.png" class="output expected" id="expected" alt="">
 <ul id="d"></ul>
 <script>
 var t = async_test("Parsing of non-negative integers");
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.minus.png b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.parse.minus.png
similarity index 100%
rename from tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.minus.png
rename to tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.parse.minus.png
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.octal.html b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.parse.octal.html
similarity index 81%
rename from tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.octal.html
rename to tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.parse.octal.html
index e1f42ea1886..ccc7efaafa9 100644
--- a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.octal.html
+++ b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.parse.octal.html
@@ -1,19 +1,19 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>Canvas test: size.attributes.parse.octal</title>
+<title>Canvas test: 2d.canvas.host.size.attributes.parse.octal</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 <link rel="stylesheet" href="/html/canvas/resources/canvas-tests.css">
 <body class="show_output">
 
-<h1>size.attributes.parse.octal</h1>
+<h1>2d.canvas.host.size.attributes.parse.octal</h1>
 <p class="desc">Parsing of non-negative integers</p>
 
 
 <p class="output">Actual output:</p>
 <canvas id="c" class="output" width="0100" height="0100"><p class="fallback">FAIL (fallback content)</p></canvas>
-<p class="output expectedtext">Expected output:<p><img src="size.attributes.parse.octal.png" class="output expected" id="expected" alt="">
+<p class="output expectedtext">Expected output:<p><img src="2d.canvas.host.size.attributes.parse.octal.png" class="output expected" id="expected" alt="">
 <ul id="d"></ul>
 <script>
 var t = async_test("Parsing of non-negative integers");
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.octal.png b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.parse.octal.png
similarity index 100%
rename from tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.octal.png
rename to tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.parse.octal.png
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.onlyspace.html b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.parse.onlyspace.html
similarity index 77%
rename from tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.onlyspace.html
rename to tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.parse.onlyspace.html
index 20721dcc6fa..da14fa25c0f 100644
--- a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.onlyspace.html
+++ b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.parse.onlyspace.html
@@ -1,19 +1,19 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>Canvas test: size.attributes.parse.onlyspace</title>
+<title>Canvas test: 2d.canvas.host.size.attributes.parse.onlyspace</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 <link rel="stylesheet" href="/html/canvas/resources/canvas-tests.css">
 <body class="show_output">
 
-<h1>size.attributes.parse.onlyspace</h1>
+<h1>2d.canvas.host.size.attributes.parse.onlyspace</h1>
 <p class="desc">Parsing of non-negative integers</p>
 
 
 <p class="output">Actual output:</p>
 <canvas id="c" class="output" width="  " height="  "><p class="fallback">FAIL (fallback content)</p></canvas>
-<p class="output expectedtext">Expected output:<p><img src="size.attributes.parse.onlyspace.png" class="output expected" id="expected" alt="">
+<p class="output expectedtext">Expected output:<p><img src="2d.canvas.host.size.attributes.parse.onlyspace.png" class="output expected" id="expected" alt="">
 <ul id="d"></ul>
 <script>
 var t = async_test("Parsing of non-negative integers");
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.onlyspace.png b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.parse.onlyspace.png
similarity index 100%
rename from tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.onlyspace.png
rename to tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.parse.onlyspace.png
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.percent.html b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.parse.percent.html
similarity index 80%
rename from tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.percent.html
rename to tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.parse.percent.html
index 860703c6c2e..d699288f73f 100644
--- a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.percent.html
+++ b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.parse.percent.html
@@ -1,19 +1,19 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>Canvas test: size.attributes.parse.percent</title>
+<title>Canvas test: 2d.canvas.host.size.attributes.parse.percent</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 <link rel="stylesheet" href="/html/canvas/resources/canvas-tests.css">
 <body class="show_output">
 
-<h1>size.attributes.parse.percent</h1>
+<h1>2d.canvas.host.size.attributes.parse.percent</h1>
 <p class="desc">Parsing of non-negative integers</p>
 
 
 <p class="output">Actual output:</p>
 <canvas id="c" class="output" width="100%" height="100%"><p class="fallback">FAIL (fallback content)</p></canvas>
-<p class="output expectedtext">Expected output:<p><img src="size.attributes.parse.percent.png" class="output expected" id="expected" alt="">
+<p class="output expectedtext">Expected output:<p><img src="2d.canvas.host.size.attributes.parse.percent.png" class="output expected" id="expected" alt="">
 <ul id="d"></ul>
 <script>
 var t = async_test("Parsing of non-negative integers");
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.percent.png b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.parse.percent.png
similarity index 100%
rename from tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.percent.png
rename to tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.parse.percent.png
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.plus.html b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.parse.plus.html
similarity index 81%
rename from tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.plus.html
rename to tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.parse.plus.html
index 2b600941a8d..58fb07f1794 100644
--- a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.plus.html
+++ b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.parse.plus.html
@@ -1,19 +1,19 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>Canvas test: size.attributes.parse.plus</title>
+<title>Canvas test: 2d.canvas.host.size.attributes.parse.plus</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 <link rel="stylesheet" href="/html/canvas/resources/canvas-tests.css">
 <body class="show_output">
 
-<h1>size.attributes.parse.plus</h1>
+<h1>2d.canvas.host.size.attributes.parse.plus</h1>
 <p class="desc">Parsing of non-negative integers</p>
 
 
 <p class="output">Actual output:</p>
 <canvas id="c" class="output" width="+100" height="+100"><p class="fallback">FAIL (fallback content)</p></canvas>
-<p class="output expectedtext">Expected output:<p><img src="size.attributes.parse.plus.png" class="output expected" id="expected" alt="">
+<p class="output expectedtext">Expected output:<p><img src="2d.canvas.host.size.attributes.parse.plus.png" class="output expected" id="expected" alt="">
 <ul id="d"></ul>
 <script>
 var t = async_test("Parsing of non-negative integers");
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.plus.png b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.parse.plus.png
similarity index 100%
rename from tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.plus.png
rename to tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.parse.plus.png
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.space.html b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.parse.space.html
similarity index 81%
rename from tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.space.html
rename to tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.parse.space.html
index 34cae4d4c90..52fadaad431 100644
--- a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.space.html
+++ b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.parse.space.html
@@ -1,19 +1,19 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>Canvas test: size.attributes.parse.space</title>
+<title>Canvas test: 2d.canvas.host.size.attributes.parse.space</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 <link rel="stylesheet" href="/html/canvas/resources/canvas-tests.css">
 <body class="show_output">
 
-<h1>size.attributes.parse.space</h1>
+<h1>2d.canvas.host.size.attributes.parse.space</h1>
 <p class="desc">Parsing of non-negative integers</p>
 
 
 <p class="output">Actual output:</p>
 <canvas id="c" class="output" width="  100" height="  100"><p class="fallback">FAIL (fallback content)</p></canvas>
-<p class="output expectedtext">Expected output:<p><img src="size.attributes.parse.space.png" class="output expected" id="expected" alt="">
+<p class="output expectedtext">Expected output:<p><img src="2d.canvas.host.size.attributes.parse.space.png" class="output expected" id="expected" alt="">
 <ul id="d"></ul>
 <script>
 var t = async_test("Parsing of non-negative integers");
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.space.png b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.parse.space.png
similarity index 100%
rename from tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.space.png
rename to tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.parse.space.png
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.trailingjunk.html b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.parse.trailingjunk.html
similarity index 80%
rename from tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.trailingjunk.html
rename to tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.parse.trailingjunk.html
index e2b92ee0aae..b18167c5991 100644
--- a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.trailingjunk.html
+++ b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.parse.trailingjunk.html
@@ -1,19 +1,19 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>Canvas test: size.attributes.parse.trailingjunk</title>
+<title>Canvas test: 2d.canvas.host.size.attributes.parse.trailingjunk</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 <link rel="stylesheet" href="/html/canvas/resources/canvas-tests.css">
 <body class="show_output">
 
-<h1>size.attributes.parse.trailingjunk</h1>
+<h1>2d.canvas.host.size.attributes.parse.trailingjunk</h1>
 <p class="desc">Parsing of non-negative integers</p>
 
 
 <p class="output">Actual output:</p>
 <canvas id="c" class="output" width="100#!?" height="100#!?"><p class="fallback">FAIL (fallback content)</p></canvas>
-<p class="output expectedtext">Expected output:<p><img src="size.attributes.parse.trailingjunk.png" class="output expected" id="expected" alt="">
+<p class="output expectedtext">Expected output:<p><img src="2d.canvas.host.size.attributes.parse.trailingjunk.png" class="output expected" id="expected" alt="">
 <ul id="d"></ul>
 <script>
 var t = async_test("Parsing of non-negative integers");
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.trailingjunk.png b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.parse.trailingjunk.png
similarity index 100%
rename from tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.trailingjunk.png
rename to tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.parse.trailingjunk.png
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.whitespace.html b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.parse.whitespace.html
similarity index 80%
rename from tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.whitespace.html
rename to tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.parse.whitespace.html
index c7a76f967e2..79e81c1020a 100644
--- a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.whitespace.html
+++ b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.parse.whitespace.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>Canvas test: size.attributes.parse.whitespace</title>
+<title>Canvas test: 2d.canvas.host.size.attributes.parse.whitespace</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 <link rel="stylesheet" href="/html/canvas/resources/canvas-tests.css">
 <body class="show_output">
 
-<h1>size.attributes.parse.whitespace</h1>
+<h1>2d.canvas.host.size.attributes.parse.whitespace</h1>
 <p class="desc">Parsing of non-negative integers</p>
 
 
@@ -15,7 +15,7 @@
 <canvas id="c" class="output" width="&#xD;
 	100" height="&#xD;
 	100"><p class="fallback">FAIL (fallback content)</p></canvas>
-<p class="output expectedtext">Expected output:<p><img src="size.attributes.parse.whitespace.png" class="output expected" id="expected" alt="">
+<p class="output expectedtext">Expected output:<p><img src="2d.canvas.host.size.attributes.parse.whitespace.png" class="output expected" id="expected" alt="">
 <ul id="d"></ul>
 <script>
 var t = async_test("Parsing of non-negative integers");
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.whitespace.png b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.parse.whitespace.png
similarity index 100%
rename from tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.whitespace.png
rename to tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.parse.whitespace.png
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.zero.html b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.parse.zero.html
similarity index 90%
rename from tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.zero.html
rename to tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.parse.zero.html
index 0f7a0415a17..b7fd499d1fb 100644
--- a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.parse.zero.html
+++ b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.parse.zero.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>Canvas test: size.attributes.parse.zero</title>
+<title>Canvas test: 2d.canvas.host.size.attributes.parse.zero</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 <link rel="stylesheet" href="/html/canvas/resources/canvas-tests.css">
 <body class="show_output">
 
-<h1>size.attributes.parse.zero</h1>
+<h1>2d.canvas.host.size.attributes.parse.zero</h1>
 <p class="desc">Parsing of non-negative integers</p>
 
 
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.decimal.html b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.setAttribute.decimal.html
similarity index 81%
rename from tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.decimal.html
rename to tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.setAttribute.decimal.html
index 9f0b4b1deb0..b6c2130bf0a 100644
--- a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.decimal.html
+++ b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.setAttribute.decimal.html
@@ -1,19 +1,19 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>Canvas test: size.attributes.setAttribute.decimal</title>
+<title>Canvas test: 2d.canvas.host.size.attributes.setAttribute.decimal</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 <link rel="stylesheet" href="/html/canvas/resources/canvas-tests.css">
 <body class="show_output">
 
-<h1>size.attributes.setAttribute.decimal</h1>
+<h1>2d.canvas.host.size.attributes.setAttribute.decimal</h1>
 <p class="desc">Parsing of non-negative integers in setAttribute</p>
 
 
 <p class="output">Actual output:</p>
 <canvas id="c" class="output" width="50" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<p class="output expectedtext">Expected output:<p><img src="size.attributes.setAttribute.decimal.png" class="output expected" id="expected" alt="">
+<p class="output expectedtext">Expected output:<p><img src="2d.canvas.host.size.attributes.setAttribute.decimal.png" class="output expected" id="expected" alt="">
 <ul id="d"></ul>
 <script>
 var t = async_test("Parsing of non-negative integers in setAttribute");
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.decimal.png b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.setAttribute.decimal.png
similarity index 100%
rename from tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.decimal.png
rename to tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.setAttribute.decimal.png
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.em.html b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.setAttribute.em.html
similarity index 81%
rename from tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.em.html
rename to tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.setAttribute.em.html
index df0eee7462e..f70713fd8f6 100644
--- a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.em.html
+++ b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.setAttribute.em.html
@@ -1,19 +1,19 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>Canvas test: size.attributes.setAttribute.em</title>
+<title>Canvas test: 2d.canvas.host.size.attributes.setAttribute.em</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 <link rel="stylesheet" href="/html/canvas/resources/canvas-tests.css">
 <body class="show_output">
 
-<h1>size.attributes.setAttribute.em</h1>
+<h1>2d.canvas.host.size.attributes.setAttribute.em</h1>
 <p class="desc">Parsing of non-negative integers in setAttribute</p>
 
 
 <p class="output">Actual output:</p>
 <canvas id="c" class="output" width="50" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<p class="output expectedtext">Expected output:<p><img src="size.attributes.setAttribute.em.png" class="output expected" id="expected" alt="">
+<p class="output expectedtext">Expected output:<p><img src="2d.canvas.host.size.attributes.setAttribute.em.png" class="output expected" id="expected" alt="">
 <ul id="d"></ul>
 <script>
 var t = async_test("Parsing of non-negative integers in setAttribute");
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.em.png b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.setAttribute.em.png
similarity index 100%
rename from tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.em.png
rename to tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.setAttribute.em.png
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.empty.html b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.setAttribute.empty.html
similarity index 78%
rename from tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.empty.html
rename to tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.setAttribute.empty.html
index 37e021424a0..fab2394fec2 100644
--- a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.empty.html
+++ b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.setAttribute.empty.html
@@ -1,19 +1,19 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>Canvas test: size.attributes.setAttribute.empty</title>
+<title>Canvas test: 2d.canvas.host.size.attributes.setAttribute.empty</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 <link rel="stylesheet" href="/html/canvas/resources/canvas-tests.css">
 <body class="show_output">
 
-<h1>size.attributes.setAttribute.empty</h1>
+<h1>2d.canvas.host.size.attributes.setAttribute.empty</h1>
 <p class="desc">Parsing of non-negative integers in setAttribute</p>
 
 
 <p class="output">Actual output:</p>
 <canvas id="c" class="output" width="50" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<p class="output expectedtext">Expected output:<p><img src="size.attributes.setAttribute.empty.png" class="output expected" id="expected" alt="">
+<p class="output expectedtext">Expected output:<p><img src="2d.canvas.host.size.attributes.setAttribute.empty.png" class="output expected" id="expected" alt="">
 <ul id="d"></ul>
 <script>
 var t = async_test("Parsing of non-negative integers in setAttribute");
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.empty.png b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.setAttribute.empty.png
similarity index 100%
rename from tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.empty.png
rename to tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.setAttribute.empty.png
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.exp.html b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.setAttribute.exp.html
similarity index 81%
rename from tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.exp.html
rename to tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.setAttribute.exp.html
index 943b98b9c3b..cfa11eb302f 100644
--- a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.exp.html
+++ b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.setAttribute.exp.html
@@ -1,19 +1,19 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>Canvas test: size.attributes.setAttribute.exp</title>
+<title>Canvas test: 2d.canvas.host.size.attributes.setAttribute.exp</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 <link rel="stylesheet" href="/html/canvas/resources/canvas-tests.css">
 <body class="show_output">
 
-<h1>size.attributes.setAttribute.exp</h1>
+<h1>2d.canvas.host.size.attributes.setAttribute.exp</h1>
 <p class="desc">Parsing of non-negative integers in setAttribute</p>
 
 
 <p class="output">Actual output:</p>
 <canvas id="c" class="output" width="50" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<p class="output expectedtext">Expected output:<p><img src="size.attributes.setAttribute.exp.png" class="output expected" id="expected" alt="">
+<p class="output expectedtext">Expected output:<p><img src="2d.canvas.host.size.attributes.setAttribute.exp.png" class="output expected" id="expected" alt="">
 <ul id="d"></ul>
 <script>
 var t = async_test("Parsing of non-negative integers in setAttribute");
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.exp.png b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.setAttribute.exp.png
similarity index 100%
rename from tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.exp.png
rename to tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.setAttribute.exp.png
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.hex.html b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.setAttribute.hex.html
similarity index 90%
rename from tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.hex.html
rename to tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.setAttribute.hex.html
index a73ff5ec042..80a1fbda602 100644
--- a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.hex.html
+++ b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.setAttribute.hex.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>Canvas test: size.attributes.setAttribute.hex</title>
+<title>Canvas test: 2d.canvas.host.size.attributes.setAttribute.hex</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 <link rel="stylesheet" href="/html/canvas/resources/canvas-tests.css">
 <body class="show_output">
 
-<h1>size.attributes.setAttribute.hex</h1>
+<h1>2d.canvas.host.size.attributes.setAttribute.hex</h1>
 <p class="desc">Parsing of non-negative integers in setAttribute</p>
 
 
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.junk.html b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.setAttribute.junk.html
similarity index 79%
rename from tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.junk.html
rename to tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.setAttribute.junk.html
index 607892d3f08..b583871f38a 100644
--- a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.junk.html
+++ b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.setAttribute.junk.html
@@ -1,19 +1,19 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>Canvas test: size.attributes.setAttribute.junk</title>
+<title>Canvas test: 2d.canvas.host.size.attributes.setAttribute.junk</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 <link rel="stylesheet" href="/html/canvas/resources/canvas-tests.css">
 <body class="show_output">
 
-<h1>size.attributes.setAttribute.junk</h1>
+<h1>2d.canvas.host.size.attributes.setAttribute.junk</h1>
 <p class="desc">Parsing of non-negative integers in setAttribute</p>
 
 
 <p class="output">Actual output:</p>
 <canvas id="c" class="output" width="50" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<p class="output expectedtext">Expected output:<p><img src="size.attributes.setAttribute.junk.png" class="output expected" id="expected" alt="">
+<p class="output expectedtext">Expected output:<p><img src="2d.canvas.host.size.attributes.setAttribute.junk.png" class="output expected" id="expected" alt="">
 <ul id="d"></ul>
 <script>
 var t = async_test("Parsing of non-negative integers in setAttribute");
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.junk.png b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.setAttribute.junk.png
similarity index 100%
rename from tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.junk.png
rename to tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.setAttribute.junk.png
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.minus.html b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.setAttribute.minus.html
similarity index 79%
rename from tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.minus.html
rename to tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.setAttribute.minus.html
index 4fd49e5eccf..90a31403e10 100644
--- a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.minus.html
+++ b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.setAttribute.minus.html
@@ -1,19 +1,19 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>Canvas test: size.attributes.setAttribute.minus</title>
+<title>Canvas test: 2d.canvas.host.size.attributes.setAttribute.minus</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 <link rel="stylesheet" href="/html/canvas/resources/canvas-tests.css">
 <body class="show_output">
 
-<h1>size.attributes.setAttribute.minus</h1>
+<h1>2d.canvas.host.size.attributes.setAttribute.minus</h1>
 <p class="desc">Parsing of non-negative integers in setAttribute</p>
 
 
 <p class="output">Actual output:</p>
 <canvas id="c" class="output" width="50" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<p class="output expectedtext">Expected output:<p><img src="size.attributes.setAttribute.minus.png" class="output expected" id="expected" alt="">
+<p class="output expectedtext">Expected output:<p><img src="2d.canvas.host.size.attributes.setAttribute.minus.png" class="output expected" id="expected" alt="">
 <ul id="d"></ul>
 <script>
 var t = async_test("Parsing of non-negative integers in setAttribute");
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.minus.png b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.setAttribute.minus.png
similarity index 100%
rename from tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.minus.png
rename to tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.setAttribute.minus.png
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.octal.html b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.setAttribute.octal.html
similarity index 81%
rename from tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.octal.html
rename to tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.setAttribute.octal.html
index d841413d3fe..c5b263bd5fa 100644
--- a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.octal.html
+++ b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.setAttribute.octal.html
@@ -1,19 +1,19 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>Canvas test: size.attributes.setAttribute.octal</title>
+<title>Canvas test: 2d.canvas.host.size.attributes.setAttribute.octal</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 <link rel="stylesheet" href="/html/canvas/resources/canvas-tests.css">
 <body class="show_output">
 
-<h1>size.attributes.setAttribute.octal</h1>
+<h1>2d.canvas.host.size.attributes.setAttribute.octal</h1>
 <p class="desc">Parsing of non-negative integers in setAttribute</p>
 
 
 <p class="output">Actual output:</p>
 <canvas id="c" class="output" width="50" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<p class="output expectedtext">Expected output:<p><img src="size.attributes.setAttribute.octal.png" class="output expected" id="expected" alt="">
+<p class="output expectedtext">Expected output:<p><img src="2d.canvas.host.size.attributes.setAttribute.octal.png" class="output expected" id="expected" alt="">
 <ul id="d"></ul>
 <script>
 var t = async_test("Parsing of non-negative integers in setAttribute");
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.octal.png b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.setAttribute.octal.png
similarity index 100%
rename from tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.octal.png
rename to tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.setAttribute.octal.png
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.onlyspace.html b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.setAttribute.onlyspace.html
similarity index 78%
rename from tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.onlyspace.html
rename to tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.setAttribute.onlyspace.html
index 7959c303d48..ac4cdb001b9 100644
--- a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.onlyspace.html
+++ b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.setAttribute.onlyspace.html
@@ -1,19 +1,19 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>Canvas test: size.attributes.setAttribute.onlyspace</title>
+<title>Canvas test: 2d.canvas.host.size.attributes.setAttribute.onlyspace</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 <link rel="stylesheet" href="/html/canvas/resources/canvas-tests.css">
 <body class="show_output">
 
-<h1>size.attributes.setAttribute.onlyspace</h1>
+<h1>2d.canvas.host.size.attributes.setAttribute.onlyspace</h1>
 <p class="desc">Parsing of non-negative integers in setAttribute</p>
 
 
 <p class="output">Actual output:</p>
 <canvas id="c" class="output" width="50" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<p class="output expectedtext">Expected output:<p><img src="size.attributes.setAttribute.onlyspace.png" class="output expected" id="expected" alt="">
+<p class="output expectedtext">Expected output:<p><img src="2d.canvas.host.size.attributes.setAttribute.onlyspace.png" class="output expected" id="expected" alt="">
 <ul id="d"></ul>
 <script>
 var t = async_test("Parsing of non-negative integers in setAttribute");
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.onlyspace.png b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.setAttribute.onlyspace.png
similarity index 100%
rename from tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.onlyspace.png
rename to tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.setAttribute.onlyspace.png
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.percent.html b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.setAttribute.percent.html
similarity index 80%
rename from tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.percent.html
rename to tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.setAttribute.percent.html
index 6fed0cdae5a..5aebf5a0b11 100644
--- a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.percent.html
+++ b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.setAttribute.percent.html
@@ -1,19 +1,19 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>Canvas test: size.attributes.setAttribute.percent</title>
+<title>Canvas test: 2d.canvas.host.size.attributes.setAttribute.percent</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 <link rel="stylesheet" href="/html/canvas/resources/canvas-tests.css">
 <body class="show_output">
 
-<h1>size.attributes.setAttribute.percent</h1>
+<h1>2d.canvas.host.size.attributes.setAttribute.percent</h1>
 <p class="desc">Parsing of non-negative integers in setAttribute</p>
 
 
 <p class="output">Actual output:</p>
 <canvas id="c" class="output" width="50" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<p class="output expectedtext">Expected output:<p><img src="size.attributes.setAttribute.percent.png" class="output expected" id="expected" alt="">
+<p class="output expectedtext">Expected output:<p><img src="2d.canvas.host.size.attributes.setAttribute.percent.png" class="output expected" id="expected" alt="">
 <ul id="d"></ul>
 <script>
 var t = async_test("Parsing of non-negative integers in setAttribute");
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.percent.png b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.setAttribute.percent.png
similarity index 100%
rename from tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.percent.png
rename to tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.setAttribute.percent.png
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.plus.html b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.setAttribute.plus.html
similarity index 81%
rename from tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.plus.html
rename to tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.setAttribute.plus.html
index 4be39bf19bd..60da44daf32 100644
--- a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.plus.html
+++ b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.setAttribute.plus.html
@@ -1,19 +1,19 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>Canvas test: size.attributes.setAttribute.plus</title>
+<title>Canvas test: 2d.canvas.host.size.attributes.setAttribute.plus</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 <link rel="stylesheet" href="/html/canvas/resources/canvas-tests.css">
 <body class="show_output">
 
-<h1>size.attributes.setAttribute.plus</h1>
+<h1>2d.canvas.host.size.attributes.setAttribute.plus</h1>
 <p class="desc">Parsing of non-negative integers in setAttribute</p>
 
 
 <p class="output">Actual output:</p>
 <canvas id="c" class="output" width="50" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<p class="output expectedtext">Expected output:<p><img src="size.attributes.setAttribute.plus.png" class="output expected" id="expected" alt="">
+<p class="output expectedtext">Expected output:<p><img src="2d.canvas.host.size.attributes.setAttribute.plus.png" class="output expected" id="expected" alt="">
 <ul id="d"></ul>
 <script>
 var t = async_test("Parsing of non-negative integers in setAttribute");
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.plus.png b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.setAttribute.plus.png
similarity index 100%
rename from tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.plus.png
rename to tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.setAttribute.plus.png
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.space.html b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.setAttribute.space.html
similarity index 81%
rename from tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.space.html
rename to tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.setAttribute.space.html
index 3cc00788ef7..fbfd4c33c04 100644
--- a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.space.html
+++ b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.setAttribute.space.html
@@ -1,19 +1,19 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>Canvas test: size.attributes.setAttribute.space</title>
+<title>Canvas test: 2d.canvas.host.size.attributes.setAttribute.space</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 <link rel="stylesheet" href="/html/canvas/resources/canvas-tests.css">
 <body class="show_output">
 
-<h1>size.attributes.setAttribute.space</h1>
+<h1>2d.canvas.host.size.attributes.setAttribute.space</h1>
 <p class="desc">Parsing of non-negative integers in setAttribute</p>
 
 
 <p class="output">Actual output:</p>
 <canvas id="c" class="output" width="50" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<p class="output expectedtext">Expected output:<p><img src="size.attributes.setAttribute.space.png" class="output expected" id="expected" alt="">
+<p class="output expectedtext">Expected output:<p><img src="2d.canvas.host.size.attributes.setAttribute.space.png" class="output expected" id="expected" alt="">
 <ul id="d"></ul>
 <script>
 var t = async_test("Parsing of non-negative integers in setAttribute");
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.space.png b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.setAttribute.space.png
similarity index 100%
rename from tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.space.png
rename to tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.setAttribute.space.png
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.trailingjunk.html b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.setAttribute.trailingjunk.html
similarity index 80%
rename from tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.trailingjunk.html
rename to tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.setAttribute.trailingjunk.html
index 4c9b7ce54a2..1d230bd654b 100644
--- a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.trailingjunk.html
+++ b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.setAttribute.trailingjunk.html
@@ -1,19 +1,19 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>Canvas test: size.attributes.setAttribute.trailingjunk</title>
+<title>Canvas test: 2d.canvas.host.size.attributes.setAttribute.trailingjunk</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 <link rel="stylesheet" href="/html/canvas/resources/canvas-tests.css">
 <body class="show_output">
 
-<h1>size.attributes.setAttribute.trailingjunk</h1>
+<h1>2d.canvas.host.size.attributes.setAttribute.trailingjunk</h1>
 <p class="desc">Parsing of non-negative integers in setAttribute</p>
 
 
 <p class="output">Actual output:</p>
 <canvas id="c" class="output" width="50" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<p class="output expectedtext">Expected output:<p><img src="size.attributes.setAttribute.trailingjunk.png" class="output expected" id="expected" alt="">
+<p class="output expectedtext">Expected output:<p><img src="2d.canvas.host.size.attributes.setAttribute.trailingjunk.png" class="output expected" id="expected" alt="">
 <ul id="d"></ul>
 <script>
 var t = async_test("Parsing of non-negative integers in setAttribute");
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.trailingjunk.png b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.setAttribute.trailingjunk.png
similarity index 100%
rename from tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.trailingjunk.png
rename to tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.setAttribute.trailingjunk.png
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.whitespace.html b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.setAttribute.whitespace.html
similarity index 81%
rename from tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.whitespace.html
rename to tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.setAttribute.whitespace.html
index 8f6ecc95b4a..1aa86d6a9eb 100644
--- a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.whitespace.html
+++ b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.setAttribute.whitespace.html
@@ -1,19 +1,19 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>Canvas test: size.attributes.setAttribute.whitespace</title>
+<title>Canvas test: 2d.canvas.host.size.attributes.setAttribute.whitespace</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 <link rel="stylesheet" href="/html/canvas/resources/canvas-tests.css">
 <body class="show_output">
 
-<h1>size.attributes.setAttribute.whitespace</h1>
+<h1>2d.canvas.host.size.attributes.setAttribute.whitespace</h1>
 <p class="desc">Parsing of non-negative integers in setAttribute</p>
 
 
 <p class="output">Actual output:</p>
 <canvas id="c" class="output" width="50" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<p class="output expectedtext">Expected output:<p><img src="size.attributes.setAttribute.whitespace.png" class="output expected" id="expected" alt="">
+<p class="output expectedtext">Expected output:<p><img src="2d.canvas.host.size.attributes.setAttribute.whitespace.png" class="output expected" id="expected" alt="">
 <ul id="d"></ul>
 <script>
 var t = async_test("Parsing of non-negative integers in setAttribute");
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.whitespace.png b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.setAttribute.whitespace.png
similarity index 100%
rename from tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.whitespace.png
rename to tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.setAttribute.whitespace.png
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.zero.html b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.setAttribute.zero.html
similarity index 90%
rename from tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.zero.html
rename to tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.setAttribute.zero.html
index 2bbad823537..64b4811d79a 100644
--- a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.setAttribute.zero.html
+++ b/tests/wpt/tests/html/canvas/element/canvas-host/2d.canvas.host.size.attributes.setAttribute.zero.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>Canvas test: size.attributes.setAttribute.zero</title>
+<title>Canvas test: 2d.canvas.host.size.attributes.setAttribute.zero</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 <link rel="stylesheet" href="/html/canvas/resources/canvas-tests.css">
 <body class="show_output">
 
-<h1>size.attributes.setAttribute.zero</h1>
+<h1>2d.canvas.host.size.attributes.setAttribute.zero</h1>
 <p class="desc">Parsing of non-negative integers in setAttribute</p>
 
 
diff --git a/tests/wpt/tests/html/canvas/element/layers/2d.layer.blur-from-outside-canvas.no-clipping-expected.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.blur-from-outside-canvas.no-clipping-expected.html
new file mode 100644
index 00000000000..6cad180f148
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/layers/2d.layer.blur-from-outside-canvas.no-clipping-expected.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.layer.blur-from-outside-canvas.no-clipping</title>
+<h1>2d.layer.blur-from-outside-canvas.no-clipping</h1>
+<p class="desc">Checks blur leaking inside from drawing outside the canvas</p>
+<canvas id="canvas" width="200" height="200">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
+<script>
+  const canvas = document.getElementById("canvas");
+  const ctx = canvas.getContext('2d');
+
+  const svg = `
+  <svg xmlns="http://www.w3.org/2000/svg"
+        width="200" height="200"
+        color-interpolation-filters="sRGB">
+    <filter id="filter" x="-100%" y="-100%" width="300%" height="300%">
+      <feGaussianBlur in="SourceGraphic" stdDeviation="30" />
+    </filter>
+    <g filter="url(#filter)">
+      <rect x="201" y="50" width="100" height="100" fill="turquoise"/>
+      <rect x="50" y="201" width="100" height="100" fill="indigo"/>
+      <rect x="-101" y="50" width="100" height="100" fill="orange"/>
+      <rect x="50" y="-101" width="100" height="100" fill="brown"/>
+    </g>
+  </svg>`;
+  const img = new Image();
+  img.width = 200;
+  img.height = 200;
+  img.onload = () => {
+      // No clipping.
+
+      ctx.drawImage(img, 0, 0);
+  };
+  img.src = 'data:image/svg+xml;base64,' + btoa(svg);
+</script>
diff --git a/tests/wpt/tests/html/canvas/element/layers/2d.layer.blur-from-outside-canvas.no-clipping.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.blur-from-outside-canvas.no-clipping.html
new file mode 100644
index 00000000000..b689ad39fe1
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/layers/2d.layer.blur-from-outside-canvas.no-clipping.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<link rel="match" href="2d.layer.blur-from-outside-canvas.no-clipping-expected.html">
+<title>Canvas test: 2d.layer.blur-from-outside-canvas.no-clipping</title>
+<h1>2d.layer.blur-from-outside-canvas.no-clipping</h1>
+<p class="desc">Checks blur leaking inside from drawing outside the canvas</p>
+<canvas id="canvas" width="200" height="200">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
+<script>
+  const canvas = document.getElementById("canvas");
+  const ctx = canvas.getContext('2d');
+
+  // No clipping.
+
+  ctx.beginLayer({filter: [ {name: 'gaussianBlur', stdDeviation: 30} ]});
+
+  ctx.fillStyle = 'turquoise';
+  ctx.fillRect(201, 50, 100, 100);
+  ctx.fillStyle = 'indigo';
+  ctx.fillRect(50, 201, 100, 100);
+  ctx.fillStyle = 'orange';
+  ctx.fillRect(-1, 50, -100, 100);
+  ctx.fillStyle = 'brown';
+  ctx.fillRect(50, -1, 100, -100);
+
+  ctx.endLayer();
+</script>
diff --git a/tests/wpt/tests/html/canvas/element/layers/2d.layer.blur-from-outside-canvas.with-clipping-expected.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.blur-from-outside-canvas.with-clipping-expected.html
new file mode 100644
index 00000000000..1823f789839
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/layers/2d.layer.blur-from-outside-canvas.with-clipping-expected.html
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.layer.blur-from-outside-canvas.with-clipping</title>
+<h1>2d.layer.blur-from-outside-canvas.with-clipping</h1>
+<p class="desc">Checks blur leaking inside from drawing outside the canvas</p>
+<canvas id="canvas" width="200" height="200">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
+<script>
+  const canvas = document.getElementById("canvas");
+  const ctx = canvas.getContext('2d');
+
+  const svg = `
+  <svg xmlns="http://www.w3.org/2000/svg"
+        width="200" height="200"
+        color-interpolation-filters="sRGB">
+    <filter id="filter" x="-100%" y="-100%" width="300%" height="300%">
+      <feGaussianBlur in="SourceGraphic" stdDeviation="30" />
+    </filter>
+    <g filter="url(#filter)">
+      <rect x="201" y="50" width="100" height="100" fill="turquoise"/>
+      <rect x="50" y="201" width="100" height="100" fill="indigo"/>
+      <rect x="-101" y="50" width="100" height="100" fill="orange"/>
+      <rect x="50" y="-101" width="100" height="100" fill="brown"/>
+    </g>
+  </svg>`;
+  const img = new Image();
+  img.width = 200;
+  img.height = 200;
+  img.onload = () => {
+      const clipRegion = new Path2D();
+      clipRegion.rect(20, 20, 160, 160);
+      ctx.clip(clipRegion);
+
+      ctx.drawImage(img, 0, 0);
+  };
+  img.src = 'data:image/svg+xml;base64,' + btoa(svg);
+</script>
diff --git a/tests/wpt/tests/html/canvas/element/layers/2d.layer.blur-from-outside-canvas.with-clipping.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.blur-from-outside-canvas.with-clipping.html
new file mode 100644
index 00000000000..9e8161019aa
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/layers/2d.layer.blur-from-outside-canvas.with-clipping.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<link rel="match" href="2d.layer.blur-from-outside-canvas.with-clipping-expected.html">
+<title>Canvas test: 2d.layer.blur-from-outside-canvas.with-clipping</title>
+<h1>2d.layer.blur-from-outside-canvas.with-clipping</h1>
+<p class="desc">Checks blur leaking inside from drawing outside the canvas</p>
+<canvas id="canvas" width="200" height="200">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
+<script>
+  const canvas = document.getElementById("canvas");
+  const ctx = canvas.getContext('2d');
+
+  const clipRegion = new Path2D();
+  clipRegion.rect(20, 20, 160, 160);
+  ctx.clip(clipRegion);
+
+  ctx.beginLayer({filter: [ {name: 'gaussianBlur', stdDeviation: 30} ]});
+
+  ctx.fillStyle = 'turquoise';
+  ctx.fillRect(201, 50, 100, 100);
+  ctx.fillStyle = 'indigo';
+  ctx.fillRect(50, 201, 100, 100);
+  ctx.fillStyle = 'orange';
+  ctx.fillRect(-1, 50, -100, 100);
+  ctx.fillStyle = 'brown';
+  ctx.fillRect(50, -1, 100, -100);
+
+  ctx.endLayer();
+</script>
diff --git a/tests/wpt/tests/html/canvas/element/layers/2d.layer.shadow-from-outside-canvas.long-distance-expected.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.shadow-from-outside-canvas.long-distance-expected.html
new file mode 100644
index 00000000000..cc10684a9bc
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/layers/2d.layer.shadow-from-outside-canvas.long-distance-expected.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.layer.shadow-from-outside-canvas.long-distance</title>
+<h1>2d.layer.shadow-from-outside-canvas.long-distance</h1>
+<p class="desc">Checks shadow produced by object drawn outside the canvas</p>
+<canvas id="canvas" width="200" height="200">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
+<script>
+  const canvas = document.getElementById("canvas");
+  const ctx = canvas.getContext('2d');
+
+  const delta = 10000;
+
+  // No clipping.
+
+  ctx.fillStyle = 'green';
+  ctx.fillRect(0, 0, 100, 100);
+</script>
diff --git a/tests/wpt/tests/html/canvas/element/layers/2d.layer.shadow-from-outside-canvas.long-distance-with-clipping-expected.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.shadow-from-outside-canvas.long-distance-with-clipping-expected.html
new file mode 100644
index 00000000000..377dd55ef6f
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/layers/2d.layer.shadow-from-outside-canvas.long-distance-with-clipping-expected.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.layer.shadow-from-outside-canvas.long-distance-with-clipping</title>
+<h1>2d.layer.shadow-from-outside-canvas.long-distance-with-clipping</h1>
+<p class="desc">Checks shadow produced by object drawn outside the canvas</p>
+<canvas id="canvas" width="200" height="200">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
+<script>
+  const canvas = document.getElementById("canvas");
+  const ctx = canvas.getContext('2d');
+
+  const delta = 10000;
+
+  const clipRegion = new Path2D();
+  clipRegion.rect(20, 20, 160, 160);
+  ctx.clip(clipRegion);
+
+  ctx.fillStyle = 'green';
+  ctx.fillRect(0, 0, 100, 100);
+</script>
diff --git a/tests/wpt/tests/html/canvas/element/layers/2d.layer.shadow-from-outside-canvas.long-distance-with-clipping.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.shadow-from-outside-canvas.long-distance-with-clipping.html
new file mode 100644
index 00000000000..88a3a67c7b3
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/layers/2d.layer.shadow-from-outside-canvas.long-distance-with-clipping.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<link rel="match" href="2d.layer.shadow-from-outside-canvas.long-distance-with-clipping-expected.html">
+<title>Canvas test: 2d.layer.shadow-from-outside-canvas.long-distance-with-clipping</title>
+<h1>2d.layer.shadow-from-outside-canvas.long-distance-with-clipping</h1>
+<p class="desc">Checks shadow produced by object drawn outside the canvas</p>
+<canvas id="canvas" width="200" height="200">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
+<script>
+  const canvas = document.getElementById("canvas");
+  const ctx = canvas.getContext('2d');
+
+  const delta = 10000;
+
+  const clipRegion = new Path2D();
+  clipRegion.rect(20, 20, 160, 160);
+  ctx.clip(clipRegion);
+
+  ctx.beginLayer({filter: [
+      {name: 'dropShadow', dx: -(200 + delta),
+        dy: -(200 + delta), stdDeviation: 0,
+        floodColor: 'green'},
+      ]});
+
+  ctx.fillStyle = 'red';
+  ctx.fillRect(200 + delta, 200 + delta, 100, 100);
+
+  ctx.endLayer();
+</script>
diff --git a/tests/wpt/tests/html/canvas/element/layers/2d.layer.shadow-from-outside-canvas.long-distance.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.shadow-from-outside-canvas.long-distance.html
new file mode 100644
index 00000000000..8ade08bec5f
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/layers/2d.layer.shadow-from-outside-canvas.long-distance.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<link rel="match" href="2d.layer.shadow-from-outside-canvas.long-distance-expected.html">
+<title>Canvas test: 2d.layer.shadow-from-outside-canvas.long-distance</title>
+<h1>2d.layer.shadow-from-outside-canvas.long-distance</h1>
+<p class="desc">Checks shadow produced by object drawn outside the canvas</p>
+<canvas id="canvas" width="200" height="200">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
+<script>
+  const canvas = document.getElementById("canvas");
+  const ctx = canvas.getContext('2d');
+
+  const delta = 10000;
+
+  // No clipping.
+
+  ctx.beginLayer({filter: [
+      {name: 'dropShadow', dx: -(200 + delta),
+        dy: -(200 + delta), stdDeviation: 0,
+        floodColor: 'green'},
+      ]});
+
+  ctx.fillStyle = 'red';
+  ctx.fillRect(200 + delta, 200 + delta, 100, 100);
+
+  ctx.endLayer();
+</script>
diff --git a/tests/wpt/tests/html/canvas/element/layers/2d.layer.shadow-from-outside-canvas.short-distance-expected.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.shadow-from-outside-canvas.short-distance-expected.html
new file mode 100644
index 00000000000..8980708dd18
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/layers/2d.layer.shadow-from-outside-canvas.short-distance-expected.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.layer.shadow-from-outside-canvas.short-distance</title>
+<h1>2d.layer.shadow-from-outside-canvas.short-distance</h1>
+<p class="desc">Checks shadow produced by object drawn outside the canvas</p>
+<canvas id="canvas" width="200" height="200">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
+<script>
+  const canvas = document.getElementById("canvas");
+  const ctx = canvas.getContext('2d');
+
+  const delta = 1;
+
+  // No clipping.
+
+  ctx.fillStyle = 'green';
+  ctx.fillRect(0, 0, 100, 100);
+</script>
diff --git a/tests/wpt/tests/html/canvas/element/layers/2d.layer.shadow-from-outside-canvas.short-distance-with-clipping-expected.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.shadow-from-outside-canvas.short-distance-with-clipping-expected.html
new file mode 100644
index 00000000000..024fc8c9a4a
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/layers/2d.layer.shadow-from-outside-canvas.short-distance-with-clipping-expected.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.layer.shadow-from-outside-canvas.short-distance-with-clipping</title>
+<h1>2d.layer.shadow-from-outside-canvas.short-distance-with-clipping</h1>
+<p class="desc">Checks shadow produced by object drawn outside the canvas</p>
+<canvas id="canvas" width="200" height="200">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
+<script>
+  const canvas = document.getElementById("canvas");
+  const ctx = canvas.getContext('2d');
+
+  const delta = 1;
+
+  const clipRegion = new Path2D();
+  clipRegion.rect(20, 20, 160, 160);
+  ctx.clip(clipRegion);
+
+  ctx.fillStyle = 'green';
+  ctx.fillRect(0, 0, 100, 100);
+</script>
diff --git a/tests/wpt/tests/html/canvas/element/layers/2d.layer.shadow-from-outside-canvas.short-distance-with-clipping.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.shadow-from-outside-canvas.short-distance-with-clipping.html
new file mode 100644
index 00000000000..7ced4481445
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/layers/2d.layer.shadow-from-outside-canvas.short-distance-with-clipping.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<link rel="match" href="2d.layer.shadow-from-outside-canvas.short-distance-with-clipping-expected.html">
+<title>Canvas test: 2d.layer.shadow-from-outside-canvas.short-distance-with-clipping</title>
+<h1>2d.layer.shadow-from-outside-canvas.short-distance-with-clipping</h1>
+<p class="desc">Checks shadow produced by object drawn outside the canvas</p>
+<canvas id="canvas" width="200" height="200">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
+<script>
+  const canvas = document.getElementById("canvas");
+  const ctx = canvas.getContext('2d');
+
+  const delta = 1;
+
+  const clipRegion = new Path2D();
+  clipRegion.rect(20, 20, 160, 160);
+  ctx.clip(clipRegion);
+
+  ctx.beginLayer({filter: [
+      {name: 'dropShadow', dx: -(200 + delta),
+        dy: -(200 + delta), stdDeviation: 0,
+        floodColor: 'green'},
+      ]});
+
+  ctx.fillStyle = 'red';
+  ctx.fillRect(200 + delta, 200 + delta, 100, 100);
+
+  ctx.endLayer();
+</script>
diff --git a/tests/wpt/tests/html/canvas/element/layers/2d.layer.shadow-from-outside-canvas.short-distance.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.shadow-from-outside-canvas.short-distance.html
new file mode 100644
index 00000000000..37398400d18
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/layers/2d.layer.shadow-from-outside-canvas.short-distance.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<link rel="match" href="2d.layer.shadow-from-outside-canvas.short-distance-expected.html">
+<title>Canvas test: 2d.layer.shadow-from-outside-canvas.short-distance</title>
+<h1>2d.layer.shadow-from-outside-canvas.short-distance</h1>
+<p class="desc">Checks shadow produced by object drawn outside the canvas</p>
+<canvas id="canvas" width="200" height="200">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
+<script>
+  const canvas = document.getElementById("canvas");
+  const ctx = canvas.getContext('2d');
+
+  const delta = 1;
+
+  // No clipping.
+
+  ctx.beginLayer({filter: [
+      {name: 'dropShadow', dx: -(200 + delta),
+        dy: -(200 + delta), stdDeviation: 0,
+        floodColor: 'green'},
+      ]});
+
+  ctx.fillStyle = 'red';
+  ctx.fillRect(200 + delta, 200 + delta, 100, 100);
+
+  ctx.endLayer();
+</script>
diff --git a/tests/wpt/tests/html/canvas/element/reset/2d.reset.render.drop_shadow-expected.html b/tests/wpt/tests/html/canvas/element/reset/2d.reset.render.drop_shadow-expected.html
new file mode 100644
index 00000000000..182f7e40cd0
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/reset/2d.reset.render.drop_shadow-expected.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.reset.render.drop_shadow</title>
+<h1>2d.reset.render.drop_shadow</h1>
+<p class="desc">check that drop shadows are correctly rendered after reset</p>
+<canvas id="canvas" width="500" height="500">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
+<script>
+  const canvas = document.getElementById("canvas");
+  const ctx = canvas.getContext('2d');
+
+  ctx.fillRect(100, 100, 100, 100);
+</script>
diff --git a/tests/wpt/tests/html/canvas/element/reset/2d.reset.render.drop_shadow.html b/tests/wpt/tests/html/canvas/element/reset/2d.reset.render.drop_shadow.html
new file mode 100644
index 00000000000..264355c8b31
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/reset/2d.reset.render.drop_shadow.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<link rel="match" href="2d.reset.render.drop_shadow-expected.html">
+<title>Canvas test: 2d.reset.render.drop_shadow</title>
+<h1>2d.reset.render.drop_shadow</h1>
+<p class="desc">check that drop shadows are correctly rendered after reset</p>
+<canvas id="canvas" width="500" height="500">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
+<script>
+  const canvas = document.getElementById("canvas");
+  const ctx = canvas.getContext('2d');
+
+  ctx.shadowOffsetX = 10;
+  ctx.shadowOffsetY = 10;
+  ctx.shadowColor = "red";
+  ctx.shadowBlur = 10;
+
+  ctx.reset();
+
+  ctx.fillRect(100, 100, 100, 100);
+</script>
diff --git a/tests/wpt/tests/html/canvas/element/reset/2d.reset.render.global_composite_operation-expected.html b/tests/wpt/tests/html/canvas/element/reset/2d.reset.render.global_composite_operation-expected.html
new file mode 100644
index 00000000000..1f9d247634c
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/reset/2d.reset.render.global_composite_operation-expected.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.reset.render.global_composite_operation</title>
+<h1>2d.reset.render.global_composite_operation</h1>
+<p class="desc">check that canvas correctly renders rectangles with the default global composite operation after reset</p>
+<canvas id="canvas" width="400" height="400">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
+<script>
+  const canvas = document.getElementById("canvas");
+  const ctx = canvas.getContext('2d');
+
+  ctx.fillRect(10, 10, 100, 100);
+  ctx.fillRect(50, 50, 100, 100);
+</script>
diff --git a/tests/wpt/tests/html/canvas/element/reset/2d.reset.render.global_composite_operation.html b/tests/wpt/tests/html/canvas/element/reset/2d.reset.render.global_composite_operation.html
new file mode 100644
index 00000000000..fc851b84b8e
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/reset/2d.reset.render.global_composite_operation.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<link rel="match" href="2d.reset.render.global_composite_operation-expected.html">
+<title>Canvas test: 2d.reset.render.global_composite_operation</title>
+<h1>2d.reset.render.global_composite_operation</h1>
+<p class="desc">check that canvas correctly renders rectangles with the default global composite operation after reset</p>
+<canvas id="canvas" width="400" height="400">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
+<script>
+  const canvas = document.getElementById("canvas");
+  const ctx = canvas.getContext('2d');
+
+  ctx.globalCompositeOperation = "xor";
+
+  ctx.reset();
+
+  ctx.fillRect(10, 10, 100, 100);
+  ctx.fillRect(50, 50, 100, 100);
+</script>
diff --git a/tests/wpt/tests/html/canvas/element/reset/2d.reset.render.line-expected.html b/tests/wpt/tests/html/canvas/element/reset/2d.reset.render.line-expected.html
new file mode 100644
index 00000000000..dcd648d8c34
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/reset/2d.reset.render.line-expected.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.reset.render.line</title>
+<h1>2d.reset.render.line</h1>
+<p class="desc">check that lines are correctly rendered after reset</p>
+<canvas id="canvas" width="400" height="400">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
+<script>
+  const canvas = document.getElementById("canvas");
+  const ctx = canvas.getContext('2d');
+
+  ctx.beginPath();
+  ctx.moveTo(100, 100);
+  ctx.lineTo(100, 300);
+  ctx.lineTo(300, 300);
+  ctx.lineTo(300, 100);
+  ctx.stroke();
+</script>
diff --git a/tests/wpt/tests/html/canvas/element/reset/2d.reset.render.line.html b/tests/wpt/tests/html/canvas/element/reset/2d.reset.render.line.html
new file mode 100644
index 00000000000..0dda7c7a7e6
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/reset/2d.reset.render.line.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<link rel="match" href="2d.reset.render.line-expected.html">
+<title>Canvas test: 2d.reset.render.line</title>
+<h1>2d.reset.render.line</h1>
+<p class="desc">check that lines are correctly rendered after reset</p>
+<canvas id="canvas" width="400" height="400">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
+<script>
+  const canvas = document.getElementById("canvas");
+  const ctx = canvas.getContext('2d');
+
+  ctx.lineWidth = 10;
+  ctx.lineCap = "round";
+  ctx.lineJoin = "bevel";
+  ctx.lineDashOffset = 10;
+  ctx.setLineDash([20]);
+
+  ctx.reset();
+
+  ctx.beginPath();
+  ctx.moveTo(100, 100);
+  ctx.lineTo(100, 300);
+  ctx.lineTo(300, 300);
+  ctx.lineTo(300, 100);
+  ctx.stroke();
+</script>
diff --git a/tests/wpt/tests/html/canvas/element/reset/2d.reset.render.misc-expected.html b/tests/wpt/tests/html/canvas/element/reset/2d.reset.render.misc-expected.html
new file mode 100644
index 00000000000..c359e6b42e2
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/reset/2d.reset.render.misc-expected.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.reset.render.misc</title>
+<h1>2d.reset.render.misc</h1>
+<p class="desc">check that canvas correctly renders rectangles after reset (states not covered by other tests)</p>
+<canvas id="canvas" width="400" height="400">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
+<script>
+  const canvas = document.getElementById("canvas");
+  const ctx = canvas.getContext('2d');
+
+  ctx.fillRect(0, 0, 100, 100);
+  ctx.strokeRect(150, 150, 100, 100);
+</script>
diff --git a/tests/wpt/tests/html/canvas/element/reset/2d.reset.render.misc.html b/tests/wpt/tests/html/canvas/element/reset/2d.reset.render.misc.html
new file mode 100644
index 00000000000..61d2dbe2f05
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/reset/2d.reset.render.misc.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<link rel="match" href="2d.reset.render.misc-expected.html">
+<title>Canvas test: 2d.reset.render.misc</title>
+<h1>2d.reset.render.misc</h1>
+<p class="desc">check that canvas correctly renders rectangles after reset (states not covered by other tests)</p>
+<canvas id="canvas" width="400" height="400">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
+<script>
+  const canvas = document.getElementById("canvas");
+  const ctx = canvas.getContext('2d');
+
+  ctx.fillStyle = "red";
+  ctx.strokeStyle = "red";
+  ctx.globalAlpha = 0.5;
+  ctx.filter = "blur(2px)";
+
+  ctx.reset();
+
+  ctx.fillRect(0, 0, 100, 100);
+  ctx.strokeRect(150, 150, 100, 100);
+</script>
diff --git a/tests/wpt/tests/html/canvas/element/reset/2d.reset.render.miter_limit-expected.html b/tests/wpt/tests/html/canvas/element/reset/2d.reset.render.miter_limit-expected.html
new file mode 100644
index 00000000000..c91f485c531
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/reset/2d.reset.render.miter_limit-expected.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.reset.render.miter_limit</title>
+<h1>2d.reset.render.miter_limit</h1>
+<p class="desc">check that the lines are correctly rendered with the default miter limit after reset</p>
+<canvas id="canvas" width="400" height="400">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
+<script>
+  const canvas = document.getElementById("canvas");
+  const ctx = canvas.getContext('2d');
+
+  ctx.lineWidth = 10;
+
+  ctx.beginPath();
+  ctx.moveTo(0, 100);
+  for (let i = 0; i < 24; i++) {
+    const dy = i % 2 === 0 ? 25 : -25;
+    ctx.lineTo(Math.pow(i, 1.5) * 2, 75 + dy);
+  }
+  ctx.stroke();
+</script>
diff --git a/tests/wpt/tests/html/canvas/element/reset/2d.reset.render.miter_limit.html b/tests/wpt/tests/html/canvas/element/reset/2d.reset.render.miter_limit.html
new file mode 100644
index 00000000000..f6eaed00f6f
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/reset/2d.reset.render.miter_limit.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<link rel="match" href="2d.reset.render.miter_limit-expected.html">
+<title>Canvas test: 2d.reset.render.miter_limit</title>
+<h1>2d.reset.render.miter_limit</h1>
+<p class="desc">check that the lines are correctly rendered with the default miter limit after reset</p>
+<canvas id="canvas" width="400" height="400">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
+<script>
+  const canvas = document.getElementById("canvas");
+  const ctx = canvas.getContext('2d');
+
+  ctx.miterLimit = 6;
+
+  ctx.reset();
+
+  ctx.lineWidth = 10;
+
+  ctx.beginPath();
+  ctx.moveTo(0, 100);
+  for (let i = 0; i < 24; i++) {
+    const dy = i % 2 === 0 ? 25 : -25;
+    ctx.lineTo(Math.pow(i, 1.5) * 2, 75 + dy);
+  }
+  ctx.stroke();
+</script>
diff --git a/tests/wpt/tests/html/canvas/element/reset/2d.reset.render.text-expected.html b/tests/wpt/tests/html/canvas/element/reset/2d.reset.render.text-expected.html
new file mode 100644
index 00000000000..7221483b02f
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/reset/2d.reset.render.text-expected.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.reset.render.text</title>
+<h1>2d.reset.render.text</h1>
+<p class="desc">check that text is correctly rendered after reset</p>
+<canvas id="canvas" width="400" height="400">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
+<script>
+  const canvas = document.getElementById("canvas");
+  const ctx = canvas.getContext('2d');
+
+  ctx.fillText("Lorem ipsum dolor sit amet, consectetur adipiscing elit", 0, 10);
+</script>
diff --git a/tests/wpt/tests/html/canvas/element/reset/2d.reset.render.text.html b/tests/wpt/tests/html/canvas/element/reset/2d.reset.render.text.html
new file mode 100644
index 00000000000..3d76ddf2920
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/reset/2d.reset.render.text.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<link rel="match" href="2d.reset.render.text-expected.html">
+<title>Canvas test: 2d.reset.render.text</title>
+<h1>2d.reset.render.text</h1>
+<p class="desc">check that text is correctly rendered after reset</p>
+<canvas id="canvas" width="400" height="400">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
+<script>
+  const canvas = document.getElementById("canvas");
+  const ctx = canvas.getContext('2d');
+
+  ctx.font = "24px serif";
+  ctx.textAlign = "center";
+  ctx.textBaseline = "hanging";
+  ctx.direction = "rtl";
+  ctx.letterSpacing = "10px";
+  ctx.fontKerning = "none";
+  ctx.fontStretch = "semi-condensed";
+  ctx.fontVariantCaps = "tilting-caps";
+  ctx.textRendering = "optimizeLegibility";
+  ctx.wordSpacing = "20px";
+
+  ctx.reset();
+
+  ctx.fillText("Lorem ipsum dolor sit amet, consectetur adipiscing elit", 0, 10);
+</script>
diff --git a/tests/wpt/tests/html/canvas/element/text/2d.text.drawing.style.letterSpacing.measure.html b/tests/wpt/tests/html/canvas/element/text/2d.text.drawing.style.letterSpacing.measure.html
index 611ea0b2f0a..0e4848b6fe6 100644
--- a/tests/wpt/tests/html/canvas/element/text/2d.text.drawing.style.letterSpacing.measure.html
+++ b/tests/wpt/tests/html/canvas/element/text/2d.text.drawing.style.letterSpacing.measure.html
@@ -22,7 +22,6 @@ _addTest(function(canvas, ctx) {
   _assertSame(ctx.letterSpacing, '0px', "ctx.letterSpacing", "'0px'");
   _assertSame(ctx.wordSpacing, '0px', "ctx.wordSpacing", "'0px'");
   var width_normal = ctx.measureText('Hello World').width;
-  var ch_width = width_normal / 11;
 
   function test_letter_spacing(value, difference_spacing, epsilon) {
     ctx.letterSpacing = value;
@@ -43,7 +42,6 @@ _addTest(function(canvas, ctx) {
                ['1em', 110, 0.1],
                ['-0.1em', -11, 0.1],
                ['1in', 1056, 0.1],
-               ['1ch', 11 * ch_width, 0.1],
                ['-0.1cm', -41.65, 0.2],
                ['-0.6mm', -24,95, 0.2]]
 
diff --git a/tests/wpt/tests/html/canvas/element/text/2d.text.drawing.style.wordSpacing.measure.html b/tests/wpt/tests/html/canvas/element/text/2d.text.drawing.style.wordSpacing.measure.html
index 802646d0301..2562477d944 100644
--- a/tests/wpt/tests/html/canvas/element/text/2d.text.drawing.style.wordSpacing.measure.html
+++ b/tests/wpt/tests/html/canvas/element/text/2d.text.drawing.style.wordSpacing.measure.html
@@ -22,7 +22,6 @@ _addTest(function(canvas, ctx) {
   _assertSame(ctx.letterSpacing, '0px', "ctx.letterSpacing", "'0px'");
   _assertSame(ctx.wordSpacing, '0px', "ctx.wordSpacing", "'0px'");
   var width_normal = ctx.measureText('Hello World, again').width;
-  var ch_width = width_normal / 18;
 
   function test_word_spacing(value, difference_spacing, epsilon) {
     ctx.wordSpacing = value;
@@ -43,7 +42,6 @@ _addTest(function(canvas, ctx) {
                ['1em', 20, 0.1],
                ['-0.5em', -10, 0.1],
                ['1in', 192, 0.1],
-               ['1ch', 2 * ch_width, 0.1],
                ['-0.1cm', -7.57, 0.2],
                ['-0.6mm', -4.54, 0.2]]
 
diff --git a/tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps1-expected.html b/tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps1-expected.html
index 8ea3c22be13..e2cef0d77a6 100644
--- a/tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps1-expected.html
+++ b/tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps1-expected.html
@@ -1,12 +1,15 @@
 <!DOCTYPE html>
-<meta charset="utf-8">
-<title>HTML Canvas reference</title>
-<link rel="author" title="Jonathan Kew" href="mailto:jkew@mozilla.com">
-
-<canvas id="c"></canvas>
-
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.text.fontVariantCaps1</title>
+<h1>2d.text.fontVariantCaps1</h1>
+<p class="desc">Testing small caps setting in fontVariant</p>
+<canvas id="canvas" width="100" height="50">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
 <script>
-let ctx = c.getContext("2d");
-ctx.font = "small-caps 32px serif";
-ctx.fillText("Hello World", 20, 100);
+  const canvas = document.getElementById("canvas");
+  const ctx = canvas.getContext('2d');
+
+  ctx.font = "small-caps 32px serif";
+  ctx.fillText("Hello World", 20, 100);
 </script>
diff --git a/tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps1.html b/tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps1.html
index b610c2240ff..56acfc61f47 100644
--- a/tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps1.html
+++ b/tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps1.html
@@ -1,17 +1,18 @@
 <!DOCTYPE html>
-<meta charset="utf-8">
-<title>HTML Canvas Test: the 'fontVariantCaps' property</title>
-<link rel="author" title="Jonathan Kew" href="mailto:jkew@mozilla.com">
-<link rel="help" href="https://html.spec.whatwg.org/multipage/canvas.html#dom-context-2d-fontvariantcaps">
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
 <link rel="match" href="2d.text.fontVariantCaps1-expected.html">
-<meta name="assert" content="text rendering respects the fontVariantCaps property">
-
-<canvas id="c"></canvas>
-
+<title>Canvas test: 2d.text.fontVariantCaps1</title>
+<h1>2d.text.fontVariantCaps1</h1>
+<p class="desc">Testing small caps setting in fontVariant</p>
+<canvas id="canvas" width="100" height="50">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
 <script>
-let ctx = c.getContext("2d");
-ctx.font = "32px serif";
-ctx.fontVariantCaps = "small-caps";
-// This should render the same as font = "small-caps 32px serif".
-ctx.fillText("Hello World", 20, 100);
+  const canvas = document.getElementById("canvas");
+  const ctx = canvas.getContext('2d');
+
+  ctx.font = "32px serif";
+  ctx.fontVariantCaps = "small-caps";
+  // This should render the same as font = "small-caps 32px serif".
+  ctx.fillText("Hello World", 20, 100);
 </script>
diff --git a/tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps2-unexpected.html b/tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps2-unexpected.html
deleted file mode 100644
index c64f5d0ec2a..00000000000
--- a/tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps2-unexpected.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>HTML Canvas reference</title>
-<link rel="author" title="Jonathan Kew" href="mailto:jkew@mozilla.com">
-
-<canvas id="c"></canvas>
-
-<script>
-let ctx = c.getContext("2d");
-ctx.font = "32px serif";
-ctx.fillText("Hello World", 20, 100);
-</script>
diff --git a/tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps2.html b/tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps2.html
index f9d42ac3a60..56efbb6fd3a 100644
--- a/tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps2.html
+++ b/tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps2.html
@@ -1,16 +1,32 @@
 <!DOCTYPE html>
-<meta charset="utf-8">
-<title>HTML Canvas Test: the 'fontVariantCaps' property</title>
-<link rel="author" title="Jonathan Kew" href="mailto:jkew@mozilla.com">
-<link rel="help" href="https://html.spec.whatwg.org/multipage/canvas.html#dom-context-2d-fontvariantcaps">
-<link rel="mismatch" href="2d.text.fontVariantCaps2-unexpected.html">
-<meta name="assert" content="text rendering respects the fontVariantCaps property">
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.text.fontVariantCaps2</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/html/canvas/resources/canvas-tests.js"></script>
+<link rel="stylesheet" href="/html/canvas/resources/canvas-tests.css">
+<body class="show_output">
 
-<canvas id="c"></canvas>
+<h1>2d.text.fontVariantCaps2</h1>
+<p class="desc">Testing small caps setting in fontVariant</p>
 
+
+<p class="output">Actual output:</p>
+<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+
+<ul id="d"></ul>
 <script>
-let ctx = c.getContext("2d");
-ctx.font = "small-caps 32px serif";
-// "mismatch" test, to verify that small-caps does change the rendering.
-ctx.fillText("Hello World", 20, 100);
+var t = async_test("Testing small caps setting in fontVariant");
+_addTest(function(canvas, ctx) {
+
+  ctx.font = "small-caps 32px serif";
+  // "mismatch" test, to verify that small-caps does change the rendering.
+  smallCaps_len = ctx.measureText("Hello World").width;
+
+  ctx.font = "32px serif";
+  normalCaps_len = ctx.measureText("Hello World").width;
+  _assert(smallCaps_len != normalCaps_len, "smallCaps_len != normalCaps_len");
+
+});
 </script>
+
diff --git a/tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps3-expected.html b/tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps3-expected.html
index 069fbfba882..cf2d5ae119b 100644
--- a/tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps3-expected.html
+++ b/tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps3-expected.html
@@ -1,12 +1,15 @@
 <!DOCTYPE html>
-<meta charset="utf-8">
-<title>HTML Canvas reference</title>
-<link rel="author" title="Jonathan Kew" href="mailto:jkew@mozilla.com">
-
-<canvas id="c"></canvas>
-
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.text.fontVariantCaps3</title>
+<h1>2d.text.fontVariantCaps3</h1>
+<p class="desc">Testing small caps setting in fontVariant</p>
+<canvas id="canvas" width="100" height="50">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
 <script>
-let ctx = c.getContext("2d");
-ctx.font = "small-caps 32px serif";
-ctx.fillText("hello world", 20, 100);
+  const canvas = document.getElementById("canvas");
+  const ctx = canvas.getContext('2d');
+
+  ctx.font = "small-caps 32px serif";
+  ctx.fillText("hello world", 20, 100);
 </script>
diff --git a/tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps3.html b/tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps3.html
index a90e0c29b3d..c3d80d3e56c 100644
--- a/tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps3.html
+++ b/tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps3.html
@@ -1,18 +1,19 @@
 <!DOCTYPE html>
-<meta charset="utf-8">
-<title>HTML Canvas Test: the 'fontVariantCaps' property</title>
-<link rel="author" title="Jonathan Kew" href="mailto:jkew@mozilla.com">
-<link rel="help" href="https://html.spec.whatwg.org/multipage/canvas.html#dom-context-2d-fontvariantcaps">
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
 <link rel="match" href="2d.text.fontVariantCaps3-expected.html">
-<meta name="assert" content="text rendering respects the fontVariantCaps property">
-
-<canvas id="c"></canvas>
-
+<title>Canvas test: 2d.text.fontVariantCaps3</title>
+<h1>2d.text.fontVariantCaps3</h1>
+<p class="desc">Testing small caps setting in fontVariant</p>
+<canvas id="canvas" width="100" height="50">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
 <script>
-let ctx = c.getContext("2d");
-ctx.font = "32px serif";
-ctx.fontVariantCaps = "all-small-caps";
-// This should render the same as using font = "small-caps 32px serif"
-// with all the underlying text in lowercase.
-ctx.fillText("Hello World", 20, 100);
+  const canvas = document.getElementById("canvas");
+  const ctx = canvas.getContext('2d');
+
+  ctx.font = "32px serif";
+  ctx.fontVariantCaps = "all-small-caps";
+  // This should render the same as using font = "small-caps 32px serif"
+  // with all the underlying text in lowercase.
+  ctx.fillText("Hello World", 20, 100);
 </script>
diff --git a/tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps4-expected.html b/tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps4-expected.html
index 069fbfba882..3813fd3684e 100644
--- a/tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps4-expected.html
+++ b/tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps4-expected.html
@@ -1,12 +1,15 @@
 <!DOCTYPE html>
-<meta charset="utf-8">
-<title>HTML Canvas reference</title>
-<link rel="author" title="Jonathan Kew" href="mailto:jkew@mozilla.com">
-
-<canvas id="c"></canvas>
-
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.text.fontVariantCaps4</title>
+<h1>2d.text.fontVariantCaps4</h1>
+<p class="desc">Testing small caps setting in fontVariant</p>
+<canvas id="canvas" width="100" height="50">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
 <script>
-let ctx = c.getContext("2d");
-ctx.font = "small-caps 32px serif";
-ctx.fillText("hello world", 20, 100);
+  const canvas = document.getElementById("canvas");
+  const ctx = canvas.getContext('2d');
+
+  ctx.font = "small-caps 32px serif";
+  ctx.fillText("hello world", 20, 100);
 </script>
diff --git a/tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps4.html b/tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps4.html
index b598fb60baf..1ee9053b4d9 100644
--- a/tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps4.html
+++ b/tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps4.html
@@ -1,18 +1,19 @@
 <!DOCTYPE html>
-<meta charset="utf-8">
-<title>HTML Canvas Test: the 'fontVariantCaps' property</title>
-<link rel="author" title="Jonathan Kew" href="mailto:jkew@mozilla.com">
-<link rel="help" href="https://html.spec.whatwg.org/multipage/canvas.html#dom-context-2d-fontvariantcaps">
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
 <link rel="match" href="2d.text.fontVariantCaps4-expected.html">
-<meta name="assert" content="text rendering respects the fontVariantCaps property">
-
-<canvas id="c"></canvas>
-
+<title>Canvas test: 2d.text.fontVariantCaps4</title>
+<h1>2d.text.fontVariantCaps4</h1>
+<p class="desc">Testing small caps setting in fontVariant</p>
+<canvas id="canvas" width="100" height="50">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
 <script>
-let ctx = c.getContext("2d");
-ctx.font = "small-caps 32px serif";
-// fontVariantCaps overrides the small-caps setting from the font attribute
-// (spec unclear, cf. https://github.com/whatwg/html/issues/8103)
-ctx.fontVariantCaps = "all-small-caps";
-ctx.fillText("Hello World", 20, 100);
+  const canvas = document.getElementById("canvas");
+  const ctx = canvas.getContext('2d');
+
+  ctx.font = "small-caps 32px serif";
+  // fontVariantCaps overrides the small-caps setting from the font attribute
+  // (spec unclear, cf. https://github.com/whatwg/html/issues/8103)
+  ctx.fontVariantCaps = "all-small-caps";
+  ctx.fillText("Hello World", 20, 100);
 </script>
diff --git a/tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps5-expected.html b/tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps5-expected.html
index 8ea3c22be13..4bda4ec4b5d 100644
--- a/tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps5-expected.html
+++ b/tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps5-expected.html
@@ -1,12 +1,15 @@
 <!DOCTYPE html>
-<meta charset="utf-8">
-<title>HTML Canvas reference</title>
-<link rel="author" title="Jonathan Kew" href="mailto:jkew@mozilla.com">
-
-<canvas id="c"></canvas>
-
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.text.fontVariantCaps5</title>
+<h1>2d.text.fontVariantCaps5</h1>
+<p class="desc">Testing small caps setting in fontVariant</p>
+<canvas id="canvas" width="100" height="50">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
 <script>
-let ctx = c.getContext("2d");
-ctx.font = "small-caps 32px serif";
-ctx.fillText("Hello World", 20, 100);
+  const canvas = document.getElementById("canvas");
+  const ctx = canvas.getContext('2d');
+
+  ctx.font = "small-caps 32px serif";
+  ctx.fillText("Hello World", 20, 100);
 </script>
diff --git a/tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps5.html b/tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps5.html
index b871f7c0624..d80de4ea318 100644
--- a/tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps5.html
+++ b/tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps5.html
@@ -1,18 +1,19 @@
 <!DOCTYPE html>
-<meta charset="utf-8">
-<title>HTML Canvas Test: the 'fontVariantCaps' property</title>
-<link rel="author" title="Jonathan Kew" href="mailto:jkew@mozilla.com">
-<link rel="help" href="https://html.spec.whatwg.org/multipage/canvas.html#dom-context-2d-fontvariantcaps">
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
 <link rel="match" href="2d.text.fontVariantCaps5-expected.html">
-<meta name="assert" content="text rendering respects the fontVariantCaps property">
-
-<canvas id="c"></canvas>
-
+<title>Canvas test: 2d.text.fontVariantCaps5</title>
+<h1>2d.text.fontVariantCaps5</h1>
+<p class="desc">Testing small caps setting in fontVariant</p>
+<canvas id="canvas" width="100" height="50">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
 <script>
-let ctx = c.getContext("2d");
-ctx.font = "small-caps 32px serif";
-// fontVariantCaps 'normal' does not override the setting from the font attribute.
-// (spec unclear, cf. https://github.com/whatwg/html/issues/8103)
-ctx.fontVariantCaps = "normal";
-ctx.fillText("Hello World", 20, 100);
+  const canvas = document.getElementById("canvas");
+  const ctx = canvas.getContext('2d');
+
+  ctx.font = "small-caps 32px serif";
+  // fontVariantCaps 'normal' does not override the setting from the font attribute.
+  // (spec unclear, cf. https://github.com/whatwg/html/issues/8103)
+  ctx.fontVariantCaps = "normal";
+  ctx.fillText("Hello World", 20, 100);
 </script>
diff --git a/tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps6-expected.html b/tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps6-expected.html
index c64f5d0ec2a..af9c736aea7 100644
--- a/tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps6-expected.html
+++ b/tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps6-expected.html
@@ -1,12 +1,15 @@
 <!DOCTYPE html>
-<meta charset="utf-8">
-<title>HTML Canvas reference</title>
-<link rel="author" title="Jonathan Kew" href="mailto:jkew@mozilla.com">
-
-<canvas id="c"></canvas>
-
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.text.fontVariantCaps6</title>
+<h1>2d.text.fontVariantCaps6</h1>
+<p class="desc">Testing small caps setting in fontVariant</p>
+<canvas id="canvas" width="100" height="50">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
 <script>
-let ctx = c.getContext("2d");
-ctx.font = "32px serif";
-ctx.fillText("Hello World", 20, 100);
+  const canvas = document.getElementById("canvas");
+  const ctx = canvas.getContext('2d');
+
+  ctx.font = "32px serif";
+  ctx.fillText("Hello World", 20, 100);
 </script>
diff --git a/tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps6.html b/tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps6.html
index e7bbd29341d..c17fac18b77 100644
--- a/tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps6.html
+++ b/tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps6.html
@@ -1,18 +1,19 @@
 <!DOCTYPE html>
-<meta charset="utf-8">
-<title>HTML Canvas Test: the 'fontVariantCaps' property</title>
-<link rel="author" title="Jonathan Kew" href="mailto:jkew@mozilla.com">
-<link rel="help" href="https://html.spec.whatwg.org/multipage/canvas.html#dom-context-2d-fontvariantcaps">
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
 <link rel="match" href="2d.text.fontVariantCaps6-expected.html">
-<meta name="assert" content="text rendering respects the fontVariantCaps property">
-
-<canvas id="c"></canvas>
-
+<title>Canvas test: 2d.text.fontVariantCaps6</title>
+<h1>2d.text.fontVariantCaps6</h1>
+<p class="desc">Testing small caps setting in fontVariant</p>
+<canvas id="canvas" width="100" height="50">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
 <script>
-let ctx = c.getContext("2d");
-// fontVariantCaps is reset when the font attribute is set.
-// (spec unclear, cf. https://github.com/whatwg/html/issues/8103)
-ctx.fontVariantCaps = "all-small-caps";
-ctx.font = "32px serif";
-ctx.fillText("Hello World", 20, 100);
+  const canvas = document.getElementById("canvas");
+  const ctx = canvas.getContext('2d');
+
+  // fontVariantCaps is reset when the font attribute is set.
+  // (spec unclear, cf. https://github.com/whatwg/html/issues/8103)
+  ctx.fontVariantCaps = "all-small-caps";
+  ctx.font = "32px serif";
+  ctx.fillText("Hello World", 20, 100);
 </script>
diff --git a/tests/wpt/tests/html/canvas/element/text/2d.text.setFont.mathFont.html b/tests/wpt/tests/html/canvas/element/text/2d.text.setFont.mathFont.html
new file mode 100644
index 00000000000..370104f1b84
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/text/2d.text.setFont.mathFont.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.text.setFont.mathFont</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/html/canvas/resources/canvas-tests.js"></script>
+<link rel="stylesheet" href="/html/canvas/resources/canvas-tests.css">
+<body class="show_output">
+
+<h1>2d.text.setFont.mathFont</h1>
+<p class="desc">crbug.com/1212190, make sure offscreencanvas doesn't crash with Math Font</p>
+
+
+<p class="output">Actual output:</p>
+<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+
+<ul id="d"></ul>
+<script>
+var t = async_test("crbug.com/1212190, make sure offscreencanvas doesn't crash with Math Font");
+_addTest(function(canvas, ctx) {
+
+  ctx.font = "math serif";
+
+});
+</script>
+
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/context.arguments.missing.html b/tests/wpt/tests/html/canvas/offscreen/canvas-context/2d.canvas.context.arguments.missing.html
similarity index 85%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/context.arguments.missing.html
rename to tests/wpt/tests/html/canvas/offscreen/canvas-context/2d.canvas.context.arguments.missing.html
index 4d5478e893a..0c9fdc96393 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/context.arguments.missing.html
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-context/2d.canvas.context.arguments.missing.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>OffscreenCanvas test: context.arguments.missing</title>
+<title>OffscreenCanvas test: 2d.canvas.context.arguments.missing</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 
-<h1>context.arguments.missing</h1>
+<h1>2d.canvas.context.arguments.missing</h1>
 <p class="desc"></p>
 
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/context.arguments.missing.worker.js b/tests/wpt/tests/html/canvas/offscreen/canvas-context/2d.canvas.context.arguments.missing.worker.js
similarity index 89%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/context.arguments.missing.worker.js
rename to tests/wpt/tests/html/canvas/offscreen/canvas-context/2d.canvas.context.arguments.missing.worker.js
index f20db3ad753..1b5c857a793 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/context.arguments.missing.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-context/2d.canvas.context.arguments.missing.worker.js
@@ -1,5 +1,5 @@
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
-// OffscreenCanvas test in a worker:context.arguments.missing
+// OffscreenCanvas test in a worker:2d.canvas.context.arguments.missing
 // Description:
 // Note:
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/context.casesensitive.html b/tests/wpt/tests/html/canvas/offscreen/canvas-context/2d.canvas.context.casesensitive.html
similarity index 88%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/context.casesensitive.html
rename to tests/wpt/tests/html/canvas/offscreen/canvas-context/2d.canvas.context.casesensitive.html
index 6183607aac5..aed71a37e95 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/context.casesensitive.html
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-context/2d.canvas.context.casesensitive.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>OffscreenCanvas test: context.casesensitive</title>
+<title>OffscreenCanvas test: 2d.canvas.context.casesensitive</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 
-<h1>context.casesensitive</h1>
+<h1>2d.canvas.context.casesensitive</h1>
 <p class="desc">Context name "2D" is unrecognised; matching is case sensitive</p>
 
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/context.casesensitive.worker.js b/tests/wpt/tests/html/canvas/offscreen/canvas-context/2d.canvas.context.casesensitive.worker.js
similarity index 91%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/context.casesensitive.worker.js
rename to tests/wpt/tests/html/canvas/offscreen/canvas-context/2d.canvas.context.casesensitive.worker.js
index a834a3e13f9..c1df3a9f808 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/context.casesensitive.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-context/2d.canvas.context.casesensitive.worker.js
@@ -1,5 +1,5 @@
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
-// OffscreenCanvas test in a worker:context.casesensitive
+// OffscreenCanvas test in a worker:2d.canvas.context.casesensitive
 // Description:Context name "2D" is unrecognised; matching is case sensitive
 // Note:
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/context.emptystring.html b/tests/wpt/tests/html/canvas/offscreen/canvas-context/2d.canvas.context.emptystring.html
similarity index 87%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/context.emptystring.html
rename to tests/wpt/tests/html/canvas/offscreen/canvas-context/2d.canvas.context.emptystring.html
index b898698bb7e..10548a6b7c6 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/context.emptystring.html
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-context/2d.canvas.context.emptystring.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>OffscreenCanvas test: context.emptystring</title>
+<title>OffscreenCanvas test: 2d.canvas.context.emptystring</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 
-<h1>context.emptystring</h1>
+<h1>2d.canvas.context.emptystring</h1>
 <p class="desc">getContext with empty string returns null</p>
 
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/context.emptystring.worker.js b/tests/wpt/tests/html/canvas/offscreen/canvas-context/2d.canvas.context.emptystring.worker.js
similarity index 91%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/context.emptystring.worker.js
rename to tests/wpt/tests/html/canvas/offscreen/canvas-context/2d.canvas.context.emptystring.worker.js
index df7d06df0c7..53a58c1f5de 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/context.emptystring.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-context/2d.canvas.context.emptystring.worker.js
@@ -1,5 +1,5 @@
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
-// OffscreenCanvas test in a worker:context.emptystring
+// OffscreenCanvas test in a worker:2d.canvas.context.emptystring
 // Description:getContext with empty string returns null
 // Note:
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.exists.html b/tests/wpt/tests/html/canvas/offscreen/canvas-context/2d.canvas.context.exists.html
similarity index 88%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.exists.html
rename to tests/wpt/tests/html/canvas/offscreen/canvas-context/2d.canvas.context.exists.html
index 73fc45c3096..41b5cfee311 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.exists.html
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-context/2d.canvas.context.exists.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>OffscreenCanvas test: 2d.getcontext.exists</title>
+<title>OffscreenCanvas test: 2d.canvas.context.exists</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 
-<h1>2d.getcontext.exists</h1>
+<h1>2d.canvas.context.exists</h1>
 <p class="desc">The 2D context is implemented</p>
 
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.exists.worker.js b/tests/wpt/tests/html/canvas/offscreen/canvas-context/2d.canvas.context.exists.worker.js
similarity index 91%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.exists.worker.js
rename to tests/wpt/tests/html/canvas/offscreen/canvas-context/2d.canvas.context.exists.worker.js
index 0ed6f242484..77a43530a04 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.exists.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-context/2d.canvas.context.exists.worker.js
@@ -1,5 +1,5 @@
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
-// OffscreenCanvas test in a worker:2d.getcontext.exists
+// OffscreenCanvas test in a worker:2d.canvas.context.exists
 // Description:The 2D context is implemented
 // Note:
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.extraargs.cache.html b/tests/wpt/tests/html/canvas/offscreen/canvas-context/2d.canvas.context.extraargs.cache.html
similarity index 92%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.extraargs.cache.html
rename to tests/wpt/tests/html/canvas/offscreen/canvas-context/2d.canvas.context.extraargs.cache.html
index 2f57050a4d5..2bcf34490ea 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.extraargs.cache.html
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-context/2d.canvas.context.extraargs.cache.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>OffscreenCanvas test: 2d.getcontext.extraargs.cache</title>
+<title>OffscreenCanvas test: 2d.canvas.context.extraargs.cache</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 
-<h1>2d.getcontext.extraargs.cache</h1>
+<h1>2d.canvas.context.extraargs.cache</h1>
 <p class="desc">The 2D context doesn't throw with extra getContext arguments (cached)</p>
 
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.extraargs.cache.worker.js b/tests/wpt/tests/html/canvas/offscreen/canvas-context/2d.canvas.context.extraargs.cache.worker.js
similarity index 94%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.extraargs.cache.worker.js
rename to tests/wpt/tests/html/canvas/offscreen/canvas-context/2d.canvas.context.extraargs.cache.worker.js
index 88540513ab3..14284a0a7d7 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.extraargs.cache.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-context/2d.canvas.context.extraargs.cache.worker.js
@@ -1,5 +1,5 @@
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
-// OffscreenCanvas test in a worker:2d.getcontext.extraargs.cache
+// OffscreenCanvas test in a worker:2d.canvas.context.extraargs.cache
 // Description:The 2D context doesn't throw with extra getContext arguments (cached)
 // Note:
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.extraargs.create.html b/tests/wpt/tests/html/canvas/offscreen/canvas-context/2d.canvas.context.extraargs.create.html
similarity index 93%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.extraargs.create.html
rename to tests/wpt/tests/html/canvas/offscreen/canvas-context/2d.canvas.context.extraargs.create.html
index a2869c45f6a..029122355c9 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.extraargs.create.html
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-context/2d.canvas.context.extraargs.create.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>OffscreenCanvas test: 2d.getcontext.extraargs.create</title>
+<title>OffscreenCanvas test: 2d.canvas.context.extraargs.create</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 
-<h1>2d.getcontext.extraargs.create</h1>
+<h1>2d.canvas.context.extraargs.create</h1>
 <p class="desc">The 2D context doesn't throw with extra getContext arguments (new context)</p>
 
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.extraargs.create.worker.js b/tests/wpt/tests/html/canvas/offscreen/canvas-context/2d.canvas.context.extraargs.create.worker.js
similarity index 95%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.extraargs.create.worker.js
rename to tests/wpt/tests/html/canvas/offscreen/canvas-context/2d.canvas.context.extraargs.create.worker.js
index 21d4f8ce6dd..b4208edba8c 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.extraargs.create.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-context/2d.canvas.context.extraargs.create.worker.js
@@ -1,5 +1,5 @@
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
-// OffscreenCanvas test in a worker:2d.getcontext.extraargs.create
+// OffscreenCanvas test in a worker:2d.canvas.context.extraargs.create
 // Description:The 2D context doesn't throw with extra getContext arguments (new context)
 // Note:
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.shared.html b/tests/wpt/tests/html/canvas/offscreen/canvas-context/2d.canvas.context.shared.html
similarity index 89%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.shared.html
rename to tests/wpt/tests/html/canvas/offscreen/canvas-context/2d.canvas.context.shared.html
index c37664f9d37..cb9501747ee 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.shared.html
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-context/2d.canvas.context.shared.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>OffscreenCanvas test: 2d.getcontext.shared</title>
+<title>OffscreenCanvas test: 2d.canvas.context.shared</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 
-<h1>2d.getcontext.shared</h1>
+<h1>2d.canvas.context.shared</h1>
 <p class="desc">getContext('2d') returns objects which share canvas state</p>
 
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.shared.worker.js b/tests/wpt/tests/html/canvas/offscreen/canvas-context/2d.canvas.context.shared.worker.js
similarity index 92%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.shared.worker.js
rename to tests/wpt/tests/html/canvas/offscreen/canvas-context/2d.canvas.context.shared.worker.js
index 936ca03c27b..8e534757563 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.shared.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-context/2d.canvas.context.shared.worker.js
@@ -1,5 +1,5 @@
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
-// OffscreenCanvas test in a worker:2d.getcontext.shared
+// OffscreenCanvas test in a worker:2d.canvas.context.shared
 // Description:getContext('2d') returns objects which share canvas state
 // Note:
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.unique.html b/tests/wpt/tests/html/canvas/offscreen/canvas-context/2d.canvas.context.unique.html
similarity index 89%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.unique.html
rename to tests/wpt/tests/html/canvas/offscreen/canvas-context/2d.canvas.context.unique.html
index 945526c5d18..66e4a049baa 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.unique.html
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-context/2d.canvas.context.unique.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>OffscreenCanvas test: 2d.getcontext.unique</title>
+<title>OffscreenCanvas test: 2d.canvas.context.unique</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 
-<h1>2d.getcontext.unique</h1>
+<h1>2d.canvas.context.unique</h1>
 <p class="desc">getContext('2d') returns the same object</p>
 
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.unique.worker.js b/tests/wpt/tests/html/canvas/offscreen/canvas-context/2d.canvas.context.unique.worker.js
similarity index 92%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.unique.worker.js
rename to tests/wpt/tests/html/canvas/offscreen/canvas-context/2d.canvas.context.unique.worker.js
index fbf8e3c68d2..275e45fde64 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d.getcontext.unique.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-context/2d.canvas.context.unique.worker.js
@@ -1,5 +1,5 @@
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
-// OffscreenCanvas test in a worker:2d.getcontext.unique
+// OffscreenCanvas test in a worker:2d.canvas.context.unique
 // Description:getContext('2d') returns the same object
 // Note:
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.badname.html b/tests/wpt/tests/html/canvas/offscreen/canvas-context/2d.canvas.context.unrecognised.badname.html
similarity index 87%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.badname.html
rename to tests/wpt/tests/html/canvas/offscreen/canvas-context/2d.canvas.context.unrecognised.badname.html
index 5460fe10796..4313f408437 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.badname.html
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-context/2d.canvas.context.unrecognised.badname.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>OffscreenCanvas test: context.unrecognised.badname</title>
+<title>OffscreenCanvas test: 2d.canvas.context.unrecognised.badname</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 
-<h1>context.unrecognised.badname</h1>
+<h1>2d.canvas.context.unrecognised.badname</h1>
 <p class="desc">getContext with unrecognised context name returns null</p>
 
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.badname.worker.js b/tests/wpt/tests/html/canvas/offscreen/canvas-context/2d.canvas.context.unrecognised.badname.worker.js
similarity index 90%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.badname.worker.js
rename to tests/wpt/tests/html/canvas/offscreen/canvas-context/2d.canvas.context.unrecognised.badname.worker.js
index 8dfee549820..dd16f2fbe11 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.badname.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-context/2d.canvas.context.unrecognised.badname.worker.js
@@ -1,5 +1,5 @@
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
-// OffscreenCanvas test in a worker:context.unrecognised.badname
+// OffscreenCanvas test in a worker:2d.canvas.context.unrecognised.badname
 // Description:getContext with unrecognised context name returns null
 // Note:
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.badsuffix.html b/tests/wpt/tests/html/canvas/offscreen/canvas-context/2d.canvas.context.unrecognised.badsuffix.html
similarity index 86%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.badsuffix.html
rename to tests/wpt/tests/html/canvas/offscreen/canvas-context/2d.canvas.context.unrecognised.badsuffix.html
index 72624be12cb..c00afa686ed 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.badsuffix.html
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-context/2d.canvas.context.unrecognised.badsuffix.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>OffscreenCanvas test: context.unrecognised.badsuffix</title>
+<title>OffscreenCanvas test: 2d.canvas.context.unrecognised.badsuffix</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 
-<h1>context.unrecognised.badsuffix</h1>
+<h1>2d.canvas.context.unrecognised.badsuffix</h1>
 <p class="desc">Context name "2d" plus a suffix is unrecognised</p>
 
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.badsuffix.worker.js b/tests/wpt/tests/html/canvas/offscreen/canvas-context/2d.canvas.context.unrecognised.badsuffix.worker.js
similarity index 89%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.badsuffix.worker.js
rename to tests/wpt/tests/html/canvas/offscreen/canvas-context/2d.canvas.context.unrecognised.badsuffix.worker.js
index 6cfcbc3c81b..5e684c92c72 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.badsuffix.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-context/2d.canvas.context.unrecognised.badsuffix.worker.js
@@ -1,5 +1,5 @@
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
-// OffscreenCanvas test in a worker:context.unrecognised.badsuffix
+// OffscreenCanvas test in a worker:2d.canvas.context.unrecognised.badsuffix
 // Description:Context name "2d" plus a suffix is unrecognised
 // Note:
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.nullsuffix.html b/tests/wpt/tests/html/canvas/offscreen/canvas-context/2d.canvas.context.unrecognised.nullsuffix.html
similarity index 86%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.nullsuffix.html
rename to tests/wpt/tests/html/canvas/offscreen/canvas-context/2d.canvas.context.unrecognised.nullsuffix.html
index f36f7583fb9..0ce3d4195e0 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.nullsuffix.html
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-context/2d.canvas.context.unrecognised.nullsuffix.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>OffscreenCanvas test: context.unrecognised.nullsuffix</title>
+<title>OffscreenCanvas test: 2d.canvas.context.unrecognised.nullsuffix</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 
-<h1>context.unrecognised.nullsuffix</h1>
+<h1>2d.canvas.context.unrecognised.nullsuffix</h1>
 <p class="desc">Context name "2d" plus a "\0" suffix is unrecognised</p>
 
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.nullsuffix.worker.js b/tests/wpt/tests/html/canvas/offscreen/canvas-context/2d.canvas.context.unrecognised.nullsuffix.worker.js
similarity index 90%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.nullsuffix.worker.js
rename to tests/wpt/tests/html/canvas/offscreen/canvas-context/2d.canvas.context.unrecognised.nullsuffix.worker.js
index d9b563db61d..2886010fb64 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.nullsuffix.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-context/2d.canvas.context.unrecognised.nullsuffix.worker.js
@@ -1,5 +1,5 @@
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
-// OffscreenCanvas test in a worker:context.unrecognised.nullsuffix
+// OffscreenCanvas test in a worker:2d.canvas.context.unrecognised.nullsuffix
 // Description:Context name "2d" plus a "\0" suffix is unrecognised
 // Note:
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.unicode.html b/tests/wpt/tests/html/canvas/offscreen/canvas-context/2d.canvas.context.unrecognised.unicode.html
similarity index 86%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.unicode.html
rename to tests/wpt/tests/html/canvas/offscreen/canvas-context/2d.canvas.context.unrecognised.unicode.html
index f8176f58dfb..316123675ad 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.unicode.html
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-context/2d.canvas.context.unrecognised.unicode.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>OffscreenCanvas test: context.unrecognised.unicode</title>
+<title>OffscreenCanvas test: 2d.canvas.context.unrecognised.unicode</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 
-<h1>context.unrecognised.unicode</h1>
+<h1>2d.canvas.context.unrecognised.unicode</h1>
 <p class="desc">Context name which kind of looks like "2d" is unrecognised</p>
 
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.unicode.worker.js b/tests/wpt/tests/html/canvas/offscreen/canvas-context/2d.canvas.context.unrecognised.unicode.worker.js
similarity index 90%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.unicode.worker.js
rename to tests/wpt/tests/html/canvas/offscreen/canvas-context/2d.canvas.context.unrecognised.unicode.worker.js
index 2d02a794563..46e562dd486 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/context.unrecognised.unicode.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-context/2d.canvas.context.unrecognised.unicode.worker.js
@@ -1,5 +1,5 @@
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
-// OffscreenCanvas test in a worker:context.unrecognised.unicode
+// OffscreenCanvas test in a worker:2d.canvas.context.unrecognised.unicode
 // Description:Context name which kind of looks like "2d" is unrecognised
 // Note:
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d-getcontext-options.any.js b/tests/wpt/tests/html/canvas/offscreen/canvas-context/2d.getContext.options.any.js
similarity index 100%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d-getcontext-options.any.js
rename to tests/wpt/tests/html/canvas/offscreen/canvas-context/2d.getContext.options.any.js
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.color.html b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.color.html
similarity index 86%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.color.html
rename to tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.color.html
index d89b01df668..0793c74f398 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.color.html
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.color.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>OffscreenCanvas test: initial.color</title>
+<title>OffscreenCanvas test: 2d.canvas.host.initial.color</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 
-<h1>initial.color</h1>
+<h1>2d.canvas.host.initial.color</h1>
 <p class="desc">Initial state is transparent black</p>
 
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.color.worker.js b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.color.worker.js
similarity index 89%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.color.worker.js
rename to tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.color.worker.js
index c9705727d99..11d6b9f098e 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.color.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.color.worker.js
@@ -1,5 +1,5 @@
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
-// OffscreenCanvas test in a worker:initial.color
+// OffscreenCanvas test in a worker:2d.canvas.host.initial.color
 // Description:Initial state is transparent black
 // Note:
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.2dstate.html b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.2dstate.html
similarity index 95%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.2dstate.html
rename to tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.2dstate.html
index 55954fc421a..36230dab773 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.2dstate.html
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.2dstate.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>OffscreenCanvas test: initial.reset.2dstate</title>
+<title>OffscreenCanvas test: 2d.canvas.host.initial.reset.2dstate</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 
-<h1>initial.reset.2dstate</h1>
+<h1>2d.canvas.host.initial.reset.2dstate</h1>
 <p class="desc">Resetting the canvas state resets 2D state variables</p>
 
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.2dstate.worker.js b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.2dstate.worker.js
similarity index 97%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.2dstate.worker.js
rename to tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.2dstate.worker.js
index dc0d6ea00b7..df0bd9f63cb 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.2dstate.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.2dstate.worker.js
@@ -1,5 +1,5 @@
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
-// OffscreenCanvas test in a worker:initial.reset.2dstate
+// OffscreenCanvas test in a worker:2d.canvas.host.initial.reset.2dstate
 // Description:Resetting the canvas state resets 2D state variables
 // Note:
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.clip.html b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.clip.html
similarity index 88%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.clip.html
rename to tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.clip.html
index 9b1354bdabf..fc532407957 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.clip.html
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.clip.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>OffscreenCanvas test: initial.reset.clip</title>
+<title>OffscreenCanvas test: 2d.canvas.host.initial.reset.clip</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 
-<h1>initial.reset.clip</h1>
+<h1>2d.canvas.host.initial.reset.clip</h1>
 <p class="desc">Resetting the canvas state resets the current clip region</p>
 
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.clip.worker.js b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.clip.worker.js
similarity index 91%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.clip.worker.js
rename to tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.clip.worker.js
index d774aad6c81..80554b0a3fd 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.clip.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.clip.worker.js
@@ -1,5 +1,5 @@
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
-// OffscreenCanvas test in a worker:initial.reset.clip
+// OffscreenCanvas test in a worker:2d.canvas.host.initial.reset.clip
 // Description:Resetting the canvas state resets the current clip region
 // Note:
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.different.html b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.different.html
similarity index 86%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.different.html
rename to tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.different.html
index a5c891ff144..3771a5e37a9 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.different.html
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.different.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>OffscreenCanvas test: initial.reset.different</title>
+<title>OffscreenCanvas test: 2d.canvas.host.initial.reset.different</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 
-<h1>initial.reset.different</h1>
+<h1>2d.canvas.host.initial.reset.different</h1>
 <p class="desc">Changing size resets canvas to transparent black</p>
 
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.different.worker.js b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.different.worker.js
similarity index 90%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.different.worker.js
rename to tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.different.worker.js
index dc8f4bd146d..6074d4f2a2c 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.different.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.different.worker.js
@@ -1,5 +1,5 @@
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
-// OffscreenCanvas test in a worker:initial.reset.different
+// OffscreenCanvas test in a worker:2d.canvas.host.initial.reset.different
 // Description:Changing size resets canvas to transparent black
 // Note:
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.gradient.html b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.gradient.html
similarity index 89%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.gradient.html
rename to tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.gradient.html
index 8b734d19b4b..387b4d1f1ed 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.gradient.html
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.gradient.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>OffscreenCanvas test: initial.reset.gradient</title>
+<title>OffscreenCanvas test: 2d.canvas.host.initial.reset.gradient</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 
-<h1>initial.reset.gradient</h1>
+<h1>2d.canvas.host.initial.reset.gradient</h1>
 <p class="desc">Resetting the canvas state does not invalidate any existing gradients</p>
 
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.gradient.worker.js b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.gradient.worker.js
similarity index 92%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.gradient.worker.js
rename to tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.gradient.worker.js
index dabc013fed6..9029b48056f 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.gradient.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.gradient.worker.js
@@ -1,5 +1,5 @@
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
-// OffscreenCanvas test in a worker:initial.reset.gradient
+// OffscreenCanvas test in a worker:2d.canvas.host.initial.reset.gradient
 // Description:Resetting the canvas state does not invalidate any existing gradients
 // Note:
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.path.html b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.path.html
similarity index 87%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.path.html
rename to tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.path.html
index 24b7ff22fb9..3a887a8f1ff 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.path.html
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.path.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>OffscreenCanvas test: initial.reset.path</title>
+<title>OffscreenCanvas test: 2d.canvas.host.initial.reset.path</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 
-<h1>initial.reset.path</h1>
+<h1>2d.canvas.host.initial.reset.path</h1>
 <p class="desc">Resetting the canvas state resets the current path</p>
 
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.path.worker.js b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.path.worker.js
similarity index 90%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.path.worker.js
rename to tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.path.worker.js
index 65352324149..0ab12872aee 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.path.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.path.worker.js
@@ -1,5 +1,5 @@
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
-// OffscreenCanvas test in a worker:initial.reset.path
+// OffscreenCanvas test in a worker:2d.canvas.host.initial.reset.path
 // Description:Resetting the canvas state resets the current path
 // Note:
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.pattern.html b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.pattern.html
similarity index 89%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.pattern.html
rename to tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.pattern.html
index 2742d8fb5ff..d822f90917f 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.pattern.html
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.pattern.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>OffscreenCanvas test: initial.reset.pattern</title>
+<title>OffscreenCanvas test: 2d.canvas.host.initial.reset.pattern</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 
-<h1>initial.reset.pattern</h1>
+<h1>2d.canvas.host.initial.reset.pattern</h1>
 <p class="desc">Resetting the canvas state does not invalidate any existing patterns</p>
 
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.pattern.worker.js b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.pattern.worker.js
similarity index 92%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.pattern.worker.js
rename to tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.pattern.worker.js
index a69f36e8736..c4870a6f998 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.pattern.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.pattern.worker.js
@@ -1,5 +1,5 @@
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
-// OffscreenCanvas test in a worker:initial.reset.pattern
+// OffscreenCanvas test in a worker:2d.canvas.host.initial.reset.pattern
 // Description:Resetting the canvas state does not invalidate any existing patterns
 // Note:
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.same.html b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.same.html
similarity index 88%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.same.html
rename to tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.same.html
index 137dcbd556e..19394def373 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.same.html
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.same.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>OffscreenCanvas test: initial.reset.same</title>
+<title>OffscreenCanvas test: 2d.canvas.host.initial.reset.same</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 
-<h1>initial.reset.same</h1>
+<h1>2d.canvas.host.initial.reset.same</h1>
 <p class="desc">Setting size (not changing the value) resets canvas to transparent black</p>
 
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.same.worker.js b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.same.worker.js
similarity index 91%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.same.worker.js
rename to tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.same.worker.js
index fd3c46482ba..48d24750ac4 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.same.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.same.worker.js
@@ -1,5 +1,5 @@
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
-// OffscreenCanvas test in a worker:initial.reset.same
+// OffscreenCanvas test in a worker:2d.canvas.host.initial.reset.same
 // Description:Setting size (not changing the value) resets canvas to transparent black
 // Note:
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.transform.html b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.transform.html
similarity index 87%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.transform.html
rename to tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.transform.html
index d09f8f928f4..ee3b5abf107 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.transform.html
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.transform.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>OffscreenCanvas test: initial.reset.transform</title>
+<title>OffscreenCanvas test: 2d.canvas.host.initial.reset.transform</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 
-<h1>initial.reset.transform</h1>
+<h1>2d.canvas.host.initial.reset.transform</h1>
 <p class="desc">Resetting the canvas state resets the current transformation matrix</p>
 
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.transform.worker.js b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.transform.worker.js
similarity index 90%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.transform.worker.js
rename to tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.transform.worker.js
index 564a3bd82f4..218e64fa5dc 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/initial.reset.transform.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.initial.reset.transform.worker.js
@@ -1,5 +1,5 @@
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
-// OffscreenCanvas test in a worker:initial.reset.transform
+// OffscreenCanvas test in a worker:2d.canvas.host.initial.reset.transform
 // Description:Resetting the canvas state resets the current transformation matrix
 // Note:
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d.canvas.readonly.html b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.readonly.html
similarity index 89%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d.canvas.readonly.html
rename to tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.readonly.html
index 6bc6eef2efa..0e7e10cd242 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d.canvas.readonly.html
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.readonly.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>OffscreenCanvas test: 2d.canvas.readonly</title>
+<title>OffscreenCanvas test: 2d.canvas.host.readonly</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 
-<h1>2d.canvas.readonly</h1>
+<h1>2d.canvas.host.readonly</h1>
 <p class="desc">canvas is readonly</p>
 
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d.canvas.readonly.worker.js b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.readonly.worker.js
similarity index 92%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d.canvas.readonly.worker.js
rename to tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.readonly.worker.js
index 068c2c2019d..bbe50dcf61f 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d.canvas.readonly.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.readonly.worker.js
@@ -1,5 +1,5 @@
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
-// OffscreenCanvas test in a worker:2d.canvas.readonly
+// OffscreenCanvas test in a worker:2d.canvas.host.readonly
 // Description:canvas is readonly
 // Note:
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d.canvas.reference.html b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.reference.html
similarity index 87%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d.canvas.reference.html
rename to tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.reference.html
index c43afd816ae..b5de73f403d 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d.canvas.reference.html
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.reference.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>OffscreenCanvas test: 2d.canvas.reference</title>
+<title>OffscreenCanvas test: 2d.canvas.host.reference</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 
-<h1>2d.canvas.reference</h1>
+<h1>2d.canvas.host.reference</h1>
 <p class="desc">canvas refers back to its canvas</p>
 
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d.canvas.reference.worker.js b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.reference.worker.js
similarity index 90%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d.canvas.reference.worker.js
rename to tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.reference.worker.js
index a1578af07c0..7a1f0c5ab49 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d.canvas.reference.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.reference.worker.js
@@ -1,5 +1,5 @@
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
-// OffscreenCanvas test in a worker:2d.canvas.reference
+// OffscreenCanvas test in a worker:2d.canvas.host.reference
 // Description:canvas refers back to its canvas
 // Note:
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.default.html b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.default.html
similarity index 86%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.default.html
rename to tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.default.html
index 52ddf116e61..dc7b894b207 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.default.html
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.default.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>OffscreenCanvas test: size.attributes.default</title>
+<title>OffscreenCanvas test: 2d.canvas.host.size.attributes.default</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 
-<h1>size.attributes.default</h1>
+<h1>2d.canvas.host.size.attributes.default</h1>
 <p class="desc">Default width/height when attributes are missing</p>
 
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.default.worker.js b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.default.worker.js
similarity index 89%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.default.worker.js
rename to tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.default.worker.js
index 83e0271f1ab..78fce5aef8d 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.default.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.default.worker.js
@@ -1,5 +1,5 @@
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
-// OffscreenCanvas test in a worker:size.attributes.default
+// OffscreenCanvas test in a worker:2d.canvas.host.size.attributes.default
 // Description:Default width/height when attributes are missing
 // Note:
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.idl.html b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.idl.html
similarity index 92%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.idl.html
rename to tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.idl.html
index a815a7beb49..7030103524c 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.idl.html
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.idl.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>OffscreenCanvas test: size.attributes.idl</title>
+<title>OffscreenCanvas test: 2d.canvas.host.size.attributes.idl</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 
-<h1>size.attributes.idl</h1>
+<h1>2d.canvas.host.size.attributes.idl</h1>
 <p class="desc">Getting/setting width/height IDL attributes</p>
 
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.idl.set.zero.html b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.idl.set.zero.html
similarity index 85%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.idl.set.zero.html
rename to tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.idl.set.zero.html
index 5a069f3c014..347c460cd7e 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.idl.set.zero.html
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.idl.set.zero.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>OffscreenCanvas test: size.attributes.idl.set.zero</title>
+<title>OffscreenCanvas test: 2d.canvas.host.size.attributes.idl.set.zero</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 
-<h1>size.attributes.idl.set.zero</h1>
+<h1>2d.canvas.host.size.attributes.idl.set.zero</h1>
 <p class="desc">Setting width/height IDL attributes to 0</p>
 
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.idl.set.zero.worker.js b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.idl.set.zero.worker.js
similarity index 89%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.idl.set.zero.worker.js
rename to tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.idl.set.zero.worker.js
index d51258ac2a4..21535da0eb3 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.idl.set.zero.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.idl.set.zero.worker.js
@@ -1,5 +1,5 @@
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
-// OffscreenCanvas test in a worker:size.attributes.idl.set.zero
+// OffscreenCanvas test in a worker:2d.canvas.host.size.attributes.idl.set.zero
 // Description:Setting width/height IDL attributes to 0
 // Note:
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.idl.worker.js b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.idl.worker.js
similarity index 94%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.idl.worker.js
rename to tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.idl.worker.js
index 931b95cb65c..a00201f18cc 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.idl.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.idl.worker.js
@@ -1,5 +1,5 @@
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
-// OffscreenCanvas test in a worker:size.attributes.idl
+// OffscreenCanvas test in a worker:2d.canvas.host.size.attributes.idl
 // Description:Getting/setting width/height IDL attributes
 // Note:
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.decimal.html b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.decimal.html
similarity index 85%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.decimal.html
rename to tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.decimal.html
index 688d80b2fa6..c3fa3b4ba66 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.decimal.html
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.decimal.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>OffscreenCanvas test: size.attributes.parse.decimal</title>
+<title>OffscreenCanvas test: 2d.canvas.host.size.attributes.parse.decimal</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 
-<h1>size.attributes.parse.decimal</h1>
+<h1>2d.canvas.host.size.attributes.parse.decimal</h1>
 <p class="desc">Parsing of non-negative integers</p>
 
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.decimal.worker.js b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.decimal.worker.js
similarity index 89%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.decimal.worker.js
rename to tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.decimal.worker.js
index 157bd613bbc..1267bb205a9 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.decimal.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.decimal.worker.js
@@ -1,5 +1,5 @@
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
-// OffscreenCanvas test in a worker:size.attributes.parse.decimal
+// OffscreenCanvas test in a worker:2d.canvas.host.size.attributes.parse.decimal
 // Description:Parsing of non-negative integers
 // Note:
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.em.html b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.em.html
similarity index 84%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.em.html
rename to tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.em.html
index 2e5056aad0d..ea6f811b8ff 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.em.html
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.em.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>OffscreenCanvas test: size.attributes.parse.em</title>
+<title>OffscreenCanvas test: 2d.canvas.host.size.attributes.parse.em</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 
-<h1>size.attributes.parse.em</h1>
+<h1>2d.canvas.host.size.attributes.parse.em</h1>
 <p class="desc">Parsing of non-negative integers</p>
 
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.em.worker.js b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.em.worker.js
similarity index 88%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.em.worker.js
rename to tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.em.worker.js
index b939765ee4e..2f0642d9979 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.em.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.em.worker.js
@@ -1,5 +1,5 @@
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
-// OffscreenCanvas test in a worker:size.attributes.parse.em
+// OffscreenCanvas test in a worker:2d.canvas.host.size.attributes.parse.em
 // Description:Parsing of non-negative integers
 // Note:
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.empty.html b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.empty.html
similarity index 85%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.empty.html
rename to tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.empty.html
index 7755f9d0db2..d38c159a6e3 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.empty.html
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.empty.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>OffscreenCanvas test: size.attributes.parse.empty</title>
+<title>OffscreenCanvas test: 2d.canvas.host.size.attributes.parse.empty</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 
-<h1>size.attributes.parse.empty</h1>
+<h1>2d.canvas.host.size.attributes.parse.empty</h1>
 <p class="desc">Parsing of non-negative integers</p>
 
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.empty.worker.js b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.empty.worker.js
similarity index 89%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.empty.worker.js
rename to tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.empty.worker.js
index 72fcd9f6e5a..b1eee3a5b22 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.empty.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.empty.worker.js
@@ -1,5 +1,5 @@
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
-// OffscreenCanvas test in a worker:size.attributes.parse.empty
+// OffscreenCanvas test in a worker:2d.canvas.host.size.attributes.parse.empty
 // Description:Parsing of non-negative integers
 // Note:
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.exp.html b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.exp.html
similarity index 86%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.exp.html
rename to tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.exp.html
index 0a2f0125834..2aa8245a49c 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.exp.html
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.exp.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>OffscreenCanvas test: size.attributes.parse.exp</title>
+<title>OffscreenCanvas test: 2d.canvas.host.size.attributes.parse.exp</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 
-<h1>size.attributes.parse.exp</h1>
+<h1>2d.canvas.host.size.attributes.parse.exp</h1>
 <p class="desc">Parsing of non-negative integers</p>
 
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.exp.worker.js b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.exp.worker.js
similarity index 90%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.exp.worker.js
rename to tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.exp.worker.js
index 0b7d5f2b975..8c8b4cc715e 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.exp.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.exp.worker.js
@@ -1,5 +1,5 @@
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
-// OffscreenCanvas test in a worker:size.attributes.parse.exp
+// OffscreenCanvas test in a worker:2d.canvas.host.size.attributes.parse.exp
 // Description:Parsing of non-negative integers
 // Note:
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.hex.html b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.hex.html
similarity index 85%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.hex.html
rename to tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.hex.html
index 5a8990183a4..4b0e47b53f5 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.hex.html
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.hex.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>OffscreenCanvas test: size.attributes.parse.hex</title>
+<title>OffscreenCanvas test: 2d.canvas.host.size.attributes.parse.hex</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 
-<h1>size.attributes.parse.hex</h1>
+<h1>2d.canvas.host.size.attributes.parse.hex</h1>
 <p class="desc">Parsing of non-negative integers</p>
 
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.hex.worker.js b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.hex.worker.js
similarity index 89%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.hex.worker.js
rename to tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.hex.worker.js
index 1edd0edee65..b685aaffa2d 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.hex.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.hex.worker.js
@@ -1,5 +1,5 @@
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
-// OffscreenCanvas test in a worker:size.attributes.parse.hex
+// OffscreenCanvas test in a worker:2d.canvas.host.size.attributes.parse.hex
 // Description:Parsing of non-negative integers
 // Note:
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.junk.html b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.junk.html
similarity index 84%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.junk.html
rename to tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.junk.html
index 10d2e20388f..a619651f781 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.junk.html
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.junk.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>OffscreenCanvas test: size.attributes.parse.junk</title>
+<title>OffscreenCanvas test: 2d.canvas.host.size.attributes.parse.junk</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 
-<h1>size.attributes.parse.junk</h1>
+<h1>2d.canvas.host.size.attributes.parse.junk</h1>
 <p class="desc">Parsing of non-negative integers</p>
 
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.junk.worker.js b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.junk.worker.js
similarity index 88%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.junk.worker.js
rename to tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.junk.worker.js
index c7e18d12cb5..f4822f4bd95 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.junk.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.junk.worker.js
@@ -1,5 +1,5 @@
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
-// OffscreenCanvas test in a worker:size.attributes.parse.junk
+// OffscreenCanvas test in a worker:2d.canvas.host.size.attributes.parse.junk
 // Description:Parsing of non-negative integers
 // Note:
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.minus.html b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.minus.html
similarity index 83%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.minus.html
rename to tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.minus.html
index 2a7d5d12968..c7f12fdb021 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.minus.html
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.minus.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>OffscreenCanvas test: size.attributes.parse.minus</title>
+<title>OffscreenCanvas test: 2d.canvas.host.size.attributes.parse.minus</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 
-<h1>size.attributes.parse.minus</h1>
+<h1>2d.canvas.host.size.attributes.parse.minus</h1>
 <p class="desc">Parsing of non-negative integers</p>
 
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.minus.worker.js b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.minus.worker.js
similarity index 88%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.minus.worker.js
rename to tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.minus.worker.js
index 9680f907766..322b992eda2 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.minus.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.minus.worker.js
@@ -1,5 +1,5 @@
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
-// OffscreenCanvas test in a worker:size.attributes.parse.minus
+// OffscreenCanvas test in a worker:2d.canvas.host.size.attributes.parse.minus
 // Description:Parsing of non-negative integers
 // Note:
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.octal.html b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.octal.html
similarity index 85%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.octal.html
rename to tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.octal.html
index 3d9c2fb0443..7bfb7658d4d 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.octal.html
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.octal.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>OffscreenCanvas test: size.attributes.parse.octal</title>
+<title>OffscreenCanvas test: 2d.canvas.host.size.attributes.parse.octal</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 
-<h1>size.attributes.parse.octal</h1>
+<h1>2d.canvas.host.size.attributes.parse.octal</h1>
 <p class="desc">Parsing of non-negative integers</p>
 
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.octal.worker.js b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.octal.worker.js
similarity index 89%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.octal.worker.js
rename to tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.octal.worker.js
index 2925361e3b3..ce518e35c7a 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.octal.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.octal.worker.js
@@ -1,5 +1,5 @@
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
-// OffscreenCanvas test in a worker:size.attributes.parse.octal
+// OffscreenCanvas test in a worker:2d.canvas.host.size.attributes.parse.octal
 // Description:Parsing of non-negative integers
 // Note:
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.onlyspace.html b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.onlyspace.html
similarity index 84%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.onlyspace.html
rename to tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.onlyspace.html
index 821de438aa4..16dace16ea9 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.onlyspace.html
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.onlyspace.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>OffscreenCanvas test: size.attributes.parse.onlyspace</title>
+<title>OffscreenCanvas test: 2d.canvas.host.size.attributes.parse.onlyspace</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 
-<h1>size.attributes.parse.onlyspace</h1>
+<h1>2d.canvas.host.size.attributes.parse.onlyspace</h1>
 <p class="desc">Parsing of non-negative integers</p>
 
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.onlyspace.worker.js b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.onlyspace.worker.js
similarity index 89%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.onlyspace.worker.js
rename to tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.onlyspace.worker.js
index e5fadf13c8e..c186a4c08ba 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.onlyspace.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.onlyspace.worker.js
@@ -1,5 +1,5 @@
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
-// OffscreenCanvas test in a worker:size.attributes.parse.onlyspace
+// OffscreenCanvas test in a worker:2d.canvas.host.size.attributes.parse.onlyspace
 // Description:Parsing of non-negative integers
 // Note:
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.percent.html b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.percent.html
similarity index 83%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.percent.html
rename to tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.percent.html
index 58748103a4f..040a775ec7a 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.percent.html
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.percent.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>OffscreenCanvas test: size.attributes.parse.percent</title>
+<title>OffscreenCanvas test: 2d.canvas.host.size.attributes.parse.percent</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 
-<h1>size.attributes.parse.percent</h1>
+<h1>2d.canvas.host.size.attributes.parse.percent</h1>
 <p class="desc">Parsing of non-negative integers</p>
 
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.percent.worker.js b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.percent.worker.js
similarity index 87%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.percent.worker.js
rename to tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.percent.worker.js
index acbd2a13548..f38a1862d41 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.percent.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.percent.worker.js
@@ -1,5 +1,5 @@
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
-// OffscreenCanvas test in a worker:size.attributes.parse.percent
+// OffscreenCanvas test in a worker:2d.canvas.host.size.attributes.parse.percent
 // Description:Parsing of non-negative integers
 // Note:
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.plus.html b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.plus.html
similarity index 85%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.plus.html
rename to tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.plus.html
index 45558293b62..50c8467e2cd 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.plus.html
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.plus.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>OffscreenCanvas test: size.attributes.parse.plus</title>
+<title>OffscreenCanvas test: 2d.canvas.host.size.attributes.parse.plus</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 
-<h1>size.attributes.parse.plus</h1>
+<h1>2d.canvas.host.size.attributes.parse.plus</h1>
 <p class="desc">Parsing of non-negative integers</p>
 
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.plus.worker.js b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.plus.worker.js
similarity index 89%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.plus.worker.js
rename to tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.plus.worker.js
index ecf67976769..bb45a1e4fa0 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.plus.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.plus.worker.js
@@ -1,5 +1,5 @@
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
-// OffscreenCanvas test in a worker:size.attributes.parse.plus
+// OffscreenCanvas test in a worker:2d.canvas.host.size.attributes.parse.plus
 // Description:Parsing of non-negative integers
 // Note:
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.space.html b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.space.html
similarity index 85%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.space.html
rename to tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.space.html
index b0d63a4694f..cb1f3ae840a 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.space.html
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.space.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>OffscreenCanvas test: size.attributes.parse.space</title>
+<title>OffscreenCanvas test: 2d.canvas.host.size.attributes.parse.space</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 
-<h1>size.attributes.parse.space</h1>
+<h1>2d.canvas.host.size.attributes.parse.space</h1>
 <p class="desc">Parsing of non-negative integers</p>
 
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.space.worker.js b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.space.worker.js
similarity index 89%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.space.worker.js
rename to tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.space.worker.js
index 11ac398b0d4..967a0939d80 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.space.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.space.worker.js
@@ -1,5 +1,5 @@
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
-// OffscreenCanvas test in a worker:size.attributes.parse.space
+// OffscreenCanvas test in a worker:2d.canvas.host.size.attributes.parse.space
 // Description:Parsing of non-negative integers
 // Note:
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.trailingjunk.html b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.trailingjunk.html
similarity index 82%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.trailingjunk.html
rename to tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.trailingjunk.html
index 536ea901d0e..8d8d481aefa 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.trailingjunk.html
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.trailingjunk.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>OffscreenCanvas test: size.attributes.parse.trailingjunk</title>
+<title>OffscreenCanvas test: 2d.canvas.host.size.attributes.parse.trailingjunk</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 
-<h1>size.attributes.parse.trailingjunk</h1>
+<h1>2d.canvas.host.size.attributes.parse.trailingjunk</h1>
 <p class="desc">Parsing of non-negative integers</p>
 
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.trailingjunk.worker.js b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.trailingjunk.worker.js
similarity index 87%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.trailingjunk.worker.js
rename to tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.trailingjunk.worker.js
index 1d1c5e7f28d..ffebcd97f1e 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.trailingjunk.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.trailingjunk.worker.js
@@ -1,5 +1,5 @@
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
-// OffscreenCanvas test in a worker:size.attributes.parse.trailingjunk
+// OffscreenCanvas test in a worker:2d.canvas.host.size.attributes.parse.trailingjunk
 // Description:Parsing of non-negative integers
 // Note:
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.whitespace.html b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.whitespace.html
similarity index 84%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.whitespace.html
rename to tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.whitespace.html
index 53a3a2e6055..f6e29d6cb61 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.whitespace.html
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.whitespace.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>OffscreenCanvas test: size.attributes.parse.whitespace</title>
+<title>OffscreenCanvas test: 2d.canvas.host.size.attributes.parse.whitespace</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 
-<h1>size.attributes.parse.whitespace</h1>
+<h1>2d.canvas.host.size.attributes.parse.whitespace</h1>
 <p class="desc">Parsing of non-negative integers</p>
 
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.whitespace.worker.js b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.whitespace.worker.js
similarity index 89%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.whitespace.worker.js
rename to tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.whitespace.worker.js
index 26296e10234..fb7ba47975a 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.whitespace.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.whitespace.worker.js
@@ -1,5 +1,5 @@
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
-// OffscreenCanvas test in a worker:size.attributes.parse.whitespace
+// OffscreenCanvas test in a worker:2d.canvas.host.size.attributes.parse.whitespace
 // Description:Parsing of non-negative integers
 // Note:
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.zero.html b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.zero.html
similarity index 85%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.zero.html
rename to tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.zero.html
index 1af0d2a61e2..07e924a6030 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.zero.html
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.zero.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>OffscreenCanvas test: size.attributes.parse.zero</title>
+<title>OffscreenCanvas test: 2d.canvas.host.size.attributes.parse.zero</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 
-<h1>size.attributes.parse.zero</h1>
+<h1>2d.canvas.host.size.attributes.parse.zero</h1>
 <p class="desc">Parsing of non-negative integers</p>
 
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.zero.worker.js b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.zero.worker.js
similarity index 89%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.zero.worker.js
rename to tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.zero.worker.js
index 5348bf6a83c..1363bff7728 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.parse.zero.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.parse.zero.worker.js
@@ -1,5 +1,5 @@
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
-// OffscreenCanvas test in a worker:size.attributes.parse.zero
+// OffscreenCanvas test in a worker:2d.canvas.host.size.attributes.parse.zero
 // Description:Parsing of non-negative integers
 // Note:
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.reflect.setidl.html b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.reflect.setidl.html
similarity index 85%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.reflect.setidl.html
rename to tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.reflect.setidl.html
index 997bf974ad8..d24b2cc49ff 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.reflect.setidl.html
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.reflect.setidl.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>OffscreenCanvas test: size.attributes.reflect.setidl</title>
+<title>OffscreenCanvas test: 2d.canvas.host.size.attributes.reflect.setidl</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 
-<h1>size.attributes.reflect.setidl</h1>
+<h1>2d.canvas.host.size.attributes.reflect.setidl</h1>
 <p class="desc">Setting IDL attributes updates IDL and content attributes</p>
 
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.reflect.setidl.worker.js b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.reflect.setidl.worker.js
similarity index 89%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.reflect.setidl.worker.js
rename to tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.reflect.setidl.worker.js
index 9555f665ab3..3b3ced124ab 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.reflect.setidl.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.reflect.setidl.worker.js
@@ -1,5 +1,5 @@
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
-// OffscreenCanvas test in a worker:size.attributes.reflect.setidl
+// OffscreenCanvas test in a worker:2d.canvas.host.size.attributes.reflect.setidl
 // Description:Setting IDL attributes updates IDL and content attributes
 // Note:
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.reflect.setidlzero.html b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.reflect.setidlzero.html
similarity index 84%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.reflect.setidlzero.html
rename to tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.reflect.setidlzero.html
index 50e9096fdd4..c4839afb0e4 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.reflect.setidlzero.html
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.reflect.setidlzero.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>OffscreenCanvas test: size.attributes.reflect.setidlzero</title>
+<title>OffscreenCanvas test: 2d.canvas.host.size.attributes.reflect.setidlzero</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 
-<h1>size.attributes.reflect.setidlzero</h1>
+<h1>2d.canvas.host.size.attributes.reflect.setidlzero</h1>
 <p class="desc">Setting IDL attributes to 0 updates IDL and content attributes</p>
 
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.reflect.setidlzero.worker.js b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.reflect.setidlzero.worker.js
similarity index 89%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.reflect.setidlzero.worker.js
rename to tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.reflect.setidlzero.worker.js
index e412b7a5142..d440a9d807a 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.attributes.reflect.setidlzero.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.attributes.reflect.setidlzero.worker.js
@@ -1,5 +1,5 @@
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
-// OffscreenCanvas test in a worker:size.attributes.reflect.setidlzero
+// OffscreenCanvas test in a worker:2d.canvas.host.size.attributes.reflect.setidlzero
 // Description:Setting IDL attributes to 0 updates IDL and content attributes
 // Note:
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.large.html b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.large.html
similarity index 90%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.large.html
rename to tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.large.html
index 46b8a055bb3..b220f8f2ede 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.large.html
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.large.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<title>OffscreenCanvas test: size.large</title>
+<title>OffscreenCanvas test: 2d.canvas.host.size.large</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 
-<h1>size.large</h1>
+<h1>2d.canvas.host.size.large</h1>
 <p class="desc"></p>
 
 <p class="notes">Not sure how reasonable this is, but the spec doesn't say there's an upper limit on the size.
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.large.worker.js b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.large.worker.js
similarity index 92%
rename from tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.large.worker.js
rename to tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.large.worker.js
index 6a5bb5ee7e0..a763704131a 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/size.large.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/canvas-host/2d.canvas.host.size.large.worker.js
@@ -1,5 +1,5 @@
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
-// OffscreenCanvas test in a worker:size.large
+// OffscreenCanvas test in a worker:2d.canvas.host.size.large
 // Description:
 // Note:<p class="notes">Not sure how reasonable this is, but the spec doesn't say there's an upper limit on the size.
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.blur-from-outside-canvas.no-clipping-expected.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.blur-from-outside-canvas.no-clipping-expected.html
new file mode 100644
index 00000000000..6cad180f148
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.blur-from-outside-canvas.no-clipping-expected.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.layer.blur-from-outside-canvas.no-clipping</title>
+<h1>2d.layer.blur-from-outside-canvas.no-clipping</h1>
+<p class="desc">Checks blur leaking inside from drawing outside the canvas</p>
+<canvas id="canvas" width="200" height="200">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
+<script>
+  const canvas = document.getElementById("canvas");
+  const ctx = canvas.getContext('2d');
+
+  const svg = `
+  <svg xmlns="http://www.w3.org/2000/svg"
+        width="200" height="200"
+        color-interpolation-filters="sRGB">
+    <filter id="filter" x="-100%" y="-100%" width="300%" height="300%">
+      <feGaussianBlur in="SourceGraphic" stdDeviation="30" />
+    </filter>
+    <g filter="url(#filter)">
+      <rect x="201" y="50" width="100" height="100" fill="turquoise"/>
+      <rect x="50" y="201" width="100" height="100" fill="indigo"/>
+      <rect x="-101" y="50" width="100" height="100" fill="orange"/>
+      <rect x="50" y="-101" width="100" height="100" fill="brown"/>
+    </g>
+  </svg>`;
+  const img = new Image();
+  img.width = 200;
+  img.height = 200;
+  img.onload = () => {
+      // No clipping.
+
+      ctx.drawImage(img, 0, 0);
+  };
+  img.src = 'data:image/svg+xml;base64,' + btoa(svg);
+</script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.blur-from-outside-canvas.no-clipping.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.blur-from-outside-canvas.no-clipping.html
new file mode 100644
index 00000000000..3cd1c674a13
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.blur-from-outside-canvas.no-clipping.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<link rel="match" href="2d.layer.blur-from-outside-canvas.no-clipping-expected.html">
+<title>Canvas test: 2d.layer.blur-from-outside-canvas.no-clipping</title>
+<h1>2d.layer.blur-from-outside-canvas.no-clipping</h1>
+<p class="desc">Checks blur leaking inside from drawing outside the canvas</p>
+<canvas id="canvas" width="200" height="200">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
+<script>
+  const canvas = new OffscreenCanvas(200, 200);
+  const ctx = canvas.getContext('2d');
+
+  // No clipping.
+
+  ctx.beginLayer({filter: [ {name: 'gaussianBlur', stdDeviation: 30} ]});
+
+  ctx.fillStyle = 'turquoise';
+  ctx.fillRect(201, 50, 100, 100);
+  ctx.fillStyle = 'indigo';
+  ctx.fillRect(50, 201, 100, 100);
+  ctx.fillStyle = 'orange';
+  ctx.fillRect(-1, 50, -100, 100);
+  ctx.fillStyle = 'brown';
+  ctx.fillRect(50, -1, 100, -100);
+
+  ctx.endLayer();
+
+  const outputCanvas = document.getElementById("canvas");
+  outputCanvas.getContext('2d').drawImage(canvas, 0, 0);
+</script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.blur-from-outside-canvas.no-clipping.w.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.blur-from-outside-canvas.no-clipping.w.html
new file mode 100644
index 00000000000..90b013c077c
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.blur-from-outside-canvas.no-clipping.w.html
@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<html class="reftest-wait">
+<link rel="match" href="2d.layer.blur-from-outside-canvas.no-clipping-expected.html">
+<title>Canvas test: 2d.layer.blur-from-outside-canvas.no-clipping</title>
+<h1>2d.layer.blur-from-outside-canvas.no-clipping</h1>
+<p class="desc">Checks blur leaking inside from drawing outside the canvas</p>
+<canvas id="canvas" width="200" height="200">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
+<script id='myWorker' type='text/worker'>
+  self.onmessage = function(e) {
+    const canvas = new OffscreenCanvas(200, 200);
+    const ctx = canvas.getContext('2d');
+
+    // No clipping.
+
+    ctx.beginLayer({filter: [ {name: 'gaussianBlur', stdDeviation: 30} ]});
+
+    ctx.fillStyle = 'turquoise';
+    ctx.fillRect(201, 50, 100, 100);
+    ctx.fillStyle = 'indigo';
+    ctx.fillRect(50, 201, 100, 100);
+    ctx.fillStyle = 'orange';
+    ctx.fillRect(-1, 50, -100, 100);
+    ctx.fillStyle = 'brown';
+    ctx.fillRect(50, -1, 100, -100);
+
+    ctx.endLayer();
+
+    const bitmap = canvas.transferToImageBitmap();
+    self.postMessage(bitmap, bitmap);
+  };
+</script>
+<script>
+  const blob = new Blob([document.getElementById('myWorker').textContent]);
+  const worker = new Worker(URL.createObjectURL(blob));
+  worker.addEventListener('message', msg => {
+    const outputCtx = document.getElementById("canvas").getContext('2d');
+    outputCtx.drawImage(msg.data, 0, 0);
+    document.documentElement.classList.remove("reftest-wait");
+  });
+  worker.postMessage(null);
+</script>
+</html>
diff --git a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.blur-from-outside-canvas.with-clipping-expected.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.blur-from-outside-canvas.with-clipping-expected.html
new file mode 100644
index 00000000000..1823f789839
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.blur-from-outside-canvas.with-clipping-expected.html
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.layer.blur-from-outside-canvas.with-clipping</title>
+<h1>2d.layer.blur-from-outside-canvas.with-clipping</h1>
+<p class="desc">Checks blur leaking inside from drawing outside the canvas</p>
+<canvas id="canvas" width="200" height="200">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
+<script>
+  const canvas = document.getElementById("canvas");
+  const ctx = canvas.getContext('2d');
+
+  const svg = `
+  <svg xmlns="http://www.w3.org/2000/svg"
+        width="200" height="200"
+        color-interpolation-filters="sRGB">
+    <filter id="filter" x="-100%" y="-100%" width="300%" height="300%">
+      <feGaussianBlur in="SourceGraphic" stdDeviation="30" />
+    </filter>
+    <g filter="url(#filter)">
+      <rect x="201" y="50" width="100" height="100" fill="turquoise"/>
+      <rect x="50" y="201" width="100" height="100" fill="indigo"/>
+      <rect x="-101" y="50" width="100" height="100" fill="orange"/>
+      <rect x="50" y="-101" width="100" height="100" fill="brown"/>
+    </g>
+  </svg>`;
+  const img = new Image();
+  img.width = 200;
+  img.height = 200;
+  img.onload = () => {
+      const clipRegion = new Path2D();
+      clipRegion.rect(20, 20, 160, 160);
+      ctx.clip(clipRegion);
+
+      ctx.drawImage(img, 0, 0);
+  };
+  img.src = 'data:image/svg+xml;base64,' + btoa(svg);
+</script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.blur-from-outside-canvas.with-clipping.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.blur-from-outside-canvas.with-clipping.html
new file mode 100644
index 00000000000..76477445e57
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.blur-from-outside-canvas.with-clipping.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<link rel="match" href="2d.layer.blur-from-outside-canvas.with-clipping-expected.html">
+<title>Canvas test: 2d.layer.blur-from-outside-canvas.with-clipping</title>
+<h1>2d.layer.blur-from-outside-canvas.with-clipping</h1>
+<p class="desc">Checks blur leaking inside from drawing outside the canvas</p>
+<canvas id="canvas" width="200" height="200">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
+<script>
+  const canvas = new OffscreenCanvas(200, 200);
+  const ctx = canvas.getContext('2d');
+
+  const clipRegion = new Path2D();
+  clipRegion.rect(20, 20, 160, 160);
+  ctx.clip(clipRegion);
+
+  ctx.beginLayer({filter: [ {name: 'gaussianBlur', stdDeviation: 30} ]});
+
+  ctx.fillStyle = 'turquoise';
+  ctx.fillRect(201, 50, 100, 100);
+  ctx.fillStyle = 'indigo';
+  ctx.fillRect(50, 201, 100, 100);
+  ctx.fillStyle = 'orange';
+  ctx.fillRect(-1, 50, -100, 100);
+  ctx.fillStyle = 'brown';
+  ctx.fillRect(50, -1, 100, -100);
+
+  ctx.endLayer();
+
+  const outputCanvas = document.getElementById("canvas");
+  outputCanvas.getContext('2d').drawImage(canvas, 0, 0);
+</script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.blur-from-outside-canvas.with-clipping.w.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.blur-from-outside-canvas.with-clipping.w.html
new file mode 100644
index 00000000000..cf5570c932d
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.blur-from-outside-canvas.with-clipping.w.html
@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<html class="reftest-wait">
+<link rel="match" href="2d.layer.blur-from-outside-canvas.with-clipping-expected.html">
+<title>Canvas test: 2d.layer.blur-from-outside-canvas.with-clipping</title>
+<h1>2d.layer.blur-from-outside-canvas.with-clipping</h1>
+<p class="desc">Checks blur leaking inside from drawing outside the canvas</p>
+<canvas id="canvas" width="200" height="200">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
+<script id='myWorker' type='text/worker'>
+  self.onmessage = function(e) {
+    const canvas = new OffscreenCanvas(200, 200);
+    const ctx = canvas.getContext('2d');
+
+    const clipRegion = new Path2D();
+    clipRegion.rect(20, 20, 160, 160);
+    ctx.clip(clipRegion);
+
+    ctx.beginLayer({filter: [ {name: 'gaussianBlur', stdDeviation: 30} ]});
+
+    ctx.fillStyle = 'turquoise';
+    ctx.fillRect(201, 50, 100, 100);
+    ctx.fillStyle = 'indigo';
+    ctx.fillRect(50, 201, 100, 100);
+    ctx.fillStyle = 'orange';
+    ctx.fillRect(-1, 50, -100, 100);
+    ctx.fillStyle = 'brown';
+    ctx.fillRect(50, -1, 100, -100);
+
+    ctx.endLayer();
+
+    const bitmap = canvas.transferToImageBitmap();
+    self.postMessage(bitmap, bitmap);
+  };
+</script>
+<script>
+  const blob = new Blob([document.getElementById('myWorker').textContent]);
+  const worker = new Worker(URL.createObjectURL(blob));
+  worker.addEventListener('message', msg => {
+    const outputCtx = document.getElementById("canvas").getContext('2d');
+    outputCtx.drawImage(msg.data, 0, 0);
+    document.documentElement.classList.remove("reftest-wait");
+  });
+  worker.postMessage(null);
+</script>
+</html>
diff --git a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.long-distance-expected.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.long-distance-expected.html
new file mode 100644
index 00000000000..cc10684a9bc
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.long-distance-expected.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.layer.shadow-from-outside-canvas.long-distance</title>
+<h1>2d.layer.shadow-from-outside-canvas.long-distance</h1>
+<p class="desc">Checks shadow produced by object drawn outside the canvas</p>
+<canvas id="canvas" width="200" height="200">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
+<script>
+  const canvas = document.getElementById("canvas");
+  const ctx = canvas.getContext('2d');
+
+  const delta = 10000;
+
+  // No clipping.
+
+  ctx.fillStyle = 'green';
+  ctx.fillRect(0, 0, 100, 100);
+</script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.long-distance-with-clipping-expected.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.long-distance-with-clipping-expected.html
new file mode 100644
index 00000000000..377dd55ef6f
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.long-distance-with-clipping-expected.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.layer.shadow-from-outside-canvas.long-distance-with-clipping</title>
+<h1>2d.layer.shadow-from-outside-canvas.long-distance-with-clipping</h1>
+<p class="desc">Checks shadow produced by object drawn outside the canvas</p>
+<canvas id="canvas" width="200" height="200">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
+<script>
+  const canvas = document.getElementById("canvas");
+  const ctx = canvas.getContext('2d');
+
+  const delta = 10000;
+
+  const clipRegion = new Path2D();
+  clipRegion.rect(20, 20, 160, 160);
+  ctx.clip(clipRegion);
+
+  ctx.fillStyle = 'green';
+  ctx.fillRect(0, 0, 100, 100);
+</script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.long-distance-with-clipping.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.long-distance-with-clipping.html
new file mode 100644
index 00000000000..98262f53b61
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.long-distance-with-clipping.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<link rel="match" href="2d.layer.shadow-from-outside-canvas.long-distance-with-clipping-expected.html">
+<title>Canvas test: 2d.layer.shadow-from-outside-canvas.long-distance-with-clipping</title>
+<h1>2d.layer.shadow-from-outside-canvas.long-distance-with-clipping</h1>
+<p class="desc">Checks shadow produced by object drawn outside the canvas</p>
+<canvas id="canvas" width="200" height="200">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
+<script>
+  const canvas = new OffscreenCanvas(200, 200);
+  const ctx = canvas.getContext('2d');
+
+  const delta = 10000;
+
+  const clipRegion = new Path2D();
+  clipRegion.rect(20, 20, 160, 160);
+  ctx.clip(clipRegion);
+
+  ctx.beginLayer({filter: [
+      {name: 'dropShadow', dx: -(200 + delta),
+        dy: -(200 + delta), stdDeviation: 0,
+        floodColor: 'green'},
+      ]});
+
+  ctx.fillStyle = 'red';
+  ctx.fillRect(200 + delta, 200 + delta, 100, 100);
+
+  ctx.endLayer();
+
+  const outputCanvas = document.getElementById("canvas");
+  outputCanvas.getContext('2d').drawImage(canvas, 0, 0);
+</script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.long-distance-with-clipping.w.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.long-distance-with-clipping.w.html
new file mode 100644
index 00000000000..90b4332f94b
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.long-distance-with-clipping.w.html
@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<html class="reftest-wait">
+<link rel="match" href="2d.layer.shadow-from-outside-canvas.long-distance-with-clipping-expected.html">
+<title>Canvas test: 2d.layer.shadow-from-outside-canvas.long-distance-with-clipping</title>
+<h1>2d.layer.shadow-from-outside-canvas.long-distance-with-clipping</h1>
+<p class="desc">Checks shadow produced by object drawn outside the canvas</p>
+<canvas id="canvas" width="200" height="200">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
+<script id='myWorker' type='text/worker'>
+  self.onmessage = function(e) {
+    const canvas = new OffscreenCanvas(200, 200);
+    const ctx = canvas.getContext('2d');
+
+    const delta = 10000;
+
+    const clipRegion = new Path2D();
+    clipRegion.rect(20, 20, 160, 160);
+    ctx.clip(clipRegion);
+
+    ctx.beginLayer({filter: [
+        {name: 'dropShadow', dx: -(200 + delta),
+          dy: -(200 + delta), stdDeviation: 0,
+          floodColor: 'green'},
+        ]});
+
+    ctx.fillStyle = 'red';
+    ctx.fillRect(200 + delta, 200 + delta, 100, 100);
+
+    ctx.endLayer();
+
+    const bitmap = canvas.transferToImageBitmap();
+    self.postMessage(bitmap, bitmap);
+  };
+</script>
+<script>
+  const blob = new Blob([document.getElementById('myWorker').textContent]);
+  const worker = new Worker(URL.createObjectURL(blob));
+  worker.addEventListener('message', msg => {
+    const outputCtx = document.getElementById("canvas").getContext('2d');
+    outputCtx.drawImage(msg.data, 0, 0);
+    document.documentElement.classList.remove("reftest-wait");
+  });
+  worker.postMessage(null);
+</script>
+</html>
diff --git a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.long-distance.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.long-distance.html
new file mode 100644
index 00000000000..eea9b5dc25f
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.long-distance.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<link rel="match" href="2d.layer.shadow-from-outside-canvas.long-distance-expected.html">
+<title>Canvas test: 2d.layer.shadow-from-outside-canvas.long-distance</title>
+<h1>2d.layer.shadow-from-outside-canvas.long-distance</h1>
+<p class="desc">Checks shadow produced by object drawn outside the canvas</p>
+<canvas id="canvas" width="200" height="200">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
+<script>
+  const canvas = new OffscreenCanvas(200, 200);
+  const ctx = canvas.getContext('2d');
+
+  const delta = 10000;
+
+  // No clipping.
+
+  ctx.beginLayer({filter: [
+      {name: 'dropShadow', dx: -(200 + delta),
+        dy: -(200 + delta), stdDeviation: 0,
+        floodColor: 'green'},
+      ]});
+
+  ctx.fillStyle = 'red';
+  ctx.fillRect(200 + delta, 200 + delta, 100, 100);
+
+  ctx.endLayer();
+
+  const outputCanvas = document.getElementById("canvas");
+  outputCanvas.getContext('2d').drawImage(canvas, 0, 0);
+</script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.long-distance.w.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.long-distance.w.html
new file mode 100644
index 00000000000..e4422558cf0
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.long-distance.w.html
@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<html class="reftest-wait">
+<link rel="match" href="2d.layer.shadow-from-outside-canvas.long-distance-expected.html">
+<title>Canvas test: 2d.layer.shadow-from-outside-canvas.long-distance</title>
+<h1>2d.layer.shadow-from-outside-canvas.long-distance</h1>
+<p class="desc">Checks shadow produced by object drawn outside the canvas</p>
+<canvas id="canvas" width="200" height="200">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
+<script id='myWorker' type='text/worker'>
+  self.onmessage = function(e) {
+    const canvas = new OffscreenCanvas(200, 200);
+    const ctx = canvas.getContext('2d');
+
+    const delta = 10000;
+
+    // No clipping.
+
+    ctx.beginLayer({filter: [
+        {name: 'dropShadow', dx: -(200 + delta),
+          dy: -(200 + delta), stdDeviation: 0,
+          floodColor: 'green'},
+        ]});
+
+    ctx.fillStyle = 'red';
+    ctx.fillRect(200 + delta, 200 + delta, 100, 100);
+
+    ctx.endLayer();
+
+    const bitmap = canvas.transferToImageBitmap();
+    self.postMessage(bitmap, bitmap);
+  };
+</script>
+<script>
+  const blob = new Blob([document.getElementById('myWorker').textContent]);
+  const worker = new Worker(URL.createObjectURL(blob));
+  worker.addEventListener('message', msg => {
+    const outputCtx = document.getElementById("canvas").getContext('2d');
+    outputCtx.drawImage(msg.data, 0, 0);
+    document.documentElement.classList.remove("reftest-wait");
+  });
+  worker.postMessage(null);
+</script>
+</html>
diff --git a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.short-distance-expected.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.short-distance-expected.html
new file mode 100644
index 00000000000..8980708dd18
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.short-distance-expected.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.layer.shadow-from-outside-canvas.short-distance</title>
+<h1>2d.layer.shadow-from-outside-canvas.short-distance</h1>
+<p class="desc">Checks shadow produced by object drawn outside the canvas</p>
+<canvas id="canvas" width="200" height="200">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
+<script>
+  const canvas = document.getElementById("canvas");
+  const ctx = canvas.getContext('2d');
+
+  const delta = 1;
+
+  // No clipping.
+
+  ctx.fillStyle = 'green';
+  ctx.fillRect(0, 0, 100, 100);
+</script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.short-distance-with-clipping-expected.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.short-distance-with-clipping-expected.html
new file mode 100644
index 00000000000..024fc8c9a4a
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.short-distance-with-clipping-expected.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.layer.shadow-from-outside-canvas.short-distance-with-clipping</title>
+<h1>2d.layer.shadow-from-outside-canvas.short-distance-with-clipping</h1>
+<p class="desc">Checks shadow produced by object drawn outside the canvas</p>
+<canvas id="canvas" width="200" height="200">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
+<script>
+  const canvas = document.getElementById("canvas");
+  const ctx = canvas.getContext('2d');
+
+  const delta = 1;
+
+  const clipRegion = new Path2D();
+  clipRegion.rect(20, 20, 160, 160);
+  ctx.clip(clipRegion);
+
+  ctx.fillStyle = 'green';
+  ctx.fillRect(0, 0, 100, 100);
+</script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.short-distance-with-clipping.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.short-distance-with-clipping.html
new file mode 100644
index 00000000000..d5f5b0c8ff9
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.short-distance-with-clipping.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<link rel="match" href="2d.layer.shadow-from-outside-canvas.short-distance-with-clipping-expected.html">
+<title>Canvas test: 2d.layer.shadow-from-outside-canvas.short-distance-with-clipping</title>
+<h1>2d.layer.shadow-from-outside-canvas.short-distance-with-clipping</h1>
+<p class="desc">Checks shadow produced by object drawn outside the canvas</p>
+<canvas id="canvas" width="200" height="200">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
+<script>
+  const canvas = new OffscreenCanvas(200, 200);
+  const ctx = canvas.getContext('2d');
+
+  const delta = 1;
+
+  const clipRegion = new Path2D();
+  clipRegion.rect(20, 20, 160, 160);
+  ctx.clip(clipRegion);
+
+  ctx.beginLayer({filter: [
+      {name: 'dropShadow', dx: -(200 + delta),
+        dy: -(200 + delta), stdDeviation: 0,
+        floodColor: 'green'},
+      ]});
+
+  ctx.fillStyle = 'red';
+  ctx.fillRect(200 + delta, 200 + delta, 100, 100);
+
+  ctx.endLayer();
+
+  const outputCanvas = document.getElementById("canvas");
+  outputCanvas.getContext('2d').drawImage(canvas, 0, 0);
+</script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.short-distance-with-clipping.w.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.short-distance-with-clipping.w.html
new file mode 100644
index 00000000000..acbf09edec1
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.short-distance-with-clipping.w.html
@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<html class="reftest-wait">
+<link rel="match" href="2d.layer.shadow-from-outside-canvas.short-distance-with-clipping-expected.html">
+<title>Canvas test: 2d.layer.shadow-from-outside-canvas.short-distance-with-clipping</title>
+<h1>2d.layer.shadow-from-outside-canvas.short-distance-with-clipping</h1>
+<p class="desc">Checks shadow produced by object drawn outside the canvas</p>
+<canvas id="canvas" width="200" height="200">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
+<script id='myWorker' type='text/worker'>
+  self.onmessage = function(e) {
+    const canvas = new OffscreenCanvas(200, 200);
+    const ctx = canvas.getContext('2d');
+
+    const delta = 1;
+
+    const clipRegion = new Path2D();
+    clipRegion.rect(20, 20, 160, 160);
+    ctx.clip(clipRegion);
+
+    ctx.beginLayer({filter: [
+        {name: 'dropShadow', dx: -(200 + delta),
+          dy: -(200 + delta), stdDeviation: 0,
+          floodColor: 'green'},
+        ]});
+
+    ctx.fillStyle = 'red';
+    ctx.fillRect(200 + delta, 200 + delta, 100, 100);
+
+    ctx.endLayer();
+
+    const bitmap = canvas.transferToImageBitmap();
+    self.postMessage(bitmap, bitmap);
+  };
+</script>
+<script>
+  const blob = new Blob([document.getElementById('myWorker').textContent]);
+  const worker = new Worker(URL.createObjectURL(blob));
+  worker.addEventListener('message', msg => {
+    const outputCtx = document.getElementById("canvas").getContext('2d');
+    outputCtx.drawImage(msg.data, 0, 0);
+    document.documentElement.classList.remove("reftest-wait");
+  });
+  worker.postMessage(null);
+</script>
+</html>
diff --git a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.short-distance.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.short-distance.html
new file mode 100644
index 00000000000..a1c4689f7e5
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.short-distance.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<link rel="match" href="2d.layer.shadow-from-outside-canvas.short-distance-expected.html">
+<title>Canvas test: 2d.layer.shadow-from-outside-canvas.short-distance</title>
+<h1>2d.layer.shadow-from-outside-canvas.short-distance</h1>
+<p class="desc">Checks shadow produced by object drawn outside the canvas</p>
+<canvas id="canvas" width="200" height="200">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
+<script>
+  const canvas = new OffscreenCanvas(200, 200);
+  const ctx = canvas.getContext('2d');
+
+  const delta = 1;
+
+  // No clipping.
+
+  ctx.beginLayer({filter: [
+      {name: 'dropShadow', dx: -(200 + delta),
+        dy: -(200 + delta), stdDeviation: 0,
+        floodColor: 'green'},
+      ]});
+
+  ctx.fillStyle = 'red';
+  ctx.fillRect(200 + delta, 200 + delta, 100, 100);
+
+  ctx.endLayer();
+
+  const outputCanvas = document.getElementById("canvas");
+  outputCanvas.getContext('2d').drawImage(canvas, 0, 0);
+</script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.short-distance.w.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.short-distance.w.html
new file mode 100644
index 00000000000..2e39091f3d4
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.shadow-from-outside-canvas.short-distance.w.html
@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<html class="reftest-wait">
+<link rel="match" href="2d.layer.shadow-from-outside-canvas.short-distance-expected.html">
+<title>Canvas test: 2d.layer.shadow-from-outside-canvas.short-distance</title>
+<h1>2d.layer.shadow-from-outside-canvas.short-distance</h1>
+<p class="desc">Checks shadow produced by object drawn outside the canvas</p>
+<canvas id="canvas" width="200" height="200">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
+<script id='myWorker' type='text/worker'>
+  self.onmessage = function(e) {
+    const canvas = new OffscreenCanvas(200, 200);
+    const ctx = canvas.getContext('2d');
+
+    const delta = 1;
+
+    // No clipping.
+
+    ctx.beginLayer({filter: [
+        {name: 'dropShadow', dx: -(200 + delta),
+          dy: -(200 + delta), stdDeviation: 0,
+          floodColor: 'green'},
+        ]});
+
+    ctx.fillStyle = 'red';
+    ctx.fillRect(200 + delta, 200 + delta, 100, 100);
+
+    ctx.endLayer();
+
+    const bitmap = canvas.transferToImageBitmap();
+    self.postMessage(bitmap, bitmap);
+  };
+</script>
+<script>
+  const blob = new Blob([document.getElementById('myWorker').textContent]);
+  const worker = new Worker(URL.createObjectURL(blob));
+  worker.addEventListener('message', msg => {
+    const outputCtx = document.getElementById("canvas").getContext('2d');
+    outputCtx.drawImage(msg.data, 0, 0);
+    document.documentElement.classList.remove("reftest-wait");
+  });
+  worker.postMessage(null);
+</script>
+</html>
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.render.drop_shadow-expected.html b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.render.drop_shadow-expected.html
new file mode 100644
index 00000000000..182f7e40cd0
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.render.drop_shadow-expected.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.reset.render.drop_shadow</title>
+<h1>2d.reset.render.drop_shadow</h1>
+<p class="desc">check that drop shadows are correctly rendered after reset</p>
+<canvas id="canvas" width="500" height="500">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
+<script>
+  const canvas = document.getElementById("canvas");
+  const ctx = canvas.getContext('2d');
+
+  ctx.fillRect(100, 100, 100, 100);
+</script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.render.drop_shadow.html b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.render.drop_shadow.html
new file mode 100644
index 00000000000..e6decd1687e
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.render.drop_shadow.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<link rel="match" href="2d.reset.render.drop_shadow-expected.html">
+<title>Canvas test: 2d.reset.render.drop_shadow</title>
+<h1>2d.reset.render.drop_shadow</h1>
+<p class="desc">check that drop shadows are correctly rendered after reset</p>
+<canvas id="canvas" width="500" height="500">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
+<script>
+  const canvas = new OffscreenCanvas(500, 500);
+  const ctx = canvas.getContext('2d');
+
+  ctx.shadowOffsetX = 10;
+  ctx.shadowOffsetY = 10;
+  ctx.shadowColor = "red";
+  ctx.shadowBlur = 10;
+
+  ctx.reset();
+
+  ctx.fillRect(100, 100, 100, 100);
+
+  const outputCanvas = document.getElementById("canvas");
+  outputCanvas.getContext('2d').drawImage(canvas, 0, 0);
+</script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.render.drop_shadow.w.html b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.render.drop_shadow.w.html
new file mode 100644
index 00000000000..0ceba2f91d2
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.render.drop_shadow.w.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<html class="reftest-wait">
+<link rel="match" href="2d.reset.render.drop_shadow-expected.html">
+<title>Canvas test: 2d.reset.render.drop_shadow</title>
+<h1>2d.reset.render.drop_shadow</h1>
+<p class="desc">check that drop shadows are correctly rendered after reset</p>
+<canvas id="canvas" width="500" height="500">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
+<script id='myWorker' type='text/worker'>
+  self.onmessage = function(e) {
+    const canvas = new OffscreenCanvas(500, 500);
+    const ctx = canvas.getContext('2d');
+
+    ctx.shadowOffsetX = 10;
+    ctx.shadowOffsetY = 10;
+    ctx.shadowColor = "red";
+    ctx.shadowBlur = 10;
+
+    ctx.reset();
+
+    ctx.fillRect(100, 100, 100, 100);
+
+    const bitmap = canvas.transferToImageBitmap();
+    self.postMessage(bitmap, bitmap);
+  };
+</script>
+<script>
+  const blob = new Blob([document.getElementById('myWorker').textContent]);
+  const worker = new Worker(URL.createObjectURL(blob));
+  worker.addEventListener('message', msg => {
+    const outputCtx = document.getElementById("canvas").getContext('2d');
+    outputCtx.drawImage(msg.data, 0, 0);
+    document.documentElement.classList.remove("reftest-wait");
+  });
+  worker.postMessage(null);
+</script>
+</html>
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.render.global_composite_operation-expected.html b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.render.global_composite_operation-expected.html
new file mode 100644
index 00000000000..1f9d247634c
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.render.global_composite_operation-expected.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.reset.render.global_composite_operation</title>
+<h1>2d.reset.render.global_composite_operation</h1>
+<p class="desc">check that canvas correctly renders rectangles with the default global composite operation after reset</p>
+<canvas id="canvas" width="400" height="400">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
+<script>
+  const canvas = document.getElementById("canvas");
+  const ctx = canvas.getContext('2d');
+
+  ctx.fillRect(10, 10, 100, 100);
+  ctx.fillRect(50, 50, 100, 100);
+</script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.render.global_composite_operation.html b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.render.global_composite_operation.html
new file mode 100644
index 00000000000..4ddcc8d8f0b
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.render.global_composite_operation.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<link rel="match" href="2d.reset.render.global_composite_operation-expected.html">
+<title>Canvas test: 2d.reset.render.global_composite_operation</title>
+<h1>2d.reset.render.global_composite_operation</h1>
+<p class="desc">check that canvas correctly renders rectangles with the default global composite operation after reset</p>
+<canvas id="canvas" width="400" height="400">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
+<script>
+  const canvas = new OffscreenCanvas(400, 400);
+  const ctx = canvas.getContext('2d');
+
+  ctx.globalCompositeOperation = "xor";
+
+  ctx.reset();
+
+  ctx.fillRect(10, 10, 100, 100);
+  ctx.fillRect(50, 50, 100, 100);
+
+  const outputCanvas = document.getElementById("canvas");
+  outputCanvas.getContext('2d').drawImage(canvas, 0, 0);
+</script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.render.global_composite_operation.w.html b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.render.global_composite_operation.w.html
new file mode 100644
index 00000000000..6df07a47e2f
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.render.global_composite_operation.w.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<html class="reftest-wait">
+<link rel="match" href="2d.reset.render.global_composite_operation-expected.html">
+<title>Canvas test: 2d.reset.render.global_composite_operation</title>
+<h1>2d.reset.render.global_composite_operation</h1>
+<p class="desc">check that canvas correctly renders rectangles with the default global composite operation after reset</p>
+<canvas id="canvas" width="400" height="400">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
+<script id='myWorker' type='text/worker'>
+  self.onmessage = function(e) {
+    const canvas = new OffscreenCanvas(400, 400);
+    const ctx = canvas.getContext('2d');
+
+    ctx.globalCompositeOperation = "xor";
+
+    ctx.reset();
+
+    ctx.fillRect(10, 10, 100, 100);
+    ctx.fillRect(50, 50, 100, 100);
+
+    const bitmap = canvas.transferToImageBitmap();
+    self.postMessage(bitmap, bitmap);
+  };
+</script>
+<script>
+  const blob = new Blob([document.getElementById('myWorker').textContent]);
+  const worker = new Worker(URL.createObjectURL(blob));
+  worker.addEventListener('message', msg => {
+    const outputCtx = document.getElementById("canvas").getContext('2d');
+    outputCtx.drawImage(msg.data, 0, 0);
+    document.documentElement.classList.remove("reftest-wait");
+  });
+  worker.postMessage(null);
+</script>
+</html>
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.render.line-expected.html b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.render.line-expected.html
new file mode 100644
index 00000000000..dcd648d8c34
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.render.line-expected.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.reset.render.line</title>
+<h1>2d.reset.render.line</h1>
+<p class="desc">check that lines are correctly rendered after reset</p>
+<canvas id="canvas" width="400" height="400">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
+<script>
+  const canvas = document.getElementById("canvas");
+  const ctx = canvas.getContext('2d');
+
+  ctx.beginPath();
+  ctx.moveTo(100, 100);
+  ctx.lineTo(100, 300);
+  ctx.lineTo(300, 300);
+  ctx.lineTo(300, 100);
+  ctx.stroke();
+</script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.render.line.html b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.render.line.html
new file mode 100644
index 00000000000..0e478cbf9d4
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.render.line.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<link rel="match" href="2d.reset.render.line-expected.html">
+<title>Canvas test: 2d.reset.render.line</title>
+<h1>2d.reset.render.line</h1>
+<p class="desc">check that lines are correctly rendered after reset</p>
+<canvas id="canvas" width="400" height="400">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
+<script>
+  const canvas = new OffscreenCanvas(400, 400);
+  const ctx = canvas.getContext('2d');
+
+  ctx.lineWidth = 10;
+  ctx.lineCap = "round";
+  ctx.lineJoin = "bevel";
+  ctx.lineDashOffset = 10;
+  ctx.setLineDash([20]);
+
+  ctx.reset();
+
+  ctx.beginPath();
+  ctx.moveTo(100, 100);
+  ctx.lineTo(100, 300);
+  ctx.lineTo(300, 300);
+  ctx.lineTo(300, 100);
+  ctx.stroke();
+
+  const outputCanvas = document.getElementById("canvas");
+  outputCanvas.getContext('2d').drawImage(canvas, 0, 0);
+</script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.render.line.w.html b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.render.line.w.html
new file mode 100644
index 00000000000..e85f155b328
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.render.line.w.html
@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<html class="reftest-wait">
+<link rel="match" href="2d.reset.render.line-expected.html">
+<title>Canvas test: 2d.reset.render.line</title>
+<h1>2d.reset.render.line</h1>
+<p class="desc">check that lines are correctly rendered after reset</p>
+<canvas id="canvas" width="400" height="400">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
+<script id='myWorker' type='text/worker'>
+  self.onmessage = function(e) {
+    const canvas = new OffscreenCanvas(400, 400);
+    const ctx = canvas.getContext('2d');
+
+    ctx.lineWidth = 10;
+    ctx.lineCap = "round";
+    ctx.lineJoin = "bevel";
+    ctx.lineDashOffset = 10;
+    ctx.setLineDash([20]);
+
+    ctx.reset();
+
+    ctx.beginPath();
+    ctx.moveTo(100, 100);
+    ctx.lineTo(100, 300);
+    ctx.lineTo(300, 300);
+    ctx.lineTo(300, 100);
+    ctx.stroke();
+
+    const bitmap = canvas.transferToImageBitmap();
+    self.postMessage(bitmap, bitmap);
+  };
+</script>
+<script>
+  const blob = new Blob([document.getElementById('myWorker').textContent]);
+  const worker = new Worker(URL.createObjectURL(blob));
+  worker.addEventListener('message', msg => {
+    const outputCtx = document.getElementById("canvas").getContext('2d');
+    outputCtx.drawImage(msg.data, 0, 0);
+    document.documentElement.classList.remove("reftest-wait");
+  });
+  worker.postMessage(null);
+</script>
+</html>
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.render.misc-expected.html b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.render.misc-expected.html
new file mode 100644
index 00000000000..c359e6b42e2
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.render.misc-expected.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.reset.render.misc</title>
+<h1>2d.reset.render.misc</h1>
+<p class="desc">check that canvas correctly renders rectangles after reset (states not covered by other tests)</p>
+<canvas id="canvas" width="400" height="400">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
+<script>
+  const canvas = document.getElementById("canvas");
+  const ctx = canvas.getContext('2d');
+
+  ctx.fillRect(0, 0, 100, 100);
+  ctx.strokeRect(150, 150, 100, 100);
+</script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.render.misc.html b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.render.misc.html
new file mode 100644
index 00000000000..b471327d989
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.render.misc.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<link rel="match" href="2d.reset.render.misc-expected.html">
+<title>Canvas test: 2d.reset.render.misc</title>
+<h1>2d.reset.render.misc</h1>
+<p class="desc">check that canvas correctly renders rectangles after reset (states not covered by other tests)</p>
+<canvas id="canvas" width="400" height="400">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
+<script>
+  const canvas = new OffscreenCanvas(400, 400);
+  const ctx = canvas.getContext('2d');
+
+  ctx.fillStyle = "red";
+  ctx.strokeStyle = "red";
+  ctx.globalAlpha = 0.5;
+  ctx.filter = "blur(2px)";
+
+  ctx.reset();
+
+  ctx.fillRect(0, 0, 100, 100);
+  ctx.strokeRect(150, 150, 100, 100);
+
+  const outputCanvas = document.getElementById("canvas");
+  outputCanvas.getContext('2d').drawImage(canvas, 0, 0);
+</script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.render.misc.w.html b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.render.misc.w.html
new file mode 100644
index 00000000000..eef646df663
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.render.misc.w.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<html class="reftest-wait">
+<link rel="match" href="2d.reset.render.misc-expected.html">
+<title>Canvas test: 2d.reset.render.misc</title>
+<h1>2d.reset.render.misc</h1>
+<p class="desc">check that canvas correctly renders rectangles after reset (states not covered by other tests)</p>
+<canvas id="canvas" width="400" height="400">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
+<script id='myWorker' type='text/worker'>
+  self.onmessage = function(e) {
+    const canvas = new OffscreenCanvas(400, 400);
+    const ctx = canvas.getContext('2d');
+
+    ctx.fillStyle = "red";
+    ctx.strokeStyle = "red";
+    ctx.globalAlpha = 0.5;
+    ctx.filter = "blur(2px)";
+
+    ctx.reset();
+
+    ctx.fillRect(0, 0, 100, 100);
+    ctx.strokeRect(150, 150, 100, 100);
+
+    const bitmap = canvas.transferToImageBitmap();
+    self.postMessage(bitmap, bitmap);
+  };
+</script>
+<script>
+  const blob = new Blob([document.getElementById('myWorker').textContent]);
+  const worker = new Worker(URL.createObjectURL(blob));
+  worker.addEventListener('message', msg => {
+    const outputCtx = document.getElementById("canvas").getContext('2d');
+    outputCtx.drawImage(msg.data, 0, 0);
+    document.documentElement.classList.remove("reftest-wait");
+  });
+  worker.postMessage(null);
+</script>
+</html>
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.render.miter_limit-expected.html b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.render.miter_limit-expected.html
new file mode 100644
index 00000000000..c91f485c531
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.render.miter_limit-expected.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.reset.render.miter_limit</title>
+<h1>2d.reset.render.miter_limit</h1>
+<p class="desc">check that the lines are correctly rendered with the default miter limit after reset</p>
+<canvas id="canvas" width="400" height="400">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
+<script>
+  const canvas = document.getElementById("canvas");
+  const ctx = canvas.getContext('2d');
+
+  ctx.lineWidth = 10;
+
+  ctx.beginPath();
+  ctx.moveTo(0, 100);
+  for (let i = 0; i < 24; i++) {
+    const dy = i % 2 === 0 ? 25 : -25;
+    ctx.lineTo(Math.pow(i, 1.5) * 2, 75 + dy);
+  }
+  ctx.stroke();
+</script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.render.miter_limit.html b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.render.miter_limit.html
new file mode 100644
index 00000000000..c00284bbc23
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.render.miter_limit.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<link rel="match" href="2d.reset.render.miter_limit-expected.html">
+<title>Canvas test: 2d.reset.render.miter_limit</title>
+<h1>2d.reset.render.miter_limit</h1>
+<p class="desc">check that the lines are correctly rendered with the default miter limit after reset</p>
+<canvas id="canvas" width="400" height="400">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
+<script>
+  const canvas = new OffscreenCanvas(400, 400);
+  const ctx = canvas.getContext('2d');
+
+  ctx.miterLimit = 6;
+
+  ctx.reset();
+
+  ctx.lineWidth = 10;
+
+  ctx.beginPath();
+  ctx.moveTo(0, 100);
+  for (let i = 0; i < 24; i++) {
+    const dy = i % 2 === 0 ? 25 : -25;
+    ctx.lineTo(Math.pow(i, 1.5) * 2, 75 + dy);
+  }
+  ctx.stroke();
+
+  const outputCanvas = document.getElementById("canvas");
+  outputCanvas.getContext('2d').drawImage(canvas, 0, 0);
+</script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.render.miter_limit.w.html b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.render.miter_limit.w.html
new file mode 100644
index 00000000000..1f98606b55e
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.render.miter_limit.w.html
@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<html class="reftest-wait">
+<link rel="match" href="2d.reset.render.miter_limit-expected.html">
+<title>Canvas test: 2d.reset.render.miter_limit</title>
+<h1>2d.reset.render.miter_limit</h1>
+<p class="desc">check that the lines are correctly rendered with the default miter limit after reset</p>
+<canvas id="canvas" width="400" height="400">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
+<script id='myWorker' type='text/worker'>
+  self.onmessage = function(e) {
+    const canvas = new OffscreenCanvas(400, 400);
+    const ctx = canvas.getContext('2d');
+
+    ctx.miterLimit = 6;
+
+    ctx.reset();
+
+    ctx.lineWidth = 10;
+
+    ctx.beginPath();
+    ctx.moveTo(0, 100);
+    for (let i = 0; i < 24; i++) {
+      const dy = i % 2 === 0 ? 25 : -25;
+      ctx.lineTo(Math.pow(i, 1.5) * 2, 75 + dy);
+    }
+    ctx.stroke();
+
+    const bitmap = canvas.transferToImageBitmap();
+    self.postMessage(bitmap, bitmap);
+  };
+</script>
+<script>
+  const blob = new Blob([document.getElementById('myWorker').textContent]);
+  const worker = new Worker(URL.createObjectURL(blob));
+  worker.addEventListener('message', msg => {
+    const outputCtx = document.getElementById("canvas").getContext('2d');
+    outputCtx.drawImage(msg.data, 0, 0);
+    document.documentElement.classList.remove("reftest-wait");
+  });
+  worker.postMessage(null);
+</script>
+</html>
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.render.text-expected.html b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.render.text-expected.html
new file mode 100644
index 00000000000..7221483b02f
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.render.text-expected.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.reset.render.text</title>
+<h1>2d.reset.render.text</h1>
+<p class="desc">check that text is correctly rendered after reset</p>
+<canvas id="canvas" width="400" height="400">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
+<script>
+  const canvas = document.getElementById("canvas");
+  const ctx = canvas.getContext('2d');
+
+  ctx.fillText("Lorem ipsum dolor sit amet, consectetur adipiscing elit", 0, 10);
+</script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.render.text.html b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.render.text.html
new file mode 100644
index 00000000000..31e35db71cb
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.render.text.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<link rel="match" href="2d.reset.render.text-expected.html">
+<title>Canvas test: 2d.reset.render.text</title>
+<h1>2d.reset.render.text</h1>
+<p class="desc">check that text is correctly rendered after reset</p>
+<canvas id="canvas" width="400" height="400">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
+<script>
+  const canvas = new OffscreenCanvas(400, 400);
+  const ctx = canvas.getContext('2d');
+
+  ctx.font = "24px serif";
+  ctx.textAlign = "center";
+  ctx.textBaseline = "hanging";
+  ctx.direction = "rtl";
+  ctx.letterSpacing = "10px";
+  ctx.fontKerning = "none";
+  ctx.fontStretch = "semi-condensed";
+  ctx.fontVariantCaps = "tilting-caps";
+  ctx.textRendering = "optimizeLegibility";
+  ctx.wordSpacing = "20px";
+
+  ctx.reset();
+
+  ctx.fillText("Lorem ipsum dolor sit amet, consectetur adipiscing elit", 0, 10);
+
+  const outputCanvas = document.getElementById("canvas");
+  outputCanvas.getContext('2d').drawImage(canvas, 0, 0);
+</script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.render.text.w.html b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.render.text.w.html
new file mode 100644
index 00000000000..6ddfd9fd9d9
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.render.text.w.html
@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<html class="reftest-wait">
+<link rel="match" href="2d.reset.render.text-expected.html">
+<title>Canvas test: 2d.reset.render.text</title>
+<h1>2d.reset.render.text</h1>
+<p class="desc">check that text is correctly rendered after reset</p>
+<canvas id="canvas" width="400" height="400">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
+<script id='myWorker' type='text/worker'>
+  self.onmessage = function(e) {
+    const canvas = new OffscreenCanvas(400, 400);
+    const ctx = canvas.getContext('2d');
+
+    ctx.font = "24px serif";
+    ctx.textAlign = "center";
+    ctx.textBaseline = "hanging";
+    ctx.direction = "rtl";
+    ctx.letterSpacing = "10px";
+    ctx.fontKerning = "none";
+    ctx.fontStretch = "semi-condensed";
+    ctx.fontVariantCaps = "tilting-caps";
+    ctx.textRendering = "optimizeLegibility";
+    ctx.wordSpacing = "20px";
+
+    ctx.reset();
+
+    ctx.fillText("Lorem ipsum dolor sit amet, consectetur adipiscing elit", 0, 10);
+
+    const bitmap = canvas.transferToImageBitmap();
+    self.postMessage(bitmap, bitmap);
+  };
+</script>
+<script>
+  const blob = new Blob([document.getElementById('myWorker').textContent]);
+  const worker = new Worker(URL.createObjectURL(blob));
+  worker.addEventListener('message', msg => {
+    const outputCtx = document.getElementById("canvas").getContext('2d');
+    outputCtx.drawImage(msg.data, 0, 0);
+    document.documentElement.classList.remove("reftest-wait");
+  });
+  worker.postMessage(null);
+</script>
+</html>
diff --git a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.letterSpacing.measure.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.letterSpacing.measure.html
index 63169486bad..a565770a163 100644
--- a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.letterSpacing.measure.html
+++ b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.letterSpacing.measure.html
@@ -23,7 +23,6 @@ t.step(function() {
   _assertSame(ctx.letterSpacing, '0px', "ctx.letterSpacing", "'0px'");
   _assertSame(ctx.wordSpacing, '0px', "ctx.wordSpacing", "'0px'");
   var width_normal = ctx.measureText('Hello World').width;
-  var ch_width = width_normal / 11;
 
   function test_letter_spacing(value, difference_spacing, epsilon) {
     ctx.letterSpacing = value;
@@ -44,7 +43,6 @@ t.step(function() {
                ['1em', 110, 0.1],
                ['-0.1em', -11, 0.1],
                ['1in', 1056, 0.1],
-               ['1ch', 11 * ch_width, 0.1],
                ['-0.1cm', -41.65, 0.2],
                ['-0.6mm', -24,95, 0.2]]
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.letterSpacing.measure.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.letterSpacing.measure.worker.js
index 585166fca01..630bf1d486e 100644
--- a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.letterSpacing.measure.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.letterSpacing.measure.worker.js
@@ -19,7 +19,6 @@ t.step(function() {
   _assertSame(ctx.letterSpacing, '0px', "ctx.letterSpacing", "'0px'");
   _assertSame(ctx.wordSpacing, '0px', "ctx.wordSpacing", "'0px'");
   var width_normal = ctx.measureText('Hello World').width;
-  var ch_width = width_normal / 11;
 
   function test_letter_spacing(value, difference_spacing, epsilon) {
     ctx.letterSpacing = value;
@@ -40,7 +39,6 @@ t.step(function() {
                ['1em', 110, 0.1],
                ['-0.1em', -11, 0.1],
                ['1in', 1056, 0.1],
-               ['1ch', 11 * ch_width, 0.1],
                ['-0.1cm', -41.65, 0.2],
                ['-0.6mm', -24,95, 0.2]]
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.wordSpacing.measure.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.wordSpacing.measure.html
index 69bf6e979c6..7a1d867d0fe 100644
--- a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.wordSpacing.measure.html
+++ b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.wordSpacing.measure.html
@@ -23,7 +23,6 @@ t.step(function() {
   _assertSame(ctx.letterSpacing, '0px', "ctx.letterSpacing", "'0px'");
   _assertSame(ctx.wordSpacing, '0px', "ctx.wordSpacing", "'0px'");
   var width_normal = ctx.measureText('Hello World, again').width;
-  var ch_width = width_normal / 18;
 
   function test_word_spacing(value, difference_spacing, epsilon) {
     ctx.wordSpacing = value;
@@ -44,7 +43,6 @@ t.step(function() {
                ['1em', 20, 0.1],
                ['-0.5em', -10, 0.1],
                ['1in', 192, 0.1],
-               ['1ch', 2 * ch_width, 0.1],
                ['-0.1cm', -7.57, 0.2],
                ['-0.6mm', -4.54, 0.2]]
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.wordSpacing.measure.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.wordSpacing.measure.worker.js
index d899b8c3282..b7acecb0ebb 100644
--- a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.wordSpacing.measure.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.drawing.style.wordSpacing.measure.worker.js
@@ -19,7 +19,6 @@ t.step(function() {
   _assertSame(ctx.letterSpacing, '0px', "ctx.letterSpacing", "'0px'");
   _assertSame(ctx.wordSpacing, '0px', "ctx.wordSpacing", "'0px'");
   var width_normal = ctx.measureText('Hello World, again').width;
-  var ch_width = width_normal / 18;
 
   function test_word_spacing(value, difference_spacing, epsilon) {
     ctx.wordSpacing = value;
@@ -40,7 +39,6 @@ t.step(function() {
                ['1em', 20, 0.1],
                ['-0.5em', -10, 0.1],
                ['1in', 192, 0.1],
-               ['1ch', 2 * ch_width, 0.1],
                ['-0.1cm', -7.57, 0.2],
                ['-0.6mm', -4.54, 0.2]]
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps1-expected.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps1-expected.html
index 942bcdec9cb..e2cef0d77a6 100644
--- a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps1-expected.html
+++ b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps1-expected.html
@@ -1,16 +1,15 @@
 <!DOCTYPE html>
-<meta charset="utf-8">
-<title>HTML OffscreenCanvas reference</title>
-<link rel="author" title="Jonathan Kew" href="mailto:jkew@mozilla.com">
-
-<canvas id="c1"></canvas>
-<br>
-<canvas id="c2"></canvas>
-
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.text.fontVariantCaps1</title>
+<h1>2d.text.fontVariantCaps1</h1>
+<p class="desc">Testing small caps setting in fontVariant</p>
+<canvas id="canvas" width="100" height="50">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
 <script>
-for (let c = 1; c <= 2; ++c) {
-  let ctx = document.getElementById("c" + c).getContext("2d");
+  const canvas = document.getElementById("canvas");
+  const ctx = canvas.getContext('2d');
+
   ctx.font = "small-caps 32px serif";
   ctx.fillText("Hello World", 20, 100);
-}
 </script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps1.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps1.html
index a2da7f557ce..3c216f07daa 100644
--- a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps1.html
+++ b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps1.html
@@ -1,55 +1,21 @@
 <!DOCTYPE html>
-<html class="reftest-wait">
-<meta charset="utf-8">
-<title>HTML OffscreenCanvas Test: the 'fontVariantCaps' property</title>
-<link rel="author" title="Jonathan Kew" href="mailto:jkew@mozilla.com">
-<link rel="help" href="https://html.spec.whatwg.org/multipage/canvas.html#dom-context-2d-fontvariantcaps">
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
 <link rel="match" href="2d.text.fontVariantCaps1-expected.html">
-<meta name="assert" content="text rendering respects the fontVariantCaps property">
-
-<canvas id="canvas1"></canvas>
-<br>
-<canvas id="canvas2"></canvas>
-
+<title>Canvas test: 2d.text.fontVariantCaps1</title>
+<h1>2d.text.fontVariantCaps1</h1>
+<p class="desc">Testing small caps setting in fontVariant</p>
+<canvas id="canvas" width="100" height="50">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
 <script>
-const testContent = `
+  const canvas = new OffscreenCanvas(100, 50);
+  const ctx = canvas.getContext('2d');
+
   ctx.font = "32px serif";
   ctx.fontVariantCaps = "small-caps";
+  // This should render the same as font = "small-caps 32px serif".
   ctx.fillText("Hello World", 20, 100);
-`;
 
-// Draw to the first canvas using a worker:
-const canvas1 = document.getElementById("canvas1");
-const offscreen1 = canvas1.transferControlToOffscreen();
-const workerScript = `
-  onmessage = (evt) => {
-    const canvas = evt.data.canvas;
-    const ctx = canvas.getContext("2d");
-
-    ${testContent}
-
-    self.postMessage("done");
-  };
-`;
-
-const blob = new Blob([workerScript], {type: 'application/javascript'});
-const worker = new Worker(URL.createObjectURL(blob));
-worker.addEventListener('message', function(e) {
-  if (e.data == "done") {
-    // Draw to the second using a main-thread OffscreenCanvas:
-    const offscreen2 = new OffscreenCanvas(300, 150);
-    const ctx = offscreen2.getContext("2d");
-
-    eval(testContent);
-
-    document.getElementById("canvas2")
-            .getContext("bitmaprenderer")
-            .transferFromImageBitmap(offscreen2.transferToImageBitmap());
-
-    document.documentElement.classList.remove("reftest-wait");
-  }
-}, false);
-
-worker.postMessage({ canvas: offscreen1 }, [offscreen1]);
+  const outputCanvas = document.getElementById("canvas");
+  outputCanvas.getContext('2d').drawImage(canvas, 0, 0);
 </script>
-
diff --git a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps1.w.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps1.w.html
new file mode 100644
index 00000000000..4bc1b36e175
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps1.w.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<html class="reftest-wait">
+<link rel="match" href="2d.text.fontVariantCaps1-expected.html">
+<title>Canvas test: 2d.text.fontVariantCaps1</title>
+<h1>2d.text.fontVariantCaps1</h1>
+<p class="desc">Testing small caps setting in fontVariant</p>
+<canvas id="canvas" width="100" height="50">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
+<script id='myWorker' type='text/worker'>
+  self.onmessage = function(e) {
+    const canvas = new OffscreenCanvas(100, 50);
+    const ctx = canvas.getContext('2d');
+
+    ctx.font = "32px serif";
+    ctx.fontVariantCaps = "small-caps";
+    // This should render the same as font = "small-caps 32px serif".
+    ctx.fillText("Hello World", 20, 100);
+
+    const bitmap = canvas.transferToImageBitmap();
+    self.postMessage(bitmap, bitmap);
+  };
+</script>
+<script>
+  const blob = new Blob([document.getElementById('myWorker').textContent]);
+  const worker = new Worker(URL.createObjectURL(blob));
+  worker.addEventListener('message', msg => {
+    const outputCtx = document.getElementById("canvas").getContext('2d');
+    outputCtx.drawImage(msg.data, 0, 0);
+    document.documentElement.classList.remove("reftest-wait");
+  });
+  worker.postMessage(null);
+</script>
+</html>
diff --git a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps2.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps2.html
index 8a644fbb616..e5bcff18316 100644
--- a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps2.html
+++ b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps2.html
@@ -1,54 +1,33 @@
 <!DOCTYPE html>
-<html class="reftest-wait">
-<meta charset="utf-8">
-<title>HTML OffscreenCanvas Test: the 'fontVariantCaps' property</title>
-<link rel="author" title="Jonathan Kew" href="mailto:jkew@mozilla.com">
-<link rel="help" href="https://html.spec.whatwg.org/multipage/canvas.html#dom-context-2d-fontvariantcaps">
-<link rel="mismatch" href="2d.text.fontVariantCaps2-unexpected.html">
-<meta name="assert" content="text rendering respects the fontVariantCaps property">
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>OffscreenCanvas test: 2d.text.fontVariantCaps2</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/html/canvas/resources/canvas-tests.js"></script>
+
+<h1>2d.text.fontVariantCaps2</h1>
+<p class="desc">Testing small caps setting in fontVariant</p>
 
-<canvas id="canvas1"></canvas>
-<br>
-<canvas id="canvas2"></canvas>
 
 <script>
-const testContent = `
+var t = async_test("Testing small caps setting in fontVariant");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
+t.step(function() {
+
+  var canvas = new OffscreenCanvas(100, 50);
+  var ctx = canvas.getContext('2d');
+
   ctx.font = "small-caps 32px serif";
-  ctx.fillText("Hello World", 20, 100);
-`;
+  // "mismatch" test, to verify that small-caps does change the rendering.
+  smallCaps_len = ctx.measureText("Hello World").width;
 
-// Draw to the first canvas using a worker:
-const canvas1 = document.getElementById("canvas1");
-const offscreen1 = canvas1.transferControlToOffscreen();
-const workerScript = `
-  onmessage = (evt) => {
-    const canvas = evt.data.canvas;
-    const ctx = canvas.getContext("2d");
+  ctx.font = "32px serif";
+  normalCaps_len = ctx.measureText("Hello World").width;
+  _assert(smallCaps_len != normalCaps_len, "smallCaps_len != normalCaps_len");
+  t.done();
 
-    ${testContent}
-
-    self.postMessage("done");
-  };
-`;
-
-const blob = new Blob([workerScript], {type: 'application/javascript'});
-const worker = new Worker(URL.createObjectURL(blob));
-worker.addEventListener('message', function(e) {
-  if (e.data == "done") {
-    // Draw to the second using a main-thread OffscreenCanvas:
-    const offscreen2 = new OffscreenCanvas(300, 150);
-    const ctx = offscreen2.getContext("2d");
-
-    eval(testContent);
-
-    document.getElementById("canvas2")
-            .getContext("bitmaprenderer")
-            .transferFromImageBitmap(offscreen2.transferToImageBitmap());
-
-    document.documentElement.classList.remove("reftest-wait");
-  }
-}, false);
-
-worker.postMessage({ canvas: offscreen1 }, [offscreen1]);
+});
 </script>
-
diff --git a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps2.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps2.worker.js
new file mode 100644
index 00000000000..89f4f48c737
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps2.worker.js
@@ -0,0 +1,28 @@
+// DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
+// OffscreenCanvas test in a worker:2d.text.fontVariantCaps2
+// Description:Testing small caps setting in fontVariant
+// Note:
+
+importScripts("/resources/testharness.js");
+importScripts("/html/canvas/resources/canvas-tests.js");
+
+var t = async_test("Testing small caps setting in fontVariant");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
+t.step(function() {
+
+  var canvas = new OffscreenCanvas(100, 50);
+  var ctx = canvas.getContext('2d');
+
+  ctx.font = "small-caps 32px serif";
+  // "mismatch" test, to verify that small-caps does change the rendering.
+  smallCaps_len = ctx.measureText("Hello World").width;
+
+  ctx.font = "32px serif";
+  normalCaps_len = ctx.measureText("Hello World").width;
+  _assert(smallCaps_len != normalCaps_len, "smallCaps_len != normalCaps_len");
+  t.done();
+});
+done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps3-expected.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps3-expected.html
index 8d96d0ab032..cf2d5ae119b 100644
--- a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps3-expected.html
+++ b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps3-expected.html
@@ -1,16 +1,15 @@
 <!DOCTYPE html>
-<meta charset="utf-8">
-<title>HTML OffscreenCanvas reference</title>
-<link rel="author" title="Jonathan Kew" href="mailto:jkew@mozilla.com">
-
-<canvas id="c1"></canvas>
-<br>
-<canvas id="c2"></canvas>
-
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.text.fontVariantCaps3</title>
+<h1>2d.text.fontVariantCaps3</h1>
+<p class="desc">Testing small caps setting in fontVariant</p>
+<canvas id="canvas" width="100" height="50">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
 <script>
-for (let c = 1; c <= 2; ++c) {
-  let ctx = document.getElementById("c" + c).getContext("2d");
+  const canvas = document.getElementById("canvas");
+  const ctx = canvas.getContext('2d');
+
   ctx.font = "small-caps 32px serif";
   ctx.fillText("hello world", 20, 100);
-}
 </script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps3.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps3.html
index 665a176087f..48699a640fe 100644
--- a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps3.html
+++ b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps3.html
@@ -1,55 +1,22 @@
 <!DOCTYPE html>
-<html class="reftest-wait">
-<meta charset="utf-8">
-<title>HTML OffscreenCanvas Test: the 'fontVariantCaps' property</title>
-<link rel="author" title="Jonathan Kew" href="mailto:jkew@mozilla.com">
-<link rel="help" href="https://html.spec.whatwg.org/multipage/canvas.html#dom-context-2d-fontvariantcaps">
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
 <link rel="match" href="2d.text.fontVariantCaps3-expected.html">
-<meta name="assert" content="text rendering respects the fontVariantCaps property">
-
-<canvas id="canvas1"></canvas>
-<br>
-<canvas id="canvas2"></canvas>
-
+<title>Canvas test: 2d.text.fontVariantCaps3</title>
+<h1>2d.text.fontVariantCaps3</h1>
+<p class="desc">Testing small caps setting in fontVariant</p>
+<canvas id="canvas" width="100" height="50">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
 <script>
-const testContent = `
+  const canvas = new OffscreenCanvas(100, 50);
+  const ctx = canvas.getContext('2d');
+
   ctx.font = "32px serif";
   ctx.fontVariantCaps = "all-small-caps";
+  // This should render the same as using font = "small-caps 32px serif"
+  // with all the underlying text in lowercase.
   ctx.fillText("Hello World", 20, 100);
-`;
 
-// Draw to the first canvas using a worker:
-const canvas1 = document.getElementById("canvas1");
-const offscreen1 = canvas1.transferControlToOffscreen();
-const workerScript = `
-  onmessage = (evt) => {
-    const canvas = evt.data.canvas;
-    const ctx = canvas.getContext("2d");
-
-    ${testContent}
-
-    self.postMessage("done");
-  };
-`;
-
-const blob = new Blob([workerScript], {type: 'application/javascript'});
-const worker = new Worker(URL.createObjectURL(blob));
-worker.addEventListener('message', function(e) {
-  if (e.data == "done") {
-    // Draw to the second using a main-thread OffscreenCanvas:
-    const offscreen2 = new OffscreenCanvas(300, 150);
-    const ctx = offscreen2.getContext("2d");
-
-    eval(testContent);
-
-    document.getElementById("canvas2")
-            .getContext("bitmaprenderer")
-            .transferFromImageBitmap(offscreen2.transferToImageBitmap());
-
-    document.documentElement.classList.remove("reftest-wait");
-  }
-}, false);
-
-worker.postMessage({ canvas: offscreen1 }, [offscreen1]);
+  const outputCanvas = document.getElementById("canvas");
+  outputCanvas.getContext('2d').drawImage(canvas, 0, 0);
 </script>
-
diff --git a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps3.w.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps3.w.html
new file mode 100644
index 00000000000..cd5c1db818f
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps3.w.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<html class="reftest-wait">
+<link rel="match" href="2d.text.fontVariantCaps3-expected.html">
+<title>Canvas test: 2d.text.fontVariantCaps3</title>
+<h1>2d.text.fontVariantCaps3</h1>
+<p class="desc">Testing small caps setting in fontVariant</p>
+<canvas id="canvas" width="100" height="50">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
+<script id='myWorker' type='text/worker'>
+  self.onmessage = function(e) {
+    const canvas = new OffscreenCanvas(100, 50);
+    const ctx = canvas.getContext('2d');
+
+    ctx.font = "32px serif";
+    ctx.fontVariantCaps = "all-small-caps";
+    // This should render the same as using font = "small-caps 32px serif"
+    // with all the underlying text in lowercase.
+    ctx.fillText("Hello World", 20, 100);
+
+    const bitmap = canvas.transferToImageBitmap();
+    self.postMessage(bitmap, bitmap);
+  };
+</script>
+<script>
+  const blob = new Blob([document.getElementById('myWorker').textContent]);
+  const worker = new Worker(URL.createObjectURL(blob));
+  worker.addEventListener('message', msg => {
+    const outputCtx = document.getElementById("canvas").getContext('2d');
+    outputCtx.drawImage(msg.data, 0, 0);
+    document.documentElement.classList.remove("reftest-wait");
+  });
+  worker.postMessage(null);
+</script>
+</html>
diff --git a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps4-expected.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps4-expected.html
index 8d96d0ab032..3813fd3684e 100644
--- a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps4-expected.html
+++ b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps4-expected.html
@@ -1,16 +1,15 @@
 <!DOCTYPE html>
-<meta charset="utf-8">
-<title>HTML OffscreenCanvas reference</title>
-<link rel="author" title="Jonathan Kew" href="mailto:jkew@mozilla.com">
-
-<canvas id="c1"></canvas>
-<br>
-<canvas id="c2"></canvas>
-
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.text.fontVariantCaps4</title>
+<h1>2d.text.fontVariantCaps4</h1>
+<p class="desc">Testing small caps setting in fontVariant</p>
+<canvas id="canvas" width="100" height="50">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
 <script>
-for (let c = 1; c <= 2; ++c) {
-  let ctx = document.getElementById("c" + c).getContext("2d");
+  const canvas = document.getElementById("canvas");
+  const ctx = canvas.getContext('2d');
+
   ctx.font = "small-caps 32px serif";
   ctx.fillText("hello world", 20, 100);
-}
 </script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps4.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps4.html
index 84c5fbb4469..b1b81b81e28 100644
--- a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps4.html
+++ b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps4.html
@@ -1,57 +1,22 @@
 <!DOCTYPE html>
-<html class="reftest-wait">
-<meta charset="utf-8">
-<title>HTML OffscreenCanvas Test: the 'fontVariantCaps' property</title>
-<link rel="author" title="Jonathan Kew" href="mailto:jkew@mozilla.com">
-<link rel="help" href="https://html.spec.whatwg.org/multipage/canvas.html#dom-context-2d-fontvariantcaps">
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
 <link rel="match" href="2d.text.fontVariantCaps4-expected.html">
-<meta name="assert" content="text rendering respects the fontVariantCaps property">
-
-<canvas id="canvas1"></canvas>
-<br>
-<canvas id="canvas2"></canvas>
-
+<title>Canvas test: 2d.text.fontVariantCaps4</title>
+<h1>2d.text.fontVariantCaps4</h1>
+<p class="desc">Testing small caps setting in fontVariant</p>
+<canvas id="canvas" width="100" height="50">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
 <script>
-const testContent = `
+  const canvas = new OffscreenCanvas(100, 50);
+  const ctx = canvas.getContext('2d');
+
   ctx.font = "small-caps 32px serif";
   // fontVariantCaps overrides the small-caps setting from the font attribute
   // (spec unclear, cf. https://github.com/whatwg/html/issues/8103)
   ctx.fontVariantCaps = "all-small-caps";
   ctx.fillText("Hello World", 20, 100);
-`;
 
-// Draw to the first canvas using a worker:
-const canvas1 = document.getElementById("canvas1");
-const offscreen1 = canvas1.transferControlToOffscreen();
-const workerScript = `
-  onmessage = (evt) => {
-    const canvas = evt.data.canvas;
-    const ctx = canvas.getContext("2d");
-
-    ${testContent}
-
-    self.postMessage("done");
-  };
-`;
-
-const blob = new Blob([workerScript], {type: 'application/javascript'});
-const worker = new Worker(URL.createObjectURL(blob));
-worker.addEventListener('message', function(e) {
-  if (e.data == "done") {
-    // Draw to the second using a main-thread OffscreenCanvas:
-    const offscreen2 = new OffscreenCanvas(300, 150);
-    const ctx = offscreen2.getContext("2d");
-
-    eval(testContent);
-
-    document.getElementById("canvas2")
-            .getContext("bitmaprenderer")
-            .transferFromImageBitmap(offscreen2.transferToImageBitmap());
-
-    document.documentElement.classList.remove("reftest-wait");
-  }
-}, false);
-
-worker.postMessage({ canvas: offscreen1 }, [offscreen1]);
+  const outputCanvas = document.getElementById("canvas");
+  outputCanvas.getContext('2d').drawImage(canvas, 0, 0);
 </script>
-
diff --git a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps4.w.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps4.w.html
new file mode 100644
index 00000000000..0bae66fcd46
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps4.w.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<html class="reftest-wait">
+<link rel="match" href="2d.text.fontVariantCaps4-expected.html">
+<title>Canvas test: 2d.text.fontVariantCaps4</title>
+<h1>2d.text.fontVariantCaps4</h1>
+<p class="desc">Testing small caps setting in fontVariant</p>
+<canvas id="canvas" width="100" height="50">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
+<script id='myWorker' type='text/worker'>
+  self.onmessage = function(e) {
+    const canvas = new OffscreenCanvas(100, 50);
+    const ctx = canvas.getContext('2d');
+
+    ctx.font = "small-caps 32px serif";
+    // fontVariantCaps overrides the small-caps setting from the font attribute
+    // (spec unclear, cf. https://github.com/whatwg/html/issues/8103)
+    ctx.fontVariantCaps = "all-small-caps";
+    ctx.fillText("Hello World", 20, 100);
+
+    const bitmap = canvas.transferToImageBitmap();
+    self.postMessage(bitmap, bitmap);
+  };
+</script>
+<script>
+  const blob = new Blob([document.getElementById('myWorker').textContent]);
+  const worker = new Worker(URL.createObjectURL(blob));
+  worker.addEventListener('message', msg => {
+    const outputCtx = document.getElementById("canvas").getContext('2d');
+    outputCtx.drawImage(msg.data, 0, 0);
+    document.documentElement.classList.remove("reftest-wait");
+  });
+  worker.postMessage(null);
+</script>
+</html>
diff --git a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps5-expected.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps5-expected.html
index 942bcdec9cb..4bda4ec4b5d 100644
--- a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps5-expected.html
+++ b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps5-expected.html
@@ -1,16 +1,15 @@
 <!DOCTYPE html>
-<meta charset="utf-8">
-<title>HTML OffscreenCanvas reference</title>
-<link rel="author" title="Jonathan Kew" href="mailto:jkew@mozilla.com">
-
-<canvas id="c1"></canvas>
-<br>
-<canvas id="c2"></canvas>
-
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.text.fontVariantCaps5</title>
+<h1>2d.text.fontVariantCaps5</h1>
+<p class="desc">Testing small caps setting in fontVariant</p>
+<canvas id="canvas" width="100" height="50">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
 <script>
-for (let c = 1; c <= 2; ++c) {
-  let ctx = document.getElementById("c" + c).getContext("2d");
+  const canvas = document.getElementById("canvas");
+  const ctx = canvas.getContext('2d');
+
   ctx.font = "small-caps 32px serif";
   ctx.fillText("Hello World", 20, 100);
-}
 </script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps5.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps5.html
index 877d890ccc6..2a6f7b5f737 100644
--- a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps5.html
+++ b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps5.html
@@ -1,57 +1,22 @@
 <!DOCTYPE html>
-<html class="reftest-wait">
-<meta charset="utf-8">
-<title>HTML OffscreenCanvas Test: the 'fontVariantCaps' property</title>
-<link rel="author" title="Jonathan Kew" href="mailto:jkew@mozilla.com">
-<link rel="help" href="https://html.spec.whatwg.org/multipage/canvas.html#dom-context-2d-fontvariantcaps">
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
 <link rel="match" href="2d.text.fontVariantCaps5-expected.html">
-<meta name="assert" content="text rendering respects the fontVariantCaps property">
-
-<canvas id="canvas1"></canvas>
-<br>
-<canvas id="canvas2"></canvas>
-
+<title>Canvas test: 2d.text.fontVariantCaps5</title>
+<h1>2d.text.fontVariantCaps5</h1>
+<p class="desc">Testing small caps setting in fontVariant</p>
+<canvas id="canvas" width="100" height="50">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
 <script>
-const testContent = `
+  const canvas = new OffscreenCanvas(100, 50);
+  const ctx = canvas.getContext('2d');
+
   ctx.font = "small-caps 32px serif";
   // fontVariantCaps 'normal' does not override the setting from the font attribute.
   // (spec unclear, cf. https://github.com/whatwg/html/issues/8103)
   ctx.fontVariantCaps = "normal";
   ctx.fillText("Hello World", 20, 100);
-`;
 
-// Draw to the first canvas using a worker:
-const canvas1 = document.getElementById("canvas1");
-const offscreen1 = canvas1.transferControlToOffscreen();
-const workerScript = `
-  onmessage = (evt) => {
-    const canvas = evt.data.canvas;
-    const ctx = canvas.getContext("2d");
-
-    ${testContent}
-
-    self.postMessage("done");
-  };
-`;
-
-const blob = new Blob([workerScript], {type: 'application/javascript'});
-const worker = new Worker(URL.createObjectURL(blob));
-worker.addEventListener('message', function(e) {
-  if (e.data == "done") {
-    // Draw to the second using a main-thread OffscreenCanvas:
-    const offscreen2 = new OffscreenCanvas(300, 150);
-    const ctx = offscreen2.getContext("2d");
-
-    eval(testContent);
-
-    document.getElementById("canvas2")
-            .getContext("bitmaprenderer")
-            .transferFromImageBitmap(offscreen2.transferToImageBitmap());
-
-    document.documentElement.classList.remove("reftest-wait");
-  }
-}, false);
-
-worker.postMessage({ canvas: offscreen1 }, [offscreen1]);
+  const outputCanvas = document.getElementById("canvas");
+  outputCanvas.getContext('2d').drawImage(canvas, 0, 0);
 </script>
-
diff --git a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps5.w.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps5.w.html
new file mode 100644
index 00000000000..8c59f5b517d
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps5.w.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<html class="reftest-wait">
+<link rel="match" href="2d.text.fontVariantCaps5-expected.html">
+<title>Canvas test: 2d.text.fontVariantCaps5</title>
+<h1>2d.text.fontVariantCaps5</h1>
+<p class="desc">Testing small caps setting in fontVariant</p>
+<canvas id="canvas" width="100" height="50">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
+<script id='myWorker' type='text/worker'>
+  self.onmessage = function(e) {
+    const canvas = new OffscreenCanvas(100, 50);
+    const ctx = canvas.getContext('2d');
+
+    ctx.font = "small-caps 32px serif";
+    // fontVariantCaps 'normal' does not override the setting from the font attribute.
+    // (spec unclear, cf. https://github.com/whatwg/html/issues/8103)
+    ctx.fontVariantCaps = "normal";
+    ctx.fillText("Hello World", 20, 100);
+
+    const bitmap = canvas.transferToImageBitmap();
+    self.postMessage(bitmap, bitmap);
+  };
+</script>
+<script>
+  const blob = new Blob([document.getElementById('myWorker').textContent]);
+  const worker = new Worker(URL.createObjectURL(blob));
+  worker.addEventListener('message', msg => {
+    const outputCtx = document.getElementById("canvas").getContext('2d');
+    outputCtx.drawImage(msg.data, 0, 0);
+    document.documentElement.classList.remove("reftest-wait");
+  });
+  worker.postMessage(null);
+</script>
+</html>
diff --git a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps6-expected.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps6-expected.html
index dbcb8abd76a..af9c736aea7 100644
--- a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps6-expected.html
+++ b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps6-expected.html
@@ -1,16 +1,15 @@
 <!DOCTYPE html>
-<meta charset="utf-8">
-<title>HTML OffscreenCanvas reference</title>
-<link rel="author" title="Jonathan Kew" href="mailto:jkew@mozilla.com">
-
-<canvas id="c1"></canvas>
-<br>
-<canvas id="c2"></canvas>
-
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.text.fontVariantCaps6</title>
+<h1>2d.text.fontVariantCaps6</h1>
+<p class="desc">Testing small caps setting in fontVariant</p>
+<canvas id="canvas" width="100" height="50">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
 <script>
-for (let c = 1; c <= 2; ++c) {
-  let ctx = document.getElementById("c" + c).getContext("2d");
+  const canvas = document.getElementById("canvas");
+  const ctx = canvas.getContext('2d');
+
   ctx.font = "32px serif";
   ctx.fillText("Hello World", 20, 100);
-}
 </script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps6.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps6.html
index 08c70a3a2e2..c33684d3886 100644
--- a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps6.html
+++ b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps6.html
@@ -1,57 +1,22 @@
 <!DOCTYPE html>
-<html class="reftest-wait">
-<meta charset="utf-8">
-<title>HTML OffscreenCanvas Test: the 'fontVariantCaps' property</title>
-<link rel="author" title="Jonathan Kew" href="mailto:jkew@mozilla.com">
-<link rel="help" href="https://html.spec.whatwg.org/multipage/canvas.html#dom-context-2d-fontvariantcaps">
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
 <link rel="match" href="2d.text.fontVariantCaps6-expected.html">
-<meta name="assert" content="text rendering respects the fontVariantCaps property">
-
-<canvas id="canvas1"></canvas>
-<br>
-<canvas id="canvas2"></canvas>
-
+<title>Canvas test: 2d.text.fontVariantCaps6</title>
+<h1>2d.text.fontVariantCaps6</h1>
+<p class="desc">Testing small caps setting in fontVariant</p>
+<canvas id="canvas" width="100" height="50">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
 <script>
-const testContent = `
+  const canvas = new OffscreenCanvas(100, 50);
+  const ctx = canvas.getContext('2d');
+
   // fontVariantCaps is reset when the font attribute is set.
   // (spec unclear, cf. https://github.com/whatwg/html/issues/8103)
   ctx.fontVariantCaps = "all-small-caps";
   ctx.font = "32px serif";
   ctx.fillText("Hello World", 20, 100);
-`;
 
-// Draw to the first canvas using a worker:
-const canvas1 = document.getElementById("canvas1");
-const offscreen1 = canvas1.transferControlToOffscreen();
-const workerScript = `
-  onmessage = (evt) => {
-    const canvas = evt.data.canvas;
-    const ctx = canvas.getContext("2d");
-
-    ${testContent}
-
-    self.postMessage("done");
-  };
-`;
-
-const blob = new Blob([workerScript], {type: 'application/javascript'});
-const worker = new Worker(URL.createObjectURL(blob));
-worker.addEventListener('message', function(e) {
-  if (e.data == "done") {
-    // Draw to the second using a main-thread OffscreenCanvas:
-    const offscreen2 = new OffscreenCanvas(300, 150);
-    const ctx = offscreen2.getContext("2d");
-
-    eval(testContent);
-
-    document.getElementById("canvas2")
-            .getContext("bitmaprenderer")
-            .transferFromImageBitmap(offscreen2.transferToImageBitmap());
-
-    document.documentElement.classList.remove("reftest-wait");
-  }
-}, false);
-
-worker.postMessage({ canvas: offscreen1 }, [offscreen1]);
+  const outputCanvas = document.getElementById("canvas");
+  outputCanvas.getContext('2d').drawImage(canvas, 0, 0);
 </script>
-
diff --git a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps6.w.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps6.w.html
new file mode 100644
index 00000000000..47f70d812b6
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps6.w.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<html class="reftest-wait">
+<link rel="match" href="2d.text.fontVariantCaps6-expected.html">
+<title>Canvas test: 2d.text.fontVariantCaps6</title>
+<h1>2d.text.fontVariantCaps6</h1>
+<p class="desc">Testing small caps setting in fontVariant</p>
+<canvas id="canvas" width="100" height="50">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
+<script id='myWorker' type='text/worker'>
+  self.onmessage = function(e) {
+    const canvas = new OffscreenCanvas(100, 50);
+    const ctx = canvas.getContext('2d');
+
+    // fontVariantCaps is reset when the font attribute is set.
+    // (spec unclear, cf. https://github.com/whatwg/html/issues/8103)
+    ctx.fontVariantCaps = "all-small-caps";
+    ctx.font = "32px serif";
+    ctx.fillText("Hello World", 20, 100);
+
+    const bitmap = canvas.transferToImageBitmap();
+    self.postMessage(bitmap, bitmap);
+  };
+</script>
+<script>
+  const blob = new Blob([document.getElementById('myWorker').textContent]);
+  const worker = new Worker(URL.createObjectURL(blob));
+  worker.addEventListener('message', msg => {
+    const outputCtx = document.getElementById("canvas").getContext('2d');
+    outputCtx.drawImage(msg.data, 0, 0);
+    document.documentElement.classList.remove("reftest-wait");
+  });
+  worker.postMessage(null);
+</script>
+</html>
diff --git a/tests/wpt/tests/html/canvas/tools/gentest_union.py b/tests/wpt/tests/html/canvas/tools/gentest_union.py
index bde7c1bc061..38a37a81ac7 100644
--- a/tests/wpt/tests/html/canvas/tools/gentest_union.py
+++ b/tests/wpt/tests/html/canvas/tools/gentest_union.py
@@ -1,3 +1,3 @@
 from gentestutilsunion import genTestUtils_union
 
-genTestUtils_union('name2dir-canvas.yaml')
+genTestUtils_union('name2dir.yaml')
diff --git a/tests/wpt/tests/html/canvas/tools/name2dir-canvas.yaml b/tests/wpt/tests/html/canvas/tools/name2dir-canvas.yaml
index 2ad5197d34c..1e0caff5b98 100644
--- a/tests/wpt/tests/html/canvas/tools/name2dir-canvas.yaml
+++ b/tests/wpt/tests/html/canvas/tools/name2dir-canvas.yaml
@@ -22,20 +22,5 @@
 2d.state:                             "the-canvas-state"
 2d.scrollPathIntoView:                "scroll"
 2d.video:                             "video"
-2d.canvas:                            "../../../html/semantics/embedded-content/the-canvas-element"
-2d.getcontext:                        "../../../html/semantics/embedded-content/the-canvas-element"
-2d.scaled:                            "../../../html/semantics/embedded-content/the-canvas-element"
-2d.type:                              "../../../html/semantics/embedded-content/the-canvas-element"
-context:                              "../../../html/semantics/embedded-content/the-canvas-element"
-fallback:                             "../../../html/semantics/embedded-content/the-canvas-element"
-initial:                              "../../../html/semantics/embedded-content/the-canvas-element"
-security:                             "../../../html/semantics/embedded-content/the-canvas-element"
-size:                                 "../../../html/semantics/embedded-content/the-canvas-element"
-toBlob:                               "../../../html/semantics/embedded-content/the-canvas-element"
-toDataURL:                            "../../../html/semantics/embedded-content/the-canvas-element"
-type:                                 "../../../html/semantics/embedded-content/the-canvas-element"
-2d.offscreencanvas:                   "the-offscreen-canvas"
-2d.offscreencanva.getcontext:         "the-offscreen-canvas"
-2d.offscreencanva.context:            "the-offscreen-canvas"
-2d.offscreencanva.initial:            "the-offscreen-canvas"
-2d.offscreencanva.size:               "the-offscreen-canvas"
+2d.canvas.host:                       "canvas-host"
+2d.canvas.context:                    "canvas-context"
diff --git a/tests/wpt/tests/html/canvas/tools/name2dir-offscreen.yaml b/tests/wpt/tests/html/canvas/tools/name2dir-offscreen.yaml
index 807b09507b1..c52acb793ba 100644
--- a/tests/wpt/tests/html/canvas/tools/name2dir-offscreen.yaml
+++ b/tests/wpt/tests/html/canvas/tools/name2dir-offscreen.yaml
@@ -18,8 +18,5 @@
 2d.coordinatespace:                   "conformance-requirements"
 2d.missingargs:                       "conformance-requirements"
 2d.voidreturn:                        "conformance-requirements"
-2d.canvas:                            "the-offscreen-canvas"
-2d.getcontext:                        "the-offscreen-canvas"
-context:                              "the-offscreen-canvas"
-initial:                              "the-offscreen-canvas"
-size:                                 "the-offscreen-canvas"
+2d.canvas.host:                       "canvas-host"
+2d.canvas.context:                    "canvas-context"
\ No newline at end of file
diff --git a/tests/wpt/tests/html/canvas/tools/name2dir.yaml b/tests/wpt/tests/html/canvas/tools/name2dir.yaml
index a56fc2ff488..ae69c153780 100644
--- a/tests/wpt/tests/html/canvas/tools/name2dir.yaml
+++ b/tests/wpt/tests/html/canvas/tools/name2dir.yaml
@@ -21,10 +21,5 @@
 2d.state:                             "the-canvas-state"
 2d.scrollPathIntoView:                "scroll"
 2d.video:                             "video"
-2d.canvas:                            "../../../html/semantics/embedded-content/the-canvas-element"
-2d.canvas.getcontext:                 "../../../html/semantics/embedded-content/the-canvas-element"
-2d.canvas.scaled:                     "../../../html/semantics/embedded-content/the-canvas-element"
-2d.canvas.type:                       "../../../html/semantics/embedded-content/the-canvas-element"
-2d.canvas.initial:                    "../../../html/semantics/embedded-content/the-canvas-element"
-2d.canvas.size:                       "../../../html/semantics/embedded-content/the-canvas-element"
-2d.canvas.type:                       "../../../html/semantics/embedded-content/the-canvas-element"
+2d.canvas.host:                       "canvas-host"
+2d.canvas.context:                    "canvas-context"
diff --git a/tests/wpt/tests/html/canvas/tools/yaml-new/layers.yaml b/tests/wpt/tests/html/canvas/tools/yaml-new/layers.yaml
index dd33e05a4d8..9145108bd3c 100644
--- a/tests/wpt/tests/html/canvas/tools/yaml-new/layers.yaml
+++ b/tests/wpt/tests/html/canvas/tools/yaml-new/layers.yaml
@@ -687,3 +687,103 @@
     @assert throws TypeError ctx.beginLayer({filter: 1});
     @assert throws TypeError ctx.beginLayer({filter: true});
     @assert throws TypeError ctx.beginLayer({filter: false});
+
+- name: 2d.layer.blur-from-outside-canvas
+  desc: Checks blur leaking inside from drawing outside the canvas
+  size: [200, 200]
+  code: |
+    {{ clipping }}
+
+    ctx.beginLayer({filter: [ {name: 'gaussianBlur', stdDeviation: 30} ]});
+
+    ctx.fillStyle = 'turquoise';
+    ctx.fillRect(201, 50, 100, 100);
+    ctx.fillStyle = 'indigo';
+    ctx.fillRect(50, 201, 100, 100);
+    ctx.fillStyle = 'orange';
+    ctx.fillRect(-1, 50, -100, 100);
+    ctx.fillStyle = 'brown';
+    ctx.fillRect(50, -1, 100, -100);
+
+    ctx.endLayer();
+  reference: |
+    const svg = `
+    <svg xmlns="http://www.w3.org/2000/svg"
+          width="{{ size[0] }}" height="{{ size[1] }}"
+          color-interpolation-filters="sRGB">
+      <filter id="filter" x="-100%" y="-100%" width="300%" height="300%">
+        <feGaussianBlur in="SourceGraphic" stdDeviation="30" />
+      </filter>
+      <g filter="url(#filter)">
+        <rect x="201" y="50" width="100" height="100" fill="turquoise"/>
+        <rect x="50" y="201" width="100" height="100" fill="indigo"/>
+        <rect x="-101" y="50" width="100" height="100" fill="orange"/>
+        <rect x="50" y="-101" width="100" height="100" fill="brown"/>
+      </g>
+    </svg>`;
+    const img = new Image();
+    img.width = {{ size[0] }};
+    img.height = {{ size[1] }};
+    img.onload = () => {
+        {{ clipping | indent(4) }}
+
+        ctx.drawImage(img, 0, 0);
+    };
+    img.src = 'data:image/svg+xml;base64,' + btoa(svg);
+  variants:
+    no-clipping:
+      clipping: // No clipping.
+    with-clipping:
+      clipping: |-
+        const clipRegion = new Path2D();
+        clipRegion.rect(20, 20, 160, 160);
+        ctx.clip(clipRegion);
+
+- name: 2d.layer.shadow-from-outside-canvas
+  desc: Checks shadow produced by object drawn outside the canvas
+  size: [200, 200]
+  code: |
+    {{ distance }}
+
+    {{ clipping }}
+
+    ctx.beginLayer({filter: [
+        {name: 'dropShadow', dx: -({{ size[0] }} + delta),
+          dy: -({{ size[1] }} + delta), stdDeviation: 0,
+          floodColor: 'green'},
+        ]});
+
+    ctx.fillStyle = 'red';
+    ctx.fillRect({{ size[0] }} + delta, {{ size[1] }} + delta, 100, 100);
+
+    ctx.endLayer();
+  reference: |
+    {{ distance }}
+
+    {{ clipping }}
+
+    ctx.fillStyle = 'green';
+    ctx.fillRect(0, 0, 100, 100);
+  variants:
+    short-distance:
+      distance: |-
+        const delta = 1;
+      clipping: // No clipping.
+    short-distance-with-clipping:
+      distance: |-
+        const delta = 1;
+      clipping: |-
+        const clipRegion = new Path2D();
+        clipRegion.rect(20, 20, 160, 160);
+        ctx.clip(clipRegion);
+    long-distance:
+      distance: |-
+        const delta = 10000;
+      clipping: // No clipping.
+    long-distance-with-clipping:
+      distance: |-
+        const delta = 10000;
+      clipping: |-
+        const clipRegion = new Path2D();
+        clipRegion.rect(20, 20, 160, 160);
+        ctx.clip(clipRegion);
diff --git a/tests/wpt/tests/html/canvas/tools/yaml-new/reset.yaml b/tests/wpt/tests/html/canvas/tools/yaml-new/reset.yaml
index fdb7f815c27..086fb04e04a 100644
--- a/tests/wpt/tests/html/canvas/tools/yaml-new/reset.yaml
+++ b/tests/wpt/tests/html/canvas/tools/yaml-new/reset.yaml
@@ -162,4 +162,125 @@
     ctx.setLineDash([1, 2]);
 
     ctx.reset();
-    @assert ctx.getLineDash().length == 0;
\ No newline at end of file
+    @assert ctx.getLineDash().length == 0;
+
+- name: 2d.reset.render.drop_shadow
+  desc: check that drop shadows are correctly rendered after reset
+  size: [500, 500]
+  code: |
+    ctx.shadowOffsetX = 10;
+    ctx.shadowOffsetY = 10;
+    ctx.shadowColor = "red";
+    ctx.shadowBlur = 10;
+
+    ctx.reset();
+
+    ctx.fillRect(100, 100, 100, 100);
+  reference: |
+    ctx.fillRect(100, 100, 100, 100);
+
+- name: 2d.reset.render.text
+  desc: check that text is correctly rendered after reset
+  size: [400, 400]
+  code: |
+    ctx.font = "24px serif";
+    ctx.textAlign = "center";
+    ctx.textBaseline = "hanging";
+    ctx.direction = "rtl";
+    ctx.letterSpacing = "10px";
+    ctx.fontKerning = "none";
+    ctx.fontStretch = "semi-condensed";
+    ctx.fontVariantCaps = "tilting-caps";
+    ctx.textRendering = "optimizeLegibility";
+    ctx.wordSpacing = "20px";
+
+    ctx.reset();
+
+    ctx.fillText("Lorem ipsum dolor sit amet, consectetur adipiscing elit", 0, 10);
+  reference: |
+    ctx.fillText("Lorem ipsum dolor sit amet, consectetur adipiscing elit", 0, 10);
+
+- name: 2d.reset.render.line
+  desc: check that lines are correctly rendered after reset
+  size: [400, 400]
+  code: |
+    ctx.lineWidth = 10;
+    ctx.lineCap = "round";
+    ctx.lineJoin = "bevel";
+    ctx.lineDashOffset = 10;
+    ctx.setLineDash([20]);
+
+    ctx.reset();
+
+    ctx.beginPath();
+    ctx.moveTo(100, 100);
+    ctx.lineTo(100, 300);
+    ctx.lineTo(300, 300);
+    ctx.lineTo(300, 100);
+    ctx.stroke();
+  reference: |
+    ctx.beginPath();
+    ctx.moveTo(100, 100);
+    ctx.lineTo(100, 300);
+    ctx.lineTo(300, 300);
+    ctx.lineTo(300, 100);
+    ctx.stroke();
+
+- name: 2d.reset.render.miter_limit
+  desc: check that the lines are correctly rendered with the default miter limit after reset
+  size: [400, 400]
+  code: |
+    ctx.miterLimit = 6;
+
+    ctx.reset();
+
+    ctx.lineWidth = 10;
+
+    ctx.beginPath();
+    ctx.moveTo(0, 100);
+    for (let i = 0; i < 24; i++) {
+      const dy = i % 2 === 0 ? 25 : -25;
+      ctx.lineTo(Math.pow(i, 1.5) * 2, 75 + dy);
+    }
+    ctx.stroke();
+  reference: |
+    ctx.lineWidth = 10;
+
+    ctx.beginPath();
+    ctx.moveTo(0, 100);
+    for (let i = 0; i < 24; i++) {
+      const dy = i % 2 === 0 ? 25 : -25;
+      ctx.lineTo(Math.pow(i, 1.5) * 2, 75 + dy);
+    }
+    ctx.stroke();
+
+- name: 2d.reset.render.global_composite_operation
+  desc: check that canvas correctly renders rectangles with the default global composite operation after reset
+  size: [400, 400]
+  code: |
+    ctx.globalCompositeOperation = "xor";
+
+    ctx.reset();
+
+    ctx.fillRect(10, 10, 100, 100);
+    ctx.fillRect(50, 50, 100, 100);
+  reference: |
+    ctx.fillRect(10, 10, 100, 100);
+    ctx.fillRect(50, 50, 100, 100);
+
+- name: 2d.reset.render.misc
+  desc: check that canvas correctly renders rectangles after reset (states not covered by other tests)
+  size: [400, 400]
+  code: |
+    ctx.fillStyle = "red";
+    ctx.strokeStyle = "red";
+    ctx.globalAlpha = 0.5;
+    ctx.filter = "blur(2px)";
+
+    ctx.reset();
+
+    ctx.fillRect(0, 0, 100, 100);
+    ctx.strokeRect(150, 150, 100, 100);
+  reference: |
+    ctx.fillRect(0, 0, 100, 100);
+    ctx.strokeRect(150, 150, 100, 100);
diff --git a/tests/wpt/tests/html/canvas/tools/yaml-new/text.yaml b/tests/wpt/tests/html/canvas/tools/yaml-new/text.yaml
index 93c86b8b5e5..8bbc874f06f 100644
--- a/tests/wpt/tests/html/canvas/tools/yaml-new/text.yaml
+++ b/tests/wpt/tests/html/canvas/tools/yaml-new/text.yaml
@@ -1270,7 +1270,6 @@
     @assert ctx.letterSpacing === '0px';
     @assert ctx.wordSpacing === '0px';
     var width_normal = ctx.measureText('Hello World').width;
-    var ch_width = width_normal / 11;
 
     function test_letter_spacing(value, difference_spacing, epsilon) {
       ctx.letterSpacing = value;
@@ -1291,7 +1290,6 @@
                  ['1em', 110, 0.1],
                  ['-0.1em', -11, 0.1],
                  ['1in', 1056, 0.1],
-                 ['1ch', 11 * ch_width, 0.1],
                  ['-0.1cm', -41.65, 0.2],
                  ['-0.6mm', -24,95, 0.2]]
 
@@ -1305,7 +1303,6 @@
     @assert ctx.letterSpacing === '0px';
     @assert ctx.wordSpacing === '0px';
     var width_normal = ctx.measureText('Hello World, again').width;
-    var ch_width = width_normal / 18;
 
     function test_word_spacing(value, difference_spacing, epsilon) {
       ctx.wordSpacing = value;
@@ -1326,7 +1323,6 @@
                  ['1em', 20, 0.1],
                  ['-0.5em', -10, 0.1],
                  ['1in', 192, 0.1],
-                 ['1ch', 2 * ch_width, 0.1],
                  ['-0.1cm', -7.57, 0.2],
                  ['-0.6mm', -4.54, 0.2]]
 
@@ -1606,4 +1602,79 @@
     ctx.fontStretch = "abcd";
     @assert ctx.fontStretch === "ultra-expanded";
 
+- name: 2d.text.fontVariantCaps1
+  desc: Testing small caps setting in fontVariant
+  code: |
+    ctx.font = "32px serif";
+    ctx.fontVariantCaps = "small-caps";
+    // This should render the same as font = "small-caps 32px serif".
+    ctx.fillText("Hello World", 20, 100);
+  reference: |
+    ctx.font = "small-caps 32px serif";
+    ctx.fillText("Hello World", 20, 100);
+
+- name: 2d.text.fontVariantCaps2
+  desc: Testing small caps setting in fontVariant
+  code: |
+    ctx.font = "small-caps 32px serif";
+    // "mismatch" test, to verify that small-caps does change the rendering.
+    smallCaps_len = ctx.measureText("Hello World").width;
+
+    ctx.font = "32px serif";
+    normalCaps_len = ctx.measureText("Hello World").width;
+    @assert smallCaps_len != normalCaps_len;
+
+- name: 2d.text.fontVariantCaps3
+  desc: Testing small caps setting in fontVariant
+  code: |
+    ctx.font = "32px serif";
+    ctx.fontVariantCaps = "all-small-caps";
+    // This should render the same as using font = "small-caps 32px serif"
+    // with all the underlying text in lowercase.
+    ctx.fillText("Hello World", 20, 100);
+  reference: |
+    ctx.font = "small-caps 32px serif";
+    ctx.fillText("hello world", 20, 100);
+
+- name: 2d.text.fontVariantCaps4
+  desc: Testing small caps setting in fontVariant
+  code: |
+    ctx.font = "small-caps 32px serif";
+    // fontVariantCaps overrides the small-caps setting from the font attribute
+    // (spec unclear, cf. https://github.com/whatwg/html/issues/8103)
+    ctx.fontVariantCaps = "all-small-caps";
+    ctx.fillText("Hello World", 20, 100);
+  reference: |
+    ctx.font = "small-caps 32px serif";
+    ctx.fillText("hello world", 20, 100);
+
+- name: 2d.text.fontVariantCaps5
+  desc: Testing small caps setting in fontVariant
+  code: |
+    ctx.font = "small-caps 32px serif";
+    // fontVariantCaps 'normal' does not override the setting from the font attribute.
+    // (spec unclear, cf. https://github.com/whatwg/html/issues/8103)
+    ctx.fontVariantCaps = "normal";
+    ctx.fillText("Hello World", 20, 100);
+  reference: |
+    ctx.font = "small-caps 32px serif";
+    ctx.fillText("Hello World", 20, 100);
+
+- name: 2d.text.fontVariantCaps6
+  desc: Testing small caps setting in fontVariant
+  code: |
+    // fontVariantCaps is reset when the font attribute is set.
+    // (spec unclear, cf. https://github.com/whatwg/html/issues/8103)
+    ctx.fontVariantCaps = "all-small-caps";
+    ctx.font = "32px serif";
+    ctx.fillText("Hello World", 20, 100);
+  reference: |
+    ctx.font = "32px serif";
+    ctx.fillText("Hello World", 20, 100);
+
+- name: 2d.text.setFont.mathFont
+  desc: crbug.com/1212190, make sure offscreencanvas doesn't crash with Math Font
+  code: |
+    ctx.font = "math serif";
+
 # TODO: shadows, alpha, composite, clip
\ No newline at end of file
diff --git a/tests/wpt/tests/html/canvas/tools/yaml/element/meta.yaml b/tests/wpt/tests/html/canvas/tools/yaml/element/meta.yaml
index 7b6f28f1713..5fd8b68498a 100644
--- a/tests/wpt/tests/html/canvas/tools/yaml/element/meta.yaml
+++ b/tests/wpt/tests/html/canvas/tools/yaml/element/meta.yaml
@@ -42,7 +42,7 @@
         # We need to replace \r with &#xD; because \r\n gets converted to \n in the HTML parser.
         htmlString = string.replace('\r', '&#xD;')
         tests.append( {
-            "name": "size.attributes.parse.%s" % name,
+            "name": "2d.canvas.host.size.attributes.parse.%s" % name,
             "desc": "Parsing of non-negative integers",
             "size": '%s, %s' % (htmlString, htmlString),
             "code": code,
@@ -53,7 +53,7 @@
         code = "canvas.setAttribute('width', %r);\ncanvas.setAttribute('height', %r);\n" % (string, string)
         code, expected = gen(name, string, exp, code)
         tests.append( {
-            "name": "size.attributes.setAttribute.%s" % name,
+            "name": "2d.canvas.host.size.attributes.setAttribute.%s" % name,
             "desc": "Parsing of non-negative integers in setAttribute",
             "size": '50, 50',
             "code": code,
@@ -102,7 +102,7 @@
         } )
 
     tests.append( {
-        'name': 'initial.reset.2dstate',
+        'name': '2d.canvas.host.initial.reset.2dstate',
         'desc': 'Resetting the canvas state resets 2D state variables',
         'code':
     """canvas.width = 100;
diff --git a/tests/wpt/tests/html/canvas/tools/yaml/element/the-canvas-element.yaml b/tests/wpt/tests/html/canvas/tools/yaml/element/the-canvas-element.yaml
index d6d8cd801b4..1ecf8ccdbf1 100644
--- a/tests/wpt/tests/html/canvas/tools/yaml/element/the-canvas-element.yaml
+++ b/tests/wpt/tests/html/canvas/tools/yaml/element/the-canvas-element.yaml
@@ -1,9 +1,9 @@
-- name: 2d.getcontext.exists
+- name: 2d.canvas.context.exists
   desc: The 2D context is implemented
   code: |
     @assert canvas.getContext('2d') !== null;
 
-- name: 2d.getcontext.invalid.args
+- name: 2d.canvas.context.invalid.args
   desc: Calling getContext with invalid arguments.
   code: |
     @assert canvas.getContext('') === null;
@@ -16,7 +16,7 @@
     @assert canvas.getContext('null') === null;
     @assert canvas.getContext('undefined') === null;
 
-- name: 2d.getcontext.extraargs.create
+- name: 2d.canvas.context.extraargs.create
   desc: The 2D context doesn't throw with extra getContext arguments (new context)
   code: |
     @assert document.createElement("canvas").getContext('2d', false, {}, [], 1, "2") !== null;
@@ -26,7 +26,7 @@
     @assert document.createElement("canvas").getContext('2d', null) !== null;
     @assert document.createElement("canvas").getContext('2d', Symbol.hasInstance) !== null;
 
-- name: 2d.getcontext.extraargs.cache
+- name: 2d.canvas.context.extraargs.cache
   desc: The 2D context doesn't throw with extra getContext arguments (cached)
   code: |
     @assert canvas.getContext('2d', false, {}, [], 1, "2") !== null;
@@ -36,13 +36,13 @@
     @assert canvas.getContext('2d', null) !== null;
     @assert canvas.getContext('2d', Symbol.hasInstance) !== null;
 
-- name: 2d.type.exists
+- name: 2d.canvas.context.type.exists
   desc: The 2D context interface is a property of 'window'
   notes: &bindings Defined in "Web IDL" (draft)
   code: |
     @assert window.CanvasRenderingContext2D;
 
-- name: 2d.type.prototype
+- name: 2d.canvas.context.type.prototype
   desc: window.CanvasRenderingContext2D.prototype are not [[Writable]] and not [[Configurable]],
     and its methods are [[Configurable]].
   notes: *bindings
@@ -58,7 +58,7 @@
     delete window.CanvasRenderingContext2D.prototype.fill;
     @assert window.CanvasRenderingContext2D.prototype.fill === undefined;
 
-- name: 2d.type.replace
+- name: 2d.canvas.context.type.replace
   desc: Interface methods can be overridden
   notes: *bindings
   code: |
@@ -73,7 +73,7 @@
     @assert pixel 50,25 == 0,255,0,255;
   expected: green
 
-- name: 2d.type.extend
+- name: 2d.canvas.context.type.extend
   desc: Interface methods can be added
   notes: *bindings
   code: |
@@ -87,12 +87,12 @@
     @assert pixel 50,25 == 0,255,0,255;
   expected: green
 
-- name: 2d.getcontext.unique
+- name: 2d.canvas.context.unique
   desc: getContext('2d') returns the same object
   code: |
     @assert canvas.getContext('2d') === canvas.getContext('2d');
 
-- name: 2d.getcontext.shared
+- name: 2d.canvas.context.shared
   desc: getContext('2d') returns objects which share canvas state
   code: |
     var ctx2 = canvas.getContext('2d');
@@ -102,7 +102,7 @@
     @assert pixel 50,25 == 0,255,0,255;
   expected: green
 
-- name: 2d.scaled
+- name: 2d.canvas.host.scaled
   desc: CSS-scaled canvases get drawn correctly
   size: 50, 25
   canvas: 'style="width: 100px; height: 50px"'
@@ -121,12 +121,12 @@
     cr.rectangle(0, 0, 50, 20)
     cr.fill()
 
-- name: 2d.canvas.reference
+- name: 2d.canvas.host.reference
   desc: CanvasRenderingContext2D.canvas refers back to its canvas
   code: |
     @assert ctx.canvas === canvas;
 
-- name: 2d.canvas.readonly
+- name: 2d.canvas.host.readonly
   desc: CanvasRenderingContext2D.canvas is readonly
   code: |
     var c = document.createElement('canvas');
@@ -135,7 +135,7 @@
     ctx.canvas = c;
     @assert ctx.canvas === d;
 
-- name: 2d.canvas.context
+- name: 2d.canvas.context.prototype
   desc: checks CanvasRenderingContext2D prototype
   code: |
     @assert Object.getPrototypeOf(CanvasRenderingContext2D.prototype) === Object.prototype;
diff --git a/tests/wpt/tests/html/canvas/tools/yaml/offscreen/meta.yaml b/tests/wpt/tests/html/canvas/tools/yaml/offscreen/meta.yaml
index bd761937f40..7b44fd9f267 100644
--- a/tests/wpt/tests/html/canvas/tools/yaml/offscreen/meta.yaml
+++ b/tests/wpt/tests/html/canvas/tools/yaml/offscreen/meta.yaml
@@ -38,7 +38,7 @@
         } )
 
     tests.append( {
-        'name': 'initial.reset.2dstate',
+        'name': '2d.canvas.host.initial.reset.2dstate',
         'desc': 'Resetting the canvas state resets 2D state variables',
         'code':
     """canvas.width = 100;
@@ -533,7 +533,7 @@
         code = ""
         code, expected = gen(name, string, exp, code)
         tests.append( {
-            "name": "size.attributes.parse.%s" % name,
+            "name": "2d.canvas.host.size.attributes.parse.%s" % name,
             "desc": "Parsing of non-negative integers",
             "code": code,
         } )
diff --git a/tests/wpt/tests/html/canvas/tools/yaml/offscreen/the-offscreen-canvas.yaml b/tests/wpt/tests/html/canvas/tools/yaml/offscreen/the-offscreen-canvas.yaml
index 0bef18bf9d5..ccabe094b8a 100644
--- a/tests/wpt/tests/html/canvas/tools/yaml/offscreen/the-offscreen-canvas.yaml
+++ b/tests/wpt/tests/html/canvas/tools/yaml/offscreen/the-offscreen-canvas.yaml
@@ -1,10 +1,10 @@
-- name: 2d.canvas.reference
+- name: 2d.canvas.host.reference
   desc: canvas refers back to its canvas
   code: |
     @assert ctx.canvas === canvas;
     t.done();
 
-- name: 2d.canvas.readonly
+- name: 2d.canvas.host.readonly
   desc: canvas is readonly
   code: |
     var offscreenCanvas2 = new OffscreenCanvas(100, 50);
@@ -14,14 +14,14 @@
     @assert ctx.canvas === d;
     t.done();
 
-- name: 2d.getcontext.exists
+- name: 2d.canvas.context.exists
   desc: The 2D context is implemented
   code: |
     var offscreenCanvas2 = new OffscreenCanvas(100, 50);
     @assert offscreenCanvas2.getContext('2d') !== null;
     t.done();
 
-- name: 2d.getcontext.extraargs.create
+- name: 2d.canvas.context.extraargs.create
   desc: The 2D context doesn't throw with extra getContext arguments (new context)
   code: |
     @assert (new OffscreenCanvas(100, 50)).getContext('2d', false, {}, [], 1, "2") !== null;
@@ -32,7 +32,7 @@
     @assert (new OffscreenCanvas(100, 50)).getContext('2d', Symbol.hasInstance) !== null;
     t.done();
 
-- name: 2d.getcontext.extraargs.cache
+- name: 2d.canvas.context.extraargs.cache
   desc: The 2D context doesn't throw with extra getContext arguments (cached)
   code: |
     @assert canvas.getContext('2d', false, {}, [], 1, "2") !== null;
@@ -43,14 +43,14 @@
     @assert canvas.getContext('2d', Symbol.hasInstance) !== null;
     t.done();
 
-- name: 2d.getcontext.unique
+- name: 2d.canvas.context.unique
   desc: getContext('2d') returns the same object
   code: |
     var offscreenCanvas2 = new OffscreenCanvas(100, 50);
     @assert offscreenCanvas2.getContext('2d') === offscreenCanvas2.getContext('2d');
     t.done();
 
-- name: 2d.getcontext.shared
+- name: 2d.canvas.context.shared
   desc: getContext('2d') returns objects which share canvas state
   code: |
     var ctx2 = canvas.getContext('2d');
@@ -60,62 +60,62 @@
     @assert pixel 50,25 == 0,255,0,255;
     t.done();
 
-- name: context.emptystring
+- name: 2d.canvas.context.emptystring
   desc: getContext with empty string returns null
   code: |
     var offscreenCanvas2 = new OffscreenCanvas(100, 50);
     @assert throws TypeError offscreenCanvas2.getContext("");
     t.done();
 
-- name: context.unrecognised.badname
+- name: 2d.canvas.context.unrecognised.badname
   desc: getContext with unrecognised context name returns null
   code: |
     var offscreenCanvas2 = new OffscreenCanvas(100, 50);
     @assert throws TypeError offscreenCanvas2.getContext('This is not an implemented context in any real browser');
     t.done();
 
-- name: context.unrecognised.badsuffix
+- name: 2d.canvas.context.unrecognised.badsuffix
   desc: Context name "2d" plus a suffix is unrecognised
   code: |
     var offscreenCanvas2 = new OffscreenCanvas(100, 50);
     @assert throws TypeError offscreenCanvas2.getContext("2d#");
     t.done();
 
-- name: context.unrecognised.nullsuffix
+- name: 2d.canvas.context.unrecognised.nullsuffix
   desc: Context name "2d" plus a "\0" suffix is unrecognised
   code: |
     var offscreenCanvas2 = new OffscreenCanvas(100, 50);
     @assert throws TypeError offscreenCanvas2.getContext("2d\0");
     t.done();
 
-- name: context.unrecognised.unicode
+- name: 2d.canvas.context.unrecognised.unicode
   desc: Context name which kind of looks like "2d" is unrecognised
   code: |
     var offscreenCanvas2 = new OffscreenCanvas(100, 50);
     @assert throws TypeError offscreenCanvas2.getContext("2\uFF44");
     t.done();
 
-- name: context.casesensitive
+- name: 2d.canvas.context.casesensitive
   desc: Context name "2D" is unrecognised; matching is case sensitive
   code: |
     var offscreenCanvas2 = new OffscreenCanvas(100, 50);
     @assert throws TypeError offscreenCanvas2.getContext('2D');
     t.done();
 
-- name: context.arguments.missing
+- name: 2d.canvas.context.arguments.missing
   code: |
     var offscreenCanvas2 = new OffscreenCanvas(100, 50);
     @assert throws TypeError offscreenCanvas2.getContext(); @moz-todo
     t.done();
 
 
-- name: initial.color
+- name: 2d.canvas.host.initial.color
   desc: Initial state is transparent black
   code: |
     @assert pixel 20,20 == 0,0,0,0;
     t.done();
 
-- name: initial.reset.different
+- name: 2d.canvas.host.initial.reset.different
   desc: Changing size resets canvas to transparent black
   code: |
     ctx.fillStyle = '#f00';
@@ -125,7 +125,7 @@
     @assert pixel 20,20 == 0,0,0,0;
     t.done();
 
-- name: initial.reset.same
+- name: 2d.canvas.host.initial.reset.same
   desc: Setting size (not changing the value) resets canvas to transparent black
   code: |
     canvas.width = 100;
@@ -136,7 +136,7 @@
     @assert pixel 20,20 == 0,0,0,0;
     t.done();
 
-- name: initial.reset.path
+- name: 2d.canvas.host.initial.reset.path
   desc: Resetting the canvas state resets the current path
   code: |
     canvas.width = 100;
@@ -147,7 +147,7 @@
     @assert pixel 20,20 == 0,0,0,0;
     t.done();
 
-- name: initial.reset.clip
+- name: 2d.canvas.host.initial.reset.clip
   desc: Resetting the canvas state resets the current clip region
   code: |
     canvas.width = 100;
@@ -159,7 +159,7 @@
     @assert pixel 20,20 == 0,255,0,255;
     t.done();
 
-- name: initial.reset.transform
+- name: 2d.canvas.host.initial.reset.transform
   desc: Resetting the canvas state resets the current transformation matrix
   code: |
     canvas.width = 100;
@@ -170,7 +170,7 @@
     @assert pixel 20,20 == 0,255,0,255;
     t.done();
 
-- name: initial.reset.gradient
+- name: 2d.canvas.host.initial.reset.gradient
   desc: Resetting the canvas state does not invalidate any existing gradients
   code: |
     canvas.width = 50;
@@ -185,7 +185,7 @@
     @assert pixel 50,25 == 0,255,0,255;
     t.done();
 
-- name: initial.reset.pattern
+- name: 2d.canvas.host.initial.reset.pattern
   desc: Resetting the canvas state does not invalidate any existing patterns
   code: |
     canvas.width = 30;
@@ -200,7 +200,7 @@
     @assert pixel 50,25 == 0,255,0,255;
     t.done();
 
-- name: size.attributes.idl.set.zero
+- name: 2d.canvas.host.size.attributes.idl.set.zero
   desc: Setting width/height IDL attributes to 0
   code: |
     canvas.width = 0;
@@ -209,7 +209,7 @@
     @assert canvas.height === 0;
     t.done();
 
-- name: size.attributes.idl
+- name: 2d.canvas.host.size.attributes.idl
   desc: Getting/setting width/height IDL attributes
   webidl:
   - es-unsigned-long
@@ -232,14 +232,14 @@
     @assert canvas.height === 301;
     t.done();
 
-- name: size.attributes.default
+- name: 2d.canvas.host.size.attributes.default
   desc: Default width/height when attributes are missing
   code: |
     @assert canvas.width === 100;
     @assert canvas.height === 50;
     t.done();
 
-- name: size.attributes.reflect.setidl
+- name: 2d.canvas.host.size.attributes.reflect.setidl
   desc: Setting IDL attributes updates IDL and content attributes
   code: |
     canvas.width = 120;
@@ -248,7 +248,7 @@
     @assert canvas.height === 60;
     t.done();
 
-- name: size.attributes.reflect.setidlzero
+- name: 2d.canvas.host.size.attributes.reflect.setidlzero
   desc: Setting IDL attributes to 0 updates IDL and content attributes
   code: |
     canvas.width = 0;
@@ -257,7 +257,7 @@
     @assert canvas.height === 0;
     t.done();
 
-- name: size.large
+- name: 2d.canvas.host.size.large
   notes: Not sure how reasonable this is, but the spec doesn't say there's an upper
     limit on the size.
   code: |
@@ -267,9 +267,3 @@
     @assert canvas.width === n;
     @assert canvas.height === n;
     t.done();
-
-- name: 2d.text.setFont.mathFont
-  desc: crbug.com/1212190, make sure offscreencanvas doesn't crash with Math Font
-  code: |
-    ctx.font = "math serif";
-    t.done();
diff --git a/tests/wpt/tests/html/dom/elements/global-attributes/dir-assorted.window.js b/tests/wpt/tests/html/dom/elements/global-attributes/dir-assorted.window.js
new file mode 100644
index 00000000000..d65cba7421c
--- /dev/null
+++ b/tests/wpt/tests/html/dom/elements/global-attributes/dir-assorted.window.js
@@ -0,0 +1,65 @@
+test(() => {
+  assert_true(document.documentElement.matches(":dir(ltr)"));
+}, "Root element has a direction");
+
+test(() => {
+  const ele = document.createElement("foobar");
+  assert_true(ele.matches(":dir(ltr)"));
+}, "Element outside the document tree has a direction");
+
+test(() => {
+  const ele = document.createElementNS("foobar", "foobar");
+  assert_true(ele.matches(":dir(ltr)"));
+}, "Non-HTML element outside the document tree has a direction");
+
+test(() => {
+  const ele = document.createElement("foobar");
+  ele.dir = "rtl";
+  const ele2 = document.createElement("foobar");
+  ele.append(ele2);
+  assert_true(ele2.matches(":dir(rtl)"));
+  ele.dir = "ltr";
+  assert_true(ele2.matches(":dir(ltr)"), "direction after dynamic change");
+}, "Element without direction has parent element direction");
+
+test(() => {
+  const ele = document.createElement("foobar");
+  ele.dir = "rtl";
+  const ele2 = document.createElementNS("foobar", "foobar");
+  ele.append(ele2);
+  assert_true(ele2.matches(":dir(rtl)"));
+  ele.dir = "ltr";
+  assert_true(ele2.matches(":dir(ltr)"), "direction after dynamic change");
+}, "Non-HTML element without direction has parent element direction");
+
+test(() => {
+  let container1 = document.createElement("div");
+  document.body.appendChild(container1);
+  let container2 = document.createElement("div");
+
+  for (let container of [container1, container2]) {
+    container.dir = "rtl";
+    let e = document.createElement("div");
+    assert_true(e.matches(":dir(ltr)"));
+    container.appendChild(e);
+    assert_false(e.matches(":dir(ltr)"));
+    e.remove();
+    assert_true(e.matches(":dir(ltr)"));
+  }
+
+  container1.remove();
+}, "dir inheritance is correct after insertion and removal from document");
+
+test(() => {
+  const ele = document.createElement("foobar");
+  ele.dir = "auto";
+  const ele2 = document.createElementNS("foobar", "foobar");
+  ele.append(ele2);
+  const text = document.createTextNode("\u05D0\u05D1\u05D2");
+  ele2.append(text);
+  assert_true(ele.matches(":dir(rtl)"), "is RTL before change");
+  assert_true(ele2.matches(":dir(rtl)"), "child is RTL before change");
+  text.data = "ABC";
+  assert_true(ele.matches(":dir(ltr)"), "is LTR after change");
+  assert_true(ele2.matches(":dir(ltr)"), "child is LTR after change");
+}, "Non-HTML element text contents influence dir=auto");
diff --git a/tests/wpt/tests/html/dom/elements/global-attributes/dir-auto-dynamic-changes.window.js b/tests/wpt/tests/html/dom/elements/global-attributes/dir-auto-dynamic-changes.window.js
new file mode 100644
index 00000000000..a0cf4aae7ba
--- /dev/null
+++ b/tests/wpt/tests/html/dom/elements/global-attributes/dir-auto-dynamic-changes.window.js
@@ -0,0 +1,276 @@
+function setup_tree(light_tree, shadow_tree) {
+  let body = document.body;
+  let old_length = body.childNodes.length;
+  body.insertAdjacentHTML("beforeend", light_tree.trim());
+  if (body.childNodes.length != old_length + 1) {
+    throw "unexpected markup";
+  }
+  let result = body.lastChild;
+  if (shadow_tree) {
+    let shadow = result.querySelector("#root").attachShadow({mode: "open"});
+    shadow.innerHTML = shadow_tree.trim();
+    return [result, shadow];
+  }
+  return result;
+}
+
+test(t => {
+  let a = setup_tree(`
+    <div id="a" dir="auto">
+      <div id="b"></div>
+      hello
+    </div>
+  `);
+
+  let acs = getComputedStyle(a);
+  assert_true(a.matches(":dir(ltr)"), ":dir(ltr) matches before insertion");
+  assert_false(a.matches(":dir(rtl)"), ":dir(rtl) does not match before insertion");
+  assert_equals(acs.direction, "ltr", "CSSdirection before insertion");
+  b.innerHTML = "\u05D0";
+  assert_false(a.matches(":dir(ltr)"), ":dir(ltr) does not match after insertion");
+  assert_true(a.matches(":dir(rtl)"), ":dir(rtl) matches after insertion");
+  assert_equals(acs.direction, "rtl", "CSSdirection after insertion");
+
+  a.remove();
+}, "dynamic insertion of RTL text in a child element");
+
+test(() => {
+  let div_rtlchar = document.createElement("div");
+  div_rtlchar.innerHTML = "\u05D0";
+
+  let container1 = document.createElement("div");
+  document.body.appendChild(container1);
+  let container2 = document.createElement("div");
+
+  for (let container of [container1, container2]) {
+    container.dir = "auto";
+    assert_true(container.matches(":dir(ltr)"));
+    container.appendChild(div_rtlchar);
+    assert_false(container.matches(":dir(ltr)"));
+    div_rtlchar.remove();
+    assert_true(container.matches(":dir(ltr)"));
+  }
+
+  container1.remove();
+}, "dir=auto changes for content insertion and removal, in and out of document");
+
+test(() => {
+  let tree, shadow;
+  [tree, shadow] = setup_tree(`
+    <div>
+      <div id="root">
+        <span id="l">A</span>
+        <span id="r">\u05D0</span>
+      </div>
+    </div>
+  `, `
+    <slot id="one" name="one" dir="auto">\u05D0</slot>
+    <slot id="two" dir="auto"></slot>
+  `);
+
+  let one = shadow.getElementById("one");
+  let two = shadow.getElementById("two");
+  let l = tree.querySelector("#l");
+  let r = tree.querySelector("#r");
+  assert_false(one.matches(":dir(ltr)"), "#one while empty");
+  assert_true(two.matches(":dir(ltr)"), "#two with both spans");
+  l.slot = "one";
+  assert_true(one.matches(":dir(ltr)"), "#one with LTR child span");
+  assert_false(two.matches(":dir(ltr)"), "#two with RTL child span");
+  r.slot = "one";
+  assert_true(one.matches(":dir(ltr)"), "#one with both child spans");
+  assert_true(two.matches(":dir(ltr)"), "#two while empty");
+  l.slot = "";
+  assert_false(one.matches(":dir(ltr)"), "#one with RTL child span");
+  assert_true(two.matches(":dir(ltr)"), "#two with LTR child span");
+
+  tree.remove();
+}, "dir=auto changes for slot reassignment");
+
+test(() => {
+  let tree, shadow;
+  [tree, shadow] = setup_tree(`
+    <div dir=auto>
+      <div id=root>
+        <div id=text>A</div>
+      </div>
+    </div>
+  `, `
+    <div dir=ltr>
+      <slot id=slot dir=auto></slot>
+    </div>
+  `);
+
+  let text = tree.querySelector("#text");
+  let slot = shadow.querySelector("#slot");
+
+  assert_true(tree.matches(":dir(ltr)"), "node tree ancestor before first text change");
+  assert_true(slot.matches(":dir(ltr)"), "slot before first text change");
+  text.innerText = "\u05D0";
+  assert_false(tree.matches(":dir(ltr)"), "node tree ancestor after first text change");
+  assert_false(slot.matches(":dir(ltr)"), "slot after first text change");
+  tree.dir = "rtl";
+  assert_false(tree.matches(":dir(ltr)"), "node tree ancestor before second text change");
+  assert_false(slot.matches(":dir(ltr)"), "slot before second text change");
+  text.innerText = "A";
+  assert_false(tree.matches(":dir(ltr)"), "node tree ancestor after second text change");
+  assert_true(slot.matches(":dir(ltr)"), "slot after second text change");
+  slot.dir = "ltr";
+  assert_false(tree.matches(":dir(ltr)"), "node tree ancestor before third text change");
+  assert_true(slot.matches(":dir(ltr)"), "slot before third text change");
+  text.innerText = "\u05D0";
+  assert_false(tree.matches(":dir(ltr)"), "node tree ancestor after third text change");
+  assert_true(slot.matches(":dir(ltr)"), "slot after third text change");
+  slot.dir = "auto";
+  tree.dir = "auto";
+  assert_false(tree.matches(":dir(ltr)"), "node tree ancestor after fourth text change");
+  assert_false(slot.matches(":dir(ltr)"), "slot after fourth text change");
+  text.innerText = "A";
+  assert_true(tree.matches(":dir(ltr)"), "node tree ancestor before fourth text change");
+  assert_true(slot.matches(":dir(ltr)"), "slot before fourth text change");
+  slot.dir = "rtl";
+  assert_true(tree.matches(":dir(ltr)"), "node tree ancestor before fifth text change");
+  assert_false(slot.matches(":dir(ltr)"), "slot before fifth text change");
+  text.innerText = "\u05D0";
+  assert_false(tree.matches(":dir(ltr)"), "node tree ancestor before fifth text change");
+  assert_false(slot.matches(":dir(ltr)"), "slot before fifth text change");
+
+  tree.remove();
+}, "text changes affecting both slot and ancestor with dir=auto");
+
+test(() => {
+  let tree = setup_tree(`
+    <div dir="auto">
+      <span id="a1">A</span>
+      <span id="aleph1">\u05D0</span>
+      <span id="a2">A</span>
+      <span id="aleph2">\u05D0</span>
+    </div>
+  `);
+
+  let a1 = tree.querySelector("#a1");
+  let aleph1 = tree.querySelector("#aleph1");
+  assert_true(tree.matches(":dir(ltr)"), "initial state");
+  assert_false(tree.matches(":dir(rtl)"), "initial state");
+  a1.dir = "ltr";
+  assert_false(tree.matches(":dir(ltr)"), "after change 1");
+  a1.dir = "invalid";
+  assert_true(tree.matches(":dir(ltr)"), "after change 2");
+  a1.dir = "rtl";
+  assert_false(tree.matches(":dir(ltr)"), "after change 3");
+  a1.removeAttribute("dir");
+  assert_true(tree.matches(":dir(ltr)"), "after change 4");
+  a1.dir = "invalid";
+  assert_true(tree.matches(":dir(ltr)"), "after change 5");
+  a1.dir = "rtl";
+  assert_false(tree.matches(":dir(ltr)"), "after change 6");
+  aleph1.dir = "auto";
+  assert_true(tree.matches(":dir(ltr)"), "after change 7");
+  aleph1.dir = "invalid";
+  assert_false(tree.matches(":dir(ltr)"), "after change 8");
+
+  tree.remove();
+}, "dynamic changes to subtrees excluded as a result of the dir attribute");
+
+test(() => {
+  let tree = setup_tree(`
+    <div dir="auto">
+      <!-- element goes here -->
+    </div>
+  `);
+
+  let element = document.createElementNS("namespace", "element");
+  let text = document.createTextNode("\u05D0");
+  element.appendChild(text);
+  tree.prepend(element);
+  assert_not_equals(element.namespaceURI, tree.namespaceURI);
+
+  assert_true(tree.matches(":dir(rtl)"), "initial state");
+  assert_false(tree.matches(":dir(ltr)"), "initial state");
+  text.data = "A";
+  assert_true(tree.matches(":dir(ltr)"), "after dynamic change");
+  assert_false(tree.matches(":dir(rtl)"), "after dynamic change");
+
+  tree.remove();
+}, "dynamic changes inside of non-HTML elements");
+
+test(() => {
+  let tree, shadow;
+  [tree, shadow] = setup_tree(`
+    <div dir="auto">
+      <div id="root">
+        <element xmlns="namespace">A</element>
+        \u05D0
+      </div>
+    </div>
+  `, `
+    <div dir="ltr">
+      <slot dir="auto">\u05D0</slot>
+    </div>
+  `);
+
+  let element = tree.querySelector("element");
+  let slot = shadow.querySelector("slot");
+  let text = element.firstChild;
+
+  assert_true(tree.matches(":dir(ltr)"), "initial state (tree)");
+  assert_true(element.matches(":dir(ltr)"), "initial state (element)");
+  assert_true(slot.matches(":dir(ltr)"), "initial state (slot)");
+
+  text.data = "\u05D0";
+
+  assert_true(tree.matches(":dir(rtl)"), "state after first change (tree)");
+  assert_true(element.matches(":dir(rtl)"), "state after first change (element)");
+  assert_true(slot.matches(":dir(rtl)"), "state after first change (slot)");
+
+  text.data = "";
+
+  assert_true(tree.matches(":dir(rtl)"), "state after second change (tree)");
+  assert_true(element.matches(":dir(rtl)"), "state after second change (element)");
+  assert_true(slot.matches(":dir(rtl)"), "state after second change (slot)");
+
+  tree.remove();
+}, "slotted non-HTML elements");
+
+test(() => {
+  let tree, shadow;
+  [tree, shadow] = setup_tree(`
+    <div>
+      <div id="root">
+        <!-- element goes here -->
+        \u05D0
+      </div>
+    </div>
+  `, `
+    <div dir="ltr">
+      <slot></slot>
+    </div>
+  `);
+
+  let element = document.createElementNS("namespace", "element");
+  let text = document.createTextNode("A");
+  element.appendChild(text);
+  tree.querySelector("#root").prepend(element);
+
+  assert_not_equals(element.namespaceURI, tree.namespaceURI);
+
+  assert_true(tree.matches(":dir(ltr)"), "initial state (tree)");
+  assert_true(element.matches(":dir(ltr)"), "initial state (element)");
+
+  tree.dir = "auto";
+
+  assert_true(tree.matches(":dir(ltr)"), "state after making dir=auto (tree)");
+  assert_true(element.matches(":dir(ltr)"), "state after making dir=auto (element)");
+
+  text.data = "\u05D0";
+
+  assert_true(tree.matches(":dir(rtl)"), "state after first change (tree)");
+  assert_true(element.matches(":dir(rtl)"), "state after first change (element)");
+
+  text.data = "";
+
+  assert_true(tree.matches(":dir(rtl)"), "state after second change (tree)");
+  assert_true(element.matches(":dir(rtl)"), "state after second change (element)");
+
+  tree.remove();
+}, "slotted non-HTML elements after dynamically assigning dir=auto, and dir attribute ignored on non-HTML elements");
diff --git a/tests/wpt/tests/html/dom/elements/global-attributes/dir-slots-directionality.tentative.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir-slots-directionality.tentative.html
index 1f0dc07f8ef..5e8cedb9c15 100644
--- a/tests/wpt/tests/html/dom/elements/global-attributes/dir-slots-directionality.tentative.html
+++ b/tests/wpt/tests/html/dom/elements/global-attributes/dir-slots-directionality.tentative.html
@@ -2,9 +2,9 @@
 <title>HTML Test: dir=auto|rtl with slots, and direction should be RTL</title>
 <meta charset="UTF-8">
 <meta name="author" title="Miyoung Shin" href="mailto:myid.shin@igalia.com">
-<meta name="assert" content="When dir='auto', the direction is set according to
-  slot's assigned node. And the direction should be propagated to shadow" />
+<meta name="author" title="L. David Baron" href="mailto:dbaron@chromium.org">
 <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-dir-attribute"/>
+<link rel="help" href="https://github.com/whatwg/html/issues/3699">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="host1"><span></span></div>
@@ -12,27 +12,55 @@
 <span id="host3" dir="auto"></span>
 <div id="host4">اختبر</div>
 <div id="host5"></div>
+<div id="host6">اختبر</div>
 <script>
-let root1 = host1.attachShadow({mode:"open"});
-root1.innerHTML = '<slot dir="rtl"></slot>';
-
-let root2 = host2.attachShadow({mode:"open"});
-root2.innerHTML = '<span></span>';
-
-let root3 = host3.attachShadow({mode:"open"});
-root3.innerHTML = `اختبر`;
-
-let root4 = host4.attachShadow({mode:"open"});
-root4.innerHTML = '<span dir="auto"><slot></slot></span>';
-
-let root5 = host5.attachShadow({mode:"open"});
-  root5.innerHTML = '<span dir="auto"><slot>اختبر</slot></span>';
 
 test(() => {
-  assert_equals(getComputedStyle(host1.firstChild).direction, "rtl");
-  assert_equals(getComputedStyle(root2.querySelector("span")).direction, "rtl");
-  assert_equals(getComputedStyle(host3).direction, "ltr");
-  assert_equals(getComputedStyle(root4.querySelector("span")).direction, "rtl");
-  assert_equals(getComputedStyle(root5.querySelector("span")).direction, "rtl");
-}, 'Slots: Directionality');
+  let root1 = host1.attachShadow({mode:"open"});
+  root1.innerHTML = '<slot dir="rtl"></slot>';
+  let span = host1.firstChild;
+  assert_equals(getComputedStyle(span).direction, "rtl");
+  assert_true(span.matches(":dir(ltr)"));
+}, 'Slots: Directionality: dir=rtl on slot');
+
+test(() => {
+  let root2 = host2.attachShadow({mode:"open"});
+  root2.innerHTML = '<span></span>';
+  let span = root2.querySelector("span");
+  assert_equals(getComputedStyle(span).direction, "rtl");
+  assert_true(span.matches(":dir(rtl)"));
+}, 'Slots: Directionality: dir=rtl on host');
+
+test(() => {
+  let root3 = host3.attachShadow({mode:"open"});
+  root3.innerHTML = `اختبر`;
+  let span = host3;
+  assert_equals(getComputedStyle(span).direction, "ltr");
+  assert_true(span.matches(":dir(ltr)"));
+}, 'Slots: Directionality: dir=auto on host with Arabic shadow tree content');
+
+test(() => {
+  let root4 = host4.attachShadow({mode:"open"});
+  root4.innerHTML = '<span dir="auto"><slot></slot></span>';
+  let span = root4.querySelector("span");
+  assert_equals(getComputedStyle(span).direction, "ltr");
+  assert_true(span.matches(":dir(ltr)"));
+}, 'Slots: Directionality: dir=auto in shadow tree with Arabic light tree content');
+
+test(() => {
+  let root5 = host5.attachShadow({mode:"open"});
+  root5.innerHTML = '<span dir="auto"><slot>اختبر</slot></span>';
+  let span = root5.querySelector("span");
+  assert_equals(getComputedStyle(span).direction, "rtl");
+  assert_true(span.matches(":dir(rtl)"));
+}, 'Slots: Directionality: dir=auto in shadow tree with Arabic shadow tree content');
+
+test(() => {
+  let root6 = host6.attachShadow({mode:"open"});
+  root6.innerHTML = '<slot dir="auto"></slot>';
+  let span = root6.querySelector("slot");
+  assert_equals(getComputedStyle(span).direction, "rtl");
+  assert_true(span.matches(":dir(rtl)"));
+}, 'Slots: Directionality: dir=auto on slot with Arabic light tree content');
+
 </script>
diff --git a/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-N-EN-ref.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-N-EN-ref.html
index 154d56aaf9a..0d938b2e168 100644
--- a/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-N-EN-ref.html
+++ b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-N-EN-ref.html
@@ -3,7 +3,6 @@
   <head>
     <meta charset="utf-8" />
     <title>HTML Test: dir=auto, start with N, then EN, then L</title>
-    <link rel="match" href="dir_auto-N-EN-L-ref.html" />
     <link rel="author" title="Matitiahu Allouche" href="mailto:matitiahu.allouche@google.com" />
     <link rel="author" title="Oren Roth" href="mailto:oren.roth@gmail.com" />
     <link rel="author" title="HTML5 bidi test WG" href="mailto:html5bidi@googlegroups.com" />
@@ -11,7 +10,7 @@
     <meta name="assert" content="
       When dir='auto', the direction is set according to the first strong character
       of the text, ignoring neutrals and numbers.
-      If there is no strong character, as in this test, the direction defaults to LTR." />
+      If there is no strong character, as in this test, the direction defaults to the parent." />
     <style>
       input, textarea {
         font-size:1em;
@@ -36,7 +35,7 @@
         <p dir="ltr">@123!</p>
       </div>
       <div dir="rtl">
-        <p dir="ltr">@123!</p>
+        <p dir="rtl">@123!</p>
       </div>
     </div>
     <div class="ref">
@@ -44,7 +43,7 @@
         <p dir="ltr">@123!</p>
       </div>
       <div dir="rtl">
-        <p dir="ltr">@123!</p>
+        <p dir="rtl">@123!</p>
       </div>
     </div>
   </body>
diff --git a/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-N-EN.html b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-N-EN.html
index 5d948d34568..467b4d09394 100644
--- a/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-N-EN.html
+++ b/tests/wpt/tests/html/dom/elements/global-attributes/dir_auto-N-EN.html
@@ -11,7 +11,7 @@
     <meta name="assert" content="
       When dir='auto', the direction is set according to the first strong character
       of the text, ignoring neutrals and numbers.
-      If there is no strong character, as in this test, the direction defaults to LTR." />
+      If there is no strong character, as in this test, the direction defaults to the parent." />
     <style>
       input, textarea {
         font-size:1em;
@@ -44,7 +44,7 @@
         <p dir="ltr">@123!</p>
       </div>
       <div dir="rtl">
-        <p dir="ltr">@123!</p>
+        <p dir="rtl">@123!</p>
       </div>
     </div>
   </body>
diff --git a/tests/wpt/tests/html/dom/elements/global-attributes/the-anchor-attribute-003-crash.tentative.html b/tests/wpt/tests/html/dom/elements/global-attributes/the-anchor-attribute-003-crash.tentative.html
new file mode 100644
index 00000000000..207275d9db0
--- /dev/null
+++ b/tests/wpt/tests/html/dom/elements/global-attributes/the-anchor-attribute-003-crash.tentative.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<title>Tests that using the `anchor` attribute with inline containing block does not crash</title>
+<link rel="help" href="https://github.com/whatwg/html/pull/9144">
+<link rel="help" href="https://crbug.com/1486148">
+<link rel="author" href="mailto:xiaochengh@chromium.org">
+
+<style>
+.target {
+  position: absolute;
+  top: anchor(top);
+  left: anchor(right);
+}
+</style>
+
+<div id="anchor">foo</div>
+
+<span style="position: relative">
+  <div anchor="anchor2" class="target">bar</div>
+</span>
+
+<span style="position: sticky">
+  <div anchor="anchor2" class="target">bar</div>
+</span>
+
+<span style="backdrop-filter: blur(1px)">
+  <div anchor="anchor2" class="target">bar</div>
+</span>
diff --git a/tests/wpt/tests/html/dom/idlharness-shadowrealm.window.js b/tests/wpt/tests/html/dom/idlharness-shadowrealm.window.js
index cb9449acb1b..ef71b74e509 100644
--- a/tests/wpt/tests/html/dom/idlharness-shadowrealm.window.js
+++ b/tests/wpt/tests/html/dom/idlharness-shadowrealm.window.js
@@ -1,2 +1,2 @@
 // META: script=/resources/idlharness-shadowrealm.js
-idl_test_shadowrealm(["html"], ["wai-aria", "SVG", "cssom", "touch-events", "uievents", "dom", "xhr", "FileAPI", "mediacapture-streams"]);
+idl_test_shadowrealm(["html"], ["wai-aria", "SVG", "cssom", "touch-events", "uievents", "dom", "xhr", "FileAPI", "mediacapture-streams", "performance-timeline"]);
diff --git a/tests/wpt/tests/html/infrastructure/urls/resolving-urls/query-encoding/resources/resolve-url.js b/tests/wpt/tests/html/infrastructure/urls/resolving-urls/query-encoding/resources/resolve-url.js
index f654a894b9d..1c4a77705e5 100644
--- a/tests/wpt/tests/html/infrastructure/urls/resolving-urls/query-encoding/resources/resolve-url.js
+++ b/tests/wpt/tests/html/infrastructure/urls/resolving-urls/query-encoding/resources/resolve-url.js
@@ -165,6 +165,7 @@ onload = function() {
 
   var query_to_image_width = {
     '%E5':1,
+    '%26%23229%3B':1,
     '%C3%A5':2,
     '%3F':16,
     'unknown query':256,
@@ -230,6 +231,7 @@ onload = function() {
 
   var query_to_video_duration = {
     '%E5':3,
+    '%26%23229%3B':3,
     '%C3%A5':5,
     '%3F':30,
     'unknown query':300,
@@ -392,9 +394,9 @@ onload = function() {
       elm.href = input_arr[0];
       elm.search = '?' + input_arr[1];
       var got_href = elm.getAttribute('href');
-      assert_true(got_href.indexOf(expected_current) > -1, 'href content attribute ' + msg(expected_current, got_href));
+      assert_true(got_href.indexOf(expected_utf8) > -1, 'href content attribute ' + msg(expected_utf8, got_href));
       var got_search = elm.search;
-      assert_true(got_search.indexOf(expected_current) > -1, 'getting .search '+msg(expected_current, got_search));
+      assert_true(got_search.indexOf(expected_utf8) > -1, 'getting .search '+msg(expected_utf8, got_search));
     }, '<'+tag+'>.search');
   }
   'a, area'.split(', ').forEach(function(str) {
@@ -405,6 +407,7 @@ onload = function() {
   // history.replaceState
   function test_history(prop) {
     subsetTestByKey('history', async_test, function() {
+      var url = input_url_html.replace('resources/', '');
       var iframe = document.createElement('iframe');
       iframe.src = blank;
       document.body.appendChild(iframe);
@@ -412,10 +415,13 @@ onload = function() {
         document.body.removeChild(iframe);
       });
       iframe.onload = this.step_func_done(function() {
-        iframe.contentWindow.history[prop](null, null, input_url_html); // this should resolve against the test's URL, not the iframe's URL
+        // this should resolve against the iframe's URL
+        // "Parse url, relative to the relevant settings object of history."
+        // https://html.spec.whatwg.org/multipage/nav-history-apis.html#shared-history-push%2Freplace-state-steps
+        iframe.contentWindow.history[prop](null, null, url);
         var got = iframe.contentWindow.location.href;
         assert_true(got.indexOf(expected_current) > -1, msg(expected_current, got));
-        assert_equals(got.indexOf('/resources/resources/'), -1, 'url was resolved against the iframe\'s URL instead of the settings object\'s API base URL');
+        assert_not_equals(got.indexOf('/resources/'), -1, 'url was resolved against the test\'s URL');
       });
     }, 'history.'+prop);
   }
@@ -493,7 +499,7 @@ onload = function() {
     var xhr = new XMLHttpRequest();
     xhr.open('GET', input_url_html);
     xhr.onload = this.step_func_done(function() {
-      assert_equals(xhr.response, expected_utf8);
+      assert_equals(xhr.response, expected_current);
     });
     xhr.send();
   }, 'XMLHttpRequest#open()');
@@ -513,13 +519,6 @@ onload = function() {
     });
   }, 'Worker() in a dedicated worker');
 
-  subsetTestByKey('workers', async_test, function() {
-    var worker = new Worker(input_url_worker_sharedworker);
-    worker.onmessage = this.step_func_done(function(e) {
-      assert_equals(e.data, expected_utf8);
-    });
-  }, 'SharedWorker() in a dedicated worker');
-
   subsetTestByKey('workers', async_test, function() {
     var worker = new SharedWorker(input_url_sharedworker_importScripts);
     worker.port.onmessage = this.step_func_done(function(e) {
@@ -534,13 +533,6 @@ onload = function() {
     });
   }, 'Worker() in a shared worker');
 
-  subsetTestByKey('workers', async_test, function() {
-    var worker = new SharedWorker(input_url_sharedworker_sharedworker);
-    worker.port.onmessage = this.step_func_done(function(e) {
-      assert_equals(e.data, expected_utf8);
-    });
-  }, 'SharedWorker() in a shared worker');
-
   // WebSocket()
   subsetTestByKey('websocket', async_test, function() {
     var ws = new WebSocket('ws://{{host}}:{{ports[ws][0]}}/echo-query?\u00E5');
@@ -674,13 +666,13 @@ onload = function() {
 
   var test_scheme_urls = ['ftp://example.invalid/?x=\u00E5',
                           'file:///?x=\u00E5',
-                          'gopher://example.invalid/?x=\u00E5',
                           'http://example.invalid/?x=\u00E5',
                           'https://example.invalid/?x=\u00E5',
                          ];
 
   var test_scheme_urls_utf8 = ['ws://example.invalid/?x=\u00E5',
                                'wss://example.invalid/?x=\u00E5',
+                               'gopher://example.invalid/?x=\u00E5',
                                'mailto:example@invalid?x=\u00E5',
                                'data:text/plain;charset='+encoding+',?x=\u00E5',
                                'javascript:"?x=\u00E5"',
diff --git a/tests/wpt/tests/html/infrastructure/urls/resolving-urls/query-encoding/resources/resource.py b/tests/wpt/tests/html/infrastructure/urls/resolving-urls/query-encoding/resources/resource.py
index 60eb4a15a06..54b4bc9b5ba 100644
--- a/tests/wpt/tests/html/infrastructure/urls/resolving-urls/query-encoding/resources/resource.py
+++ b/tests/wpt/tests/html/infrastructure/urls/resolving-urls/query-encoding/resources/resource.py
@@ -39,23 +39,12 @@ def main(request, response):
                    } catch(ex) {
                      postMessage(String(ex));
                    }""" % encoding)
-    elif type == b'worker_sharedworker':
-        return ([(b"Content-Type", b"text/javascript; charset=%s" % encoding)], # charset should be ignored for workers
-                b"""try {
-                   var worker = new SharedWorker('?q=\\u00E5&type=sharedworker&encoding=%s');
-                     worker.port.onmessage = function(e) {
-                       postMessage(e.data);
-                       close();
-                     };
-                   } catch(ex) {
-                     postMessage(String(ex));
-                   }""" % encoding)
     elif type == b'sharedworker_importScripts':
-        return ([(b"Content-Type", b"text/javascript; charset=%s" % request.GET[b'encoding'])], # charset should be ignored for workers
-                b"""onconnect = function(e) {
+        return ([(b"Content-Type", b"text/javascript; charset=%s" % encoding)], # charset should be ignored for workers
+                b"""var x = 'importScripts failed to run';
+                     onconnect = function(e) {
                      var connect_port = e.source;
                      try {
-                       var x = 'importScripts failed to run';
                        importScripts('?q=\\u00E5&type=js&var=x&encoding=%s');
                        connect_port.postMessage(x);
                        close();
@@ -77,25 +66,6 @@ def main(request, response):
                        connect_port.postMessage(String(ex));
                      }
                    };""" % encoding)
-    elif type == b'sharedworker_sharedworker':
-        return ([(b"Content-Type", b"text/javascript; charset=%s" % encoding)], # charset should be ignored for workers
-                b"""onconnect = function(e) {
-                     var connect_port = e.source;
-                     try {
-                       onerror = function(msg) {
-                         connect_port.postMessage(msg);
-                         close();
-                         return false;
-                       };
-                       var worker = new SharedWorker('?q=\\u00E5&type=sharedworker&encoding=%s');
-                       worker.port.onmessage = function(e) {
-                         connect_port.postMessage(e.data);
-                         close();
-                       };
-                     } catch(ex) {
-                       connect_port.postMessage(String(ex));
-                     }
-                   };""" % encoding)
     elif type == b'eventstream':
         return [(b"Content-Type", b"text/event-stream")], b"data: %s\n\n" % isomorphic_encode(q)
     elif type == b'svg':
@@ -105,7 +75,7 @@ def main(request, response):
                 (u"""<?xml-stylesheet href="?q=&#x00E5;&amp;type=css&amp;encoding=%s"?><html xmlns="http://www.w3.org/1999/xhtml"/>""" % isomorphic_decode(encoding))
                 .encode(isomorphic_decode(encoding)))
     elif type == b'png':
-        if q == u'%E5':
+        if q == u'%E5' or q == u'%26%23229%3B':
             image = u'green-1x1.png'
         elif q == u'%C3%A5':
             image = u'green-2x2.png'
@@ -117,7 +87,7 @@ def main(request, response):
         return [(b"Content-Type", b"image/png")], rv
     elif type == b'video':
         ext = request.GET[b'ext']
-        if q == u'%E5':
+        if q == u'%E5' or q == u'%26%23229%3B':
             video = u'A4' # duration: 3
         elif q == u'%C3%A5':
             video = u'movie_5' # duration: 5
diff --git a/tests/wpt/tests/html/interaction/focus/setSequentialFocusStartingPoint.tentative.html b/tests/wpt/tests/html/interaction/focus/setSequentialFocusStartingPoint.tentative.html
new file mode 100644
index 00000000000..a7c7506b13b
--- /dev/null
+++ b/tests/wpt/tests/html/interaction/focus/setSequentialFocusStartingPoint.tentative.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<link rel=author href="mailto:jarhar@chromium.org">
+<link rel=help href="https://github.com/whatwg/html/issues/5326">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+
+<button id=b1>b1</button>
+<div id=d1>d1</div>
+<button id=b2>b2</button>
+
+<script>
+const tabKey = '\uE004';
+promise_test(async () => {
+  assert_equals(document.activeElement, document.body,
+    'Focus should initially be set on the body element.');
+
+  document.setSequentialFocusStartingPoint(d1);
+  assert_equals(document.activeElement, document.body,
+    'Calling setSequentialFocusStartingPoint should not change the focused element.');
+
+  await test_driver.send_keys(document.activeElement, tabKey);
+  assert_equals(document.activeElement, b2,
+    'Pressing tab should focus the next button after the sequential focus starting point.');
+}, 'document.setSequentialFocusStartingPoint should set the sequential focus starting point on any element.');
+</script>
diff --git a/tests/wpt/tests/html/links/stylesheet/quirk-origin-check-recursive-import.html b/tests/wpt/tests/html/links/stylesheet/quirk-origin-check-recursive-import.html
new file mode 100644
index 00000000000..c0053f1f29a
--- /dev/null
+++ b/tests/wpt/tests/html/links/stylesheet/quirk-origin-check-recursive-import.html
@@ -0,0 +1,15 @@
+<!-- quirks -->
+<title>Origin check for stylesheet with non-CSS MIME type quirk: recursive @import</title>
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1477672">
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1850965">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+setup({ single_test: true });
+let errors = 0;
+onload = () => {
+  assert_equals(errors, 1);
+  done();
+};
+</script>
+<link rel="stylesheet" href="data:/,@import url('x/');" onerror="errors++">
diff --git a/tests/wpt/tests/html/links/stylesheet/quirk-origin-check.html b/tests/wpt/tests/html/links/stylesheet/quirk-origin-check.html
new file mode 100644
index 00000000000..89adcb428fa
--- /dev/null
+++ b/tests/wpt/tests/html/links/stylesheet/quirk-origin-check.html
@@ -0,0 +1,13 @@
+<!-- quirks -->
+<title>Origin check for stylesheet with non-CSS MIME type quirk</title>
+<link rel="stylesheet" href="data:text/plain,.test { background: red }">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<p class=test>There should be no red.</p>
+<script>
+setup({ single_test: true });
+onload = () => {
+  assert_equals(getComputedStyle(document.querySelector('.test')).backgroundColor, 'rgba(0, 0, 0, 0)');
+  done();
+};
+</script>
diff --git a/tests/wpt/tests/html/rendering/non-replaced-elements/hidden-elements.html b/tests/wpt/tests/html/rendering/non-replaced-elements/hidden-elements.html
index 4286681addd..e1bcf508e5d 100644
--- a/tests/wpt/tests/html/rendering/non-replaced-elements/hidden-elements.html
+++ b/tests/wpt/tests/html/rendering/non-replaced-elements/hidden-elements.html
@@ -3,6 +3,8 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div hidden></div>
+<embed hidden>
+<embed hidden=until-found>
 <script>
 const kNotHiddenElementLocalNames = [
   "source", "track",
@@ -30,6 +32,21 @@ for (let name of kHiddenElementLocalNames) {
 }
 
 test(function() {
-  assert_equals(getComputedStyle(document.querySelector("[hidden]")).display, "none");
-}, `[hidden] element should be hidden`);
+  assert_equals(getComputedStyle(document.querySelector("div[hidden]")).display, "none");
+}, `div[hidden] element should be hidden`);
+
+test(function() {
+  const el = document.querySelector("embed[hidden='']");
+  assert_equals(getComputedStyle(el).display, "inline");
+  assert_equals(getComputedStyle(el).width, "0px");
+  assert_equals(getComputedStyle(el).height, "0px");
+}, `embed[hidden=''] element should be inline 0x0`);
+
+test(function() {
+  const el = document.querySelector("embed[hidden='until-found']");
+  assert_equals(getComputedStyle(el).display, "inline");
+  assert_equals(getComputedStyle(el).width, "0px");
+  assert_equals(getComputedStyle(el).height, "0px");
+  assert_equals(getComputedStyle(el).contentVisibility, "visible");
+}, `embed[hidden='until-found'] element should be inline 0x0`);
 </script>
diff --git a/tests/wpt/tests/html/rendering/the-details-element/details-pseudo-elements-002-ref.html b/tests/wpt/tests/html/rendering/the-details-element/details-pseudo-elements-002-ref.html
new file mode 100644
index 00000000000..baf242291b5
--- /dev/null
+++ b/tests/wpt/tests/html/rendering/the-details-element/details-pseudo-elements-002-ref.html
@@ -0,0 +1,14 @@
+<!DOCTYPE HTML>
+<title>Details pseudo-elements</title>
+<!-- This test is (at time of writing) _EXTREMELY_ tentative. -->
+<style>
+
+summary { list-style-type: disclosure-closed; }
+div { background: aqua }
+
+</style>
+
+<details open>
+  <summary>The summary</summary>
+  <div>The details!</div>
+</details>
diff --git a/tests/wpt/tests/html/rendering/the-details-element/details-pseudo-elements-002.tentative.html b/tests/wpt/tests/html/rendering/the-details-element/details-pseudo-elements-002.tentative.html
new file mode 100644
index 00000000000..e1493956651
--- /dev/null
+++ b/tests/wpt/tests/html/rendering/the-details-element/details-pseudo-elements-002.tentative.html
@@ -0,0 +1,21 @@
+<!DOCTYPE HTML>
+<title>Details pseudo-elements</title>
+<!-- This test is (at time of writing) _EXTREMELY_ tentative. -->
+<link rel="match" href="details-pseudo-elements-002-ref.html">
+<link rel="help" href="https://github.com/dbaron/details-styling">
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1469418">
+<meta name="assert" content="Checks that the content-visibility property on the pseudo-element overrides the style attribute inside the shadow dom.">
+<style>
+
+details::details-content {
+  background: aqua;
+  display: block; /* override display: contents for slot */
+  content-visibility: visible;
+}
+
+</style>
+
+<details>
+  <summary>The summary</summary>
+  <div>The details!</div>
+</details>
diff --git a/tests/wpt/tests/html/rendering/widgets/form-sizing-input-number.tentative.html b/tests/wpt/tests/html/rendering/widgets/form-sizing-input-number.tentative.html
new file mode 100644
index 00000000000..59835805a07
--- /dev/null
+++ b/tests/wpt/tests/html/rendering/widgets/form-sizing-input-number.tentative.html
@@ -0,0 +1,149 @@
+<!DOCTYPE html>
+<link rel="help" href="https://github.com/w3c/csswg-drafts/pull/9251">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+.disable-default {
+  form-sizing: normal;
+}
+
+.small-placeholder {
+  font-size: 32px;
+}
+.small-placeholder::placeholder {
+  font-size: 16px;
+}
+
+.large-placeholder {
+  font-size: 20px;
+}
+.large-placeholder::placeholder {
+  font-size: 40px;
+}
+</style>
+<body>
+<div id="container"></div>
+<script>
+const DISABLE = 'class="disable-default"';
+const LONG_VALUE = '12345678901234567890.123';
+const LONG_TEXT = 'The quick brown fox jumps over the lazy dog.';
+
+function addElements(source) {
+  const container = document.querySelector('#container');
+  container.innerHTML = source + source;
+  container.lastElementChild.classList.add('disable-default');
+  return {
+    fixed: container.firstElementChild,
+    content: container.lastElementChild
+  };
+}
+
+function addTwoElements(source1, source2) {
+  const container = document.querySelector('#container');
+  container.innerHTML = source1 + source2;
+  return {
+    e1: container.firstElementChild,
+    e2: container.lastElementChild
+  };
+}
+
+['number'].forEach(type => {
+  test(() => {
+    let pair = addElements(`<input type=${type}>`);
+    // A text <input> has approximately 20ch width by default.
+    // A text <input> with form-sizing:normal must be shorter than the default.
+    assert_less_than(pair.content.offsetWidth, pair.fixed.offsetWidth);
+    assert_equals(pair.content.offsetHeight, pair.fixed.offsetHeight);
+
+    pair = addTwoElements(`<input type=${type} ${DISABLE}>`,
+                          `<input type=${type} ${DISABLE} value="123">`);
+    assert_less_than(pair.e1.offsetWidth, pair.e2.offsetWidth);
+    assert_equals(pair.e1.offsetHeight, pair.e2.offsetHeight);
+  }, `${type}: Empty value`);
+
+  test(() => {
+    let pair = addElements(`<input type=${type} value="${LONG_VALUE}">`);
+    assert_greater_than(pair.content.offsetWidth, pair.fixed.offsetWidth);
+    pair = addElements(`<input type=${type} placeholder="${LONG_TEXT}">`);
+    assert_greater_than(pair.content.offsetWidth, pair.fixed.offsetWidth);
+  }, `${type}: Auto width and auto height with a long text`);
+
+  test(() => {
+    let pair = addElements(`<input type=${type} style="width:20ch; height:2lh">`);
+    assert_equals(pair.content.offsetWidth, pair.fixed.offsetWidth);
+    assert_equals(pair.content.offsetHeight, pair.fixed.offsetHeight);
+
+    pair = addElements(`<input type=${type} style="width:20ch; height:2lh" value="${LONG_VALUE}">`);
+    assert_equals(pair.content.offsetWidth, pair.fixed.offsetWidth);
+    assert_equals(pair.content.offsetHeight, pair.fixed.offsetHeight);
+
+    pair = addElements(`<input type=${type} style="width:20ch; height:2lh" placeholder="${LONG_TEXT}">`);
+    assert_equals(pair.content.offsetWidth, pair.fixed.offsetWidth);
+    assert_equals(pair.content.offsetHeight, pair.fixed.offsetHeight);
+  }, `${type}: Explicit width and heigth`);
+
+  test(() => {
+    let pair = addElements(`<input type=${type} style="width:20ch">`);
+    assert_equals(pair.content.offsetWidth, pair.fixed.offsetWidth);
+    assert_equals(pair.content.offsetHeight, pair.fixed.offsetHeight);
+
+    pair = addElements(`<input type=${type} style="width:20ch" value="${LONG_VALUE}">`);
+    assert_equals(pair.content.offsetWidth, pair.fixed.offsetWidth);
+    assert_equals(pair.content.offsetHeight, pair.fixed.offsetHeight);
+
+    pair = addElements(`<input type=${type} style="width:20ch" placeholder="${LONG_TEXT}">`);
+    assert_equals(pair.content.offsetWidth, pair.fixed.offsetWidth);
+    assert_equals(pair.content.offsetHeight, pair.fixed.offsetHeight);
+  }, `${type}: Explicit width and auto height`);
+
+  test(() => {
+    let pair = addElements(`<input type=${type} style="height:2lh">`);
+    assert_less_than(pair.content.offsetWidth, pair.fixed.offsetWidth);
+    assert_equals(pair.content.offsetHeight, pair.fixed.offsetHeight);
+
+    pair = addElements(`<input type=${type} style="height:2lh" value="${LONG_VALUE}">`);
+    assert_greater_than(pair.content.offsetWidth, pair.fixed.offsetWidth);
+    assert_equals(pair.content.offsetHeight, pair.fixed.offsetHeight);
+
+    pair = addElements(`<input type=${type} style="height:2lh" placeholder="${LONG_TEXT}">`);
+    assert_greater_than(pair.content.offsetWidth, pair.fixed.offsetWidth);
+    assert_equals(pair.content.offsetHeight, pair.fixed.offsetHeight);
+  }, `${type}: Explicit height and auto width`);
+
+  test(() => {
+    let pair = addTwoElements(
+        `<input type=${type} class="disable-default small-placeholder">`,
+        `<input type=${type} class="disable-default small-placeholder" placeholder="foo bar">`);
+    assert_less_than(pair.e1.offsetWidth, pair.e2.offsetWidth);
+    assert_equals(pair.e1.offsetHeight, pair.e2.offsetHeight);
+  }, `${type}: Text caret is taller than the placeholder`);
+
+  test(() => {
+    let pair = addTwoElements(
+        `<input type=${type} class="disable-default large-placeholder">`,
+        `<input type=${type} class="disable-default large-placeholder" placeholder="foo bar">`);
+    assert_less_than(pair.e1.offsetWidth, pair.e2.offsetWidth);
+    assert_less_than(pair.e1.offsetHeight, pair.e2.offsetHeight);
+
+    pair = addTwoElements(
+        `<input type=${type} class="disable-default" style="font-size:40px; padding:16px">`,
+        `<input type=${type} class="disable-default large-placeholder"
+                placeholder="foo bar" style="font-size:40px; padding:16px">`);
+    assert_equals(pair.e1.offsetHeight, pair.e2.offsetHeight);
+    assert_equals(pair.e1.offsetTop, pair.e2.offsetTop);
+  }, `${type}: Text caret is shorter than the placeholder`);
+
+  test(() => {
+     const container = document.querySelector('#container');
+     container.innerHTML = `<input type=${type}>`;
+     const element = container.firstChild;
+     const w = element.offsetWidth;
+     const h = element.offsetHeight;
+     element.classList.add('disable-default');
+     assert_less_than(element.offsetWidth, w);
+     assert_equals(element.offsetHeight, h);
+  }, `${type}: Update form-sizing property dynamically`);
+
+});
+</script>
+</body>
diff --git a/tests/wpt/tests/html/rendering/widgets/form-sizing-input-text.tentative.html b/tests/wpt/tests/html/rendering/widgets/form-sizing-input-text.tentative.html
new file mode 100644
index 00000000000..32cabc557f6
--- /dev/null
+++ b/tests/wpt/tests/html/rendering/widgets/form-sizing-input-text.tentative.html
@@ -0,0 +1,154 @@
+<!DOCTYPE html>
+<link rel="help" href="https://github.com/w3c/csswg-drafts/pull/9251">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+.disable-default {
+  form-sizing: normal;
+}
+
+.small-placeholder {
+  font-size: 32px;
+}
+.small-placeholder::placeholder {
+  font-size: 16px;
+}
+
+.large-placeholder {
+  font-size: 20px;
+}
+.large-placeholder::placeholder {
+  font-size: 40px;
+}
+</style>
+<body>
+<div id="container"></div>
+<script>
+const DISABLE = 'class="disable-default"';
+const LONG_TEXT = 'The quick brown fox jumps over the lazy dog.';
+
+function addElements(source) {
+  const container = document.querySelector('#container');
+  container.innerHTML = source + source;
+  container.lastElementChild.classList.add('disable-default');
+  return {
+    fixed: container.firstElementChild,
+    content: container.lastElementChild
+  };
+}
+
+function addTwoElements(source1, source2) {
+  const container = document.querySelector('#container');
+  container.innerHTML = source1 + source2;
+  return {
+    e1: container.firstElementChild,
+    e2: container.lastElementChild
+  };
+}
+
+['text', 'search', 'tel', 'url', 'email', 'password'].forEach(type => {
+  test(() => {
+    let pair = addElements(`<input type=${type}>`);
+    // A text <input> has approximately 20ch width by default.
+    // A text <input> with form-sizing:normal must be shorter than the default.
+    assert_less_than(pair.content.offsetWidth, pair.fixed.offsetWidth);
+    assert_equals(pair.content.offsetHeight, pair.fixed.offsetHeight);
+
+    pair = addTwoElements(`<input type=${type} ${DISABLE}>`,
+                          `<input type=${type} ${DISABLE} value="foo">`);
+    assert_less_than(pair.e1.offsetWidth, pair.e2.offsetWidth);
+    assert_equals(pair.e1.offsetHeight, pair.e2.offsetHeight);
+  }, `${type}: Empty value`);
+
+  test(() => {
+    let pair = addElements(`<input type=${type} size="10">`);
+    assert_less_than(pair.content.offsetWidth, pair.fixed.offsetWidth);
+    assert_equals(pair.content.offsetHeight, pair.fixed.offsetHeight);
+  }, `${type}: Empty value with a size atttribute`);
+
+  test(() => {
+    let pair = addElements(`<input type=${type} value="${LONG_TEXT}">`);
+    assert_greater_than(pair.content.offsetWidth, pair.fixed.offsetWidth);
+    pair = addElements(`<input type=${type} placeholder="${LONG_TEXT}">`);
+    assert_greater_than(pair.content.offsetWidth, pair.fixed.offsetWidth);
+  }, `${type}: Auto width and auto height with a long text`);
+
+  test(() => {
+    let pair = addElements(`<input type=${type} style="width:20ch; height:2lh">`);
+    assert_equals(pair.content.offsetWidth, pair.fixed.offsetWidth);
+    assert_equals(pair.content.offsetHeight, pair.fixed.offsetHeight);
+
+    pair = addElements(`<input type=${type} style="width:20ch; height:2lh" value="${LONG_TEXT}">`);
+    assert_equals(pair.content.offsetWidth, pair.fixed.offsetWidth);
+    assert_equals(pair.content.offsetHeight, pair.fixed.offsetHeight);
+
+    pair = addElements(`<input type=${type} style="width:20ch; height:2lh" placeholder="${LONG_TEXT}">`);
+    assert_equals(pair.content.offsetWidth, pair.fixed.offsetWidth);
+    assert_equals(pair.content.offsetHeight, pair.fixed.offsetHeight);
+  }, `${type}: Explicit width and heigth`);
+
+  test(() => {
+    let pair = addElements(`<input type=${type} style="width:20ch">`);
+    assert_equals(pair.content.offsetWidth, pair.fixed.offsetWidth);
+    assert_equals(pair.content.offsetHeight, pair.fixed.offsetHeight);
+
+    pair = addElements(`<input type=${type} style="width:20ch" value="${LONG_TEXT}">`);
+    assert_equals(pair.content.offsetWidth, pair.fixed.offsetWidth);
+    assert_equals(pair.content.offsetHeight, pair.fixed.offsetHeight);
+
+    pair = addElements(`<input type=${type} style="width:20ch" placeholder="${LONG_TEXT}">`);
+    assert_equals(pair.content.offsetWidth, pair.fixed.offsetWidth);
+    assert_equals(pair.content.offsetHeight, pair.fixed.offsetHeight);
+  }, `${type}: Explicit width and auto height`);
+
+  test(() => {
+    let pair = addElements(`<input type=${type} style="height:2lh">`);
+    assert_less_than(pair.content.offsetWidth, pair.fixed.offsetWidth);
+    assert_equals(pair.content.offsetHeight, pair.fixed.offsetHeight);
+
+    pair = addElements(`<input type=${type} style="height:2lh" value="${LONG_TEXT}">`);
+    assert_greater_than(pair.content.offsetWidth, pair.fixed.offsetWidth);
+    assert_equals(pair.content.offsetHeight, pair.fixed.offsetHeight);
+
+    pair = addElements(`<input type=${type} style="height:2lh" placeholder="${LONG_TEXT}">`);
+    assert_greater_than(pair.content.offsetWidth, pair.fixed.offsetWidth);
+    assert_equals(pair.content.offsetHeight, pair.fixed.offsetHeight);
+  }, `${type}: Explicit height and auto width`);
+
+  test(() => {
+    let pair = addTwoElements(
+        `<input type=${type} class="disable-default small-placeholder">`,
+        `<input type=${type} class="disable-default small-placeholder" placeholder="foo bar">`);
+    assert_less_than(pair.e1.offsetWidth, pair.e2.offsetWidth);
+    assert_equals(pair.e1.offsetHeight, pair.e2.offsetHeight);
+  }, `${type}: Text caret is taller than the placeholder`);
+
+  test(() => {
+    let pair = addTwoElements(
+        `<input type=${type} class="disable-default large-placeholder">`,
+        `<input type=${type} class="disable-default large-placeholder" placeholder="foo bar">`);
+    assert_less_than(pair.e1.offsetWidth, pair.e2.offsetWidth);
+    assert_less_than(pair.e1.offsetHeight, pair.e2.offsetHeight);
+
+    pair = addTwoElements(
+        `<input type=${type} class="disable-default" style="font-size:40px; padding:16px">`,
+        `<input type=${type} class="disable-default large-placeholder"
+                placeholder="foo bar" style="font-size:40px; padding:16px">`);
+    assert_equals(pair.e1.offsetHeight, pair.e2.offsetHeight);
+    assert_equals(pair.e1.offsetTop, pair.e2.offsetTop);
+  }, `${type}: Text caret is shorter than the placeholder`);
+
+  test(() => {
+     const container = document.querySelector('#container');
+     container.innerHTML = `<input type=${type}>`;
+     const element = container.firstChild;
+     const w = element.offsetWidth;
+     const h = element.offsetHeight;
+     element.classList.add('disable-default');
+     assert_less_than(element.offsetWidth, w);
+     assert_equals(element.offsetHeight, h);
+  }, `${type}: Update form-sizing property dynamically`);
+
+});
+</script>
+</body>
diff --git a/tests/wpt/tests/html/rendering/widgets/form-sizing-select.tentative.html b/tests/wpt/tests/html/rendering/widgets/form-sizing-select.tentative.html
new file mode 100644
index 00000000000..f9efdc74f91
--- /dev/null
+++ b/tests/wpt/tests/html/rendering/widgets/form-sizing-select.tentative.html
@@ -0,0 +1,87 @@
+<!DOCTYPE html>
+<link rel="help" href="https://github.com/w3c/csswg-drafts/pull/9251">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<body>
+<style>
+.disable-default {
+  form-sizing: normal;
+}
+</style>
+<div id="container"></div>
+<script>
+const container = document.querySelector('#container');
+const DISABLE = 'class="disable-default"';
+
+// Tests for drop-down box ====================================================
+
+test(() => {
+  const s = '<select>><option>1<option>quick brown<option>fox</select>';
+  container.innerHTML = s + s;
+  container.lastElementChild.style.formSizing = 'normal';
+  const widthForContent1 = container.lastElementChild.offsetWidth;
+  assert_greater_than(container.firstElementChild.offsetWidth,
+                      widthForContent1);
+  container.lastElementChild.selectedIndex = 1;
+  const widthForContentQuickBrown = container.lastElementChild.offsetWidth;
+  assert_greater_than(widthForContentQuickBrown, widthForContent1);
+}, 'dropdown: The width should depend on the selected OPTION');
+
+test(() => {
+  container.innerHTML = '<select><option>foo<option>quick brown fox</select>';
+  const select = container.firstElementChild;
+  const initialWidth = select.offsetWidth;
+  select.style.formSizing = 'normal';
+  assert_less_than(select.offsetWidth, initialWidth);
+  select.style.formSizing = 'auto';
+  assert_equals(select.offsetWidth, initialWidth);
+}, 'dropdown: Change the form-sizing value dynamically');
+
+// Tests for list box =========================================================
+
+// Some paltforms don't support list box rendering.
+container.innerHTML = '<select></select><select multiple></select>';
+if (container.firstElementChild.offsetHeight != container.lastElementChild.offsetHeight) {
+
+  test(() => {
+    container.innerHTML = `<select multiple><option>fox</select>` +
+                          `<select multiple ${DISABLE}><option>fox</select>`;
+    const former = container.firstElementChild;
+    const latter = container.lastElementChild;
+    const widthForOneItem = latter.offsetWidth;
+    const heightForOneItem = latter.offsetHeight;
+    assert_equals(former.offsetWidth, widthForOneItem);
+    assert_greater_than(former.offsetHeight, heightForOneItem);
+
+    latter.add(new Option('quick brown'));
+    assert_greater_than(latter.offsetWidth, widthForOneItem);
+    assert_greater_than(latter.offsetHeight, heightForOneItem);
+  }, 'listbox: The size depend on the content');
+
+  test(() => {
+    container.innerHTML = `<select size="4"></select><select size="4" ${DISABLE}></select>`;
+    const former = container.firstElementChild;
+    const latter = container.lastElementChild;
+    const widthForZeroItem = latter.offsetWidth;
+    const heightForZeroItem = latter.offsetHeight;
+    assert_equals(former.offsetWidth, widthForZeroItem);
+    assert_greater_than(former.offsetHeight, heightForZeroItem);
+
+    latter.add(new Option('quick brown'));
+    assert_greater_than(latter.offsetWidth, widthForZeroItem);
+    assert_greater_than(latter.offsetHeight, heightForZeroItem);
+  }, 'listbox: The size attribute value is ignored');
+
+  test(() => {
+    container.innerHTML = '<select multiple><option>foo<option>quick brown fox</select>';
+    const select = container.firstElementChild;
+    const initialHeight = select.offsetHeight;
+    select.style.formSizing = 'normal';
+    assert_less_than(select.offsetHeight, initialHeight);
+    select.style.formSizing = 'auto';
+    assert_equals(select.offsetHeight, initialHeight);
+  }, 'listbox: Change the form-sizing value dynamically');
+
+}
+</script>
+</body>
diff --git a/tests/wpt/tests/html/rendering/widgets/form-sizing-textarea.tentative.html b/tests/wpt/tests/html/rendering/widgets/form-sizing-textarea.tentative.html
new file mode 100644
index 00000000000..ae20e59290c
--- /dev/null
+++ b/tests/wpt/tests/html/rendering/widgets/form-sizing-textarea.tentative.html
@@ -0,0 +1,141 @@
+<!DOCTYPE html>
+<link rel="help" href="https://github.com/w3c/csswg-drafts/pull/9251">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+.disable-default {
+  form-sizing: normal;
+}
+
+.small-placeholder {
+  font-size: 32px;
+}
+.small-placeholder::placeholder {
+  font-size: 16px;
+}
+
+.large-placeholder {
+  font-size: 20px;
+}
+.large-placeholder::placeholder {
+  font-size: 40px;
+}
+</style>
+<body>
+<div id="container"></div>
+<script>
+const DISABLE = 'class="disable-default"';
+const LONG_TEXT = 'The quick brown fox jumps over the lazy dog.';
+
+function addElements(source) {
+  const container = document.querySelector('#container');
+  container.innerHTML = source + source;
+  container.lastElementChild.classList.add('disable-default');
+  return {
+    fixed: container.firstElementChild,
+    content: container.lastElementChild
+  };
+}
+
+function addTwoElements(source1, source2) {
+  const container = document.querySelector('#container');
+  container.innerHTML = source1 + source2;
+  return {
+    e1: container.firstElementChild,
+    e2: container.lastElementChild
+  };
+}
+
+test(() => {
+  let pair = addElements('<textarea></textarea>');
+  // Historically a <textarea> has approximately 20ch x 2lh size by default.
+  // A <textarea> with form-sizing:normal must be samller than the default.
+  assert_less_than(pair.content.offsetWidth, pair.fixed.offsetWidth);
+  assert_less_than(pair.content.offsetHeight, pair.fixed.offsetHeight);
+
+  pair = addTwoElements(`<textarea ${DISABLE}></textarea>`, `<textarea ${DISABLE}>foo</textarea>`);
+  assert_less_than(pair.e1.offsetWidth, pair.e2.offsetWidth);
+  assert_equals(pair.e1.offsetHeight, pair.e2.offsetHeight);
+}, 'Empty value');
+
+test(() => {
+  let pair = addElements('<textarea cols="10" rows="3"></textarea>');
+  assert_less_than(pair.content.offsetWidth, pair.fixed.offsetWidth);
+  assert_less_than(pair.content.offsetHeight, pair.fixed.offsetHeight);
+}, 'Empty value with cols/rows');
+
+test(() => {
+  let pair = addElements(`<textarea>${LONG_TEXT}</textarea>`);
+  assert_greater_than(pair.content.offsetWidth, pair.fixed.offsetWidth);
+  pair = addElements(`<textarea placeholder="${LONG_TEXT}"></textarea>`);
+  assert_greater_than(pair.content.offsetWidth, pair.fixed.offsetWidth);
+}, 'Auto width and auto height with a long text');
+
+test(() => {
+  let pair = addElements('<textarea style="width:20ch; height:2lh"></textarea>');
+  assert_equals(pair.content.offsetWidth, pair.fixed.offsetWidth);
+  assert_equals(pair.content.offsetHeight, pair.fixed.offsetHeight);
+
+  pair = addElements(`<textarea style="width:20ch; height:2lh">${LONG_TEXT}</textarea>`);
+  assert_equals(pair.content.offsetWidth, pair.fixed.offsetWidth);
+  assert_equals(pair.content.offsetHeight, pair.fixed.offsetHeight);
+
+  pair = addElements(`<textarea style="width:20ch; height:2lh" placeholder="${LONG_TEXT}"></textarea>`);
+  assert_equals(pair.content.offsetWidth, pair.fixed.offsetWidth);
+  assert_equals(pair.content.offsetHeight, pair.fixed.offsetHeight);
+}, 'Explicit width and heigth');
+
+test(() => {
+  let pair = addElements('<textarea style="width:20ch"></textarea>');
+  assert_equals(pair.content.offsetWidth, pair.fixed.offsetWidth);
+  assert_less_than(pair.content.offsetHeight, pair.fixed.offsetHeight);
+
+  pair = addElements(`<textarea style="width:20ch">${LONG_TEXT}</textarea>`);
+  assert_equals(pair.content.offsetWidth, pair.fixed.offsetWidth);
+  assert_greater_than(pair.content.offsetHeight, pair.fixed.offsetHeight);
+
+  pair = addElements(`<textarea style="width:20ch" placeholder="${LONG_TEXT}"></textarea>`);
+  assert_equals(pair.content.offsetWidth, pair.fixed.offsetWidth);
+  assert_greater_than(pair.content.offsetHeight, pair.fixed.offsetHeight);
+}, 'Explicit width and auto height');
+
+test(() => {
+  let pair = addElements('<textarea style="height:2lh"></textarea>');
+  assert_less_than(pair.content.offsetWidth, pair.fixed.offsetWidth);
+  assert_equals(pair.content.offsetHeight, pair.fixed.offsetHeight);
+
+  pair = addElements(`<textarea style="height:2lh">${LONG_TEXT}</textarea>`);
+  assert_greater_than(pair.content.offsetWidth, pair.fixed.offsetWidth);
+  assert_equals(pair.content.offsetHeight, pair.fixed.offsetHeight);
+
+  pair = addElements(`<textarea style="height:2lh" placeholder="${LONG_TEXT}"></textarea>`);
+  assert_greater_than(pair.content.offsetWidth, pair.fixed.offsetWidth);
+  assert_equals(pair.content.offsetHeight, pair.fixed.offsetHeight);
+}, 'Explicit height and auto width');
+
+test(() => {
+  let pair = addTwoElements(`<textarea class="disable-default small-placeholder"></textarea>`,
+                            `<textarea class="disable-default small-placeholder" placeholder="foo"></textarea>`);
+  assert_less_than(pair.e1.offsetWidth, pair.e2.offsetWidth);
+  assert_equals(pair.e1.offsetHeight, pair.e2.offsetHeight);
+}, 'Text caret is taller than the placeholder');
+
+test(() => {
+  let pair = addTwoElements(`<textarea class="disable-default large-placeholder"></textarea>`,
+                            `<textarea class="disable-default large-placeholder" placeholder="foo"></textarea>`);
+  assert_less_than(pair.e1.offsetWidth, pair.e2.offsetWidth, 'width');
+  assert_less_than(pair.e1.offsetHeight, pair.e2.offsetHeight, 'height');
+}, 'Text caret is shorter than the placeholder');
+
+test(() => {
+   const container = document.querySelector('#container');
+   container.innerHTML = '<textarea></textarea>';
+   const element = container.firstChild;
+   const w = element.offsetWidth;
+   const h = element.offsetHeight;
+   element.classList.add('disable-default');
+   assert_less_than(element.offsetWidth, w);
+   assert_less_than(element.offsetHeight, h);
+}, 'Update form-sizing property dynamically');
+</script>
+</body>
diff --git a/tests/wpt/tests/html/semantics/document-metadata/the-base-element/base-data.html b/tests/wpt/tests/html/semantics/document-metadata/the-base-element/base-data.html
new file mode 100644
index 00000000000..4905dd84ca1
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/document-metadata/the-base-element/base-data.html
@@ -0,0 +1,32 @@
+<!-- Please update base-javascript.html together with this -->
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>&lt;base> and data: URLs</title>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<base href="data:/,test">
+<base href="https://example.com/">
+<div id=log></div>
+<script>
+test(() => {
+  const link = document.createElement("a");
+  link.href = "blah";
+  assert_equals(link.href, new URL("blah", document.URL).href);
+}, "First <base> has a data: URL so fallback is used");
+
+test(() => {
+  document.querySelector("base").remove();
+  const link = document.createElement("a");
+  link.href = "blah";
+  assert_equals(link.href, new URL("blah", "https://example.com/").href);
+}, "First <base> is removed so second is used");
+
+test(() => {
+  const base = document.createElement("base");
+  base.href = "data:/,more-test";
+  document.head.prepend(base);
+  const link = document.createElement("a");
+  link.href = "blah";
+  assert_equals(link.href, new URL("blah", document.URL).href);
+}, "Dynamically inserted first <base> has a data: URL so fallback is used");
+</script>
diff --git a/tests/wpt/tests/html/semantics/document-metadata/the-base-element/base-javascript.html b/tests/wpt/tests/html/semantics/document-metadata/the-base-element/base-javascript.html
new file mode 100644
index 00000000000..65d9c84fcf7
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/document-metadata/the-base-element/base-javascript.html
@@ -0,0 +1,32 @@
+<!-- Please update base-data.html together with this -->
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>&lt;base> and javascript: URLs</title>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<base href="javascript:/,test">
+<base href="https://example.com/">
+<div id=log></div>
+<script>
+test(() => {
+  const link = document.createElement("a");
+  link.href = "blah";
+  assert_equals(link.href, new URL("blah", document.URL).href);
+}, "First <base> has a javascript: URL so fallback is used");
+
+test(() => {
+  document.querySelector("base").remove();
+  const link = document.createElement("a");
+  link.href = "blah";
+  assert_equals(link.href, new URL("blah", "https://example.com/").href);
+}, "First <base> is removed so second is used");
+
+test(() => {
+  const base = document.createElement("base");
+  base.href = "javascript:/,more-test";
+  document.head.prepend(base);
+  const link = document.createElement("a");
+  link.href = "blah";
+  assert_equals(link.href, new URL("blah", document.URL).href);
+}, "Dynamically inserted first <base> has a javascript: URL so fallback is used");
+</script>
diff --git a/tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resources/media-min-width.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resources/media-min-width.html
index 6d429d70fd2..7c309469024 100644
--- a/tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resources/media-min-width.html
+++ b/tests/wpt/tests/html/semantics/embedded-content/media-elements/loading-the-media-resource/resources/media-min-width.html
@@ -13,6 +13,7 @@ const rAF = () => new Promise(resolve => requestAnimationFrame(resolve));
 const hash = str => str.substr(str.lastIndexOf('#'));
 (async () => {
   const v = document.querySelector('video');
+  v.getBoundingClientRect(); // force layout flush. ensure viewport dimensions are up-to-date
   v.append(createSource('delayed-broken-video.py#a', '(min-width: 200px)'));
   v.append(createSource('delayed-broken-video.py#b'));
   await rAF();
diff --git a/tests/wpt/tests/html/semantics/embedded-content/media-elements/location-of-the-media-resource/currentSrc.html b/tests/wpt/tests/html/semantics/embedded-content/media-elements/location-of-the-media-resource/currentSrc.html
index cd1ebb9e492..be4d09f7395 100644
--- a/tests/wpt/tests/html/semantics/embedded-content/media-elements/location-of-the-media-resource/currentSrc.html
+++ b/tests/wpt/tests/html/semantics/embedded-content/media-elements/location-of-the-media-resource/currentSrc.html
@@ -14,14 +14,16 @@
       var e = document.createElement(tagName);
       e.src = src;
       assert_equals(e.currentSrc, '');
-      t.step_timeout(function() {
-        if (src == '') {
-          assert_equals(e.currentSrc, '');
-        } else {
-          assert_equals(e.currentSrc, e.src);
-        }
-        t.done();
-      }, 0);
+      e.addEventListener('loadstart', function () {
+        t.step_timeout(function () {
+          if (src == '') {
+            assert_equals(e.currentSrc, '');
+          } else {
+            assert_equals(e.currentSrc, e.src);
+          }
+          t.done();
+        }, 0);
+      })
     }, tagName + '.currentSrc after setting src attribute "' + src + '"');
 
     async_test(function(t) {
@@ -30,14 +32,16 @@
       s.src = src;
       e.appendChild(s);
       assert_equals(e.currentSrc, '');
-      t.step_timeout(function() {
-        if (src == '') {
-          assert_equals(e.currentSrc, '');
-        } else {
-          assert_equals(e.currentSrc, s.src);
-        }
-        t.done();
-      }, 0);
+      e.addEventListener('loadstart', function() {
+        t.step_timeout(function () {
+          if (src == '') {
+            assert_equals(e.currentSrc, '');
+          } else {
+            assert_equals(e.currentSrc, s.src);
+          }
+          t.done();
+        }, 0);
+      });
     }, tagName + '.currentSrc after adding source element with src attribute "' + src + '"');
   });
 });
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.style.html b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.style.html
index 31640c82f42..aeb5c7ecb2e 100644
--- a/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.style.html
+++ b/tests/wpt/tests/html/semantics/embedded-content/the-canvas-element/size.attributes.style.html
@@ -26,3 +26,4 @@ _assertSame(canvas.height, 30, "canvas.height", "30");
 });
 </script>
 
+
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-img-element/img-with-containment-and-size.html b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/img-with-containment-and-size.html
index a095adc7cf6..bdeae0ac2ea 100644
--- a/tests/wpt/tests/html/semantics/embedded-content/the-img-element/img-with-containment-and-size.html
+++ b/tests/wpt/tests/html/semantics/embedded-content/the-img-element/img-with-containment-and-size.html
@@ -13,10 +13,12 @@ img {
 }
 </style>
 <script>
+onload = () => {
   var i = new Image();
   i.onload = function() {
     document.body.appendChild(i);
     document.documentElement.classList.remove("reftest-wait");
   };
   i.src = "image.png";
+};
 </script>
diff --git a/tests/wpt/tests/html/semantics/forms/constraints/infinite_backtracking.html b/tests/wpt/tests/html/semantics/forms/constraints/infinite_backtracking.tentative.html
similarity index 100%
rename from tests/wpt/tests/html/semantics/forms/constraints/infinite_backtracking.html
rename to tests/wpt/tests/html/semantics/forms/constraints/infinite_backtracking.tentative.html
diff --git a/tests/wpt/tests/html/semantics/forms/the-input-element/auto-direction-dynamic.html b/tests/wpt/tests/html/semantics/forms/the-input-element/auto-direction-dynamic.html
new file mode 100644
index 00000000000..68ea51185c0
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-input-element/auto-direction-dynamic.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+<link rel="match" href="auto-direction-ref.html">
+<body>
+<script>
+const dirInput = document.createElement('input')
+dirInput.setAttribute('dir', 'auto')
+dirInput.setAttribute('value', 'شنينسنمس')
+document.body.appendChild(dirInput)
+</script>
+</body>
+</html>
diff --git a/tests/wpt/tests/html/semantics/forms/the-input-element/auto-direction-ref.html b/tests/wpt/tests/html/semantics/forms/the-input-element/auto-direction-ref.html
new file mode 100644
index 00000000000..675ba509144
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-input-element/auto-direction-ref.html
@@ -0,0 +1,2 @@
+<!DOCTYPE html>
+<input dir="auto" value="شنينسنمس">
diff --git a/tests/wpt/tests/html/semantics/forms/the-input-element/radio-disconnected-group-owner.html b/tests/wpt/tests/html/semantics/forms/the-input-element/radio-disconnected-group-owner.html
new file mode 100644
index 00000000000..60feb2b0ba9
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-input-element/radio-disconnected-group-owner.html
@@ -0,0 +1,168 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <meta charset="utf-8">
+  <title>Test for validity of disconnected radio buttons</title>
+</head>
+
+<body>
+  <input type="radio" name="group" id="radio1" required />
+  <input type="radio" name="group" id="radio2" checked />
+  <form>
+    <input type="radio" name="group" id="radio3" required />
+    <input type="radio" name="group" id="radio4" checked />
+  </form>
+
+  <script>
+    test(() => {
+      const radio1 = document.getElementById("radio1");
+      const radio2 = document.getElementById("radio2");
+      assert_false(radio1.validity.valueMissing, "Element should not suffer from value missing");
+
+      radio2.remove();
+      assert_true(radio1.validity.valueMissing, "Element should suffer from value missing");
+
+      radio1.checked = true;
+      radio2.required = true;
+      assert_false(radio2.validity.valueMissing, "Element should not suffer from value missing");
+
+      const radio3 = document.getElementById("radio3");
+      const radio4 = document.getElementById("radio4");
+      assert_false(radio3.validity.valueMissing, "Element should not suffer from value missing");
+
+      radio4.remove();
+      assert_true(radio3.validity.valueMissing, "Element should suffer from value missing");
+
+      radio3.checked = true;
+      assert_true(radio4.checked, "Element should remain checked");
+      assert_false(radio3.validity.valueMissing, "Element should not suffer from value missing");
+
+      document.querySelector("form").appendChild(radio2);
+      assert_false(radio3.checked, "Element should be unchecked");
+      assert_false(radio1.validity.valueMissing, "Element should not suffer from value missing");
+    }, "Removed elements are moved into separate radio groups.");
+
+    test(() => {
+      const container = document.createElement("div");
+      const radio = document.createElement("input");
+      radio.type = "radio";
+      radio.name = "group";
+      radio.id = "radio5";
+      radio.required = true;
+      container.appendChild(radio);
+      assert_true(radio.validity.valueMissing, "Element should suffer from value missing");
+
+      const outerContainer = document.createElement("div");
+      const outerRadio = document.createElement("input");
+      outerRadio.type = "radio";
+      outerRadio.name = "group";
+      outerRadio.id = "radio6";
+      outerRadio.checked = true;
+      outerContainer.appendChild(outerRadio);
+      outerContainer.appendChild(container);
+      assert_false(radio.validity.valueMissing, "Element should not suffer from value missing");
+
+      container.remove();
+      assert_true(radio.validity.valueMissing, "Element should suffer from value missing");
+    }, "Disconnected radio buttons should be contained by their tree root.");
+
+    test(() => {
+      const radioParent = document.createElement("input");
+      radioParent.type = "radio";
+      radioParent.name = "group";
+      radioParent.id = "radio-parent";
+      radioParent.required = true;
+      assert_true(radioParent.validity.valueMissing, "Element should suffer from value missing");
+
+      const radioChild = document.createElement("input");
+      radioChild.type = "radio";
+      radioChild.name = "group";
+      radioChild.id = "radio-child";
+      radioChild.checked = true;
+      assert_false(radioChild.validity.valueMissing, "Element should not suffer from value missing");
+
+      radioParent.appendChild(radioChild);
+      assert_false(radioChild.validity.valueMissing, "Element should not suffer from value missing");
+      assert_false(radioParent.validity.valueMissing, "Element should not suffer from value missing");
+
+      radioParent.checked = true;
+      assert_false(radioChild.checked, "Element should no longer be checked");
+    }, "Disconnected radio buttons can serve as radio group containers.");
+
+    test(() => {
+      const shadowHost = document.createElement("div");
+      const root = shadowHost.attachShadow({mode: "open"});
+      const container = document.createElement("div");
+      container.appendChild(shadowHost);
+
+      const radio1 = document.createElement("input");
+      radio1.type = "radio";
+      radio1.name = "group";
+      radio1.required = true;
+      const radio2 = document.createElement("input");
+      radio2.type = "radio";
+      radio2.name = "group";
+      radio2.checked = true;
+      const radio3 = document.createElement("input");
+      radio3.type = "radio";
+      radio3.name = "group";
+      radio3.required = true;
+
+      root.appendChild(radio1);
+      container.appendChild(radio3);
+      assert_true(radio1.validity.valueMissing, "Element should suffer from value missing");
+      assert_true(radio3.validity.valueMissing, "Element should suffer from value missing");
+
+      root.appendChild(radio2);
+      assert_false(radio1.validity.valueMissing, "Element should not suffer from value missing");
+      assert_true(radio3.validity.valueMissing, "Element should suffer from value missing");
+    }, "Shadow roots in disconnected trees can serve as radio group containers.");
+
+    test(() => {
+      const svgRoot = document.createElementNS("http://www.w3.org/2000/svg", "g")
+      const htmlContainer = document.createElementNS("http://www.w3.org/2000/svg", "foreignObject");
+      svgRoot.appendChild(htmlContainer);
+
+      const radio1 = document.createElement("input");
+      radio1.type = "radio";
+      radio1.name = "group";
+      radio1.required = true;
+      const radio2 = document.createElement("input");
+      radio2.type = "radio";
+      radio2.name = "group";
+      radio2.checked = true;
+
+      htmlContainer.appendChild(radio1);
+      assert_true(radio1.validity.valueMissing, "Element should suffer from value missing");
+      htmlContainer.appendChild(radio2);
+      assert_false(radio1.validity.valueMissing, "Element should not suffer from value missing");
+      radio1.checked = true;
+      assert_false(radio2.checked, "Element should no longer be checked");
+    }, "Non-HTML elements in disconnected trees can serve as radio group containers.");
+
+    test(() => {
+      const fragment = document.createDocumentFragment();
+
+      const radio1 = document.createElement("input");
+      radio1.type = "radio";
+      radio1.name = "group";
+      radio1.required = true;
+      const radio2 = document.createElement("input");
+      radio2.type = "radio";
+      radio2.name = "group";
+      radio2.checked = true;
+
+      fragment.appendChild(radio1);
+      assert_true(radio1.validity.valueMissing, "Element should suffer from value missing");
+      fragment.appendChild(radio2);
+      assert_false(radio1.validity.valueMissing, "Element should not suffer from value missing");
+      radio1.checked = true;
+      assert_false(radio2.checked, "Element should no longer be checked");
+    }, "Disconnected document fragments can serve as radio group containers.");
+  </script>
+</body>
+
+</html>
diff --git a/tests/wpt/tests/html/semantics/forms/the-optgroup-element/optgroup-removal.window.js b/tests/wpt/tests/html/semantics/forms/the-optgroup-element/optgroup-removal.window.js
new file mode 100644
index 00000000000..4e4c2df77e3
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-optgroup-element/optgroup-removal.window.js
@@ -0,0 +1,7 @@
+test(() => {
+  const select = document.createElement("select");
+  select.innerHTML = "<optgroup><option>1<optgroup><option>2";
+  assert_equals(select.value, "1");
+  select.querySelector("optgroup").remove();
+  assert_equals(select.value, "2");
+}, "<select> needs to be updated when <optgroup> is removed");
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/resources/show-picker-child-iframe.html b/tests/wpt/tests/html/semantics/forms/the-select-element/resources/show-picker-child-iframe.html
new file mode 100644
index 00000000000..bba39898249
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/resources/show-picker-child-iframe.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<title>Test showPicker() in an iframe</title>
+<script type=module>
+    const urlParams = new URLSearchParams(location.search);
+    const documentDomain = urlParams.get('documentDomain');
+    if (documentDomain) {
+        document.domain = documentDomain;
+    }
+
+    let securityErrors = [];
+    const select = document.createElement("select");
+    try {
+        select.showPicker();
+    } catch (error) {
+        if (error instanceof DOMException && error.name == 'SecurityError') {
+            securityErrors.push("select");
+        }
+    }
+    parent.postMessage(securityErrors.join(','), "*");
+</script>
\ No newline at end of file
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/select-add-optgroup.html b/tests/wpt/tests/html/semantics/forms/the-select-element/select-add-optgroup.html
new file mode 100644
index 00000000000..fab5332f26b
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/select-add-optgroup.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<link rel=author href="mailto:jarhar@chromium.org">
+<link rel=help href="https://bugs.chromium.org/p/chromium/issues/detail?id=1477785">
+<link rel=help href="https://html.spec.whatwg.org/multipage/common-dom-interfaces.html#dom-htmloptionscollection-add">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<select>
+  <option id=opt1>opt1</option>
+  <optgroup label=group1>
+    <option id=opt2>opt2</option>
+  </optgroup>
+</select>
+
+<script>
+test(() => {
+  const select = document.querySelector('select');
+  const optgroup = document.querySelector('optgroup');
+  const newOption = document.createElement('option');
+  newOption.textContent = 'new option';
+
+  select.options.add(newOption, 1);
+  assert_equals(select.options.length, 3);
+  assert_equals(select.options[0], opt1, 'First item should be opt1.');
+  assert_equals(select.options[1], newOption, 'Second item should be newOption.');
+  assert_equals(select.options[2], opt2, 'Third item should be opt2.');
+  assert_equals(newOption.parentNode, optgroup, 'The new option should be inside the optgroup.');
+}, 'select.add() with an index should work when the target is inside an optgroup.');
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/show-picker-cross-origin-iframe.tentative.html b/tests/wpt/tests/html/semantics/forms/the-select-element/show-picker-cross-origin-iframe.tentative.html
new file mode 100644
index 00000000000..3f710b39c60
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/show-picker-cross-origin-iframe.tentative.html
@@ -0,0 +1,79 @@
+<!DOCTYPE html>
+<title>Test showPicker() called from cross-origin iframe</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
+<body>
+<iframe id="iframe1"></iframe>
+<iframe id="iframe2"></iframe>
+<iframe id="iframe3"></iframe>
+<iframe id="iframe4"></iframe>
+</body>
+<script>
+    function waitForSecurityErrors() {
+        return new Promise((resolve) => {
+            window.addEventListener("message", (event) => resolve(event.data), {
+                once: true,
+            });
+        });
+    }
+
+    promise_test(async (t) => {
+        iframe1.src =
+            new URL("resources/", self.location).pathname +
+            "show-picker-child-iframe.html";
+
+        // Wait for the iframe to report security errors when calling showPicker().
+        const securityErrors = await waitForSecurityErrors();
+        assert_equals(
+            securityErrors,
+            "",
+            "In same-origin iframes, showPicker() does not throw a SecurityError."
+        );
+    });
+
+    promise_test(async (t) => {
+        iframe2.src =
+            get_host_info().HTTP_NOTSAMESITE_ORIGIN +
+            new URL("resources/", self.location).pathname +
+            "show-picker-child-iframe.html";
+
+        // Wait for the iframe to report security errors when calling showPicker().
+        const securityErrors = await waitForSecurityErrors();
+        assert_equals(
+            securityErrors,
+            "select",
+            "In cross-origin iframes, showPicker() throws a SecurityError."
+        );
+    });
+
+    promise_test(async (t) => {
+        iframe3.src =
+            new URL("resources/", self.location).pathname +
+            "show-picker-child-iframe.html?documentDomain=" + get_host_info().ORIGINAL_HOST;
+
+        // Wait for the iframe to report security errors when calling showPicker().
+        const securityErrors = await waitForSecurityErrors();
+        assert_equals(
+            securityErrors,
+            "",
+            "In same-origin but cross-origin-domain iframes, showPicker() does not throw a SecurityError."
+        );
+    });
+
+    promise_test(async (t) => {
+        document.domain = get_host_info().ORIGINAL_HOST;
+        iframe4.src =
+            get_host_info().HTTP_REMOTE_ORIGIN +
+            new URL("resources/", self.location).pathname +
+            "show-picker-child-iframe.html?documentDomain=" + get_host_info().ORIGINAL_HOST;
+
+        // Wait for the iframe to report security errors when calling showPicker().
+        const securityErrors = await waitForSecurityErrors();
+        assert_equals(
+            securityErrors,
+            "select",
+            "In cross-origin but same-origin-domain iframes, showPicker() throws a SecurityError."
+        );
+    });
+</script>
\ No newline at end of file
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/show-picker-disabled.tentative.html b/tests/wpt/tests/html/semantics/forms/the-select-element/show-picker-disabled.tentative.html
new file mode 100644
index 00000000000..f20bc2cf61b
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/show-picker-disabled.tentative.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<title>Test showPicker() disabled requirement</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<select id="select" disabled>
+    <option>Item 1</option>
+</select>
+<script>
+    test(() => {
+        assert_throws_dom('InvalidStateError', () => { select.showPicker(); });
+    }, 'select showPicker() throws when disabled');
+</script>
\ No newline at end of file
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/show-picker-multiple.tentative.html b/tests/wpt/tests/html/semantics/forms/the-select-element/show-picker-multiple.tentative.html
new file mode 100644
index 00000000000..c38e98ee4e9
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/show-picker-multiple.tentative.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<title>Test showPicker() on multiple selects</title>
+<meta name="timeout" content="long">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<select id="select" multiple>
+  <option>Item 1</option>
+</select>
+<script>
+promise_test(async t => {
+  await test_driver.bless('show picker');
+  select.showPicker();
+  select.blur();
+}, `select showPicker() does not throw when called on a <select multiple>`);
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/show-picker-size.tentative.html b/tests/wpt/tests/html/semantics/forms/the-select-element/show-picker-size.tentative.html
new file mode 100644
index 00000000000..b9b10c42a91
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/show-picker-size.tentative.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<title>Test showPicker() on sized selects</title>
+<meta name="timeout" content="long">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<select id="select" size="4">
+  <option>Item 1</option>
+</select>
+<script>
+promise_test(async t => {
+  await test_driver.bless('show picker');
+  select.showPicker();
+  select.blur();
+}, `select showPicker() does not throw when called on a <select size="4">`);
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/show-picker-user-gesture.tentative.html b/tests/wpt/tests/html/semantics/forms/the-select-element/show-picker-user-gesture.tentative.html
new file mode 100644
index 00000000000..24ccd72c8ae
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/show-picker-user-gesture.tentative.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<title>Test showPicker() user gesture requirement</title>
+<meta name="timeout" content="long">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<body></body>
+<script type=module>
+    test(() => {
+        const select = document.createElement("select");
+
+        assert_throws_dom('NotAllowedError', () => { select.showPicker(); });
+    }, `select showPicker() requires a user gesture`);
+
+    promise_test(async t => {
+        const select = document.createElement("select");
+
+        await test_driver.bless('show picker');
+        select.showPicker();
+        select.blur();
+    }, `select showPicker() does not throw when user activation is active`);
+</script>
\ No newline at end of file
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectlist-element/button-type-selectlist-appearance-ref.html b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/button-type-selectlist-appearance-ref.html
new file mode 100644
index 00000000000..fd7f2b7bcaf
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/button-type-selectlist-appearance-ref.html
@@ -0,0 +1,2 @@
+<!DOCTYPE html>
+<button>button</button>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectlist-element/button-type-selectlist-appearance.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/button-type-selectlist-appearance.tentative.html
new file mode 100644
index 00000000000..3ab7044366e
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/button-type-selectlist-appearance.tentative.html
@@ -0,0 +1,6 @@
+<!DOCTYPE html>
+<link rel=author href="mailto:jarhar@chromium.org">
+<link rel=help href="https://github.com/openui/open-ui/issues/702">
+<link rel=match href="button-type-selectlist-appearance-ref.html">
+
+<button type=selectlist>button</button>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-button-type-appearance-ref.html b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-button-type-appearance-ref.html
new file mode 100644
index 00000000000..37d4b1b4714
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-button-type-appearance-ref.html
@@ -0,0 +1,2 @@
+<!DOCTYPE html>
+<button>hello world</button>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-button-type-appearance.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-button-type-appearance.tentative.html
new file mode 100644
index 00000000000..50ad339b056
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-button-type-appearance.tentative.html
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<link rel=author href="mailto:jarhar@chromium.org">
+<link rel=help href="https://github.com/openui/open-ui/issues/702">
+<link rel=match href="selectlist-button-type-appearance-ref.html">
+
+<selectlist>
+  <button type=selectlist>hello world</button>
+</selectlist>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-button-type-behavior.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-button-type-behavior.tentative.html
new file mode 100644
index 00000000000..cc7eb62a632
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-button-type-behavior.tentative.html
@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<link rel=author href="mailto:jarhar@chromium.org">
+<link rel=help href="https://github.com/openui/open-ui/issues/702">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+
+<selectlist>
+  <button type=selectlist id=b1>first button</button>
+  <button type=selectlist id=b2>second button</button>
+  <button id=b3>third button</button>
+  <option>option</option>
+</selectlist>
+
+<script>
+const ESC = '\uE00C'
+
+promise_test(async () => {
+  const selectlist = document.querySelector('selectlist');
+  const b1 = document.getElementById('b1');
+  const b2 = document.getElementById('b2');
+  const b3 = document.getElementById('b3');
+
+  assert_false(selectlist.open, 'The selectlist should start closed.');
+  await test_driver.click(b1);
+  assert_true(selectlist.open, 'The selectlist should get opened when the button is clicked.');
+
+  await test_driver.send_keys(selectlist, ESC);
+  assert_false(selectlist.open, 'Pressing escape should close the selectlist.');
+
+  await test_driver.click(b2);
+  assert_true(selectlist.open, 'The selectlist should get opened when a second type=selectlist button is clicked.');
+  await test_driver.send_keys(selectlist, ESC);
+  assert_false(selectlist.open, 'Pressing escape should close the selectlist.');
+
+  await test_driver.click(b3);
+  assert_false(selectlist.open, 'Clicking a button witout type=selectlist should not open the listbox.');
+
+  b1.removeAttribute('type');
+  await test_driver.click(b1);
+  assert_false(selectlist.open, 'If the button is not type=selectlist, it should not open the selectlist.');
+}, '<button type=selectlist> should open the parent selectlist when clicked.');
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-default-button-slot-ref.html b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-default-button-slot-ref.html
new file mode 100644
index 00000000000..faa96e1f272
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-default-button-slot-ref.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<style>
+.container {
+  display: inline-flex;
+  font-family: sans-serif;
+  font-size: 0.875em;
+}
+</style>
+<div class=container>
+  <div>first child</div>
+  <div>second child</div>
+</div>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-default-button-slot.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-default-button-slot.tentative.html
new file mode 100644
index 00000000000..d8688d5957d
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-default-button-slot.tentative.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<link rel=author href="mailto:jarhar@chromium.org">
+<link rel=help href="https://github.com/openui/open-ui/issues/702">
+<link rel=match href="selectlist-default-button-slot-ref.html">
+<meta rel=assert title="Child nodes of selectlist should be slotted into the button slot by default">
+
+<selectlist>
+ <div>first child</div>
+ <div>second child</div>
+</selectlist>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-explicit-size-ref.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-explicit-size-ref.tentative.html
index 3e967d03ed0..46d932c4b27 100644
--- a/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-explicit-size-ref.tentative.html
+++ b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-explicit-size-ref.tentative.html
@@ -4,6 +4,7 @@
 <script>
   const selectlist = createFakeSelectlist('option');
   document.body.appendChild(selectlist);
-  selectlist.style.width = "400px";
-  selectlist.style.height = "50px";
+  const button = selectlist.querySelector('.fake-selectlist-internal-selectlist-button');
+  button.style.width = "400px";
+  button.style.height = "50px";
 </script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-listbox-element-ref.html b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-listbox-element-ref.html
new file mode 100644
index 00000000000..5533a97f603
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-listbox-element-ref.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<script src="support/fake-selectlist.js"></script>
+<body>
+<script>
+const selectlist = createFakeSelectlist('button', /*includeListbox=*/true);
+document.body.appendChild(selectlist);
+
+selectlist.querySelector('button').remove();
+selectlist.insertAdjacentHTML('afterbegin', `<button>button</button>`);
+
+const listbox = selectlist.querySelector('.fake-selectlist-listbox');
+listbox.innerHTML = `
+  <option id=optone tabindex=0>one</option>
+  <option>two</option>
+`;
+document.getElementById('optone').focus();
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-listbox-element.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-listbox-element.tentative.html
new file mode 100644
index 00000000000..14223633b90
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-listbox-element.tentative.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<link rel=author href="mailto:jarhar@chromium.org">
+<link rel=help href="https://github.com/openui/open-ui/issues/702">
+<link rel=match href="selectlist-listbox-element-ref.html">
+
+<selectlist>
+  <button type=selectlist>button</button>
+  <listbox>
+    <option>one</option>
+    <option>two</option>
+  </listbox>
+</selectlist>
+
+<script>
+document.querySelector('button').click();
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-popover.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-popover.tentative.html
index b7663875ce0..2187226adbf 100644
--- a/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-popover.tentative.html
+++ b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-popover.tentative.html
@@ -9,7 +9,6 @@
 <selectlist id="selectList0">
   <option>one</option>
   <option id="selectList0-child2">two</option>
-  <div id="selectList0-child3">I'm a div with no part attr</div>
   <option>three</option>
   <option>four</option>
 </selectlist>
@@ -50,7 +49,6 @@
   promise_test(async () => {
     const selectList0 = document.getElementById("selectList0");
     const selectList0Child2 = document.getElementById("selectList0-child2");
-    const selectList0Child3 = document.getElementById("selectList0-child3");
     assert_equals(selectList0.value, "one");
     assert_equals(selectList0.open, false);
     await clickOn(selectList0);
@@ -61,9 +59,6 @@
 
     await clickOn(selectList0);
     assert_equals(selectList0.open, true);
-    await clickOn(selectList0Child3);
-    assert_equals(selectList0.value, "two", "Clicking a non-option should not change the value");
-    assert_equals(selectList0.open, true);
     await clickOn(selectList0Child2);
     assert_equals(selectList0.open, false);
   }, "Opening the popover and clicking an option should change the selectlist's value");
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-rtl-ref.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-rtl-ref.tentative.html
index 70d2b98d330..7c71ea079cf 100644
--- a/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-rtl-ref.tentative.html
+++ b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-rtl-ref.tentative.html
@@ -4,6 +4,7 @@
 <script>
   const selectlist = createFakeSelectlist('option');
   document.body.appendChild(selectlist);
-  selectlist.style.direction = "rtl";
-  selectlist.style.width = "300px";
+  const button = selectlist.querySelector('.fake-selectlist-internal-selectlist-button');
+  button.style.direction = "rtl";
+  button.style.width = "300px";
 </script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-selectedoption-element-cloning-ref.html b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-selectedoption-element-cloning-ref.html
new file mode 100644
index 00000000000..1c0be58d67e
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-selectedoption-element-cloning-ref.html
@@ -0,0 +1,4 @@
+<!DOCTYPE html>
+<button>
+  <span style="color:red">red</span> one
+</button>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-selectedoption-element-cloning.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-selectedoption-element-cloning.tentative.html
new file mode 100644
index 00000000000..5d273c21bff
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-selectedoption-element-cloning.tentative.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<link rel=author href="mailto:jarhar@chromium.org">
+<link rel=help href="https://github.com/openui/open-ui/issues/571">
+<link rel=match href="selectlist-selectedoption-element-cloning-ref.html">
+
+<selectlist>
+  <button type=selectlist>
+    <selectedoption></selectedoption>
+  </button>
+  <option><span style="color:red">red</span> one</option>
+</selectlist>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-selectedoption-element.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-selectedoption-element.tentative.html
new file mode 100644
index 00000000000..593c4a6f211
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-selectedoption-element.tentative.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<link rel=author href="mailto:jarhar@chromium.org">
+<link rel=help href="https://github.com/openui/open-ui/issues/702">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<selectlist>
+  <div>Foo <selectedoption></selectedoption> Bar</div>
+  <option>one</option>
+  <option>two</option>
+</selectlist>
+
+<script>
+test(() => {
+  const selectlist = document.querySelector('selectlist');
+  const selectedoption = document.querySelector('selectedoption');
+  const div = document.querySelector('div');
+
+  assert_equals(selectlist.value, 'one', 'one should be selected initially.');
+  assert_equals(selectedoption.textContent, 'one', "selectedoption's initial text content should be one.");
+  assert_equals(div.textContent, 'Foo one Bar', 'Outer textContent should include default selectedoption.');
+
+  selectlist.value = 'two';
+  assert_equals(selectlist.value, 'two', "assigning two into selectlists's value should work.");
+  assert_equals(selectedoption.textContent, 'two', "selectedoption's text content should be updated with the new value.");
+  assert_equals(div.textContent, 'Foo two Bar', 'Outer textContent should include new selectedoption.');
+}, "<selectedoption>'s text contents should be replaced with its ancestor <selectlist>'s selected value.");
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-text-only-ref.html b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-text-only-ref.html
new file mode 100644
index 00000000000..ab28fbede61
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-text-only-ref.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<style>
+.container {
+  display: inline-flex;
+  font-family: sans-serif;
+  font-size: 0.875em;
+}
+</style>
+<div class=container>text node</div>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-text-only.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-text-only.tentative.html
new file mode 100644
index 00000000000..ceefeca6087
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-text-only.tentative.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<link rel=author href="mailto:jarhar@chromium.org">
+<link rel=help href="https://github.com/openui/open-ui/issues/702">
+<link rel=match href="selectlist-text-only-ref.html">
+
+<selectlist>
+  text node
+  <option>option</option>
+</selectlist>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectlist-element/support/fake-selectlist.js b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/support/fake-selectlist.js
index c17fe1afc5f..77b3f749211 100644
--- a/tests/wpt/tests/html/semantics/forms/the-selectlist-element/support/fake-selectlist.js
+++ b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/support/fake-selectlist.js
@@ -2,29 +2,60 @@ function replaceChildElement(newChild, oldChild) {
   oldChild.parentElement.replaceChild(newChild, oldChild);
 }
 
-function createFakeSelectlist(selectedValueText) {
+function createFakeSelectlist(selectedValueText, includeListbox) {
   const selectlist = document.createElement('div');
-  selectlist.classList.add('fake-selectlist-internal-selectlist-button');
+  selectlist.classList.add('fake-selectlist');
   selectlist.innerHTML = `
-    <div class="fake-selectlist-selected-value"></div>
-    <div class="fake-selectlist-internal-selectlist-button-icon"></div>
-    <style>
-    .fake-selectlist-internal-selectlist-button {
-      align-items: center;
-      appearance: none;
-      background-color: Field;
-      border: 1px solid ButtonBorder;
-      border-radius: 0.25em;
-      box-sizing: border-box;
-      box-shadow: none;
-      color: ButtonText;
-      cursor: default;
+    <button class="fake-selectlist-internal-selectlist-button">
+      <div class="fake-selectlist-selected-value"></div>
+      <div class="fake-selectlist-internal-selectlist-button-icon"></div>
+    </button>
+  `;
+  if (includeListbox) {
+    const listbox = document.createElement('div');
+    listbox.classList.add('fake-selectlist-listbox');
+    listbox.anchorElement = selectlist;
+    selectlist.appendChild(listbox);
+  }
+  selectlist.appendChild(createFakeSelectlistStyles());
+
+  const selectedvalue = selectlist.querySelector('.fake-selectlist-selected-value');
+  if (selectedValueText) {
+    selectedvalue.textContent = selectedValueText;
+  }
+
+  return selectlist;
+}
+
+function createFakeSelectlistStyles() {
+  const style = document.createElement('style');
+  style.textContent = `
+    .fake-selectlist {
       display: inline-flex;
-      font: -webkit-small-control;
-      font-size: .875em;
-      overflow-x:hidden;
-      overflow-y:hidden;
+      font-family: sans-serif;
+      font-size: 0.875em;
+      user-select: none;
+    }
+
+    .fake-selectlist-internal-selectlist-button {
+      color: fieldtext;
+      background-color: field;
+      appearance: none;
+      cursor: default;
+      font-size: inherit;
+      text-align: inherit;
+      display: inline-flex;
+      flex-grow: 1;
+      flex-shrink: 1;
+      align-items: center;
+      overflow-x: hidden;
+      overflow-y: hidden;
       padding: 0.25em;
+      border-width: 1px;
+      border-style: solid;
+      border-color: buttonborder;
+      border-image: initial;
+      border-radius: 0.25em;
     }
 
     .fake-selectlist-selected-value {
@@ -47,12 +78,35 @@ function createFakeSelectlist(selectedValueText) {
       padding-top: 2px;
       width: 1.2em;
     }
-    </style>
+
+    .fake-selectlist-listbox {
+      font-family: sans-serif;
+      box-shadow: rgba(0, 0, 0, 0.13) 0px 12.8px 28.8px, rgba(0, 0, 0, 0.11) 0px 0px 9.2px;
+      box-sizing: border-box;
+      background-color: canvas;
+      min-inline-size: anchor-size(self-inline);
+      min-block-size: 1lh;
+      position: fixed;
+      width: fit-content;
+      height: fit-content;
+      color: canvastext;
+      overflow: auto;
+      border-width: initial;
+      border-style: solid;
+      border-color: initial;
+      border-image: initial;
+      border-radius: 0.25em;
+      padding: 0.25em;
+      margin: 0px;
+      inset: auto;
+
+      top: anchor(bottom);
+    }
+
+    .fake-selectlist option {
+      font-size: 0.875em;
+      padding: 0.25em;
+    }
   `;
-
-  if (selectedValueText) {
-    selectlist.querySelector('.fake-selectlist-selected-value').textContent = selectedValueText;
-  }
-
-  return selectlist;
+  return style;
 }
diff --git a/tests/wpt/tests/html/semantics/interactive-elements/the-details-element/name-attribute.tentative.html b/tests/wpt/tests/html/semantics/interactive-elements/the-details-element/name-attribute.tentative.html
index 271577efe5e..6f45b3da089 100644
--- a/tests/wpt/tests/html/semantics/interactive-elements/the-details-element/name-attribute.tentative.html
+++ b/tests/wpt/tests/html/semantics/interactive-elements/the-details-element/name-attribute.tentative.html
@@ -75,9 +75,9 @@ promise_test(async t => {
     assert_array_equals([first.open, second.open, third.open], [expected_first, expected_second, expected_third], description);
   }
 
-  assert_states(true, false, true, "initial states from open attribute");
+  assert_states(true, false, false, "initial states from open attribute");
   first.open = true;
-  assert_states(true, false, true, "non-mutation doesn't change state");
+  assert_states(true, false, false, "non-mutation doesn't change state");
   second.open = true;
   assert_states(false, true, false, "mutation closes multiple open elements");
   third.setAttribute("open", "");
@@ -148,19 +148,19 @@ promise_test(async t => {
     }));
   }
   assert_array_equals(mutation_event_received_ids, []);
-  assert_element_states(elements, [1, 0, 1, 1], "states before mutation");
+  assert_element_states(elements, [1, 0, 0, 0], "states before mutation");
   elements[1].open = true;
   if (mutation_event_received_ids.length == 0) {
     // ok if mutation events are not supported
   } else {
-    assert_array_equals(mutation_event_received_ids, ["e0", "e2", "e3", "e1"],
-                        "removal events received in tree order, followed by addition event");
+    assert_array_equals(mutation_event_received_ids, ["e0", "e1"],
+                        "removal event followed by addition event");
   }
   assert_element_states(elements, [0, 1, 0, 0], "states after mutation");
   assert_array_equals(toggle_event_received_ids, [], "toggle events received before awaiting promises");
   await Promise.all(toggle_event_promises);
-  assert_array_equals(toggle_event_received_ids, ["e1", "e0", "e2", "e3"], "toggle events received after awaiting promises");
-}, "mutation event and toggle event order matches tree order");
+  assert_array_equals(toggle_event_received_ids, ["e3", "e2", "e1", "e0"], "toggle events received after awaiting promises, including toggle events from parser insertion");
+}, "mutation event and toggle event order");
 
 // This function is used to guard tests that test behavior that is
 // relevant only because of Mutation Events.  If mutation events (for
@@ -203,9 +203,9 @@ promise_test(async t => {
     element.addEventListener("DOMSubtreeModified", listener);
   }
   assert_array_equals(received_ids, []);
-  assert_element_states(elements, [1, 0, 1], "states before mutation");
+  assert_element_states(elements, [1, 0, 0], "states before mutation");
   elements[1].open = true;
-  assert_array_equals(received_ids, ["e0", "e2", "e1"],
+  assert_array_equals(received_ids, ["e0", "e1"],
                       "removal events received in tree order, followed by addition event, despite changes to name during mutation event");
   assert_element_states(elements, [0, 1, 0], "states after mutation");
 }, "interaction of open attribute changes with mutation events");
@@ -326,4 +326,94 @@ for (const [scenario, scenario_callbacks] of Object.entries(connected_scenarios)
   }, `exclusivity enforcement with attachment scenario ${scenario}`);
 }
 
+promise_test(async t => {
+  container.innerHTML = `
+    <details name="a" id="e0" open></details>
+    <details name="a" id="e1"></details>
+    <details name="b" id="e2" open></details>
+  `;
+  let elements = [ document.getElementById("e0"),
+                   document.getElementById("e1"),
+                   document.getElementById("e2") ];
+
+  assert_element_states(elements, [1, 0, 1], "states before first mutation");
+  elements[2].name = "a";
+  assert_element_states(elements, [1, 0, 0], "states after first mutation");
+  elements[0].name = "c";
+  elements[2].open = true;
+  assert_element_states(elements, [1, 0, 1], "states before second mutation");
+  elements[0].name = "a";
+  assert_element_states(elements, [0, 0, 1], "states after second mutation");
+}, "handling of name attribute changes");
+
+promise_test(async t => {
+  container.innerHTML = `
+    <details name="a" id="e0" open></details>
+    <details name="a" id="e1" open></details>
+    <details open name="a" id="e2"></details>
+  `;
+  let elements = [ document.getElementById("e0"),
+                   document.getElementById("e1"),
+                   document.getElementById("e2") ];
+
+  assert_element_states(elements, [1, 0, 0], "states after insertion by parser");
+}, "closing as a result of parsing doesn't depend on attribute order");
+
+promise_test(async t => {
+  container.innerHTML = `
+    <details name="a" id="e0" open></details>
+    <details name="a" id="e1"></details>
+  `;
+  let elements = [ document.getElementById("e0"),
+                   document.getElementById("e1") ];
+
+  assert_element_states(elements, [1, 0], "states before first mutation");
+
+  let make_details = () => {
+    let e = document.createElement("details");
+    e.setAttribute("name", "a");
+    return e;
+  };
+
+  let watch_e0 = new EventWatcher(t, elements[0], ['toggle']);
+  let watch_e1 = new EventWatcher(t, elements[1], ['toggle']);
+
+  let expect_opening = async (watcher) => {
+    await watcher.wait_for(['toggle'], {record: 'all'}).then((events) => {
+      assert_equals(events[0].oldState, "closed");
+      assert_equals(events[0].newState, "open");
+    });
+  };
+
+  let expect_closing = async (watcher) => {
+    await watcher.wait_for(['toggle'], {record: 'all'}).then((events) => {
+      assert_equals(events[0].oldState, "open");
+      assert_equals(events[0].newState, "closed");
+    });
+  };
+
+  await expect_opening(watch_e0);
+
+  // Test appending an open element in the group.
+  let new1 = make_details();
+  let watch_new1 = new EventWatcher(t, new1, ['toggle']);
+  new1.open = true;
+  await expect_opening(watch_new1);
+  container.appendChild(new1);
+  await expect_closing(watch_new1);
+
+  // Test appending a closed element in the group.
+  let new2 = make_details();
+  let watch_new2 = new EventWatcher(t, new2, ['toggle']);
+  container.appendChild(new2);
+
+  // Test inserting an open element at the start of the group.
+  let new3 = make_details();
+  new3.open = true; // this time do this before creating the EventWatcher
+  let watch_new3 = new EventWatcher(t, new3, ['toggle']);
+  await expect_opening(watch_new3);
+  container.insertBefore(new3, elements[0]);
+  await expect_closing(watch_new3);
+}, "handling of insertion of elements into group");
+
 </script>
diff --git a/tests/wpt/tests/html/semantics/interactive-elements/the-details-element/toggleEvent.html b/tests/wpt/tests/html/semantics/interactive-elements/the-details-element/toggleEvent.html
index 8ad60de5d9b..a54ad1f8a8e 100644
--- a/tests/wpt/tests/html/semantics/interactive-elements/the-details-element/toggleEvent.html
+++ b/tests/wpt/tests/html/semantics/interactive-elements/the-details-element/toggleEvent.html
@@ -10,7 +10,7 @@
   <summary>Lorem ipsum</summary>
   <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>
 </details>
-<details id=details2 open>
+<details id=details2>
   <summary>Lorem ipsum</summary>
   <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>
 </details>
@@ -28,7 +28,7 @@
   <summary>Lorem ipsum</summary>
   <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>
 </details>
-<details id=details8 open>
+<details id=details8>
   <summary>Lorem ipsum</summary>
   <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>
 </details>
@@ -46,15 +46,15 @@
   <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>
 </details>
 <script>
-  var t1 = async_test("Adding open to 'details' should fire a toggle event at the 'details' element"),
-  t2 = async_test("Removing open from 'details' should fire a toggle event at the 'details' element"),
-  t3 = async_test("Adding open to 'details' (display:none) should fire a toggle event at the 'details' element"),
-  t4 = async_test("Adding open from 'details' (no children) should fire a toggle event at the 'details' element"),
-  t6 = async_test("Calling open twice on 'details' fires only one toggle event"),
-  t7 = async_test("Calling setAttribute('open', '') to 'details' should fire a toggle event at the 'details' element"),
-  t8 = async_test("Calling removeAttribute('open') to 'details' should fire a toggle event at the 'details' element"),
-  t9 = async_test("Setting open=true to opened 'details' element should not fire a toggle event at the 'details' element"),
-  t10 = async_test("Setting open=false to closed 'details' element should not fire a toggle event at the 'details' element"),
+  var t1 = async_test("Adding open to 'details' should fire a toggle event at the 'details' element, with 'oldState: closed' and 'newState: open'"),
+  t2 = async_test("Adding open to 'details' and then removing open from that 'details' should fire only one toggle event at the 'details' element, with 'oldState: closed' and 'newState: closed'"),
+  t3 = async_test("Adding open to 'details' (display:none) should fire a toggle event at the 'details' element, with 'oldState: closed' and 'newState: open'"),
+  t4 = async_test("Adding open to 'details' (no children) should fire a toggle event at the 'details' element, with 'oldState: closed' and 'newState: open'"),
+  t6 = async_test("Adding open to 'details' and then removing open from that 'details' and then again adding open to that 'details' should fire only one toggle event at the 'details' element, with 'oldState: closed' and 'newState: closed'"),
+  t7 = async_test("Adding open to 'details' using setAttribute('open', '') should fire a toggle event at the 'details' element, with 'oldState: closed' and 'newState: open'"),
+  t8 = async_test("Adding open to 'details' and then calling removeAttribute('open') should fire only one toggle event at the 'details' element, with 'oldState: closed' and 'newState: closed'"),
+  t9 = async_test("Setting open=true on an opened 'details' element should not fire a toggle event at the 'details' element"),
+  t10 = async_test("Setting open=false on a closed 'details' element should not fire a toggle event at the 'details' element"),
 
   details1 = document.getElementById('details1'),
   details2 = document.getElementById('details2'),
@@ -71,28 +71,37 @@
     assert_true(evt.isTrusted, "event is trusted");
     assert_false(evt.bubbles, "event doesn't bubble");
     assert_false(evt.cancelable, "event is not cancelable");
-    assert_equals(Object.getPrototypeOf(evt), Event.prototype, "Prototype of toggle event is Event.prototype");
+    assert_equals(Object.getPrototypeOf(evt), ToggleEvent.prototype, "Prototype of toggle event is ToggleEvent.prototype");
   }
 
   details1.ontoggle = t1.step_func_done(function(evt) {
+    assert_equals(evt.oldState, "closed");
+    assert_equals(evt.newState, "open");
     assert_true(details1.open);
     testEvent(evt)
   });
   details1.open = true; // opens details1
 
   details2.ontoggle = t2.step_func_done(function(evt) {
+    assert_equals(evt.oldState, "closed");
+    assert_equals(evt.newState, "closed");
     assert_false(details2.open);
     testEvent(evt);
   });
+  details2.open = true;
   details2.open = false; // closes details2
 
   details3.ontoggle = t3.step_func_done(function(evt) {
+    assert_equals(evt.oldState, "closed");
+    assert_equals(evt.newState, "open");
     assert_true(details3.open);
     testEvent(evt);
   });
   details3.open = true; // opens details3
 
   details4.ontoggle = t4.step_func_done(function(evt) {
+    assert_equals(evt.oldState, "closed");
+    assert_equals(evt.newState, "open");
     assert_true(details4.open);
     testEvent(evt);
   });
@@ -101,18 +110,22 @@
   async_test(function(t) {
     var details5 = document.createElement("details");
     details5.ontoggle = t.step_func_done(function(evt) {
+      assert_equals(evt.oldState, "closed");
+      assert_equals(evt.newState, "open");
       assert_true(details5.open);
       testEvent(evt);
     })
     details5.open = true;
-  }, "Adding open to 'details' (not in the document) should fire a toggle event at the 'details' element");
+  }, "Adding open to 'details' (not in the document) should fire a toggle event at the 'details' element, with 'oldState: closed' and 'newState: open'");
 
   details6.open = true;
   details6.open = false;
-  details6.ontoggle = t6.step_func(function() {
+  details6.ontoggle = t6.step_func(function(evt) {
     if (loop) {
       assert_unreached("toggle event fired twice");
     } else {
+      assert_equals(evt.oldState, "closed");
+      assert_equals(evt.newState, "closed");
       loop = true;
     }
   });
@@ -122,15 +135,20 @@
   }, 0);
 
   details7.ontoggle = t7.step_func_done(function(evt) {
+    assert_equals(evt.oldState, "closed");
+    assert_equals(evt.newState, "open");
     assert_true(details7.open);
     testEvent(evt)
   });
   details7.setAttribute('open', ''); // opens details7
 
   details8.ontoggle = t8.step_func_done(function(evt) {
+    assert_equals(evt.oldState, "closed");
+    assert_equals(evt.newState, "closed");
     assert_false(details8.open);
     testEvent(evt)
   });
+  details8.open = true;
   details8.removeAttribute('open'); // closes details8
 
   window.details9TogglePromise.then(t9.step_func(() => {
diff --git a/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/backdrop-descendant-selector.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/backdrop-descendant-selector.html
index 3e2ac6afa16..73706548eaf 100644
--- a/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/backdrop-descendant-selector.html
+++ b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/backdrop-descendant-selector.html
@@ -9,6 +9,7 @@ dialog {
 }
 
 ::backdrop {
+    visibility: visible;
     position: absolute;
     height: 100px;
     width: 100px;
diff --git a/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/backdrop-does-not-inherit-ref.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/backdrop-does-not-inherit-ref.html
deleted file mode 100644
index bdc84186f69..00000000000
--- a/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/backdrop-does-not-inherit-ref.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE html>
-<style>
-#backdrop {
-    position: absolute;
-    top: 100px;
-    left: 100px;
-    height: 100px;
-    width: 100px;
-    background: green;
-}
-</style>
-<body>
-Test that ::backdrop does not inherit from anything. The test passes if there is
-a green box and no red.
-<div id="backdrop"></div>
-</body>
diff --git a/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/backdrop-does-not-inherit.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/backdrop-does-not-inherit.html
deleted file mode 100644
index 44085b9c31d..00000000000
--- a/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/backdrop-does-not-inherit.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE html>
-<link rel="match" href="backdrop-does-not-inherit-ref.html">
-<link rel="help" href="https://fullscreen.spec.whatwg.org/#new-stacking-layer">
-<style>
-dialog {
-    visibility: inherit;
-    background: red;
-}
-
-dialog::backdrop {
-    position: absolute;
-    top: 100px;
-    left: 100px;
-    height: 100px;
-    width: 100px;
-    visibility: inherit;
-    background: green;
-}
-</style>
-<body>
-Test that ::backdrop does not inherit from anything. The test passes if there is
-a green box and no red.
-<div style="visibility: hidden">
-    <dialog></dialog>
-</div>
-<script>
-document.querySelector('dialog').showModal();
-</script>
-</body>
diff --git a/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/backdrop-dynamic-style-change.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/backdrop-dynamic-style-change.html
index 19297b8c171..6c609a769cc 100644
--- a/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/backdrop-dynamic-style-change.html
+++ b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/backdrop-dynamic-style-change.html
@@ -9,6 +9,7 @@ dialog {
 }
 
 ::backdrop {
+    visibility: visible;
     position: absolute;
     top: 100px;
     left: 100px;
diff --git a/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/backdrop-in-flow.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/backdrop-in-flow.html
index 7201ebbc022..06f790979eb 100644
--- a/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/backdrop-in-flow.html
+++ b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/backdrop-in-flow.html
@@ -7,6 +7,7 @@ dialog {
 }
 
 dialog::backdrop {
+    visibility: visible;
     height: 100px;
     width: 50px;
 }
diff --git a/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/backdrop-inherits-ref.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/backdrop-inherits-ref.html
new file mode 100644
index 00000000000..d9f4cb2c841
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/backdrop-inherits-ref.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<style>
+#backdrop {
+  position: absolute;
+  top: 100px;
+  left: 100px;
+  height: 100px;
+  width: 100px;
+  background: green;
+}
+</style>
+<body>
+Test that ::backdrop inherits from its originating element. The test passes if
+there is a green box and no red.
+<div id="backdrop"></div>
+</body>
diff --git a/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/backdrop-inherits.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/backdrop-inherits.html
new file mode 100644
index 00000000000..458320f0196
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/backdrop-inherits.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<link rel="match" href="backdrop-inherits-ref.html">
+<link rel="help" href="https://drafts.csswg.org/css-position-4/#backdrop">
+<style>
+dialog {
+  --backdrop-bg: green;
+  visibility: hidden;
+}
+
+dialog::backdrop {
+  position: absolute;
+  top: 100px;
+  left: 100px;
+  height: 100px;
+  width: 100px;
+  visibility: visible;
+  background-color: var(--backdrop-bg);
+}
+</style>
+Test that ::backdrop inherits from its originating element. The test passes if
+there is a green box and no red.
+<dialog></dialog>
+<script>
+document.querySelector('dialog').showModal();
+</script>
diff --git a/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/backdrop-receives-element-events.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/backdrop-receives-element-events.html
index 31c3c6ce3c0..5d515000cef 100644
--- a/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/backdrop-receives-element-events.html
+++ b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/backdrop-receives-element-events.html
@@ -11,6 +11,8 @@ dialog {
 }
 
 dialog::backdrop {
+    visibility: visible;
+    pointer-events: initial;
     background-color: red;
     top: 0;
     bottom: 0;
diff --git a/tests/wpt/tests/html/semantics/links/links-created-by-a-and-area-elements/non-parsable-url-getter-setter.window.js b/tests/wpt/tests/html/semantics/links/links-created-by-a-and-area-elements/non-parsable-url-getter-setter.window.js
new file mode 100644
index 00000000000..587f9b9c463
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/links/links-created-by-a-and-area-elements/non-parsable-url-getter-setter.window.js
@@ -0,0 +1,54 @@
+[
+  {
+    "property": "origin",
+    "set": null
+  },
+  {
+    "property": "protocol",
+    "get": ":",
+    "set": "https"
+  },
+  {
+    "property": "username"
+  },
+  {
+    "property": "password"
+  },
+  {
+    "property": "host"
+  },
+  {
+    "property": "hostname"
+  },
+  {
+    "property": "port",
+    "set": "8000"
+  },
+  {
+    "property": "pathname"
+  },
+  {
+    "property": "search"
+  },
+  {
+    "property": "hash"
+  }
+].forEach(({ property, get = "", set = "string" }) => {
+  ["a", "area"].forEach(name => {
+    test(() => {
+      const link = document.createElement(name);
+      link.href = "http://test:test/"; // non-parsable URL
+      assert_equals(link[property], get);
+    }, `<${name} href="http://test:test/">.${property} getter`);
+
+    if (set !== null) {
+      test(() => {
+        const link = document.createElement(name);
+        link.href = "http://test:test/"; // non-parsable URL
+        link[property] = set;
+        assert_equals(link[property], get);
+        assert_equals(link.href, "http://test:test/");
+      }, `<${name} href="http://test:test/">.${property} setter`);
+    }
+  });
+});
diff --git a/tests/wpt/tests/html/semantics/links/links-created-by-a-and-area-elements/non-special-opaque-path-url-getter-setter.window.js b/tests/wpt/tests/html/semantics/links/links-created-by-a-and-area-elements/non-special-opaque-path-url-getter-setter.window.js
new file mode 100644
index 00000000000..9549c6e2a6f
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/links/links-created-by-a-and-area-elements/non-special-opaque-path-url-getter-setter.window.js
@@ -0,0 +1,59 @@
+[
+  {
+    "property": "origin",
+    "get": "null",
+    "set": null
+  },
+  {
+    "property": "protocol",
+    "get": "non-special:",
+    "set": "super-special",
+    "setget": "super-special:"
+  },
+  {
+    "property": "username"
+  },
+  {
+    "property": "password"
+  },
+  {
+    "property": "host",
+  },
+  {
+    "property": "hostname",
+  },
+  {
+    "property": "port",
+    "set": "8000"
+  },
+  {
+    "property": "pathname",
+    "get": "opaque",
+    "setget": "opaque"
+  },
+  {
+    "property": "search",
+    "setget": "?string"
+  },
+  {
+    "property": "hash",
+    "setget": "#string"
+  }
+].forEach(({ property, get = "", set = "string", setget = get }) => {
+  ["a", "area"].forEach(name => {
+    test(() => {
+      const link = document.createElement(name);
+      link.href = "non-special:opaque";
+      assert_equals(link[property], get);
+    }, `<${name} href="non-special:opaque">.${property} getter`);
+
+    if (set !== null) {
+      test(() => {
+        const link = document.createElement(name);
+        link.href = "non-special:opaque";
+        link[property] = set;
+        assert_equals(link[property], setget);
+      }, `<${name} href="non-special:opaque">.${property} setter`);
+    }
+  });
+});
diff --git a/tests/wpt/tests/html/semantics/links/links-created-by-a-and-area-elements/non-special-url-getter-setter.window.js b/tests/wpt/tests/html/semantics/links/links-created-by-a-and-area-elements/non-special-url-getter-setter.window.js
new file mode 100644
index 00000000000..de528a2f973
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/links/links-created-by-a-and-area-elements/non-special-url-getter-setter.window.js
@@ -0,0 +1,63 @@
+[
+  {
+    "property": "origin",
+    "get": "null",
+    "set": null
+  },
+  {
+    "property": "protocol",
+    "get": "non-special:",
+    "set": "super-special",
+    "setget": "super-special:"
+  },
+  {
+    "property": "username"
+  },
+  {
+    "property": "password"
+  },
+  {
+    "property": "host",
+    "get": "test:9001",
+    "setget": "string:9001"
+  },
+  {
+    "property": "hostname",
+    "get": "test"
+  },
+  {
+    "property": "port",
+    "get": "9001",
+    "set": "8000"
+  },
+  {
+    "property": "pathname",
+    "get": "/",
+    "setget": "/string"
+  },
+  {
+    "property": "search",
+    "setget": "?string"
+  },
+  {
+    "property": "hash",
+    "setget": "#string"
+  }
+].forEach(({ property, get = "", set = "string", setget = set }) => {
+  ["a", "area"].forEach(name => {
+    test(() => {
+      const link = document.createElement(name);
+      link.href = "non-special://test:9001/";
+      assert_equals(link[property], get);
+    }, `<${name} href="non-special://test:9001/">.${property} getter`);
+
+    if (set !== null) {
+      test(() => {
+        const link = document.createElement(name);
+        link.href = "non-special://test:9001/";
+        link[property] = set;
+        assert_equals(link[property], setget);
+      }, `<${name} href="non-special://test:9001/">.${property} setter`);
+    }
+  });
+});
diff --git a/tests/wpt/tests/html/semantics/popovers/popover-light-dismiss-flat-tree.html b/tests/wpt/tests/html/semantics/popovers/popover-light-dismiss-flat-tree.html
index d2792a895cc..26c8d7af4c1 100644
--- a/tests/wpt/tests/html/semantics/popovers/popover-light-dismiss-flat-tree.html
+++ b/tests/wpt/tests/html/semantics/popovers/popover-light-dismiss-flat-tree.html
@@ -26,6 +26,7 @@
     <script src="resources/popover-utils.js"></script>
     <script>
         promise_test(async () => {
+            polyfill_declarative_shadow_dom(outerPopover);
             const innerPopoverToggle = outerPopover.shadowRoot.querySelector("#innerPopoverToggle");
             const innerPopover = outerPopover.shadowRoot.querySelector("#innerPopover");
 
diff --git a/tests/wpt/tests/html/semantics/popovers/popover-light-dismiss.html b/tests/wpt/tests/html/semantics/popovers/popover-light-dismiss.html
index 4c31bed1635..4a57276bce3 100644
--- a/tests/wpt/tests/html/semantics/popovers/popover-light-dismiss.html
+++ b/tests/wpt/tests/html/semantics/popovers/popover-light-dismiss.html
@@ -629,3 +629,27 @@ promise_test(async () => {
   p25.hidePopover(); // Cleanup
 }, 'Nested showPopover');
 </script>
+
+<div id=p29 popover>Popover 29</div>
+<button id=b29 popovertarget=p29>Open popover 29</button>
+<iframe id=iframe29 width=100 height=100></iframe>
+<script>
+promise_test(async () => {
+  let iframe_url = (new URL("/common/blank.html", location.href)).href;
+  iframe29.src = iframe_url;
+  iframe29.contentDocument.body.style.height = '100%';
+  assert_false(p29.matches(':popover-open'));
+  p29.showPopover();
+  assert_true(p29.matches(':popover-open'));
+  let actions = new test_driver.Actions();
+  await actions.pointerMove(0,0,{origin: b29})
+      .pointerDown({button: actions.ButtonType.LEFT})
+      .send();
+
+  actions = new test_driver.Actions();
+  await actions.pointerMove(0,0,{origin: iframe29.contentDocument.body})
+      .pointerUp({button: actions.ButtonType.LEFT})
+      .send();
+  assert_true(p29.matches(':popover-open'));
+},`Pointer down in one document and pointer up in another document shouldn't dismiss popover`);
+</script>
diff --git a/tests/wpt/tests/html/semantics/popovers/popover-shadowhost-focus.html b/tests/wpt/tests/html/semantics/popovers/popover-shadowhost-focus.html
index 4dcf6692420..d5899d21bb0 100644
--- a/tests/wpt/tests/html/semantics/popovers/popover-shadowhost-focus.html
+++ b/tests/wpt/tests/html/semantics/popovers/popover-shadowhost-focus.html
@@ -3,6 +3,7 @@
 <link rel=help href="https://github.com/whatwg/html/issues/8994">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+<script src="/resources/declarative-shadow-dom-polyfill.js"></script>
 
 <div popover=auto tabindex=0 data-test="autofocus=true, delegatesfocus=false" autofocus class=should-be-focused>
   <template shadowrootmode=open>
@@ -31,16 +32,7 @@
 </div>
 
 <script>
-(function attachShadowRoots(root) {
-  root.querySelectorAll("template[shadowrootmode]").forEach(template => {
-    const mode = template.getAttribute("shadowrootmode");
-    const delegatesFocus = template.hasAttribute("shadowrootdelegatesfocus");
-    const shadowRoot = template.parentNode.attachShadow({ mode, delegatesFocus });
-    shadowRoot.appendChild(template.content);
-    template.remove();
-    attachShadowRoots(shadowRoot);
-  });
-})(document);
+polyfill_declarative_shadow_dom(document);
 
 document.querySelectorAll('body > [popover]').forEach(popover => {
   promise_test(async () => {
diff --git a/tests/wpt/tests/html/semantics/popovers/resources/popover-utils.js b/tests/wpt/tests/html/semantics/popovers/resources/popover-utils.js
index bc7643c21ab..f11291e5c2f 100644
--- a/tests/wpt/tests/html/semantics/popovers/resources/popover-utils.js
+++ b/tests/wpt/tests/html/semantics/popovers/resources/popover-utils.js
@@ -18,7 +18,7 @@ async function clickOn(element) {
 async function sendTab() {
   await waitForRender();
   const kTab = '\uE004';
-  await new test_driver.send_keys(document.documentElement,kTab);
+  await new test_driver.send_keys(document.activeElement || document.documentElement, kTab);
   await waitForRender();
 }
 async function sendShiftTab() {
@@ -35,12 +35,12 @@ async function sendShiftTab() {
 }
 async function sendEscape() {
   await waitForRender();
-  await new test_driver.send_keys(document.documentElement,'\uE00C'); // Escape
+  await new test_driver.send_keys(document.activeElement || document.documentElement,'\uE00C'); // Escape
   await waitForRender();
 }
 async function sendEnter() {
   await waitForRender();
-  await new test_driver.send_keys(document.documentElement,'\uE007'); // Enter
+  await new test_driver.send_keys(document.activeElement || document.documentElement,'\uE007'); // Enter
   await waitForRender();
 }
 function isElementVisible(el) {
diff --git a/tests/wpt/tests/html/semantics/scripting-1/the-script-element/import-assertions/invalid-import-errors-order.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/import-assertions/invalid-import-errors-order.html
new file mode 100644
index 00000000000..17c95faea0f
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/import-assertions/invalid-import-errors-order.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<title>Handling of invalid module type import attributes</title>
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+    setup({allow_uncaught_exception: true});
+
+    var log = [];
+    window.addEventListener("error", ev => log.push(ev.error));
+
+    const test_load = async_test(
+        "Test that the errors order for invalid import declarations is" +
+        " specifier, then attribute key, and then type attribute value.");
+    window.addEventListener("load", test_load.step_func_done(ev => {
+      assert_equals(log.length, 3);
+      assert_equals(log[0].constructor, SyntaxError);
+      assert_equals(log[1].constructor, SyntaxError);
+      assert_equals(log[2].constructor, SyntaxError);
+    }));
+
+    function unreachable() { log.push("unexpected"); }
+</script>
+<script type="module" onerror="unreachable()">
+  // unknown attribute is reported before invalid specifier
+  import "INVALID" assert { unknown: "foo" };
+</script>
+<script type="module" onerror="unreachable()">
+  // unknown attribute is reported before unknown type
+  import "./valid" assert { unknown: "foo", type: "unknown" };
+</script>
+<script type="module" onerror="unreachable()">
+  // unknown attribute is reported before invalid specifier in subsequent import
+  import "./valid" assert { unknown: "foo" };
+  import "INVALID";
+</script>
diff --git a/tests/wpt/tests/html/semantics/scripting-1/the-script-element/import-attributes/invalid-import-errors-order.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/import-attributes/invalid-import-errors-order.html
new file mode 100644
index 00000000000..8c438f626b7
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/import-attributes/invalid-import-errors-order.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<title>Handling of invalid module type import attributes</title>
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+    setup({allow_uncaught_exception: true});
+
+    var log = [];
+    window.addEventListener("error", ev => log.push(ev.error));
+
+    const test_load = async_test(
+        "Test that the errors order for invalid import declarations is" +
+        " specifier, then attribute key, and then type attribute value.");
+    window.addEventListener("load", test_load.step_func_done(ev => {
+      assert_equals(log.length, 3);
+      assert_equals(log[0].constructor, SyntaxError);
+      assert_equals(log[1].constructor, SyntaxError);
+      assert_equals(log[2].constructor, SyntaxError);
+    }));
+
+    function unreachable() { log.push("unexpected"); }
+</script>
+<script type="module" onerror="unreachable()">
+  // unknown attribute is reported before invalid specifier
+  import "INVALID" with { unknown: "foo" };
+</script>
+<script type="module" onerror="unreachable()">
+  // unknown attribute is reported before unknown type
+  import "./valid" with { unknown: "foo", type: "unknown" };
+</script>
+<script type="module" onerror="unreachable()">
+  // unknown attribute is reported before invalid specifier in subsequent import
+  import "./valid" with { unknown: "foo" };
+  import "INVALID";
+</script>
diff --git a/tests/wpt/tests/html/semantics/scripting-1/the-script-element/import-attributes/unsupported-attribute.js b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/import-attributes/unsupported-attribute.js
index e589fea8305..2fc6829cfbf 100644
--- a/tests/wpt/tests/html/semantics/scripting-1/the-script-element/import-attributes/unsupported-attribute.js
+++ b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/import-attributes/unsupported-attribute.js
@@ -1,2 +1,2 @@
-import "./hello.js" assert { unsupportedAttributeKey: "unsupportedAttributeValue" };
+import "./hello.js" with { unsupportedAttributeKey: "unsupportedAttributeValue" };
 log.push("unsupported-attribute");
diff --git a/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/inline-async-onload.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/inline-async-onload.html
new file mode 100644
index 00000000000..314abc98dc7
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/inline-async-onload.html
@@ -0,0 +1,28 @@
+<html>
+  <head>
+    <title>Inline async module script without external deps onload blocking</title>
+    <meta name=timeout content=long>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+  </head>
+  <body>
+    <script>
+      let loadFired = false;
+      let moduleRan = false
+      let test = async_test("Inline async module script vs. onload");
+      window.addEventListener("load", test.step_func(function() {
+        loadFired = true;
+        assert_true(moduleRan, "Module should have run before the load event");
+        test.step_timeout(function() {
+          test.done();
+        }, 0);
+      }));
+    </script>
+    <script type="module" async>
+      moduleRan = true;
+      test.step_func(function() {
+        assert_false(loadFired, "onload should not have fired yet");
+      });
+    </script>
+  </body>
+</html>
diff --git a/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/inline-defer-onload.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/inline-defer-onload.html
new file mode 100644
index 00000000000..0a0bc36f8b8
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/inline-defer-onload.html
@@ -0,0 +1,29 @@
+<html>
+  <head>
+    <title>Inline defer module script without external deps onload blocking</title>
+    <meta name=timeout content=long>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+  </head>
+  <body>
+    <script>
+      let loadFired = false;
+      let moduleRan = false
+      let test = async_test("Inline defer module script vs. onload");
+      window.addEventListener("load", test.step_func(function() {
+        loadFired = true;
+        assert_true(moduleRan, "Module should have run before the load event");
+        test.step_timeout(function() {
+          test.done();
+        }, 0);
+      }));
+    </script>
+    <!-- defer should be equivalent to neither defer nor async specified -->
+    <script type="module" defer>
+      moduleRan = true;
+      test.step_func(function() {
+        assert_false(loadFired, "onload should not have fired yet");
+      });
+    </script>
+  </body>
+</html>
diff --git a/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/inline-no-async-onload.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/inline-no-async-onload.html
new file mode 100644
index 00000000000..50f42c6a386
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/inline-no-async-onload.html
@@ -0,0 +1,28 @@
+<html>
+  <head>
+    <title>Inline module script without external deps onload blocking</title>
+    <meta name=timeout content=long>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+  </head>
+  <body>
+    <script>
+      let loadFired = false;
+      let moduleRan = false
+      let test = async_test("Inline module script vs. onload");
+      window.addEventListener("load", test.step_func(function() {
+        loadFired = true;
+        assert_true(moduleRan, "Module should have run before the load event");
+        test.step_timeout(function() {
+          test.done();
+        }, 0);
+      }));
+    </script>
+    <script type="module">
+      moduleRan = true;
+      test.step_func(function() {
+        assert_false(loadFired, "onload should not have fired yet");
+      });
+    </script>
+  </body>
+</html>
diff --git a/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/referrer-policy-for-descendants.sub.html b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/referrer-policy-for-descendants.sub.html
index cf8a3dce014..4a7005da840 100644
--- a/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/referrer-policy-for-descendants.sub.html
+++ b/tests/wpt/tests/html/semantics/scripting-1/the-script-element/module/referrer-policy-for-descendants.sub.html
@@ -23,19 +23,27 @@ import { referrer as parentWithNoReferrerWhenDowngrade } from
 import { referrer as parentWithOrigin} from
     "./resources/import-referrer-checker.sub.js?name=same_remote&pipe=header(Referrer-Policy,origin)";
 
+import { referrer as parentWithSameOrigin} from
+    "./resources/import-referrer-checker.sub.js?name=same_remote_so&pipe=header(Referrer-Policy,same-origin)";
+
 import { referrer as parentWithOriginWhenCrossOriginRemoteDescendant} from
     "./resources/import-remote-origin-referrer-checker.sub.js?name=same_remote_owco&pipe=header(Referrer-Policy,origin-when-cross-origin)";
 
 import { referrer as remoteParentWithOriginWhenCrossOriginSameOriginDescendant} from
     "http://{{domains[www1]}}:{{ports[http][0]}}/html/semantics/scripting-1/the-script-element/module/resources/import-referrer-checker.sub.js?name=remote_same&pipe=header(Referrer-Policy,origin-when-cross-origin)";
 
+import { referrer as remoteParentWithSameOriginWhenCrossOriginSameOriginDescendant} from
+    "http://{{domains[www1]}}:{{ports[http][0]}}/html/semantics/scripting-1/the-script-element/module/resources/import-referrer-checker.sub.js?name=remote_same_so&pipe=header(Referrer-Policy,same-origin)";
+
 import { referrer as remoteParentWithOriginWhenCrossOriginRemoteDescendant} from
     "http://{{domains[www1]}}:{{ports[http][0]}}/html/semantics/scripting-1/the-script-element/module/resources/import-same-origin-referrer-checker-from-remote-origin.sub.js?name=remote_remote&pipe=header(Referrer-Policy,origin-when-cross-origin)";
 
+import { referrer as remoteParentWithSameOriginWhenCrossOriginRemoteDescendant} from
+    "http://{{domains[www1]}}:{{ports[http][0]}}/html/semantics/scripting-1/the-script-element/module/resources/import-same-origin-referrer-checker-from-remote-origin.sub.js?name=remote_remote_so&pipe=header(Referrer-Policy,same-origin)";
+
 import { referrer as parentWithInvalidPolicy } from
     "http://{{domains[www1]}}:{{ports[http][0]}}/html/semantics/scripting-1/the-script-element/module/resources/import-referrer-checker.sub.js?name=remote_same_invalid&pipe=header(Referrer-Policy,invalid-policy)";
 
-
 test(t => {
   const expected_url =
       new URL("html/semantics/scripting-1/the-script-element/module/resources/import-referrer-checker.sub.js?name=same_same&pipe=header(Referrer-Policy,no-referrer-when-downgrade)",
@@ -51,6 +59,15 @@ test(t => {
       "Descendant referrer should be the parent's origin.");
 }, "Parent module delivered with `origin` policy importing a same-origin descendant script.");
 
+test(t => {
+  const expected_url =
+      new URL("html/semantics/scripting-1/the-script-element/module/resources/import-referrer-checker.sub.js?name=same_remote_so&pipe=header(Referrer-Policy,same-origin)",
+              window.origin);
+  assert_equals(
+      parentWithSameOrigin, expected_url.toString(),
+      "Descendant referrer should be the parent's full URL.");
+}, "Parent module delivered with `same-origin` policy importing a same-origin descendant script.");
+
 test(t => {
   assert_equals(
       parentWithOriginWhenCrossOriginRemoteDescendant, window.origin + "/",
@@ -66,12 +83,26 @@ test(t => {
       "Same-origin descendant referrer should be the parent's full URL.");
 }, "Remote parent module delivered with `origin-when-cross-origin` policy importing a same-origin-to-parent-module descendant script.");
 
+test(t => {
+  const expected_url =
+      new URL("/html/semantics/scripting-1/the-script-element/module/resources/import-referrer-checker.sub.js?name=remote_same_so&pipe=header(Referrer-Policy,same-origin)",
+              "http://{{domains[www1]}}:{{ports[http][0]}}/");
+  assert_equals(
+      remoteParentWithSameOriginWhenCrossOriginSameOriginDescendant, expected_url.toString(),
+      "Same-origin descendant referrer should be the parent's full URL.");
+}, "Remote parent module delivered with `same-origin` policy importing a same-origin-to-parent-module descendant script.");
+
 test(t => {
   assert_equals(
       remoteParentWithOriginWhenCrossOriginRemoteDescendant, "http://{{domains[www1]}}:{{ports[http][0]}}/",
       "Remote-origin descendant referrer should be the parent's origin.");
 }, "Remote parent module delivered with `origin-when-cross-origin` policy importing a cross-origin-to-parent-module descendant script.");
 
+test(t => {
+  assert_equals(
+      remoteParentWithSameOriginWhenCrossOriginRemoteDescendant, "");
+}, "Remote parent module delivered with `same-origin` policy importing a cross-origin-to-parent-module descendant script.");
+
 // This tests the following spec line:
 //
 // "If referrerPolicy is not the empty string, set options's referrer policy to
diff --git a/tests/wpt/tests/html/semantics/selectors/pseudo-classes/readwrite-readonly.html b/tests/wpt/tests/html/semantics/selectors/pseudo-classes/readwrite-readonly.html
index fc112f3ceb3..fb8a5b9ad70 100644
--- a/tests/wpt/tests/html/semantics/selectors/pseudo-classes/readwrite-readonly.html
+++ b/tests/wpt/tests/html/semantics/selectors/pseudo-classes/readwrite-readonly.html
@@ -44,6 +44,20 @@
 <p id=p2 contenteditable>paragraph2.</p>
 </div>
 
+<div id=set5>
+  <div id=cd1 contenteditable>
+    <p id=p3></p>
+    <input id=ci1 readonly>
+    <input id=ci2 disabled>
+    <input id=ci3>
+    <input id=ci4>
+    <textarea id=ct1 readonly></textarea>
+    <textarea id=ct2 disabled></textarea>
+    <textarea id=ct3></textarea>
+    <textarea id=ct4></textarea>
+  </div>
+</div>
+
 <script>
   testSelectorIdsMatch("#set0 :read-write", [], "The :read-write pseudo-class must not match input elements to which the readonly attribute does not apply");
 
@@ -97,4 +111,8 @@
 
   testSelectorIdsMatch("#set4 :read-only", [], "The :read-only pseudo-class must not match elements that are editing hosts");
 
+  document.designMode = "off";
+
+  testSelectorIdsMatch("#set5 :read-write", ["cd1", "p3", "ci3", "ci4", "ct3", "ct4"], "The :read-write pseudo-class must match elements that are inside editing hosts, but not match inputs and textareas inside that aren't");
+
 </script>
diff --git a/tests/wpt/tests/html/user-activation/activation-trigger-pointerevent.html b/tests/wpt/tests/html/user-activation/activation-trigger-pointerevent.html
index 5d3eedb925e..e3042b718de 100644
--- a/tests/wpt/tests/html/user-activation/activation-trigger-pointerevent.html
+++ b/tests/wpt/tests/html/user-activation/activation-trigger-pointerevent.html
@@ -25,16 +25,16 @@
     promise_test(async () => {
         const test_pointer = pointer_type + "TestPointer";
 
-        new test_driver.Actions().addPointer(test_pointer, pointer_type)
+        let pointerdown_event = getEvent('pointerdown');
+        let pointerup_event = getEvent('pointerup');
+        let click_event = getEvent('click');
+
+        await new test_driver.Actions().addPointer(test_pointer, pointer_type)
             .pointerMove(0, 0, {origin:document.body, sourceName:test_pointer})
             .pointerDown({sourceName:test_pointer})
             .pointerUp({sourceName:test_pointer})
             .send();
 
-        let pointerdown_event = getEvent('pointerdown');
-        let pointerup_event = getEvent('pointerup');
-        let click_event = getEvent('click');
-
         await pointerdown_event;
         let consumed_pointerdown = await consumeTransientActivation();
         await pointerup_event;
diff --git a/tests/wpt/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/clientinformation.window.js b/tests/wpt/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/clientinformation.window.js
index 3d3b6b5947d..197a3b13e93 100644
--- a/tests/wpt/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/clientinformation.window.js
+++ b/tests/wpt/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/clientinformation.window.js
@@ -1,3 +1,8 @@
 test(() => {
   assert_equals(window.clientInformation, window.navigator);
 }, "window.clientInformation exists and equals window.navigator");
+
+test(() => {
+  window.clientInformation = 1;
+  assert_equals(window.clientInformation, 1);
+}, "window.clientInformation is Replaceable");
diff --git a/tests/wpt/tests/idle-detection/idle-detection-detached-frame.https.html b/tests/wpt/tests/idle-detection/idle-detection-detached-frame.https.html
new file mode 100644
index 00000000000..062499b54d6
--- /dev/null
+++ b/tests/wpt/tests/idle-detection/idle-detection-detached-frame.https.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<body>
+<script src=/resources/testdriver.js></script>
+<script src=/resources/testdriver-vendor.js></script>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+
+<script>
+'use strict';
+
+promise_test(async t => {
+  await new Promise((resolve) => {
+    window.addEventListener('load', resolve);
+  });
+  await test_driver.set_permission({name: 'idle-detection'}, 'granted');
+
+  const frame = document.body.appendChild(document.createElement('iframe'));
+  const frameIdleDetector = frame.contentWindow.IdleDetector;
+  const frameDOMException = frame.contentWindow.DOMException;
+
+  let detector = new frameIdleDetector();
+  document.body.outerHTML = "";
+  await promise_rejects_dom(t, 'InvalidStateError', frameDOMException, detector.start());
+
+  detector = new frameIdleDetector();
+  return promise_rejects_dom(t, 'InvalidStateError', frameDOMException, detector.start());
+}, 'Using an IdleDetector from a detached frame');
+
+</script>
diff --git a/tests/wpt/tests/images/META.yml b/tests/wpt/tests/images/META.yml
index f4c01cfa0f6..35d872dd695 100644
--- a/tests/wpt/tests/images/META.yml
+++ b/tests/wpt/tests/images/META.yml
@@ -1,2 +1 @@
 suggested_reviewers:
-  - zqzhang
diff --git a/tests/wpt/tests/infrastructure/metadata/infrastructure/testdriver/virtual_authenticator.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/testdriver/virtual_authenticator.html.ini
index 92cbbf37621..b5683f8fa99 100644
--- a/tests/wpt/tests/infrastructure/metadata/infrastructure/testdriver/virtual_authenticator.html.ini
+++ b/tests/wpt/tests/infrastructure/metadata/infrastructure/testdriver/virtual_authenticator.html.ini
@@ -4,28 +4,28 @@
 
   [Can create an authenticator]
     expected:
-      if product != "chrome": FAIL
+      if product == "safari": FAIL
 
   [Can add a credential]
     expected:
-      if product != "chrome": FAIL
+      if product == "safari": FAIL
 
   [Can get the credentials]
     expected:
-      if product != "chrome": FAIL
+      if product == "safari": FAIL
 
   [Can remove a credential]
     expected:
-      if product != "chrome": FAIL
+      if product == "safari": FAIL
 
   [Can remove all credentials]
     expected:
-      if product != "chrome": FAIL
+      if product == "safari": FAIL
 
   [Can set user verified]
     expected:
-      if product != "chrome": FAIL
+      if product == "safari": FAIL
 
   [Can remove a virtual authenticator]
     expected:
-      if product != "chrome": FAIL
+      if product == "safari": FAIL
diff --git a/tests/wpt/tests/interfaces/FedCM.idl b/tests/wpt/tests/interfaces/FedCM.idl
index 8de87e88b05..5ef1ca8bc11 100644
--- a/tests/wpt/tests/interfaces/FedCM.idl
+++ b/tests/wpt/tests/interfaces/FedCM.idl
@@ -12,14 +12,23 @@ partial dictionary CredentialRequestOptions {
   IdentityCredentialRequestOptions identity;
 };
 
+enum IdentityCredentialRequestOptionsContext {
+  "signin",
+  "signup",
+  "use",
+  "continue"
+};
+
 dictionary IdentityCredentialRequestOptions {
-  sequence<IdentityProviderConfig> providers;
+  required sequence<IdentityProviderConfig> providers;
+  IdentityCredentialRequestOptionsContext context = "signin";
 };
 
 dictionary IdentityProviderConfig {
   required USVString configURL;
   required USVString clientId;
   USVString nonce;
+  DOMString loginHint;
 };
 
 dictionary IdentityProviderWellKnown {
@@ -52,6 +61,7 @@ dictionary IdentityProviderAccount {
   USVString given_name;
   USVString picture;
   sequence<USVString> approved_clients;
+  sequence<DOMString> login_hints;
 };
 dictionary IdentityProviderAccountList {
   sequence<IdentityProviderAccount> accounts;
@@ -65,3 +75,14 @@ dictionary IdentityProviderClientMetadata {
   USVString privacy_policy_url;
   USVString terms_of_service_url;
 };
+
+dictionary IdentityUserInfo {
+  USVString email;
+  USVString name;
+  USVString givenName;
+  USVString picture;
+};
+
+[Exposed=Window, SecureContext] interface IdentityProvider {
+    static Promise<sequence<IdentityUserInfo>> getUserInfo(IdentityProviderConfig config);
+};
diff --git a/tests/wpt/tests/interfaces/captured-mouse-events.idl b/tests/wpt/tests/interfaces/captured-mouse-events.idl
new file mode 100644
index 00000000000..64c73b906d5
--- /dev/null
+++ b/tests/wpt/tests/interfaces/captured-mouse-events.idl
@@ -0,0 +1,20 @@
+// GENERATED CONTENT - DO NOT EDIT
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
+// Source: Captured Mouse Events (https://screen-share.github.io/captured-mouse-events/)
+
+[Exposed=Window]
+interface CapturedMouseEvent : Event {
+  constructor(DOMString type, optional CapturedMouseEventInit eventInitDict = {});
+  readonly attribute long surfaceX;
+  readonly attribute long surfaceY;
+};
+
+dictionary CapturedMouseEventInit : EventInit {
+  long surfaceX = -1;
+  long surfaceY = -1;
+};
+
+partial interface CaptureController {
+  attribute EventHandler oncapturedmousechange;
+};
diff --git a/tests/wpt/tests/interfaces/close-watcher.idl b/tests/wpt/tests/interfaces/close-watcher.idl
deleted file mode 100644
index de7940c07e7..00000000000
--- a/tests/wpt/tests/interfaces/close-watcher.idl
+++ /dev/null
@@ -1,19 +0,0 @@
-// GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into webref
-// (https://github.com/w3c/webref)
-// Source: Close Watcher API (https://wicg.github.io/close-watcher/)
-
-[Exposed=Window]
-interface CloseWatcher : EventTarget {
-  constructor(optional CloseWatcherOptions options = {});
-
-  undefined destroy();
-  undefined close();
-
-  attribute EventHandler oncancel;
-  attribute EventHandler onclose;
-};
-
-dictionary CloseWatcherOptions {
-  AbortSignal signal;
-};
diff --git a/tests/wpt/tests/interfaces/cookie-store.idl b/tests/wpt/tests/interfaces/cookie-store.idl
index f44b4c63546..8a000cac0b2 100644
--- a/tests/wpt/tests/interfaces/cookie-store.idl
+++ b/tests/wpt/tests/interfaces/cookie-store.idl
@@ -40,12 +40,14 @@ dictionary CookieInit {
   USVString? domain = null;
   USVString path = "/";
   CookieSameSite sameSite = "strict";
+  boolean partitioned = false;
 };
 
 dictionary CookieStoreDeleteOptions {
   required USVString name;
   USVString? domain = null;
   USVString path = "/";
+  boolean partitioned = false;
 };
 
 dictionary CookieListItem {
@@ -56,6 +58,7 @@ dictionary CookieListItem {
   DOMHighResTimeStamp? expires;
   boolean secure;
   CookieSameSite sameSite;
+  boolean partitioned;
 };
 
 typedef sequence<CookieListItem> CookieList;
diff --git a/tests/wpt/tests/interfaces/credential-management.idl b/tests/wpt/tests/interfaces/credential-management.idl
index e9fab13f35f..75e18319190 100644
--- a/tests/wpt/tests/interfaces/credential-management.idl
+++ b/tests/wpt/tests/interfaces/credential-management.idl
@@ -23,7 +23,7 @@ partial interface Navigator {
 [Exposed=Window, SecureContext]
 interface CredentialsContainer {
   Promise<Credential?> get(optional CredentialRequestOptions options = {});
-  Promise<Credential> store(Credential credential);
+  Promise<undefined> store(Credential credential);
   Promise<Credential?> create(optional CredentialCreationOptions options = {});
   Promise<undefined> preventSilentAccess();
 };
diff --git a/tests/wpt/tests/interfaces/css-anchor-position.idl b/tests/wpt/tests/interfaces/css-anchor-position.idl
index c5da3f43f72..5d3973eff3d 100644
--- a/tests/wpt/tests/interfaces/css-anchor-position.idl
+++ b/tests/wpt/tests/interfaces/css-anchor-position.idl
@@ -1,3 +1,6 @@
+// GENERATED CONTENT - DO NOT EDIT
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: CSS Anchor Positioning (https://drafts.csswg.org/css-anchor-position-1/)
 
 [Exposed=Window]
diff --git a/tests/wpt/tests/interfaces/css-fonts.idl b/tests/wpt/tests/interfaces/css-fonts.idl
index eddfc025215..070cbc58f5d 100644
--- a/tests/wpt/tests/interfaces/css-fonts.idl
+++ b/tests/wpt/tests/interfaces/css-fonts.idl
@@ -5,7 +5,7 @@
 
 [Exposed=Window]
 interface CSSFontFaceRule : CSSRule {
-    readonly attribute CSSStyleDeclaration style;
+  readonly attribute CSSStyleDeclaration style;
 };
 
 partial interface CSSRule {  const unsigned short FONT_FEATURE_VALUES_RULE = 14;
@@ -25,7 +25,7 @@ interface CSSFontFeatureValuesRule : CSSRule {
 interface CSSFontFeatureValuesMap {
   maplike<CSSOMString, sequence<unsigned long>>;
   undefined set(CSSOMString featureValueName,
-           (unsigned long or sequence<unsigned long>) values);
+         (unsigned long or sequence<unsigned long>) values);
 };
 
 [Exposed=Window]interface CSSFontPaletteValuesRule : CSSRule {
diff --git a/tests/wpt/tests/interfaces/css-nesting.idl b/tests/wpt/tests/interfaces/css-nesting.idl
deleted file mode 100644
index 01f27ab9d65..00000000000
--- a/tests/wpt/tests/interfaces/css-nesting.idl
+++ /dev/null
@@ -1,10 +0,0 @@
-// GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into webref
-// (https://github.com/w3c/webref)
-// Source: CSS Nesting Module (https://drafts.csswg.org/css-nesting-1/)
-
-partial interface CSSStyleRule {
-  [SameObject] readonly attribute CSSRuleList cssRules;
-  unsigned long insertRule(CSSOMString rule, optional unsigned long index = 0);
-  undefined deleteRule(unsigned long index);
-};
diff --git a/tests/wpt/tests/interfaces/css-transitions-2.idl b/tests/wpt/tests/interfaces/css-transitions-2.idl
index 9d06f3cf260..223810f761e 100644
--- a/tests/wpt/tests/interfaces/css-transitions-2.idl
+++ b/tests/wpt/tests/interfaces/css-transitions-2.idl
@@ -3,6 +3,10 @@
 // (https://github.com/w3c/webref)
 // Source: CSS Transitions Level 2 (https://drafts.csswg.org/css-transitions-2/)
 
+[Exposed=Window]
+interface CSSStartingStyleRule : CSSGroupingRule {
+};
+
 [Exposed=Window]
 interface CSSTransition : Animation {
   readonly attribute CSSOMString transitionProperty;
diff --git a/tests/wpt/tests/interfaces/css-typed-om.idl b/tests/wpt/tests/interfaces/css-typed-om.idl
index 0df6a0327a2..b0f26ea83c7 100644
--- a/tests/wpt/tests/interfaces/css-typed-om.idl
+++ b/tests/wpt/tests/interfaces/css-typed-om.idl
@@ -184,12 +184,17 @@ partial namespace CSS {
     CSSUnitValue percent(double value);
 
     // <length>
+    CSSUnitValue cap(double value);
+    CSSUnitValue ch(double value);
     CSSUnitValue em(double value);
     CSSUnitValue ex(double value);
-    CSSUnitValue ch(double value);
     CSSUnitValue ic(double value);
-    CSSUnitValue rem(double value);
     CSSUnitValue lh(double value);
+    CSSUnitValue rcap(double value);
+    CSSUnitValue rch(double value);
+    CSSUnitValue rem(double value);
+    CSSUnitValue rex(double value);
+    CSSUnitValue ric(double value);
     CSSUnitValue rlh(double value);
     CSSUnitValue vw(double value);
     CSSUnitValue vh(double value);
diff --git a/tests/wpt/tests/interfaces/cssom.idl b/tests/wpt/tests/interfaces/cssom.idl
index 0574f1a771c..94cd1912b91 100644
--- a/tests/wpt/tests/interfaces/cssom.idl
+++ b/tests/wpt/tests/interfaces/cssom.idl
@@ -96,6 +96,12 @@ interface CSSRule {
   const unsigned short NAMESPACE_RULE = 10;
 };
 
+[Exposed=Window]
+interface CSSStyleRule : CSSGroupingRule {
+  attribute CSSOMString selectorText;
+  [SameObject, PutForwards=cssText] readonly attribute CSSStyleDeclaration style;
+};
+
 [Exposed=Window]
 interface CSSImportRule : CSSRule {
   readonly attribute USVString href;
@@ -112,12 +118,6 @@ interface CSSGroupingRule : CSSRule {
   undefined deleteRule(unsigned long index);
 };
 
-[Exposed=Window]
-interface CSSStyleRule : CSSGroupingRule {
-  attribute CSSOMString selectorText;
-  [SameObject, PutForwards=cssText] readonly attribute CSSStyleDeclaration style;
-};
-
 [Exposed=Window]
 interface CSSPageRule : CSSGroupingRule {
            attribute CSSOMString selectorText;
diff --git a/tests/wpt/tests/interfaces/document-picture-in-picture.idl b/tests/wpt/tests/interfaces/document-picture-in-picture.idl
index 742f65e6f06..f54f437a936 100644
--- a/tests/wpt/tests/interfaces/document-picture-in-picture.idl
+++ b/tests/wpt/tests/interfaces/document-picture-in-picture.idl
@@ -20,10 +20,9 @@ interface DocumentPictureInPicture : EventTarget {
 dictionary DocumentPictureInPictureOptions {
   [EnforceRange] unsigned long long width = 0;
   [EnforceRange] unsigned long long height = 0;
-  boolean copyStyleSheets = false;
 };
 
-[Exposed=Window]
+[Exposed=Window, SecureContext]
 interface DocumentPictureInPictureEvent : Event {
   constructor(DOMString type, DocumentPictureInPictureEventInit eventInitDict);
   [SameObject] readonly attribute Window window;
diff --git a/tests/wpt/tests/interfaces/edit-context.idl b/tests/wpt/tests/interfaces/edit-context.idl
index 91d8af2ea68..937b6579376 100644
--- a/tests/wpt/tests/interfaces/edit-context.idl
+++ b/tests/wpt/tests/interfaces/edit-context.idl
@@ -69,11 +69,8 @@ interface TextUpdateEvent : Event {
 dictionary TextFormatInit {
     unsigned long rangeStart;
     unsigned long rangeEnd;
-    DOMString textColor;
-    DOMString backgroundColor;
     DOMString underlineStyle;
     DOMString underlineThickness;
-    DOMString underlineColor;
 };
 
 [Exposed=Window]
@@ -81,11 +78,8 @@ interface TextFormat {
     constructor(optional TextFormatInit options = {});
     readonly attribute unsigned long rangeStart;
     readonly attribute unsigned long rangeEnd;
-    readonly attribute DOMString textColor;
-    readonly attribute DOMString backgroundColor;
     readonly attribute DOMString underlineStyle;
     readonly attribute DOMString underlineThickness;
-    readonly attribute DOMString underlineColor;
 };
 
 dictionary TextFormatUpdateEventInit : EventInit {
diff --git a/tests/wpt/tests/interfaces/element-capture.idl b/tests/wpt/tests/interfaces/element-capture.idl
new file mode 100644
index 00000000000..619a0fd2f44
--- /dev/null
+++ b/tests/wpt/tests/interfaces/element-capture.idl
@@ -0,0 +1,14 @@
+// GENERATED CONTENT - DO NOT EDIT
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
+// Source: Element Capture (https://screen-share.github.io/element-capture/)
+
+[Exposed=(Window,Worker), Serializable]
+interface RestrictionTarget {
+  [Exposed=Window, SecureContext] static Promise<RestrictionTarget> fromElement(Element element);
+};
+
+[Exposed = Window]
+partial interface BrowserCaptureMediaStreamTrack {
+  Promise<undefined> restrictTo(RestrictionTarget? RestrictionTarget);
+};
diff --git a/tests/wpt/tests/interfaces/encoding.idl b/tests/wpt/tests/interfaces/encoding.idl
index a8cbe4431a2..a9499f62378 100644
--- a/tests/wpt/tests/interfaces/encoding.idl
+++ b/tests/wpt/tests/interfaces/encoding.idl
@@ -22,7 +22,7 @@ dictionary TextDecodeOptions {
 interface TextDecoder {
   constructor(optional DOMString label = "utf-8", optional TextDecoderOptions options = {});
 
-  USVString decode(optional [AllowShared] BufferSource input, optional TextDecodeOptions options = {});
+  USVString decode(optional AllowSharedBufferSource input, optional TextDecodeOptions options = {});
 };
 TextDecoder includes TextDecoderCommon;
 
diff --git a/tests/wpt/tests/interfaces/event-timing.idl b/tests/wpt/tests/interfaces/event-timing.idl
index 741a05dc6bc..ad2cb7b831c 100644
--- a/tests/wpt/tests/interfaces/event-timing.idl
+++ b/tests/wpt/tests/interfaces/event-timing.idl
@@ -1,7 +1,7 @@
 // GENERATED CONTENT - DO NOT EDIT
 // Content was automatically extracted by Reffy into webref
 // (https://github.com/w3c/webref)
-// Source: Event Timing API (https://w3c.github.io/event-timing)
+// Source: Event Timing API (https://w3c.github.io/event-timing/)
 
 [Exposed=Window]
 interface PerformanceEventTiming : PerformanceEntry {
diff --git a/tests/wpt/tests/interfaces/fenced-frame.idl b/tests/wpt/tests/interfaces/fenced-frame.idl
index 440ec2bbaa1..75196932821 100644
--- a/tests/wpt/tests/interfaces/fenced-frame.idl
+++ b/tests/wpt/tests/interfaces/fenced-frame.idl
@@ -18,7 +18,7 @@ enum OpaqueProperty {"opaque"};
 typedef (unsigned long or OpaqueProperty) FencedFrameConfigSize;
 typedef USVString FencedFrameConfigURL;
 
-[Exposed=Window]
+[Exposed=Window, Serializable]
 interface FencedFrameConfig {
   readonly attribute FencedFrameConfigSize? containerWidth;
   readonly attribute FencedFrameConfigSize? containerHeight;
@@ -40,6 +40,7 @@ dictionary FenceEvent {
   required DOMString eventType;
   required DOMString eventData;
   required sequence<FenceReportingDestination> destination;
+  boolean once = false;
 };
 
 typedef (FenceEvent or DOMString) ReportEventType;
diff --git a/tests/wpt/tests/interfaces/file-system-access.idl b/tests/wpt/tests/interfaces/file-system-access.idl
index 572f9342a40..f1d86065072 100644
--- a/tests/wpt/tests/interfaces/file-system-access.idl
+++ b/tests/wpt/tests/interfaces/file-system-access.idl
@@ -35,7 +35,7 @@ enum WellKnownDirectory {
 typedef (WellKnownDirectory or FileSystemHandle) StartInDirectory;
 
 dictionary FilePickerAcceptType {
-    USVString description;
+    USVString description = "";
     record<USVString, (USVString or sequence<USVString>)> accept;
 };
 
diff --git a/tests/wpt/tests/interfaces/fs.idl b/tests/wpt/tests/interfaces/fs.idl
index e341ab387d9..46a59dd1acd 100644
--- a/tests/wpt/tests/interfaces/fs.idl
+++ b/tests/wpt/tests/interfaces/fs.idl
@@ -80,9 +80,9 @@ dictionary FileSystemReadWriteOptions {
 
 [Exposed=DedicatedWorker, SecureContext]
 interface FileSystemSyncAccessHandle {
-  unsigned long long read([AllowShared] BufferSource buffer,
+  unsigned long long read(AllowSharedBufferSource buffer,
                           optional FileSystemReadWriteOptions options = {});
-  unsigned long long write([AllowShared] BufferSource buffer,
+  unsigned long long write(AllowSharedBufferSource buffer,
                            optional FileSystemReadWriteOptions options = {});
 
   undefined truncate([EnforceRange] unsigned long long newSize);
diff --git a/tests/wpt/tests/interfaces/gpc-spec.idl b/tests/wpt/tests/interfaces/gpc-spec.idl
deleted file mode 100644
index 0e9a063c54c..00000000000
--- a/tests/wpt/tests/interfaces/gpc-spec.idl
+++ /dev/null
@@ -1,10 +0,0 @@
-// GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into webref
-// (https://github.com/w3c/webref)
-// Source: Global Privacy Control (GPC) (https://privacycg.github.io/gpc-spec/)
-
-interface mixin GlobalPrivacyControl {
-  readonly attribute boolean globalPrivacyControl;
-};
-Navigator includes GlobalPrivacyControl;
-WorkerNavigator includes GlobalPrivacyControl;
diff --git a/tests/wpt/tests/interfaces/html.idl b/tests/wpt/tests/interfaces/html.idl
index 99b33705b39..eec3f781c74 100644
--- a/tests/wpt/tests/interfaces/html.idl
+++ b/tests/wpt/tests/interfaces/html.idl
@@ -131,7 +131,7 @@ interface HTMLElement : Element {
   // The popover API
   undefined showPopover();
   undefined hidePopover();
-  undefined togglePopover(optional boolean force);
+  boolean togglePopover(optional boolean force);
   [CEReactions] attribute DOMString? popover;
 };
 
@@ -1594,6 +1594,7 @@ OffscreenCanvasRenderingContext2D includes CanvasPath;
 interface CustomElementRegistry {
   [CEReactions] undefined define(DOMString name, CustomElementConstructor constructor, optional ElementDefinitionOptions options = {});
   (CustomElementConstructor or undefined) get(DOMString name);
+  DOMString? getName(CustomElementConstructor constructor);
   Promise<CustomElementConstructor> whenDefined(DOMString name);
   [CEReactions] undefined upgrade(Node root);
 };
@@ -1661,6 +1662,18 @@ partial interface Navigator {
   [SameObject] readonly attribute UserActivation userActivation;
 };
 
+[Exposed=Window]
+interface ToggleEvent : Event {
+  constructor(DOMString type, optional ToggleEventInit eventInitDict = {});
+  readonly attribute DOMString oldState;
+  readonly attribute DOMString newState;
+};
+
+dictionary ToggleEventInit : EventInit {
+  DOMString oldState = "";
+  DOMString newState = "";
+};
+
 dictionary FocusOptions {
   boolean preventScroll = false;
   boolean focusVisible;
@@ -1728,18 +1741,6 @@ interface mixin PopoverInvokerElement {
   [CEReactions] attribute DOMString popoverTargetAction;
 };
 
-[Exposed=Window]
-interface ToggleEvent : Event {
-  constructor(DOMString type, optional ToggleEventInit eventInitDict = {});
-  readonly attribute DOMString oldState;
-  readonly attribute DOMString newState;
-};
-
-dictionary ToggleEventInit : EventInit {
-  DOMString oldState = "";
-  DOMString newState = "";
-};
-
 [Global=Window,
  Exposed=Window,
  LegacyUnenumerableNamedProperties]
@@ -1751,6 +1752,7 @@ interface Window : EventTarget {
   attribute DOMString name;
   [PutForwards=href, LegacyUnforgeable] readonly attribute Location location;
   readonly attribute History history;
+  readonly attribute Navigation navigation;
   readonly attribute CustomElementRegistry customElements;
   [Replaceable] readonly attribute BarProp locationbar;
   [Replaceable] readonly attribute BarProp menubar;
@@ -1841,15 +1843,169 @@ interface History {
   undefined replaceState(any data, DOMString unused, optional USVString? url = null);
 };
 
+[Exposed=Window]
+interface Navigation : EventTarget {
+  sequence<NavigationHistoryEntry> entries();
+  readonly attribute NavigationHistoryEntry? currentEntry;
+  undefined updateCurrentEntry(NavigationUpdateCurrentEntryOptions options);
+  readonly attribute NavigationTransition? transition;
+
+  readonly attribute boolean canGoBack;
+  readonly attribute boolean canGoForward;
+
+  NavigationResult navigate(USVString url, optional NavigationNavigateOptions options = {});
+  NavigationResult reload(optional NavigationReloadOptions options = {});
+
+  NavigationResult traverseTo(DOMString key, optional NavigationOptions options = {});
+  NavigationResult back(optional NavigationOptions options = {});
+  NavigationResult forward(optional NavigationOptions options = {});
+
+  attribute EventHandler onnavigate;
+  attribute EventHandler onnavigatesuccess;
+  attribute EventHandler onnavigateerror;
+  attribute EventHandler oncurrententrychange;
+};
+
+dictionary NavigationUpdateCurrentEntryOptions {
+  required any state;
+};
+
+dictionary NavigationOptions {
+  any info;
+};
+
+dictionary NavigationNavigateOptions : NavigationOptions {
+  any state;
+  NavigationHistoryBehavior history = "auto";
+};
+
+dictionary NavigationReloadOptions : NavigationOptions {
+  any state;
+};
+
+dictionary NavigationResult {
+  Promise<NavigationHistoryEntry> committed;
+  Promise<NavigationHistoryEntry> finished;
+};
+
+enum NavigationHistoryBehavior {
+  "auto",
+  "push",
+  "replace"
+};
+
+enum NavigationType {
+ "push",
+ "replace",
+ "reload",
+ "traverse"
+};
+
+[Exposed=Window]
+interface NavigationHistoryEntry : EventTarget {
+  readonly attribute USVString? url;
+  readonly attribute DOMString key;
+  readonly attribute DOMString id;
+  readonly attribute long long index;
+  readonly attribute boolean sameDocument;
+
+  any getState();
+
+  attribute EventHandler ondispose;
+};
+
+[Exposed=Window]
+interface NavigationTransition {
+  readonly attribute NavigationType navigationType;
+  readonly attribute NavigationHistoryEntry from;
+  readonly attribute Promise<undefined> finished;
+};
+
+[Exposed=Window]
+interface NavigateEvent : Event {
+  constructor(DOMString type, NavigateEventInit eventInitDict);
+
+  readonly attribute NavigationType navigationType;
+  readonly attribute NavigationDestination destination;
+  readonly attribute boolean canIntercept;
+  readonly attribute boolean userInitiated;
+  readonly attribute boolean hashChange;
+  readonly attribute AbortSignal signal;
+  readonly attribute FormData? formData;
+  readonly attribute DOMString? downloadRequest;
+  readonly attribute any info;
+  readonly attribute boolean hasUAVisualTransition;
+
+  undefined intercept(optional NavigationInterceptOptions options = {});
+  undefined scroll();
+};
+
+dictionary NavigateEventInit : EventInit {
+  NavigationType navigationType = "push";
+  required NavigationDestination destination;
+  boolean canIntercept = false;
+  boolean userInitiated = false;
+  boolean hashChange = false;
+  required AbortSignal signal;
+  FormData? formData = null;
+  DOMString? downloadRequest = null;
+  any info;
+  boolean hasUAVisualTransition = false;
+};
+
+dictionary NavigationInterceptOptions {
+  NavigationInterceptHandler handler;
+  NavigationFocusReset focusReset;
+  NavigationScrollBehavior scroll;
+};
+
+enum NavigationFocusReset {
+  "after-transition",
+  "manual"
+};
+
+enum NavigationScrollBehavior {
+  "after-transition",
+  "manual"
+};
+
+callback NavigationInterceptHandler = Promise<undefined> ();
+
+[Exposed=Window]
+interface NavigationDestination {
+  readonly attribute USVString url;
+  readonly attribute DOMString key;
+  readonly attribute DOMString id;
+  readonly attribute long long index;
+  readonly attribute boolean sameDocument;
+
+  any getState();
+};
+
+[Exposed=Window]
+interface NavigationCurrentEntryChangeEvent : Event {
+  constructor(DOMString type, NavigationCurrentEntryChangeEventInit eventInitDict);
+
+  readonly attribute NavigationType? navigationType;
+  readonly attribute NavigationHistoryEntry from;
+};
+
+dictionary NavigationCurrentEntryChangeEventInit : EventInit {
+  NavigationType? navigationType = null;
+  required NavigationHistoryEntry from;
+};
+
 [Exposed=Window]
 interface PopStateEvent : Event {
   constructor(DOMString type, optional PopStateEventInit eventInitDict = {});
 
   readonly attribute any state;
+  readonly attribute boolean hasUAVisualTransition;
 };
 
 dictionary PopStateEventInit : EventInit {
   any state = null;
+  boolean hasUAVisualTransition = false;
 };
 
 [Exposed=Window]
diff --git a/tests/wpt/tests/interfaces/mediacapture-streams.idl b/tests/wpt/tests/interfaces/mediacapture-streams.idl
index 3197ff73689..373f0c328d9 100644
--- a/tests/wpt/tests/interfaces/mediacapture-streams.idl
+++ b/tests/wpt/tests/interfaces/mediacapture-streams.idl
@@ -239,10 +239,6 @@ typedef (DOMString or
 sequence<DOMString> or
 ConstrainDOMStringParameters) ConstrainDOMString;
 
-dictionary DevicePermissionDescriptor : PermissionDescriptor {
-  DOMString deviceId;
-};
-
-dictionary CameraDevicePermissionDescriptor : DevicePermissionDescriptor {
+dictionary CameraDevicePermissionDescriptor : PermissionDescriptor {
   boolean panTiltZoom = false;
 };
diff --git a/tests/wpt/tests/interfaces/navigation-timing.idl b/tests/wpt/tests/interfaces/navigation-timing.idl
index 5a33964f07e..355950160e3 100644
--- a/tests/wpt/tests/interfaces/navigation-timing.idl
+++ b/tests/wpt/tests/interfaces/navigation-timing.idl
@@ -15,6 +15,7 @@ interface PerformanceNavigationTiming : PerformanceResourceTiming {
     readonly        attribute DOMHighResTimeStamp  loadEventEnd;
     readonly        attribute NavigationTimingType type;
     readonly        attribute unsigned short       redirectCount;
+    readonly        attribute DOMHighResTimeStamp  criticalCHRestart;
     [Default] object toJSON();
 };
 
diff --git a/tests/wpt/tests/interfaces/private-network-access.idl b/tests/wpt/tests/interfaces/private-network-access.idl
new file mode 100644
index 00000000000..19423bad383
--- /dev/null
+++ b/tests/wpt/tests/interfaces/private-network-access.idl
@@ -0,0 +1,15 @@
+// GENERATED CONTENT - DO NOT EDIT
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
+// Source: Private Network Access (https://wicg.github.io/private-network-access/)
+
+dictionary PrivateNetworkAccessPermissionDescriptor
+    : PermissionDescriptor {
+  DOMString id;
+};
+
+partial dictionary RequestInit {
+  RequestTargetAddressSpace targetAddressSpace;
+};
+
+enum RequestTargetAddressSpace { "private", "local" };
diff --git a/tests/wpt/tests/interfaces/real-world-meshing.idl b/tests/wpt/tests/interfaces/real-world-meshing.idl
index 38fe71f6c66..e3c2970fa59 100644
--- a/tests/wpt/tests/interfaces/real-world-meshing.idl
+++ b/tests/wpt/tests/interfaces/real-world-meshing.idl
@@ -17,5 +17,5 @@
 };
 
 partial interface XRFrame {
-  readonly attribute XRMeshSet detectedMeshs;
+  readonly attribute XRMeshSet detectedMeshes;
 };
diff --git a/tests/wpt/tests/interfaces/screen-capture.idl b/tests/wpt/tests/interfaces/screen-capture.idl
index 830b96d16fa..45fd0dd72c5 100644
--- a/tests/wpt/tests/interfaces/screen-capture.idl
+++ b/tests/wpt/tests/interfaces/screen-capture.idl
@@ -8,6 +8,7 @@ partial interface MediaDevices {
 };
 
 enum CaptureStartFocusBehavior {
+  "focus-capturing-application",
   "focus-captured-surface",
   "no-focus-change"
 };
@@ -33,6 +34,11 @@ enum SurfaceSwitchingPreferenceEnum {
   "exclude"
 };
 
+enum MonitorTypeSurfacesEnum {
+  "include",
+  "exclude"
+};
+
 dictionary DisplayMediaStreamOptions {
   (boolean or MediaTrackConstraints) video = true;
   (boolean or MediaTrackConstraints) audio = false;
@@ -40,6 +46,7 @@ dictionary DisplayMediaStreamOptions {
   SelfCapturePreferenceEnum selfBrowserSurface;
   SystemAudioPreferenceEnum systemAudio;
   SurfaceSwitchingPreferenceEnum surfaceSwitching;
+  MonitorTypeSurfacesEnum monitorTypeSurfaces;
 };
 
 partial dictionary MediaTrackSupportedConstraints {
diff --git a/tests/wpt/tests/interfaces/scroll-animations.idl b/tests/wpt/tests/interfaces/scroll-animations.idl
index 31b3746e9d4..d18b8f110d2 100644
--- a/tests/wpt/tests/interfaces/scroll-animations.idl
+++ b/tests/wpt/tests/interfaces/scroll-animations.idl
@@ -6,8 +6,8 @@
 enum ScrollAxis {
   "block",
   "inline",
-  "horizontal",
-  "vertical"
+  "x",
+  "y"
 };
 
 dictionary ScrollTimelineOptions {
@@ -35,12 +35,3 @@ interface ViewTimeline : ScrollTimeline {
   readonly attribute CSSNumericValue startOffset;
   readonly attribute CSSNumericValue endOffset;
 };
-
-dictionary AnimationTimeOptions {
-  DOMString? range;
-};
-
-[Exposed=Window]
-partial interface AnimationTimeline {
-  CSSNumericValue? getCurrentTime(optional AnimationTimeOptions options = {});
-};
diff --git a/tests/wpt/tests/interfaces/secure-payment-confirmation.idl b/tests/wpt/tests/interfaces/secure-payment-confirmation.idl
index 08ec8065c53..bec599d7a23 100644
--- a/tests/wpt/tests/interfaces/secure-payment-confirmation.idl
+++ b/tests/wpt/tests/interfaces/secure-payment-confirmation.idl
@@ -16,6 +16,10 @@ dictionary SecurePaymentConfirmationRequest {
     boolean showOptOut;
 };
 
+partial interface PaymentRequest {
+    static Promise<boolean> isSecurePaymentConfirmationAvailable();
+};
+
 partial dictionary AuthenticationExtensionsClientInputs {
   AuthenticationExtensionsPaymentInputs payment;
 };
diff --git a/tests/wpt/tests/interfaces/serial.idl b/tests/wpt/tests/interfaces/serial.idl
index ee46a8562bb..e624c3c1a60 100644
--- a/tests/wpt/tests/interfaces/serial.idl
+++ b/tests/wpt/tests/interfaces/serial.idl
@@ -23,11 +23,13 @@ interface Serial : EventTarget {
 
 dictionary SerialPortRequestOptions {
   sequence<SerialPortFilter> filters;
+  sequence<BluetoothServiceUUID> allowedBluetoothServiceClassIds;
 };
 
 dictionary SerialPortFilter {
   unsigned short usbVendorId;
   unsigned short usbProductId;
+  BluetoothServiceUUID bluetoothServiceClassId;
 };
 
 [Exposed=(DedicatedWorker,Window), SecureContext]
@@ -49,6 +51,7 @@ interface SerialPort : EventTarget {
 dictionary SerialPortInfo {
   unsigned short usbVendorId;
   unsigned short usbProductId;
+  BluetoothServiceUUID bluetoothServiceClassId;
 };
 
 dictionary SerialOptions {
diff --git a/tests/wpt/tests/interfaces/shared-storage.idl b/tests/wpt/tests/interfaces/shared-storage.idl
index eb5806f9a6d..d223736f29f 100644
--- a/tests/wpt/tests/interfaces/shared-storage.idl
+++ b/tests/wpt/tests/interfaces/shared-storage.idl
@@ -11,6 +11,8 @@ interface SharedStorageWorklet : Worklet {
 interface SharedStorageWorkletGlobalScope : WorkletGlobalScope {
   undefined register(DOMString name,
                      SharedStorageOperationConstructor operationCtor);
+
+  readonly attribute WorkletSharedStorage sharedStorage;
 };
 
 callback SharedStorageOperationConstructor =
@@ -70,6 +72,10 @@ dictionary SharedStorageUrlWithMetadata {
   object reportingMetadata;
 };
 
+partial interface Window {
+  [SecureContext] readonly attribute WindowSharedStorage? sharedStorage;
+};
+
 [Exposed=(SharedStorageWorklet)]
 interface WorkletSharedStorage : SharedStorage {
   Promise<DOMString> get(DOMString key);
diff --git a/tests/wpt/tests/interfaces/streams.idl b/tests/wpt/tests/interfaces/streams.idl
index fd5420f16a0..838bf39c6d6 100644
--- a/tests/wpt/tests/interfaces/streams.idl
+++ b/tests/wpt/tests/interfaces/streams.idl
@@ -7,6 +7,8 @@
 interface ReadableStream {
   constructor(optional object underlyingSource, optional QueuingStrategy strategy = {});
 
+  static ReadableStream from(any asyncIterable);
+
   readonly attribute boolean locked;
 
   Promise<undefined> cancel(optional any reason);
diff --git a/tests/wpt/tests/interfaces/sub-apps.tentative.idl b/tests/wpt/tests/interfaces/sub-apps.tentative.idl
deleted file mode 100644
index 39dcd97a500..00000000000
--- a/tests/wpt/tests/interfaces/sub-apps.tentative.idl
+++ /dev/null
@@ -1,17 +0,0 @@
-[
-  Exposed=Window,
-  SecureContext,
-  ImplementedAs=SubApps
-] partial interface Navigator {
-  [SameObject, RuntimeEnabled=DesktopPWAsSubApps] readonly attribute SubApps subApps;
-};
-
-[
-  Exposed=Window,
-  SecureContext,
-  RuntimeEnabled=DesktopPWAsSubApps
-] interface SubApps {
-  [CallWith=ScriptState, RaisesException] Promise<undefined> add(DOMString install_url);
-  [CallWith=ScriptState, RaisesException] Promise<FrozenArray<DOMString>> list();
-  [CallWith=ScriptState, RaisesException] Promise<undefined> remove(DOMString app_id);
-};
diff --git a/tests/wpt/tests/interfaces/trust-token-api.idl b/tests/wpt/tests/interfaces/trust-token-api.idl
index f521acea1f5..fb7f15b4b74 100644
--- a/tests/wpt/tests/interfaces/trust-token-api.idl
+++ b/tests/wpt/tests/interfaces/trust-token-api.idl
@@ -20,6 +20,14 @@ partial dictionary RequestInit {
   PrivateToken privateToken;
 };
 
+partial interface HTMLIFrameElement {
+  [SecureContext] attribute DOMString privateToken;
+};
+
+partial interface XMLHttpRequest {
+  undefined setPrivateToken(PrivateToken privateToken);
+};
+
 partial interface Document {
   Promise<boolean> hasPrivateTokens(USVString issuer);
   Promise<boolean> hasRedemptionRecord(USVString issuer);
diff --git a/tests/wpt/tests/interfaces/turtledove.idl b/tests/wpt/tests/interfaces/turtledove.idl
index f5867e995a8..393792ffeac 100644
--- a/tests/wpt/tests/interfaces/turtledove.idl
+++ b/tests/wpt/tests/interfaces/turtledove.idl
@@ -5,22 +5,23 @@
 
 [SecureContext]
 partial interface Navigator {
-  Promise<undefined> joinAdInterestGroup(AuctionAdInterestGroup group, double durationSeconds);
+  Promise<undefined> joinAdInterestGroup(AuctionAdInterestGroup group);
 };
 
 dictionary AuctionAd {
   required USVString renderURL;
   any metadata;
+  USVString buyerReportingId;
+  USVString buyerAndSellerReportingId;
 };
 
-dictionary AuctionAdInterestGroup {
+dictionary GenerateBidInterestGroup {
   required USVString owner;
   required USVString name;
+  required double lifetimeMs;
 
-  double priority = 0.0;
   boolean enableBiddingSignalsPrioritization = false;
   record<DOMString, double> priorityVector;
-  record<DOMString, double> prioritySignalsOverrides;
 
   DOMString executionMode = "compatibility";
   USVString biddingLogicURL;
@@ -33,9 +34,14 @@ dictionary AuctionAdInterestGroup {
   sequence<AuctionAd> adComponents;
 };
 
+dictionary AuctionAdInterestGroup : GenerateBidInterestGroup {
+  double priority = 0.0;
+  record<DOMString, double> prioritySignalsOverrides;
+};
+
 [SecureContext]
 partial interface Navigator {
-  Promise<undefined> leaveAdInterestGroup(AuctionAdInterestGroupKey group);
+  Promise<undefined> leaveAdInterestGroup(optional AuctionAdInterestGroupKey group = {});
 };
 
 dictionary AuctionAdInterestGroupKey {
@@ -45,7 +51,7 @@ dictionary AuctionAdInterestGroupKey {
 
 [SecureContext]
 partial interface Navigator {
-  Promise<USVString?> runAdAuction(AuctionAdConfig config);
+  Promise<(USVString or FencedFrameConfig)?> runAdAuction(AuctionAdConfig config);
 };
 
 dictionary AuctionAdConfig {
@@ -53,18 +59,21 @@ dictionary AuctionAdConfig {
   required USVString decisionLogicURL;
   USVString trustedScoringSignalsURL;
   sequence<USVString> interestGroupBuyers;
-  any auctionSignals;
-  any sellerSignals;
-  USVString directFromSellerSignals;
+  Promise<any> auctionSignals;
+  Promise<any> sellerSignals;
+  Promise<USVString> directFromSellerSignals;
   unsigned long long sellerTimeout;
   unsigned short sellerExperimentGroupId;
-  record<USVString, any> perBuyerSignals;
-  record<USVString, unsigned long long> perBuyerTimeouts;
+  USVString sellerCurrency;
+  Promise<record<USVString, any>> perBuyerSignals;
+  Promise<record<USVString, unsigned long long>> perBuyerTimeouts;
   record<USVString, unsigned short> perBuyerGroupLimits;
   record<USVString, unsigned short> perBuyerExperimentGroupIds;
   record<USVString, record<USVString, double>> perBuyerPrioritySignals;
+  Promise<record<USVString, USVString>> perBuyerCurrencies;
   sequence<AuctionAdConfig> componentAuctions = [];
   AbortSignal? signal;
+  Promise<boolean> resolveToConfig;
 };
 
 [Exposed=InterestGroupScriptRunnerGlobalScope]
@@ -76,10 +85,26 @@ interface InterestGroupScriptRunnerGlobalScope {
          InterestGroupBiddingScriptRunnerGlobalScope)]
 interface InterestGroupBiddingScriptRunnerGlobalScope
         : InterestGroupScriptRunnerGlobalScope {
-  boolean setBid();
-  boolean setBid(GenerateBidOutput generateBidOutput);
+  boolean setBid(optional GenerateBidOutput generateBidOutput = {});
   undefined setPriority(double priority);
-  undefined setPrioritySignalsOverride(DOMString key, double priority);
+  undefined setPrioritySignalsOverride(DOMString key, optional double? priority);
+};
+
+dictionary AdRender {
+  required DOMString url;
+  DOMString width;
+  DOMString height;
+};
+
+dictionary GenerateBidOutput {
+  double bid = -1;
+  DOMString bidCurrency;
+  (DOMString or AdRender) render;
+  any ad;
+  sequence<(DOMString or AdRender)> adComponents;
+  double adCost;
+  unrestricted double modelingSignals;
+  boolean allowComponentAuction = false;
 };
 
 [Exposed=InterestGroupScoringScriptRunnerGlobalScope,
@@ -98,23 +123,77 @@ interface InterestGroupReportingScriptRunnerGlobalScope
   undefined registerAdBeacon(record<DOMString, USVString> map);
 };
 
-dictionary AdRender {
-  required DOMString url;
-  required DOMString width;
-  required DOMString height;
-};
-
-dictionary GenerateBidOutput {
-  required double bid;
-  required (DOMString or AdRender) adRender;
-  any ad;
-  sequence<(DOMString or AdRender)> adComponents;
-  double adCost;
-  double modelingSignals;
-  boolean allowComponentAuction = false;
-};
-
 [SecureContext]
 partial interface Navigator {
   undefined updateAdInterestGroups();
 };
+
+dictionary PreviousWin {
+  required long long timeDelta;
+  required DOMString adJSON;
+};
+
+dictionary BiddingBrowserSignals {
+  required DOMString topWindowHostname;
+  required USVString seller;
+  required long joinCount;
+  required long bidCount;
+  required long recency;
+
+  USVString topLevelSeller;
+  sequence<PreviousWin> prevWinsMs;
+  object wasmHelper;
+  unsigned long dataVersion;
+};
+
+dictionary ScoringBrowserSignals {
+  required DOMString topWindowHostname;
+  required USVString interestGroupOwner;
+  required USVString renderURL;
+  required unsigned long biddingDurationMsec;
+  required DOMString bidCurrency;
+
+  unsigned long dataVersion;
+  sequence<USVString> adComponents;
+};
+
+dictionary ReportingBrowserSignals {
+  required DOMString topWindowHostname;
+  required USVString interestGroupOwner;
+  required USVString renderURL;
+  required double bid;
+  required double highestScoringOtherBid;
+
+  DOMString bidCurrency;
+  DOMString highestScoringOtherBidCurrency;
+  USVString topLevelSeller;
+  USVString componentSeller;
+
+  USVString buyerAndSellerReportingId;
+};
+
+dictionary ReportResultBrowserSignals : ReportingBrowserSignals {
+  required double desirability;
+
+  DOMString topLevelSellerSignals;
+  double modifiedBid;
+  unsigned long dataVersion;
+};
+
+dictionary ReportWinBrowserSignals : ReportingBrowserSignals {
+  double adCost;
+  USVString seller;
+  boolean madeHighestScoringOtherBid;
+  DOMString interestGroupName;
+  DOMString buyerReportingId;
+  unsigned short modelingSignals;
+  unsigned long dataVersion;
+};
+
+dictionary ScoreAdOutput {
+  required double desirability;
+  double bid;
+  DOMString bidCurrency;
+  double incomingBidInSellerCurrency;
+  boolean allowComponentAuction = false;
+};
diff --git a/tests/wpt/tests/interfaces/web-animations.idl b/tests/wpt/tests/interfaces/web-animations.idl
index 956d700f49b..1bc82fab119 100644
--- a/tests/wpt/tests/interfaces/web-animations.idl
+++ b/tests/wpt/tests/interfaces/web-animations.idl
@@ -18,29 +18,29 @@ interface DocumentTimeline : AnimationTimeline {
 
 [Exposed=Window]
 interface Animation : EventTarget {
-    constructor(optional AnimationEffect? effect = null,
-                optional AnimationTimeline? timeline);
-             attribute DOMString                id;
-             attribute AnimationEffect?         effect;
-             attribute AnimationTimeline?       timeline;
-             attribute double                   playbackRate;
-    readonly attribute AnimationPlayState       playState;
-    readonly attribute AnimationReplaceState    replaceState;
-    readonly attribute boolean                  pending;
-    readonly attribute Promise<Animation>       ready;
-    readonly attribute Promise<Animation>       finished;
-             attribute EventHandler             onfinish;
-             attribute EventHandler             oncancel;
-             attribute EventHandler             onremove;
-    undefined cancel();
-    undefined finish();
-    undefined play();
-    undefined pause();
-    undefined updatePlaybackRate(double playbackRate);
-    undefined reverse();
-    undefined persist();
-    [CEReactions]
-    undefined commitStyles();
+  constructor(optional AnimationEffect? effect = null,
+              optional AnimationTimeline? timeline);
+           attribute DOMString                id;
+           attribute AnimationEffect?         effect;
+           attribute AnimationTimeline?       timeline;
+           attribute double                   playbackRate;
+  readonly attribute AnimationPlayState       playState;
+  readonly attribute AnimationReplaceState    replaceState;
+  readonly attribute boolean                  pending;
+  readonly attribute Promise<Animation>       ready;
+  readonly attribute Promise<Animation>       finished;
+           attribute EventHandler             onfinish;
+           attribute EventHandler             oncancel;
+           attribute EventHandler             onremove;
+  undefined cancel();
+  undefined finish();
+  undefined play();
+  undefined pause();
+  undefined updatePlaybackRate(double playbackRate);
+  undefined reverse();
+  undefined persist();
+  [CEReactions]
+  undefined commitStyles();
 };
 
 enum AnimationPlayState { "idle", "running", "paused", "finished" };
@@ -55,22 +55,22 @@ interface AnimationEffect {
 };
 
 dictionary EffectTiming {
-    FillMode                           fill = "auto";
-    double                             iterationStart = 0.0;
-    unrestricted double                iterations = 1.0;
-    PlaybackDirection                  direction = "normal";
-    DOMString                          easing = "linear";
+  FillMode                           fill = "auto";
+  double                             iterationStart = 0.0;
+  unrestricted double                iterations = 1.0;
+  PlaybackDirection                  direction = "normal";
+  DOMString                          easing = "linear";
 };
 
 dictionary OptionalEffectTiming {
-    double                             delay;
-    double                             endDelay;
-    FillMode                           fill;
-    double                             iterationStart;
-    unrestricted double                iterations;
-    (unrestricted double or DOMString) duration;
-    PlaybackDirection                  direction;
-    DOMString                          easing;
+  double                             delay;
+  double                             endDelay;
+  FillMode                           fill;
+  double                             iterationStart;
+  unrestricted double                iterations;
+  (unrestricted double or DOMString) duration;
+  PlaybackDirection                  direction;
+  DOMString                          easing;
 };
 
 enum FillMode { "none", "forwards", "backwards", "both", "auto" };
@@ -78,21 +78,21 @@ enum FillMode { "none", "forwards", "backwards", "both", "auto" };
 enum PlaybackDirection { "normal", "reverse", "alternate", "alternate-reverse" };
 
 dictionary ComputedEffectTiming : EffectTiming {
-    double?              progress;
-    unrestricted double? currentIteration;
+  double?              progress;
+  unrestricted double? currentIteration;
 };
 
 [Exposed=Window]
 interface KeyframeEffect : AnimationEffect {
-    constructor(Element? target,
-                object? keyframes,
-                optional (unrestricted double or KeyframeEffectOptions) options = {});
-    constructor(KeyframeEffect source);
-    attribute Element?           target;
-    attribute CSSOMString?       pseudoElement;
-    attribute CompositeOperation composite;
-    sequence<object> getKeyframes();
-    undefined        setKeyframes(object? keyframes);
+  constructor(Element?       target,
+              object?        keyframes,
+              optional (unrestricted double or KeyframeEffectOptions) options = {});
+  constructor(KeyframeEffect source);
+  attribute Element?           target;
+  attribute CSSOMString?       pseudoElement;
+  attribute CompositeOperation composite;
+  sequence<object> getKeyframes();
+  undefined        setKeyframes(object? keyframes);
 };
 
 dictionary BaseComputedKeyframe {
@@ -103,15 +103,15 @@ dictionary BaseComputedKeyframe {
 };
 
 dictionary BasePropertyIndexedKeyframe {
-    (double? or sequence<double?>)                         offset = [];
-    (DOMString or sequence<DOMString>)                     easing = [];
-    (CompositeOperationOrAuto or sequence<CompositeOperationOrAuto>) composite = [];
+  (double? or sequence<double?>)                         offset = [];
+  (DOMString or sequence<DOMString>)                     easing = [];
+  (CompositeOperationOrAuto or sequence<CompositeOperationOrAuto>) composite = [];
 };
 
 dictionary BaseKeyframe {
-    double?                  offset = null;
-    DOMString                easing = "linear";
-    CompositeOperationOrAuto composite = "auto";
+  double?                  offset = null;
+  DOMString                easing = "linear";
+  CompositeOperationOrAuto composite = "auto";
 };
 
 dictionary KeyframeEffectOptions : EffectTiming {
diff --git a/tests/wpt/tests/interfaces/webauthn.idl b/tests/wpt/tests/interfaces/webauthn.idl
index 9a37207ba2c..888040f53d7 100644
--- a/tests/wpt/tests/interfaces/webauthn.idl
+++ b/tests/wpt/tests/interfaces/webauthn.idl
@@ -27,8 +27,19 @@ dictionary RegistrationResponseJSON {
 
 dictionary AuthenticatorAttestationResponseJSON {
     required Base64URLString clientDataJSON;
-    required Base64URLString attestationObject;
+    required Base64URLString authenticatorData;
     required sequence<DOMString> transports;
+    // The publicKey field will be missing if pubKeyCredParams was used to
+    // negotiate a public-key algorithm that the user agent doesn’t
+    // understand. (See section “Easily accessing credential data” for a
+    // list of which algorithms user agents must support.) If using such an
+    // algorithm then the public key must be parsed directly from
+    // attestationObject or authenticatorData.
+    Base64URLString publicKey;
+    required long long publicKeyAlgorithm;
+    // This value contains copies of some of the fields above. See
+    // section “Easily accessing credential data”.
+    required Base64URLString attestationObject;
 };
 
 dictionary AuthenticationResponseJSON {
@@ -45,6 +56,7 @@ dictionary AuthenticatorAssertionResponseJSON {
     required Base64URLString authenticatorData;
     required Base64URLString signature;
     Base64URLString userHandle;
+    Base64URLString attestationObject;
 };
 
 dictionary AuthenticationExtensionsClientOutputsJSON {
@@ -62,6 +74,10 @@ partial interface PublicKeyCredential {
     static Promise<boolean> isUserVerifyingPlatformAuthenticatorAvailable();
 };
 
+partial interface PublicKeyCredential {
+    static Promise<boolean> isPasskeyPlatformAuthenticatorAvailable();
+};
+
 partial interface PublicKeyCredential {
     static PublicKeyCredentialCreationOptions parseCreationOptionsFromJSON(PublicKeyCredentialCreationOptionsJSON options);
 };
@@ -74,7 +90,9 @@ dictionary PublicKeyCredentialCreationOptionsJSON {
     unsigned long                                           timeout;
     sequence<PublicKeyCredentialDescriptorJSON>             excludeCredentials = [];
     AuthenticatorSelectionCriteria                          authenticatorSelection;
+    sequence<DOMString>                                     hints = [];
     DOMString                                               attestation = "none";
+    sequence<DOMString>                                     attestationFormats = [];
     AuthenticationExtensionsClientInputsJSON                extensions;
 };
 
@@ -103,6 +121,9 @@ dictionary PublicKeyCredentialRequestOptionsJSON {
     DOMString                                               rpId;
     sequence<PublicKeyCredentialDescriptorJSON>             allowCredentials = [];
     DOMString                                               userVerification = "preferred";
+    sequence<DOMString>                                     hints = [];
+    DOMString                                               attestation = "none";
+    sequence<DOMString>                                     attestationFormats = [];
     AuthenticationExtensionsClientInputsJSON                extensions;
 };
 
@@ -143,6 +164,7 @@ dictionary PublicKeyCredentialCreationOptions {
     unsigned long                                timeout;
     sequence<PublicKeyCredentialDescriptor>      excludeCredentials = [];
     AuthenticatorSelectionCriteria               authenticatorSelection;
+    sequence<DOMString>                          hints = [];
     DOMString                                    attestation = "none";
     sequence<DOMString>                          attestationFormats = [];
     AuthenticationExtensionsClientInputs         extensions;
@@ -192,6 +214,7 @@ dictionary PublicKeyCredentialRequestOptions {
     USVString                            rpId;
     sequence<PublicKeyCredentialDescriptor> allowCredentials = [];
     DOMString                            userVerification = "preferred";
+    sequence<DOMString>                  hints = [];
     DOMString                            attestation = "none";
     sequence<DOMString>                  attestationFormats = [];
     AuthenticationExtensionsClientInputs extensions;
@@ -245,6 +268,12 @@ enum UserVerificationRequirement {
     "discouraged"
 };
 
+enum PublicKeyCredentialHints {
+    "security-key",
+    "client-device",
+    "hybrid",
+};
+
 partial dictionary AuthenticationExtensionsClientInputs {
   USVString appid;
 };
diff --git a/tests/wpt/tests/interfaces/webcodecs-hevc-codec-registration.idl b/tests/wpt/tests/interfaces/webcodecs-hevc-codec-registration.idl
index b767db89e6f..92043748c49 100644
--- a/tests/wpt/tests/interfaces/webcodecs-hevc-codec-registration.idl
+++ b/tests/wpt/tests/interfaces/webcodecs-hevc-codec-registration.idl
@@ -15,3 +15,11 @@ enum HevcBitstreamFormat {
   "annexb",
   "hevc",
 };
+
+partial dictionary VideoEncoderEncodeOptions {
+  VideoEncoderEncodeOptionsForHevc hevc;
+};
+
+dictionary VideoEncoderEncodeOptionsForHevc {
+  unsigned short? quantizer;
+};
diff --git a/tests/wpt/tests/interfaces/webcodecs.idl b/tests/wpt/tests/interfaces/webcodecs.idl
index 0b95dc8b757..08bf0e26e03 100644
--- a/tests/wpt/tests/interfaces/webcodecs.idl
+++ b/tests/wpt/tests/interfaces/webcodecs.idl
@@ -146,7 +146,7 @@ dictionary AudioDecoderConfig {
 
 dictionary VideoDecoderConfig {
   required DOMString codec;
-  [AllowShared] BufferSource description;
+  AllowSharedBufferSource description;
   [EnforceRange] unsigned long codedWidth;
   [EnforceRange] unsigned long codedHeight;
   [EnforceRange] unsigned long displayAspectWidth;
@@ -161,7 +161,7 @@ dictionary AudioEncoderConfig {
   [EnforceRange] unsigned long sampleRate;
   [EnforceRange] unsigned long numberOfChannels;
   [EnforceRange] unsigned long long bitrate;
-  BitrateMode bitrateMode;
+  BitrateMode bitrateMode = "variable";
 };
 
 dictionary VideoEncoderConfig {
@@ -221,7 +221,7 @@ interface EncodedAudioChunk {
   readonly attribute unsigned long long? duration; // microseconds
   readonly attribute unsigned long byteLength;
 
-  undefined copyTo([AllowShared] BufferSource destination);
+  undefined copyTo(AllowSharedBufferSource destination);
 };
 
 dictionary EncodedAudioChunkInit {
@@ -244,14 +244,14 @@ interface EncodedVideoChunk {
   readonly attribute unsigned long long? duration;    // microseconds
   readonly attribute unsigned long byteLength;
 
-  undefined copyTo([AllowShared] BufferSource destination);
+  undefined copyTo(AllowSharedBufferSource destination);
 };
 
 dictionary EncodedVideoChunkInit {
   required EncodedVideoChunkType type;
   [EnforceRange] required long long timestamp;        // microseconds
   [EnforceRange] unsigned long long duration;         // microseconds
-  required [AllowShared] BufferSource data;
+  required AllowSharedBufferSource data;
 };
 
 enum EncodedVideoChunkType {
@@ -271,7 +271,7 @@ interface AudioData {
   readonly attribute long long timestamp;          // microseconds
 
   unsigned long allocationSize(AudioDataCopyToOptions options);
-  undefined copyTo([AllowShared] BufferSource destination, AudioDataCopyToOptions options);
+  undefined copyTo(AllowSharedBufferSource destination, AudioDataCopyToOptions options);
   AudioData clone();
   undefined close();
 };
@@ -283,6 +283,7 @@ dictionary AudioDataInit {
   [EnforceRange] required unsigned long numberOfChannels;
   [EnforceRange] required long long timestamp;  // microseconds
   required BufferSource data;
+  sequence<ArrayBuffer> transfer = [];
 };
 
 dictionary AudioDataCopyToOptions {
@@ -306,7 +307,7 @@ enum AudioSampleFormat {
 [Exposed=(Window,DedicatedWorker), Serializable, Transferable]
 interface VideoFrame {
   constructor(CanvasImageSource image, optional VideoFrameInit init = {});
-  constructor([AllowShared] BufferSource data, VideoFrameBufferInit init);
+  constructor(AllowSharedBufferSource data, VideoFrameBufferInit init);
 
   readonly attribute VideoPixelFormat? format;
   readonly attribute unsigned long codedWidth;
@@ -324,7 +325,7 @@ interface VideoFrame {
   unsigned long allocationSize(
       optional VideoFrameCopyToOptions options = {});
   Promise<sequence<PlaneLayout>> copyTo(
-      [AllowShared] BufferSource destination,
+      AllowSharedBufferSource destination,
       optional VideoFrameCopyToOptions options = {});
   VideoFrame clone();
   undefined close();
@@ -365,6 +366,8 @@ dictionary VideoFrameBufferInit {
   [EnforceRange] unsigned long displayHeight;
 
   VideoColorSpaceInit colorSpace;
+
+  sequence<ArrayBuffer> transfer = [];
 };
 
 dictionary VideoFrameMetadata {
@@ -470,6 +473,7 @@ dictionary ImageDecoderInit {
   [EnforceRange] unsigned long desiredWidth;
   [EnforceRange] unsigned long desiredHeight;
   boolean preferAnimation;
+  sequence<ArrayBuffer> transfer = [];
 };
 
 dictionary ImageDecodeOptions {
diff --git a/tests/wpt/tests/interfaces/webgl1.idl b/tests/wpt/tests/interfaces/webgl1.idl
index 3912e9a4b04..b61f031ab28 100644
--- a/tests/wpt/tests/interfaces/webgl1.idl
+++ b/tests/wpt/tests/interfaces/webgl1.idl
@@ -685,8 +685,8 @@ interface mixin WebGLRenderingContextBase
 interface mixin WebGLRenderingContextOverloads
 {
     undefined bufferData(GLenum target, GLsizeiptr size, GLenum usage);
-    undefined bufferData(GLenum target, [AllowShared] BufferSource? data, GLenum usage);
-    undefined bufferSubData(GLenum target, GLintptr offset, [AllowShared] BufferSource data);
+    undefined bufferData(GLenum target, AllowSharedBufferSource? data, GLenum usage);
+    undefined bufferSubData(GLenum target, GLintptr offset, AllowSharedBufferSource data);
 
     undefined compressedTexImage2D(GLenum target, GLint level, GLenum internalformat,
                                    GLsizei width, GLsizei height, GLint border,
diff --git a/tests/wpt/tests/interfaces/webgl2.idl b/tests/wpt/tests/interfaces/webgl2.idl
index 22e2d6fa324..5499e5a68b1 100644
--- a/tests/wpt/tests/interfaces/webgl2.idl
+++ b/tests/wpt/tests/interfaces/webgl2.idl
@@ -483,8 +483,8 @@ interface mixin WebGL2RenderingContextOverloads
 {
   // WebGL1:
   undefined bufferData(GLenum target, GLsizeiptr size, GLenum usage);
-  undefined bufferData(GLenum target, [AllowShared] BufferSource? srcData, GLenum usage);
-  undefined bufferSubData(GLenum target, GLintptr dstByteOffset, [AllowShared] BufferSource srcData);
+  undefined bufferData(GLenum target, AllowSharedBufferSource? srcData, GLenum usage);
+  undefined bufferSubData(GLenum target, GLintptr dstByteOffset, AllowSharedBufferSource srcData);
   // WebGL2:
   undefined bufferData(GLenum target, [AllowShared] ArrayBufferView srcData, GLenum usage, GLuint srcOffset,
                        optional GLuint length = 0);
diff --git a/tests/wpt/tests/interfaces/webgpu.idl b/tests/wpt/tests/interfaces/webgpu.idl
index 25943d99c35..9ef2b0134c6 100644
--- a/tests/wpt/tests/interfaces/webgpu.idl
+++ b/tests/wpt/tests/interfaces/webgpu.idl
@@ -8,7 +8,7 @@ interface mixin GPUObjectBase {
 };
 
 dictionary GPUObjectDescriptorBase {
-    USVString label;
+    USVString label = "";
 };
 
 [Exposed=(Window, DedicatedWorker), SecureContext]
@@ -307,6 +307,7 @@ enum GPUTextureFormat {
     "bgra8unorm-srgb",
     // Packed 32-bit formats
     "rgb9e5ufloat",
+    "rgb10a2uint",
     "rgb10a2unorm",
     "rg11b10ufloat",
 
@@ -604,7 +605,7 @@ interface GPUCompilationInfo {
 
 [Exposed=(Window, DedicatedWorker), SecureContext, Serializable]
 interface GPUPipelineError : DOMException {
-    constructor((DOMString or undefined) message, GPUPipelineErrorInit options);
+    constructor(optional DOMString message = "", GPUPipelineErrorInit options);
     readonly attribute GPUPipelineErrorReason reason;
 };
 
@@ -876,8 +877,16 @@ dictionary GPUImageCopyTextureTagged
     boolean premultipliedAlpha = false;
 };
 
+typedef (ImageBitmap or
+         ImageData or
+         HTMLImageElement or
+         HTMLVideoElement or
+         VideoFrame or
+         HTMLCanvasElement or
+         OffscreenCanvas) GPUImageCopyExternalImageSource;
+
 dictionary GPUImageCopyExternalImage {
-    required (ImageBitmap or HTMLVideoElement or HTMLCanvasElement or OffscreenCanvas) source;
+    required GPUImageCopyExternalImageSource source;
     GPUOrigin2D origin = {};
     boolean flipY = false;
 };
@@ -1119,13 +1128,13 @@ interface GPUQueue {
     undefined writeBuffer(
         GPUBuffer buffer,
         GPUSize64 bufferOffset,
-        [AllowShared] BufferSource data,
+        AllowSharedBufferSource data,
         optional GPUSize64 dataOffset = 0,
         optional GPUSize64 size);
 
     undefined writeTexture(
         GPUImageCopyTexture destination,
-        [AllowShared] BufferSource data,
+        AllowSharedBufferSource data,
         GPUImageDataLayout dataLayout,
         GPUExtent3D size);
 
diff --git a/tests/wpt/tests/interfaces/webhid.idl b/tests/wpt/tests/interfaces/webhid.idl
index a1a02d3e438..03e72511d96 100644
--- a/tests/wpt/tests/interfaces/webhid.idl
+++ b/tests/wpt/tests/interfaces/webhid.idl
@@ -17,7 +17,7 @@ interface HID : EventTarget {
     attribute EventHandler onconnect;
     attribute EventHandler ondisconnect;
     Promise<sequence<HIDDevice>> getDevices();
-    Promise<sequence<HIDDevice>> requestDevice(
+    [Exposed=Window] Promise<sequence<HIDDevice>> requestDevice(
         HIDDeviceRequestOptions options);
 };
 
diff --git a/tests/wpt/tests/interfaces/webidl.idl b/tests/wpt/tests/interfaces/webidl.idl
index 7271f19dfa6..4d0dfaa1062 100644
--- a/tests/wpt/tests/interfaces/webidl.idl
+++ b/tests/wpt/tests/interfaces/webidl.idl
@@ -9,6 +9,7 @@ typedef (Int8Array or Int16Array or Int32Array or
          Float32Array or Float64Array or DataView) ArrayBufferView;
 
 typedef (ArrayBufferView or ArrayBuffer) BufferSource;
+typedef (ArrayBuffer or SharedArrayBuffer or [AllowShared] ArrayBufferView) AllowSharedBufferSource;
 [Exposed=*,
  Serializable]
 interface DOMException { // but see below note about ECMAScript binding
diff --git a/tests/wpt/tests/interfaces/webnn.idl b/tests/wpt/tests/interfaces/webnn.idl
index 17e30803b88..fa0908f0e9f 100644
--- a/tests/wpt/tests/interfaces/webnn.idl
+++ b/tests/wpt/tests/interfaces/webnn.idl
@@ -65,7 +65,8 @@ dictionary MLOperandDescriptor {
 interface MLOperand {};
 
 [SecureContext, Exposed=(Window, DedicatedWorker)]
-interface MLActivation {};
+interface MLActivation {
+};
 
 typedef record<DOMString, ArrayBufferView> MLNamedArrayBufferViews;
 
@@ -162,7 +163,7 @@ dictionary MLClampOptions {
 };
 
 partial interface MLGraphBuilder {
-  MLOperand clamp(MLOperand x, optional MLClampOptions options = {});
+  MLOperand clamp(MLOperand operand, optional MLClampOptions options = {});
   MLActivation clamp(optional MLClampOptions options = {});
 };
 
@@ -235,15 +236,15 @@ partial interface MLGraphBuilder {
 };
 
 partial interface MLGraphBuilder {
-  MLOperand abs(MLOperand x);
-  MLOperand ceil(MLOperand x);
-  MLOperand cos(MLOperand x);
-  MLOperand exp(MLOperand x);
-  MLOperand floor(MLOperand x);
-  MLOperand log(MLOperand x);
-  MLOperand neg(MLOperand x);
-  MLOperand sin(MLOperand x);
-  MLOperand tan(MLOperand x);
+  MLOperand abs(MLOperand input);
+  MLOperand ceil(MLOperand input);
+  MLOperand cos(MLOperand input);
+  MLOperand exp(MLOperand input);
+  MLOperand floor(MLOperand input);
+  MLOperand log(MLOperand input);
+  MLOperand neg(MLOperand input);
+  MLOperand sin(MLOperand input);
+  MLOperand tan(MLOperand input);
 };
 
 dictionary MLEluOptions {
@@ -251,7 +252,7 @@ dictionary MLEluOptions {
 };
 
 partial interface MLGraphBuilder {
-  MLOperand elu(MLOperand x, optional MLEluOptions options = {});
+  MLOperand elu(MLOperand input, optional MLEluOptions options = {});
   MLActivation elu(optional MLEluOptions options = {});
 };
 
@@ -315,12 +316,12 @@ dictionary MLHardSigmoidOptions {
 };
 
 partial interface MLGraphBuilder {
-  MLOperand hardSigmoid(MLOperand x, optional MLHardSigmoidOptions options = {});
+  MLOperand hardSigmoid(MLOperand input, optional MLHardSigmoidOptions options = {});
   MLActivation hardSigmoid(optional MLHardSigmoidOptions options = {});
 };
 
 partial interface MLGraphBuilder {
-  MLOperand hardSwish(MLOperand x);
+  MLOperand hardSwish(MLOperand input);
   MLActivation hardSwish();
 };
 
@@ -341,7 +342,7 @@ dictionary MLLeakyReluOptions {
 };
 
 partial interface MLGraphBuilder {
-  MLOperand leakyRelu(MLOperand x, optional MLLeakyReluOptions options = {});
+  MLOperand leakyRelu(MLOperand input, optional MLLeakyReluOptions options = {});
   MLActivation leakyRelu(optional MLLeakyReluOptions options = {});
 };
 
@@ -351,7 +352,7 @@ dictionary MLLinearOptions {
 };
 
 partial interface MLGraphBuilder {
-  MLOperand linear(MLOperand x, optional MLLinearOptions options = {});
+  MLOperand linear(MLOperand input, optional MLLinearOptions options = {});
   MLActivation linear(optional MLLinearOptions options = {});
 };
 
@@ -438,7 +439,7 @@ partial interface MLGraphBuilder {
 };
 
 partial interface MLGraphBuilder {
-  MLOperand prelu(MLOperand x, MLOperand slope);
+  MLOperand prelu(MLOperand input, MLOperand slope);
 };
 
 dictionary MLReduceOptions {
@@ -460,7 +461,7 @@ partial interface MLGraphBuilder {
 };
 
 partial interface MLGraphBuilder {
-  MLOperand relu(MLOperand x);
+  MLOperand relu(MLOperand input);
   MLActivation relu();
 };
 
@@ -485,7 +486,7 @@ partial interface MLGraphBuilder {
 };
 
 partial interface MLGraphBuilder {
-  MLOperand sigmoid(MLOperand x);
+  MLOperand sigmoid(MLOperand input);
   MLActivation sigmoid();
 };
 
@@ -494,7 +495,7 @@ partial interface MLGraphBuilder {
 };
 
 partial interface MLGraphBuilder {
-  MLOperand softmax(MLOperand x);
+  MLOperand softmax(MLOperand input);
   MLActivation softmax();
 };
 
@@ -503,12 +504,12 @@ dictionary MLSoftplusOptions {
 };
 
 partial interface MLGraphBuilder {
-  MLOperand softplus(MLOperand x, optional MLSoftplusOptions options = {});
+  MLOperand softplus(MLOperand input, optional MLSoftplusOptions options = {});
   MLActivation softplus(optional MLSoftplusOptions options = {});
 };
 
 partial interface MLGraphBuilder {
-  MLOperand softsign(MLOperand x);
+  MLOperand softsign(MLOperand input);
   MLActivation softsign();
 };
 
@@ -531,7 +532,7 @@ partial interface MLGraphBuilder {
 };
 
 partial interface MLGraphBuilder {
-  MLOperand tanh(MLOperand x);
+  MLOperand tanh(MLOperand input);
   MLActivation tanh();
 };
 
diff --git a/tests/wpt/tests/interfaces/webrtc-stats.idl b/tests/wpt/tests/interfaces/webrtc-stats.idl
index b398c73e3f4..8e65578b6ee 100644
--- a/tests/wpt/tests/interfaces/webrtc-stats.idl
+++ b/tests/wpt/tests/interfaces/webrtc-stats.idl
@@ -44,7 +44,6 @@ dictionary RTCReceivedRtpStreamStats : RTCRtpStreamStats {
 
 dictionary RTCInboundRtpStreamStats : RTCReceivedRtpStreamStats {
  required DOMString   trackIdentifier;
- required DOMString   kind;
  DOMString            mid;
  DOMString            remoteId;
  unsigned long        framesDecoded;
@@ -65,6 +64,7 @@ dictionary RTCInboundRtpStreamStats : RTCReceivedRtpStreamStats {
  DOMHighResTimeStamp  lastPacketReceivedTimestamp;
  unsigned long long   headerBytesReceived;
  unsigned long long   packetsDiscarded;
+ unsigned long long   fecBytesReceived;
  unsigned long long   fecPacketsReceived;
  unsigned long long   fecPacketsDiscarded;
  unsigned long long   bytesReceived;
@@ -94,6 +94,8 @@ dictionary RTCInboundRtpStreamStats : RTCReceivedRtpStreamStats {
  double               totalAssemblyTime;
  unsigned long long   retransmittedPacketsReceived;
  unsigned long long   retransmittedBytesReceived;
+ unsigned long        rtxSsrc;
+ unsigned long        fecSsrc;
 };
 
 dictionary RTCRemoteInboundRtpStreamStats : RTCReceivedRtpStreamStats {
@@ -117,6 +119,7 @@ dictionary RTCOutboundRtpStreamStats : RTCSentRtpStreamStats {
              unsigned long long   headerBytesSent;
              unsigned long long   retransmittedPacketsSent;
              unsigned long long   retransmittedBytesSent;
+             unsigned long        rtxSsrc;
              double               targetBitrate;
              unsigned long long   totalEncodedBytesTarget;
              unsigned long        frameWidth;
diff --git a/tests/wpt/tests/interfaces/webrtc.idl b/tests/wpt/tests/interfaces/webrtc.idl
index 4c31d3be67a..e571abb527f 100644
--- a/tests/wpt/tests/interfaces/webrtc.idl
+++ b/tests/wpt/tests/interfaces/webrtc.idl
@@ -289,7 +289,8 @@ interface RTCRtpSender {
   readonly attribute MediaStreamTrack? track;
   readonly attribute RTCDtlsTransport? transport;
   static RTCRtpCapabilities? getCapabilities(DOMString kind);
-  Promise<undefined> setParameters(RTCRtpSendParameters parameters);
+  Promise<undefined> setParameters(RTCRtpSendParameters parameters,
+      optional RTCSetParameterOptions setParameterOptions = {});
   RTCRtpSendParameters getParameters();
   Promise<undefined> replaceTrack(MediaStreamTrack? withTrack);
   undefined setStreams(MediaStream... streams);
@@ -355,6 +356,9 @@ dictionary RTCRtpHeaderExtensionCapability {
   required DOMString uri;
 };
 
+dictionary RTCSetParameterOptions {
+};
+
 [Exposed=Window]
 interface RTCRtpReceiver {
   readonly attribute MediaStreamTrack track;
diff --git a/tests/wpt/tests/interfaces/webusb.idl b/tests/wpt/tests/interfaces/webusb.idl
index fb0a71f307d..c9b2c2f55f1 100644
--- a/tests/wpt/tests/interfaces/webusb.idl
+++ b/tests/wpt/tests/interfaces/webusb.idl
@@ -14,6 +14,7 @@ dictionary USBDeviceFilter {
 
 dictionary USBDeviceRequestOptions {
   required sequence<USBDeviceFilter> filters;
+  sequence<USBDeviceFilter> exclusionFilters = [];
 };
 
 [Exposed=(Worker,Window), SecureContext]
@@ -231,6 +232,7 @@ interface USBEndpoint {
 
 dictionary USBPermissionDescriptor : PermissionDescriptor {
   sequence<USBDeviceFilter> filters;
+  sequence<USBDeviceFilter> exclusionFilters;
 };
 
 dictionary AllowedUSBDevice {
diff --git a/tests/wpt/tests/intersection-observer/scroll-and-root-margin.html b/tests/wpt/tests/intersection-observer/scroll-and-root-margin.html
new file mode 100644
index 00000000000..c79233d0875
--- /dev/null
+++ b/tests/wpt/tests/intersection-observer/scroll-and-root-margin.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<meta name="viewport" content="width=device-width,initial-scale=1">
+<link rel="help" href="https://www.w3.org/TR/intersection-observer/#dom-intersectionobserver-scrollmargin">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="./resources/intersection-observer-test-utils.js"></script>
+
+<style>
+#spacer { width: 50px; height: calc(100vh + 10px); }
+#target { width: 50px; height: 50px; background-color: green; }
+</style>
+
+<div id=spacer></div>
+<div id=target></div>
+
+<script>
+let entries = [];
+
+window.onload = function() {
+  runTestCycle(testIntersection, "Test scroll margin intersection");
+
+  const observer = new IntersectionObserver(
+    es => entries = entries.concat(es),
+    {
+      scrollMargin: "10px",
+      rootMargin: "10px"
+    }
+  );
+  observer.observe(target);
+};
+
+function testIntersection() {
+  assert_equals(entries.length, 1, "IntersectionObserverEntryCount");
+  assert_true(entries[0].isIntersecting, "isIntersecting");
+  assert_approx_equals(entries[0].intersectionRatio, 0.04, 0.0001, "intersectionRatio");
+}
+</script>
diff --git a/tests/wpt/tests/intersection-observer/scroll-margin-4-val.html b/tests/wpt/tests/intersection-observer/scroll-margin-4-val.html
new file mode 100644
index 00000000000..04b1e4bace8
--- /dev/null
+++ b/tests/wpt/tests/intersection-observer/scroll-margin-4-val.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<meta name="viewport" content="width=device-width,initial-scale=1">
+<link rel="help" href="https://www.w3.org/TR/intersection-observer/">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="./resources/intersection-observer-test-utils.js"></script>
+
+<style>
+#scroller { width: 100px; height: 100px; overflow: hidden; background-color: gray; }
+#spacer { width: 50px; height: 100px; }
+#target { width: 50px; height: 50px; background-color: green; }
+</style>
+
+<div id=scroller>
+  <div id=spacer></div>
+  <div id=target></div>
+</div>
+
+<script>
+let entries = [];
+
+window.onload = function() {
+  runTestCycle(testIntersection, "Test scroll margin intersection");
+
+  const observer = new IntersectionObserver(
+    es => entries = entries.concat(es),
+    {
+      scrollMargin: "1px 2px 10px 3px"
+    }
+  );
+  observer.observe(target);
+};
+
+function testIntersection() {
+  assert_equals(entries.length, 1, "IntersectionObserverEntryCount");
+  assert_true(entries[0].isIntersecting, "isIntersecting");
+  assert_approx_equals(entries[0].intersectionRatio, 0.2, 0.001, "intersectionRatio");
+}
+</script>
diff --git a/tests/wpt/tests/intersection-observer/scroll-margin-clip-path.html b/tests/wpt/tests/intersection-observer/scroll-margin-clip-path.html
new file mode 100644
index 00000000000..05a9cc20239
--- /dev/null
+++ b/tests/wpt/tests/intersection-observer/scroll-margin-clip-path.html
@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<meta name="viewport" content="width=device-width,initial-scale=1">
+<link rel="help" href="https://www.w3.org/TR/intersection-observer/#dom-intersectionobserver-scrollmargin">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="./resources/intersection-observer-test-utils.js"></script>
+
+<style>
+#scroller {
+  width: 100px;
+  height: 100px;
+  overflow: hidden;
+  background-color: gray;
+  clip-path: inset(10%);
+}
+#spacer { width: 50px; height: 100px; }
+#target { width: 50px; height: 50px; background-color: green; }
+</style>
+
+<div id=scroller>
+  <div id=spacer></div>
+  <div id=target></div>
+</div>
+
+<script>
+let entries = [];
+
+window.onload = function() {
+  runTestCycle(testIntersection, "Test scroll margin intersection");
+
+  const observer = new IntersectionObserver(
+    es => entries = entries.concat(es),
+    {
+      scrollMargin: "20px"
+    }
+  );
+  observer.observe(target);
+};
+
+function testIntersection() {
+  assert_equals(entries.length, 1, "IntersectionObserverEntryCount");
+  assert_true(entries[0].isIntersecting, "isIntersecting");
+  assert_approx_equals(entries[0].intersectionRatio, 0.2, 0.001, "intersectionRatio");
+}
+</script>
diff --git a/tests/wpt/tests/intersection-observer/scroll-margin-dynamic.html b/tests/wpt/tests/intersection-observer/scroll-margin-dynamic.html
new file mode 100644
index 00000000000..e2f697b79e6
--- /dev/null
+++ b/tests/wpt/tests/intersection-observer/scroll-margin-dynamic.html
@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<meta name="viewport" content="width=device-width,initial-scale=1">
+<link rel="help" href="https://www.w3.org/TR/intersection-observer/#dom-intersectionobserver-scrollmargin">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="./resources/intersection-observer-test-utils.js"></script>
+
+<style>
+#scroller { width: 100px; height: 100px; overflow: hidden; background-color: gray; }
+#spacer { width: 50px; height: 120px; }
+#target { width: 50px; height: 50px; background-color: green; }
+</style>
+
+<div id=scroller>
+  <div id=spacer></div>
+  <div id=target></div>
+</div>
+
+<script>
+let entries = [];
+
+window.onload = function() {
+  runTestCycle(testNoInitialIntersection, "Test no initial scroll margin intersection");
+
+  const observer = new IntersectionObserver(
+    es => entries = entries.concat(es),
+    {
+      scrollMargin: "10px"
+    }
+  );
+  observer.observe(target);
+};
+
+function testNoInitialIntersection() {
+  assert_equals(entries.length, 1, "IntersectionObserverEntryCount");
+  assert_false(entries[0].isIntersecting, "isIntersectingInitial");
+  assert_approx_equals(entries[0].intersectionRatio, 0.0, 0.001, "intersectionRatioInitial");
+
+  scroller.scrollTop = 20;
+  runTestCycle(testIntersectionAfterScroll, "Test scroll margin intersection after scrolling");
+}
+
+function testIntersectionAfterScroll() {
+  assert_equals(entries.length, 2, "IntersectionObserverEntryCount");
+  assert_true(entries[1].isIntersecting, "isIntersecting");
+  assert_approx_equals(entries[1].intersectionRatio, 0.2, 0.001, "intersectionRatio");
+}
+</script>
diff --git a/tests/wpt/tests/intersection-observer/scroll-margin-horizontal.html b/tests/wpt/tests/intersection-observer/scroll-margin-horizontal.html
new file mode 100644
index 00000000000..0c79167f346
--- /dev/null
+++ b/tests/wpt/tests/intersection-observer/scroll-margin-horizontal.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<meta name="viewport" content="width=device-width,initial-scale=1">
+<link rel="help" href="https://www.w3.org/TR/intersection-observer/">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="./resources/intersection-observer-test-utils.js"></script>
+
+<style>
+#scroller { width: 100px; height: 100px; overflow: hidden; background-color: gray; display: flex; }
+#spacer { width: 100px; height: 50px; flex-shrink: 0; }
+#target { width: 50px; height: 50px; background-color: green; flex-shrink: 0; }
+</style>
+
+<div id=scroller>
+  <div id=spacer></div>
+  <div id=target></div>
+</div>
+
+<script>
+let entries = [];
+
+window.onload = function() {
+  runTestCycle(testIntersection, "Test scroll margin intersection");
+
+  const observer = new IntersectionObserver(
+    es => entries = entries.concat(es),
+    {
+      scrollMargin: "10px"
+    }
+  );
+  observer.observe(target);
+};
+
+function testIntersection() {
+  assert_equals(entries.length, 1, "IntersectionObserverEntryCount");
+  assert_true(entries[0].isIntersecting, "isIntersecting");
+  assert_approx_equals(entries[0].intersectionRatio, 0.2, 0.001, "intersectionRatio");
+}
+</script>
diff --git a/tests/wpt/tests/intersection-observer/scroll-margin-nested-2.html b/tests/wpt/tests/intersection-observer/scroll-margin-nested-2.html
new file mode 100644
index 00000000000..32cfd1ba936
--- /dev/null
+++ b/tests/wpt/tests/intersection-observer/scroll-margin-nested-2.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<meta name="viewport" content="width=device-width,initial-scale=1">
+<link rel="help" href="https://www.w3.org/TR/intersection-observer/#dom-intersectionobserver-scrollmargin">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="./resources/intersection-observer-test-utils.js"></script>
+
+<style>
+#scroller { width: 100px; height: 100px; overflow: hidden; background-color: gray; }
+#scroller2 { width: 130px; height: 130px; overflow: hidden; }
+#spacer { width: 50px; height: 120px; }
+#target { width: 50px; height: 50px; background-color: green; }
+</style>
+
+<div id=scroller2>
+  <div id=spacer></div>
+  <div id=scroller>
+    <div id=target></div>
+  </div>
+</div>
+
+<script>
+let entries = [];
+
+window.onload = function() {
+  runTestCycle(testIntersection, "Test scroll margin intersection");
+
+  const observer = new IntersectionObserver(
+    es => entries = entries.concat(es),
+    {
+      scrollMargin: "10px"
+    }
+  );
+  observer.observe(target);
+};
+
+function testIntersection() {
+  assert_equals(entries.length, 1, "IntersectionObserverEntryCount");
+  assert_true(entries[0].isIntersecting, "isIntersecting");
+  assert_approx_equals(entries[0].intersectionRatio, 0.4, 0.001, "intersectionRatio");
+}
+</script>
diff --git a/tests/wpt/tests/intersection-observer/scroll-margin-nested-3.html b/tests/wpt/tests/intersection-observer/scroll-margin-nested-3.html
new file mode 100644
index 00000000000..06aaeb825bd
--- /dev/null
+++ b/tests/wpt/tests/intersection-observer/scroll-margin-nested-3.html
@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<meta name="viewport" content="width=device-width,initial-scale=1">
+<link rel="help" href="https://www.w3.org/TR/intersection-observer/#dom-intersectionobserver-scrollmargin">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="./resources/intersection-observer-test-utils.js"></script>
+
+<style>
+#scroller { width: 100px; height: 100px; overflow: hidden; background-color: gray; }
+#scroller2 { width: 130px; height: 130px; overflow: hidden; }
+#scroller3 { width: 160px; height: 160px; overflow: hidden; }
+#spacer { width: 50px; height: 100px; }
+#target { width: 50px; height: 50px; background-color: green; }
+</style>
+
+<div id=scroller3>
+  <div id=scroller2>
+    <div id=scroller>
+      <div id=spacer></div>
+      <div id=target></div>
+    </div>
+  </div>
+</div>
+
+<script>
+let entries = [];
+
+window.onload = function() {
+  runTestCycle(testIntersection, "Test scroll margin intersection");
+
+  const observer = new IntersectionObserver(
+    es => entries = entries.concat(es),
+    {
+      scrollMargin: "10px"
+    }
+  );
+  observer.observe(target);
+};
+
+function testIntersection() {
+  assert_equals(entries.length, 1, "IntersectionObserverEntryCount");
+  assert_true(entries[0].isIntersecting, "isIntersecting");
+  assert_approx_equals(entries[0].intersectionRatio, 0.2, 0.001, "intersectionRatio");
+}
+</script>
diff --git a/tests/wpt/tests/intersection-observer/scroll-margin-nested.html b/tests/wpt/tests/intersection-observer/scroll-margin-nested.html
new file mode 100644
index 00000000000..247f5454706
--- /dev/null
+++ b/tests/wpt/tests/intersection-observer/scroll-margin-nested.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<meta name="viewport" content="width=device-width,initial-scale=1">
+<link rel="help" href="https://www.w3.org/TR/intersection-observer/#dom-intersectionobserver-scrollmargin">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="./resources/intersection-observer-test-utils.js"></script>
+
+<style>
+#scroller { width: 100px; height: 100px; overflow: hidden; background-color: gray; }
+#scroller2 { width: 130px; height: 130px; overflow: hidden; }
+#spacer { width: 50px; height: 100px; }
+#target { width: 50px; height: 50px; background-color: green; }
+</style>
+
+<div id=scroller2>
+  <div id=scroller>
+    <div id=spacer></div>
+    <div id=target></div>
+  </div>
+</div>
+
+<script>
+let entries = [];
+
+window.onload = function() {
+  runTestCycle(testIntersection, "Test scroll margin intersection");
+
+  const observer = new IntersectionObserver(
+    es => entries = entries.concat(es),
+    {
+      scrollMargin: "10px"
+    }
+  );
+  observer.observe(target);
+};
+
+function testIntersection() {
+  assert_equals(entries.length, 1, "IntersectionObserverEntryCount");
+  assert_true(entries[0].isIntersecting, "isIntersecting");
+  assert_approx_equals(entries[0].intersectionRatio, 0.2, 0.001, "intersectionRatio");
+}
+</script>
diff --git a/tests/wpt/tests/intersection-observer/scroll-margin-no-intersect.html b/tests/wpt/tests/intersection-observer/scroll-margin-no-intersect.html
new file mode 100644
index 00000000000..3259d472b5e
--- /dev/null
+++ b/tests/wpt/tests/intersection-observer/scroll-margin-no-intersect.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<meta name="viewport" content="width=device-width,initial-scale=1">
+<link rel="help" href="https://www.w3.org/TR/intersection-observer/#dom-intersectionobserver-scrollmargin">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="./resources/intersection-observer-test-utils.js"></script>
+
+<style>
+#scroller { width: 100px; height: 100px; overflow: hidden; background-color: gray; }
+#spacer { width: 50px; height: 120px; }
+#target { width: 50px; height: 50px; background-color: green; }
+</style>
+
+<div id=scroller>
+  <div id=spacer></div>
+  <div id=target></div>
+</div>
+
+<script>
+let entries = [];
+
+window.onload = function() {
+  runTestCycle(testIntersection, "Test scroll margin intersection");
+
+  const observer = new IntersectionObserver(
+    es => entries = entries.concat(es),
+    {
+      scrollMargin: "10px"
+    }
+  );
+  observer.observe(target);
+};
+
+function testIntersection() {
+  assert_equals(entries.length, 1, "IntersectionObserverEntryCount");
+  assert_false(entries[0].isIntersecting, "isIntersecting");
+  assert_approx_equals(entries[0].intersectionRatio, 0.0, 0.001, "intersectionRatio");
+}
+</script>
diff --git a/tests/wpt/tests/intersection-observer/scroll-margin-non-scrolling-root.html b/tests/wpt/tests/intersection-observer/scroll-margin-non-scrolling-root.html
new file mode 100644
index 00000000000..9f567c2896c
--- /dev/null
+++ b/tests/wpt/tests/intersection-observer/scroll-margin-non-scrolling-root.html
@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<meta name="viewport" content="width=device-width,initial-scale=1">
+<link rel="help" href="https://www.w3.org/TR/intersection-observer/#dom-intersectionobserver-scrollmargin">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="./resources/intersection-observer-test-utils.js"></script>
+
+<style>
+#scroller { width: 100px; height: 100px; overflow: hidden; background-color: gray; }
+#spacer { width: 50px; height: 110px; background-color: darkgray; }
+#root { height: 75; width: 75; background-color: blue; }
+#target { width: 50px; height: 50px; background-color: green; }
+#spacer2 { width: 10px; height: 10px; background-color: lightgray; }
+</style>
+
+<div id=scroller>
+  <div id=spacer></div>
+  <div id=root>
+    <div id=spacer2></div>
+    <div id=target></div>
+  </div>
+</div>
+
+<script>
+let entries = [];
+
+window.onload = function() {
+  runTestCycle(testIntersection, "Test scroll margin intersection");
+
+  const observer = new IntersectionObserver(
+    es => entries = entries.concat(es),
+    {
+      root: document.querySelector("#root"),
+      scrollMargin: "10px"
+    }
+  );
+  observer.observe(target);
+};
+
+function testIntersection() {
+  assert_equals(entries.length, 1, "IntersectionObserverEntryCount");
+  assert_true(entries[0].isIntersecting, "isIntersecting");
+  assert_approx_equals(entries[0].intersectionRatio, 1.0, 0.001, "intersectionRatio");
+}
+</script>
diff --git a/tests/wpt/tests/intersection-observer/scroll-margin-percent.html b/tests/wpt/tests/intersection-observer/scroll-margin-percent.html
new file mode 100644
index 00000000000..c33cfeae28a
--- /dev/null
+++ b/tests/wpt/tests/intersection-observer/scroll-margin-percent.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<meta name="viewport" content="width=device-width,initial-scale=1">
+<link rel="help" href="https://www.w3.org/TR/intersection-observer/#dom-intersectionobserver-scrollmargin">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="./resources/intersection-observer-test-utils.js"></script>
+
+<style>
+#scroller { width: 100px; height: 100px; overflow: hidden; background-color: gray; }
+#spacer { width: 50px; height: 100px; }
+#target { width: 50px; height: 50px; background-color: green; }
+</style>
+
+<div id=scroller>
+  <div id=spacer></div>
+  <div id=target></div>
+</div>
+
+<script>
+let entries = [];
+
+window.onload = function() {
+  runTestCycle(testIntersection, "Test scroll margin intersection");
+
+  const observer = new IntersectionObserver(
+    es => entries = entries.concat(es),
+    {
+      scrollMargin: "10%"
+    }
+  );
+  observer.observe(target);
+};
+
+function testIntersection() {
+  assert_equals(entries.length, 1, "IntersectionObserverEntryCount");
+  assert_true(entries[0].isIntersecting, "isIntersecting");
+  assert_approx_equals(entries[0].intersectionRatio, 0.2, 0.001, "intersectionRatio");
+}
+</script>
diff --git a/tests/wpt/tests/intersection-observer/scroll-margin-zero.html b/tests/wpt/tests/intersection-observer/scroll-margin-zero.html
new file mode 100644
index 00000000000..9f2727f6959
--- /dev/null
+++ b/tests/wpt/tests/intersection-observer/scroll-margin-zero.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<meta name="viewport" content="width=device-width,initial-scale=1">
+<link rel="help" href="https://www.w3.org/TR/intersection-observer/#dom-intersectionobserver-scrollmargin">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="./resources/intersection-observer-test-utils.js"></script>
+
+<style>
+#scroller { width: 100px; height: 100px; overflow: hidden; background-color: gray; }
+#spacer { width: 50px; height: 110px; }
+#target { width: 50px; height: 50px; background-color: green; }
+</style>
+
+<div id=scroller>
+  <div id=spacer></div>
+  <div id=target></div>
+</div>
+
+<script>
+let entries = [];
+
+window.onload = function() {
+  runTestCycle(testIntersection, "Test scroll margin intersection");
+
+  const observer = new IntersectionObserver(
+    es => entries = entries.concat(es),
+    {
+      scrollMargin: "0px"
+    }
+  );
+  observer.observe(target);
+};
+
+function testIntersection() {
+  assert_equals(entries.length, 1, "IntersectionObserverEntryCount");
+  assert_false(entries[0].isIntersecting, "isIntersecting");
+  assert_approx_equals(entries[0].intersectionRatio, 0.0, 0.001, "intersectionRatio");
+}
+</script>
diff --git a/tests/wpt/tests/intersection-observer/scroll-margin.html b/tests/wpt/tests/intersection-observer/scroll-margin.html
new file mode 100644
index 00000000000..1b8cdd6b39a
--- /dev/null
+++ b/tests/wpt/tests/intersection-observer/scroll-margin.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<meta name="viewport" content="width=device-width,initial-scale=1">
+<link rel="help" href="https://www.w3.org/TR/intersection-observer/#dom-intersectionobserver-scrollmargin">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="./resources/intersection-observer-test-utils.js"></script>
+
+<style>
+#scroller { width: 100px; height: 100px; overflow: hidden; background-color: gray; }
+#spacer { width: 50px; height: 100px; }
+#target { width: 50px; height: 50px; background-color: green; }
+</style>
+
+<div id=scroller>
+  <div id=spacer></div>
+  <div id=target></div>
+</div>
+
+<script>
+let entries = [];
+
+window.onload = function() {
+  runTestCycle(testIntersection, "Test scroll margin intersection");
+
+  const observer = new IntersectionObserver(
+    es => entries = entries.concat(es),
+    {
+      scrollMargin: "10px"
+    }
+  );
+  observer.observe(target);
+};
+
+function testIntersection() {
+  assert_equals(entries.length, 1, "IntersectionObserverEntryCount");
+  assert_true(entries[0].isIntersecting, "isIntersecting");
+  assert_approx_equals(entries[0].intersectionRatio, 0.2, 0.001, "intersectionRatio");
+}
+</script>
diff --git a/tests/wpt/tests/largest-contentful-paint/broken-image-icon.html b/tests/wpt/tests/largest-contentful-paint/broken-image-icon.html
new file mode 100644
index 00000000000..be27e34e6ac
--- /dev/null
+++ b/tests/wpt/tests/largest-contentful-paint/broken-image-icon.html
@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+  <title>Broken Image Icon Should Not Be LCP</title>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+</head>
+
+<body>
+  <img src="../non-existent-image.jpg">
+  <img src="/css/css-images/support/colors-16x8.png">
+
+  <script>
+    promise_test(async () => {
+      // Wait for the first-contentful-paint entry so that we know the broken image
+      // icon has been painted.
+      await new Promise(resolve => {
+        new PerformanceObserver((entryList, observer) => {
+          if (entryList.getEntriesByName('first-contentful-paint').length > 0) {
+            observer.disconnect();
+            resolve();
+          }
+        }).observe({ type: 'paint', buffered: true });
+      });
+
+      // There should be only 1 LCP entry and it should be the colors-16x8.png though
+      // being smaller than the broken image icon. The broken image icon should not
+      // emit an LCP entry.
+      let LcpEntryListLength = await new Promise(resolve => {
+        new PerformanceObserver((entryList, observer) => {
+          if (entryList.getEntries().filter(e => e.url.includes('colors-16x8.png'))) {
+            observer.disconnect();
+            resolve(entryList.getEntries().length);
+          }
+        }).observe({ type: 'largest-contentful-paint', buffered: true });
+      });
+
+      assert_equals(LcpEntryListLength, 1, 'There should be one and only one LCP entry.');
+
+    }, "The broken image icon should not emit an LCP entry.");
+  </script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/tests/wpt/tests/largest-contentful-paint/image-upscaling.html b/tests/wpt/tests/largest-contentful-paint/image-upscaling.html
index b3ce16f03f9..5de0790281b 100644
--- a/tests/wpt/tests/largest-contentful-paint/image-upscaling.html
+++ b/tests/wpt/tests/largest-contentful-paint/image-upscaling.html
@@ -1,107 +1,128 @@
 <!DOCTYPE HTML>
 <meta charset=utf-8>
-<title>Largest Contentful Paint: largest image is reported.</title>
+<title>Largest Contentful Paint: Largest image is reported.</title>
 <body>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="resources/largest-contentful-paint-helpers.js"></script>
-<script src="/common/utils.js"></script>
-<script>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <script src="resources/largest-contentful-paint-helpers.js"></script>
+  <script src="/common/utils.js"></script>
+  <script>
     setup({"hide_test_state": true});
-    setup(() =>
-        assert_implements(window.LargestContentfulPaint, "LargestContentfulPaint is not implemented"));
-
+    assert_implements(window.LargestContentfulPaint, "LargestContentfulPaint not implemented");
     const imageURL = `${window.location.origin}/images/blue.png`;
+
     async function load_image_and_get_lcp_size(t, imageStyle = {}, containerStyle = {}) {
-        const popup = window.open();
-        t.add_cleanup(() => popup.close());
-        const image = popup.document.createElement('img');
-        image.src = imageURL;
+      const popup = window.open();
+      t.add_cleanup(() => popup.close());
+      const image = popup.document.createElement('img');
+      image.src = imageURL;
 
-        // We decode the image to get the natural size (though it's a constant)
-        await image.decode();
-        const naturalSize = image.width * image.height;
+      // We decode the image to get the natural size (though it's a constant)
+      await image.decode();
+      const naturalSize = image.width * image.height;
+      const container = popup.document.createElement('div');
+      container.appendChild(image);
 
-        const container = popup.document.createElement('div');
-        container.appendChild(image);
-        const applyStyle = (el, style = {}) =>
-            Object.entries(style).forEach(([k, v]) => el.style.setProperty(k, v));
+      const applyStyle = (el, style = {}) =>
+        Object.entries(style).forEach(([k, v]) => el.style.setProperty(k, v));
+      applyStyle(image, imageStyle);
+      applyStyle(container, containerStyle);
+      image.id = token();
+      container.id = token();
 
-        applyStyle(image, imageStyle);
-        applyStyle(container, containerStyle);
-        image.id = token();
-        container.id = token();
-        const entryReported = new Promise(resolve => new popup.PerformanceObserver(entryList => {
-            entryList.getEntries().forEach(entry => {
-                if (entry.id === image.id || entry.id === container.id)
-                    resolve(entry.size);
-            });
-        }).observe({type: 'largest-contentful-paint'}));
-        popup.document.body.appendChild(container);
-        return {
-            lcpSize: (await await_with_timeout(1000, 'not reported', entryReported)),
-            naturalSize
-        };
+      const entryReported = new Promise(resolve =>
+        new popup.PerformanceObserver(entryList => {
+          entryList.getEntries().forEach(entry => {
+            if (entry.id === image.id || entry.id === container.id) {
+              resolve(entry.size);
+            }
+          });
+        }).observe({ type: 'largest-contentful-paint', buffered: true })
+      );
+
+      popup.document.body.appendChild(container);
+
+      return {
+        lcpSize: await entryReported,
+        naturalSize
+      };
     }
 
-    // We set the image to display: none when testing background, so that only the background is reported
-    // and not the image itself
+    /* We set the image to display: none when testing background,
+    so that only the background is reported
+    and not the image itself */
     const load_background_image_and_get_lcp_size = (t, style) =>
-        load_image_and_get_lcp_size(t, {display: 'none'},
-            {
-                position: 'absolute',
-                'background-image': `url(${imageURL})`,
-                ...style,
-            });
+      load_image_and_get_lcp_size(t, { display: 'none' }, {
+        position: 'absolute',
+        'background-image': `url(${imageURL})`,
+        ...style,
+      });
 
     promise_test(async t => {
-        const {naturalSize, lcpSize} = await load_image_and_get_lcp_size(t);
-        assert_equals(lcpSize, naturalSize);
+      const { naturalSize, lcpSize } = await load_image_and_get_lcp_size(t);
+      assert_equals(lcpSize, naturalSize);
     }, 'Non-scaled image should report the natural size');
 
     promise_test(async t => {
-        const {naturalSize, lcpSize} = await load_image_and_get_lcp_size(t, {width: '50px', height: '50px'});
-        assert_equals(lcpSize, 50 * 50);
+      const { naturalSize, lcpSize } = await load_image_and_get_lcp_size(t,
+        { width: '50px', height: '50px' });
+      assert_equals(lcpSize, 50 * 50);
     }, 'A downscaled image (width/height) should report the displayed size');
 
     promise_test(async t => {
-        const {naturalSize, lcpSize} = await load_image_and_get_lcp_size(t, {transform: 'scale(0.5)'});
-        assert_equals(Math.floor(lcpSize), Math.floor(naturalSize / 4));
+      const { naturalSize, lcpSize } = await load_image_and_get_lcp_size(t,
+        { transform: 'scale(0.5)' });
+      assert_equals(Math.floor(lcpSize), Math.floor(naturalSize / 4));
     }, 'A downscaled image (using scale) should report the displayed size');
 
     promise_test(async t => {
-        const {naturalSize, lcpSize} = await load_image_and_get_lcp_size(t, {width: '500px', height: '500px'});
-        assert_equals(lcpSize, naturalSize);
+      const { naturalSize, lcpSize } = await load_image_and_get_lcp_size(t,
+        { width: '500px', height: '500px' });
+      assert_equals(lcpSize, naturalSize);
     }, 'An upscaled image (width/height) should report the natural size');
 
+    /* TODO(crbug.com/1484431):
+    Need to dig deeper into this test, to verify the implementation of scale()
+    Currently unable to upscale image*/
     promise_test(async t => {
-        const {naturalSize, lcpSize} = await load_image_and_get_lcp_size(t, {transform: 'scale(2)'});
-        assert_equals(Math.floor(lcpSize), Math.floor(naturalSize));
+      const { naturalSize, lcpSize } = await load_image_and_get_lcp_size(t,
+        { transform: 'scale(1.0)' });
+      assert_equals(Math.floor(lcpSize), Math.floor(naturalSize));
     }, 'An upscaled image (using scale) should report the natural size');
 
     promise_test(async t => {
-        const {naturalSize, lcpSize} = await load_image_and_get_lcp_size(t, {'object-size': '300px 300px'});
-        assert_equals(Math.floor(lcpSize), Math.floor(naturalSize));
+      const { naturalSize, lcpSize } = await load_image_and_get_lcp_size(t,
+        { 'object-size': '300px 300px' });
+      assert_equals(Math.floor(lcpSize), Math.floor(naturalSize));
     }, 'An upscaled image (using object-size) should report the natural size');
 
     promise_test(async t => {
-        const {naturalSize, lcpSize} = await load_image_and_get_lcp_size(t, {'object-position': '-100px 0'});
-        assert_equals(lcpSize, 3498);
-    }, 'An intersecting element with a partial-intersecting image (object-position) should report the image intersection');
+      const { naturalSize, lcpSize } = await load_image_and_get_lcp_size(t,
+        { 'object-position': '-100px 0' });
+      assert_equals(lcpSize, 3498);
+    }, 'Intersecting element with partial-intersecting image to report image intersection');
 
     promise_test(async t => {
-        const {naturalSize, lcpSize} = await load_background_image_and_get_lcp_size(t, {width: '50px', height: '50px'});
-        assert_equals(lcpSize, 50 * 50);
+      const { naturalSize, lcpSize } = await load_background_image_and_get_lcp_size(t,
+        { width: '50px', height: '50px' });
+      assert_equals(lcpSize, 50 * 50);
     }, 'A background image larger than the container should report the container size');
 
     promise_test(async t => {
-        const {naturalSize, lcpSize} = await load_background_image_and_get_lcp_size(t, {width: '300px', height: '300px'});
-        assert_equals(lcpSize, naturalSize);
+      const { naturalSize, lcpSize } = await load_background_image_and_get_lcp_size(t,
+        { width: '300px', height: '300px' });
+      assert_equals(lcpSize, naturalSize);
     }, 'A background image smaller than the container should report the natural size');
 
     promise_test(async t => {
-        const {naturalSize, lcpSize} = await load_background_image_and_get_lcp_size(t, {width: '300px', height: '300px', 'background-size': '10px 10x'});
-        assert_equals(lcpSize, 100);
+      const { naturalSize, lcpSize } = await load_background_image_and_get_lcp_size(t,
+        {
+          width: '300px',
+          height: '300px',
+          'background-size': '10px 10px',
+          'background-repeat': 'no-repeat'
+        });
+      assert_equals(lcpSize, 100);
     }, 'A scaled-down background image should report the background size');
-</script>
-</body>
+  </script>
+</body>
\ No newline at end of file
diff --git a/tests/wpt/tests/largest-contentful-paint/resources/largest-contentful-paint-helpers.js b/tests/wpt/tests/largest-contentful-paint/resources/largest-contentful-paint-helpers.js
index 3ac3705e8e7..52f7036466c 100644
--- a/tests/wpt/tests/largest-contentful-paint/resources/largest-contentful-paint-helpers.js
+++ b/tests/wpt/tests/largest-contentful-paint/resources/largest-contentful-paint-helpers.js
@@ -1,4 +1,4 @@
-const image_delay = 1000;
+const image_delay = 2000;
 const delay_pipe_value = image_delay / 1000;
 
 const await_with_timeout = async (delay, message, promise, cleanup = ()=>{}) => {
diff --git a/tests/wpt/tests/lint.ignore b/tests/wpt/tests/lint.ignore
index 489c717cd6a..1b03b0cdeb8 100644
--- a/tests/wpt/tests/lint.ignore
+++ b/tests/wpt/tests/lint.ignore
@@ -89,7 +89,7 @@ CR AT EOL: html/syntax/charset/after-head-after-1kb-crlf.html
 CR AT EOL: html/syntax/charset/after-head-in-1kb-crlf.html
 
 # Intentional use of tabs
-INDENT TABS: html/semantics/embedded-content/the-canvas-element/size.attributes.parse.whitespace.html
+INDENT TABS: html/canvas/element/canvas-host/2d.canvas.host.size.attributes.parse.whitespace.html
 INDENT TABS: webvtt/parsing/file-parsing/tests/support/header-tab.vtt
 INDENT TABS: webvtt/parsing/file-parsing/tests/support/whitespace-chars.vtt
 
@@ -214,6 +214,7 @@ SET TIMEOUT: performance-timeline/resources/navigation-id-detached-frame-page.ht
 SET TIMEOUT: portals/resources/portals-adopt-predecessor-portal.html
 SET TIMEOUT: preload/single-download-preload.html
 SET TIMEOUT: preload/resources/slow-exec.js
+SET TIMEOUT: print/crashtests/reload-crash.html
 SET TIMEOUT: resize-observer/resources/iframe.html
 SET TIMEOUT: resource-timing/resources/nested-contexts.js
 SET TIMEOUT: reporting/resources/first-csp-report.https.sub.html
@@ -621,6 +622,7 @@ AHEM SYSTEM FONT: css/css-fonts/font-size-adjust-metrics-override.html
 AHEM SYSTEM FONT: css/css-fonts/font-size-adjust-metrics-override-ref.html
 AHEM SYSTEM FONT: css/css-fonts/line-gap-override.html
 AHEM SYSTEM FONT: css/css-fonts/parsing/font-size-adjust-computed.html
+AHEM SYSTEM FONT: css/css-fonts/size-adjust-unicode-range-system-fallback.html
 AHEM SYSTEM FONT: html/dom/render-blocking/remove-attr-unblocks-rendering.optional.html
 AHEM SYSTEM FONT: html/dom/render-blocking/remove-element-unblocks-rendering.optional.html
 
@@ -705,3 +707,17 @@ SET TIMEOUT: editing/crashtests/outdent-across-svg-boundary.html
 SET TIMEOUT: editing/crashtests/textarea-will-be-blurred-by-focus-event-listener.html
 SET TIMEOUT: mathml/crashtests/mozilla/*
 PARSE-FAILED: mathml/crashtests/mozilla/289180-1.xml
+
+# Invalid HTML syntax /> on non-void elements
+HTML INVALID SYNTAX: acid/*
+HTML INVALID SYNTAX: conformance-checkers/*
+HTML INVALID SYNTAX: css/css-scoping/shadow-cascade-order-001.html
+HTML INVALID SYNTAX: dom/nodes/Document-createElement-namespace.html
+HTML INVALID SYNTAX: dom/nodes/Node-lookupNamespaceURI.html
+HTML INVALID SYNTAX: dom/nodes/Node-normalize.html
+HTML INVALID SYNTAX: domparsing/DOMParser-parseFromString-xml-doctype.html
+HTML INVALID SYNTAX: domparsing/DOMParser-parseFromString-xml-parsererror.html
+HTML INVALID SYNTAX: domparsing/XMLSerializer-serializeToString.html
+HTML INVALID SYNTAX: html/canvas/element/manual/unclosed-canvas-4.htm
+HTML INVALID SYNTAX: quirks/percentage-height-calculation.html
+HTML INVALID SYNTAX: trusted-types/TrustedTypePolicyFactory-getAttributeType-namespace.tentative.html
diff --git a/tests/wpt/tests/long-animation-frame/tentative/loaf-callback-after-promise.html b/tests/wpt/tests/long-animation-frame/tentative/loaf-callback-after-promise.html
new file mode 100644
index 00000000000..f7048072fa8
--- /dev/null
+++ b/tests/wpt/tests/long-animation-frame/tentative/loaf-callback-after-promise.html
@@ -0,0 +1,27 @@
+<!DOCTYPE HTML>
+<meta charset=utf-8>
+<title>Long Animation Frame Timing: promise resolver before callback</title>
+<meta name="timeout" content="long">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/utils.js"></script>
+
+<body>
+<h1>Long Animation Frame: promise resolvers before callback</h1>
+<div id="log"></div>
+<script type="module">
+
+test_promise_script(async t => {
+    const response = await fetch("/common/dummy.xml");
+    await response.text();
+    let count = 0;
+
+    /* A DOM forEach invokes a callback */
+    new URLSearchParams("a=1&b=2").forEach(() => {
+      count++;
+    })
+    busy_wait(very_long_frame_duration);
+}, "resolve", "Response.text.then");
+
+</script>
+</body>
diff --git a/tests/wpt/tests/long-animation-frame/tentative/loaf-desired-exec-time.html b/tests/wpt/tests/long-animation-frame/tentative/loaf-desired-exec-time.html
index dd350078b60..656c58d0c24 100644
--- a/tests/wpt/tests/long-animation-frame/tentative/loaf-desired-exec-time.html
+++ b/tests/wpt/tests/long-animation-frame/tentative/loaf-desired-exec-time.html
@@ -56,8 +56,8 @@ promise_test(async t => {
   });
   const entry = await entryPromise;
   const script = entry.scripts.find(s => s.name === "TimerHandler:setTimeout");
-  assert_greater_than_equal(script.desiredExecutionStart, timeBeforeSetup + delay - 5);
-  assert_less_than_equal(script.desiredExecutionStart, timeAfterSetup + delay);
+  assert_greater_than_equal(script.desiredExecutionStart, timeBeforeSetup + delay - INTERNAL_OVERHEAD_DELAY_EPSILON);
+  assert_less_than_equal(script.desiredExecutionStart, timeAfterSetup + delay + INTERNAL_OVERHEAD_DELAY_EPSILON);
 }, "desiredExecutionStart for setTimeout should be the setup time + delay");
 
 promise_test(async t => {
@@ -73,8 +73,8 @@ promise_test(async t => {
   });
   const entry = await entryPromise;
   const script = entry.scripts.find(s => s.name === "SchedulerPostTaskCallback");
-  assert_greater_than_equal(script.desiredExecutionStart, timeBeforeSetup);
-  assert_less_than_equal(script.desiredExecutionStart, timeAfterSetup);
+  assert_greater_than_equal(script.desiredExecutionStart, timeBeforeSetup - INTERNAL_OVERHEAD_DELAY_EPSILON);
+  assert_less_than_equal(script.desiredExecutionStart, timeAfterSetup + INTERNAL_OVERHEAD_DELAY_EPSILON);
 }, "desiredExecutionStart for Scheduler.postTask should be the time it was called");
 
 promise_test(async t => {
diff --git a/tests/wpt/tests/long-animation-frame/tentative/loaf-first-ui-event.html b/tests/wpt/tests/long-animation-frame/tentative/loaf-first-ui-event.html
index 47a3a51de21..857ccd0a182 100644
--- a/tests/wpt/tests/long-animation-frame/tentative/loaf-first-ui-event.html
+++ b/tests/wpt/tests/long-animation-frame/tentative/loaf-first-ui-event.html
@@ -51,9 +51,9 @@ promise_test(async t => {
        .pointerUp();
     await actions.send();
     await eventPromise;
-  }, s => s.name === "BUTTON.onpointermove", t);
-  const [entry] = await entryPromise;
-  assert_equals(entry.firstUIEventTimestamp, expectedTimestamp);
+  }, (script, entry) =>
+      script.name === "BUTTON.onpointermove" &&
+      entry.firstUIEventTimestamp === expectedTimestamp, t);
 }, "LoAF should expose firstUIEventTimestamp for pointermove events");
 
 promise_test(async t => {
diff --git a/tests/wpt/tests/long-animation-frame/tentative/loaf-source-location-redirect.html b/tests/wpt/tests/long-animation-frame/tentative/loaf-source-location-redirect.html
new file mode 100644
index 00000000000..f8d5d3d2498
--- /dev/null
+++ b/tests/wpt/tests/long-animation-frame/tentative/loaf-source-location-redirect.html
@@ -0,0 +1,63 @@
+<!DOCTYPE HTML>
+<meta charset=utf-8>
+<title>Long Animation Frame Timing: source location should not expose cross-origin redirects</title>
+<meta name="timeout" content="long">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/utils.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
+<script src="resources/utils.js"></script>
+
+<body>
+<h1>Long Animation Frame: source location with cross-origin redirects</h1>
+<div id="log"></div>
+<script>
+
+const {REMOTE_ORIGIN} = get_host_info();
+
+function crossOriginRedirectURL(path) {
+  const url = new URL(`/common/redirect.py`, REMOTE_ORIGIN);
+  url.searchParams.set("location", path);
+  return url.href;
+}
+
+function test_source_location_pre_redirect({path, type, name}) {
+  promise_test(async t => {
+    const very_long_frame_duration = 360;
+    const url = crossOriginRedirectURL(path);
+    let [entry, script] = await expect_long_frame_with_script(() => {
+      const script = document.createElement("script");
+      script.src = url;
+      document.body.appendChild(script);
+      t.add_cleanup(() => script.remove());
+    }, script => (
+          script.type === type &&
+          (!name || script.name.startsWith(name)) &&
+          script.duration >= very_long_frame_duration), t);
+
+      assert_true(script.sourceLocation.includes("redirect.py"),
+        `${script.sourceLocation} should be pre-redirect`);
+    }, `${type} doesn't expose post-redirect source location`);
+}
+
+test_source_location_pre_redirect({
+  path: "/long-animation-frame/tentative/resources/busy.js",
+  type: "classic-script"
+});
+test_source_location_pre_redirect({
+  path: "/long-animation-frame/tentative/resources/raf-generates-loaf.js",
+  name: "FrameRequestCallback",
+  type: "user-callback"
+});
+test_source_location_pre_redirect({
+  path: "/long-animation-frame/tentative/resources/promise-generates-loaf.js",
+  type: "resolve-promise",
+  name: "Window.fetch.then"
+});
+test_source_location_pre_redirect({
+  path: "/long-animation-frame/tentative/resources/event-generates-loaf.js",
+  type: "event-listener",
+  name: "XMLHttpRequest.onload"
+});
+</script>
+</body>
diff --git a/tests/wpt/tests/long-animation-frame/tentative/loaf-source-location.html b/tests/wpt/tests/long-animation-frame/tentative/loaf-source-location.html
index 1065564206f..41979105e58 100644
--- a/tests/wpt/tests/long-animation-frame/tentative/loaf-source-location.html
+++ b/tests/wpt/tests/long-animation-frame/tentative/loaf-source-location.html
@@ -44,5 +44,15 @@ promise_test(async t => {
   assert_regexp_match(script.sourceLocation, source_location_regex);
 }, "Source location should be extracted for setTimeout");
 
+promise_test(async t => {
+  const scriptLocation = new URL("resources/promise-generates-loaf.js", location.href);
+  const [entry, script] = await expect_long_frame_with_script(() => {
+    const scriptElement = document.createElement("script");
+    scriptElement.src = scriptLocation;
+    document.body.appendChild(scriptElement);
+  }, script => script.name === "Window.fetch.then", t);
+  assert_true(script.sourceLocation?.includes("promise-generates-loaf.js"));
+}, "Source location should be extracted for promises");
+
 </script>
 </body>
diff --git a/tests/wpt/tests/long-animation-frame/tentative/loaf-trusted-types.html b/tests/wpt/tests/long-animation-frame/tentative/loaf-trusted-types.html
new file mode 100644
index 00000000000..4297842759f
--- /dev/null
+++ b/tests/wpt/tests/long-animation-frame/tentative/loaf-trusted-types.html
@@ -0,0 +1,42 @@
+<!DOCTYPE HTML>
+<meta charset=utf-8>
+<title>Long Animation Frame Timing: basic</title>
+<meta name="timeout" content="long">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/utils.js"></script>
+<script src="resources/utils.js"></script>
+
+<body>
+<h1>Long Animation Frame: eval</h1>
+<div id="log"></div>
+<script id="element"></script>
+<script>
+setup(() =>
+  assert_implements("trustedTypes" in window,
+    'trustedTypes are not supported.'));
+
+/* This invokes the createHTML trusted type */
+trustedTypes.defaultPolicy = trustedTypes.createPolicy("default", {
+    createHTML: (input) => input
+});
+
+document.getElementById("element").innerHTML = `
+  busy_wait(very_long_frame_duration / 2);
+  Promise.resolve().then(() => {
+    busy_wait(very_long_frame_duration / 2);
+  })
+`;
+
+promise_test(async t => {
+  await new Promise(resolve => new PerformanceObserver(entries => {
+    const entry = entries.getEntries()[0];
+    if (entry.duration >= (very_long_frame_duration - 5) &&
+      entry.scripts.some(script => script.duration >= very_long_frame_duration)) {
+        resolve(entry);
+      }
+  }).observe({type: "long-animation-frame", buffered: true}));
+});
+
+</script>
+</body>
diff --git a/tests/wpt/tests/long-animation-frame/tentative/resources/event-generates-loaf.js b/tests/wpt/tests/long-animation-frame/tentative/resources/event-generates-loaf.js
new file mode 100644
index 00000000000..fe7c3eca2b3
--- /dev/null
+++ b/tests/wpt/tests/long-animation-frame/tentative/resources/event-generates-loaf.js
@@ -0,0 +1,10 @@
+(() => {
+  const xhr = new XMLHttpRequest();
+  xhr.open('GET', '/common/dummy.xml');
+  xhr.addEventListener('load', () => {
+    const deadline = performance.now() + 360;
+    while (performance.now() < deadline) {
+    }
+  });
+  xhr.send();
+})();
diff --git a/tests/wpt/tests/long-animation-frame/tentative/resources/promise-generates-loaf.js b/tests/wpt/tests/long-animation-frame/tentative/resources/promise-generates-loaf.js
new file mode 100644
index 00000000000..53369f72260
--- /dev/null
+++ b/tests/wpt/tests/long-animation-frame/tentative/resources/promise-generates-loaf.js
@@ -0,0 +1,4 @@
+fetch("/common/dummy.xml").then(() => {
+  const deadline = performance.now() + 360;
+  while (performance.now() < deadline) {}
+});
diff --git a/tests/wpt/tests/long-animation-frame/tentative/resources/raf-generates-loaf.js b/tests/wpt/tests/long-animation-frame/tentative/resources/raf-generates-loaf.js
new file mode 100644
index 00000000000..b7544af4e56
--- /dev/null
+++ b/tests/wpt/tests/long-animation-frame/tentative/resources/raf-generates-loaf.js
@@ -0,0 +1,5 @@
+requestAnimationFrame(() => {
+  const deadline = performance.now() + 360;
+  while (performance.now() < deadline) {
+  }
+});
diff --git a/tests/wpt/tests/long-animation-frame/tentative/resources/utils.js b/tests/wpt/tests/long-animation-frame/tentative/resources/utils.js
index 8781252e941..574af6d6b8c 100644
--- a/tests/wpt/tests/long-animation-frame/tentative/resources/utils.js
+++ b/tests/wpt/tests/long-animation-frame/tentative/resources/utils.js
@@ -4,7 +4,7 @@ setup(() =>
     'Long animation frames are not supported.'));
 
 const very_long_frame_duration = 360;
-const no_long_frame_timeout = very_long_frame_duration * 3;
+const no_long_frame_timeout = very_long_frame_duration * 2;
 const waiting_for_long_frame_timeout = very_long_frame_duration * 10;
 
 function loaf_promise(t) {
@@ -49,7 +49,7 @@ async function expect_long_frame_with_script(cb, predicate, t) {
       if (entry === "timeout" || !entry.scripts.length)
         continue;
       for (const script of entry.scripts) {
-        if (predicate(script))
+        if (predicate(script, entry))
           return [entry, script];
       }
   }
diff --git a/tests/wpt/tests/mathml/presentation-markup/mrow/mphantom-001.html b/tests/wpt/tests/mathml/presentation-markup/mrow/mphantom-001.html
new file mode 100644
index 00000000000..771688cf194
--- /dev/null
+++ b/tests/wpt/tests/mathml/presentation-markup/mrow/mphantom-001.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>Test the mphantom element</title>
+<link rel="help" href="https://w3c.github.io/mathml-core/#making-sub-expressions-invisible-mphantom">
+<link rel="help" href="https://w3c.github.io/mathml-core/#user-agent-stylesheet">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<meta name="assert" content="Verify default mphantom style and size.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+  math {
+      font: 25px/1 Ahem;
+  }
+</style>
+</head>
+<body>
+  <div id="log"></div>
+  <div>
+    <math>
+      <mrow id="reference"><mtext>AN ERROR</mtext></mrow>
+      <mphantom id="mphantom"><mtext>AN ERROR</mtext></mphantom>
+    </math>
+  </div>
+  <script>
+    test(function () {
+        var style = window.getComputedStyle(document.getElementById("mphantom"));
+        assert_equals(style.visibility, "hidden");
+    }, "Default CSS properties on mphantom");
+
+    test(function () {
+        var mphantomBox = document.getElementById("mphantom").getBoundingClientRect();
+        var referenceBox = document.getElementById("reference").getBoundingClientRect();
+        assert_equals(mphantomBox.width, referenceBox.width);
+        assert_equals(mphantomBox.height, referenceBox.height);
+    }, "Bounding box is the same as mrow");
+</script>
+</body>
+</html>
diff --git a/tests/wpt/tests/mathml/presentation-markup/operators/non-spacing-accent-1-ref.xhtml b/tests/wpt/tests/mathml/presentation-markup/operators/non-spacing-accent-1-ref.xhtml
new file mode 100644
index 00000000000..9c5a9145f86
--- /dev/null
+++ b/tests/wpt/tests/mathml/presentation-markup/operators/non-spacing-accent-1-ref.xhtml
@@ -0,0 +1,17 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style type="text/css">
+      html { background-color: white }
+      mi { color: white; }
+      mo { color: red; }
+    </style>
+  </head>
+<body>
+  <math xmlns="http://www.w3.org/1998/Math/MathML">
+    <mover>
+      <mi>a</mi>
+      <mo>&#x302;</mo>
+    </mover>
+  </math>
+</body>
+</html>
diff --git a/tests/wpt/tests/mathml/presentation-markup/operators/non-spacing-accent-1.xhtml b/tests/wpt/tests/mathml/presentation-markup/operators/non-spacing-accent-1.xhtml
new file mode 100644
index 00000000000..6061b96bc51
--- /dev/null
+++ b/tests/wpt/tests/mathml/presentation-markup/operators/non-spacing-accent-1.xhtml
@@ -0,0 +1,20 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <title>Check that non-spacing marks in accents are visible</title>
+    <link rel="mismatch" href="non-spacing-accent-1-ref.xhtml"/>
+    <link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=427659"/>
+    <style type="text/css">
+      html { background-color: white }
+      mi { color: white; }
+      mo { color: black; }
+    </style>
+  </head>
+<body>
+  <math xmlns="http://www.w3.org/1998/Math/MathML">
+    <mover>
+      <mi>a</mi>
+      <mo>&#x302;</mo>
+    </mover>
+  </math>
+</body>
+</html>
diff --git a/tests/wpt/tests/mathml/presentation-markup/operators/stretchy-underbar-1-ref.xhtml b/tests/wpt/tests/mathml/presentation-markup/operators/stretchy-underbar-1-ref.xhtml
new file mode 100644
index 00000000000..0f36f2da640
--- /dev/null
+++ b/tests/wpt/tests/mathml/presentation-markup/operators/stretchy-underbar-1-ref.xhtml
@@ -0,0 +1,17 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style type="text/css">
+      html { background-color: white; font-size: 50px }
+      mi { color: white; }
+      mo { color: red; }
+    </style>
+  </head>
+<body>
+  <math xmlns="http://www.w3.org/1998/Math/MathML">
+    <munder>
+      <mi>long</mi>
+      <mo stretchy="true">&#x332;</mo>
+    </munder>
+  </math>
+</body>
+</html>
diff --git a/tests/wpt/tests/mathml/presentation-markup/operators/stretchy-underbar-1.xhtml b/tests/wpt/tests/mathml/presentation-markup/operators/stretchy-underbar-1.xhtml
new file mode 100644
index 00000000000..63bf7391c67
--- /dev/null
+++ b/tests/wpt/tests/mathml/presentation-markup/operators/stretchy-underbar-1.xhtml
@@ -0,0 +1,20 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <title>Check that UnderBar is visible when stretched</title>
+    <link rel="mismatch" href="stretchy-underbar-1-ref.xhtml"/>
+    <link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=242861"/>
+    <style type="text/css">
+      html { background-color: white; font-size: 50px }
+      mi { color: white; }
+      mo { color: black; }
+    </style>
+  </head>
+<body>
+  <math xmlns="http://www.w3.org/1998/Math/MathML">
+    <munder>
+      <mi>long</mi>
+      <mo stretchy="true">&#x332;</mo>
+    </munder>
+  </math>
+</body>
+</html>
diff --git a/tests/wpt/tests/mathml/presentation-markup/tokens/dynamic-mtext-like-002.html b/tests/wpt/tests/mathml/presentation-markup/tokens/dynamic-mtext-like-002.html
new file mode 100644
index 00000000000..f04504bb8cc
--- /dev/null
+++ b/tests/wpt/tests/mathml/presentation-markup/tokens/dynamic-mtext-like-002.html
@@ -0,0 +1,70 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<head>
+<meta charset="utf-8">
+<title>Dynamic mtext-like elements</title>
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<link rel="help" href="https://w3c.github.io/mathml-core/#text-mtext">
+<script src="/mathml/support/mathml-fragments.js"></script>
+<meta name="assert" content="Dynamically set children of mtext-like elements.">
+<style>
+  math {
+      font: 25px/1 Ahem;
+      background: lightblue;
+  }
+  li {
+      padding: 2px;
+  }
+</style>
+<link rel="match" href="dynamic-mtext-like-001-ref.html">
+<script>
+  window.addEventListener("load", function() {
+
+      // force initial layout so we're sure what we're testing against
+      document.documentElement.getBoundingClientRect();
+
+      Array.from(document.getElementsByClassName("testedElement")).forEach(e => {
+          if (e.textContent === "")
+              e.textContent = "É";
+          else if (e.textContent === "X")
+              e.firstChild.data = "pX";
+          else if (e.textContent === "p") {
+              while (e.firstChild)
+                  e.removeChild(e.firstChild);
+              e.insertAdjacentHTML("beforeend", "<span>Xp</span>")
+          }
+      });
+
+      document.documentElement.classList.remove('reftest-wait');
+  });
+</script>
+</head>
+<body>
+  <ol>
+    <li><math><mtext class="testedElement"></mtext></math></li>
+    <li><math><mtext class="testedElement">X</mtext></math></li>
+    <li><math><mtext class="testedElement">p</mtext></math></li>
+    <li><math><mi class="testedElement"></mi></math></li>
+    <li><math><mi class="testedElement">X</mi></math></li>
+    <li><math><mi class="testedElement">p</mi></math></li>
+    <li><math><mn class="testedElement"></mn></math></li>
+    <li><math><mn class="testedElement">X</mn></math></li>
+    <li><math><mn class="testedElement">p</mn></math></li>
+    <li><math><mo class="testedElement"></mo></math></li>
+    <li><math><mo class="testedElement">X</mo></math></li>
+    <li><math><mo class="testedElement">p</mo></math></li>
+    <li><math><mo class="testedElement"></mo></math></li>
+    <li><math><mo class="testedElement">X</mo></math></li>
+    <li><math><mo class="testedElement">p</mo></math></li>
+    <li><math><ms class="testedElement"></ms></math></li>
+    <li><math><ms class="testedElement">X</ms></math></li>
+    <li><math><ms class="testedElement">p</ms></math></li>
+    <!-- HTML parser does not accept span as a child of annotation or
+         annotation-xml, so we can't test dynamic VS static. -->
+    <li><math><annotation class="testedElement"></annotation></math></li>
+    <li><math><annotation class="testedElement">X</annotation></math></li>
+    <li><math><annotation-xml class="testedElement"></annotation-xml></math></li>
+    <li><math><annotation-xml class="testedElement">X</annotation-xml></math></li>
+  </ol>
+</body>
+</html>
diff --git a/tests/wpt/tests/mediacapture-extensions/MediaStreamTrack-getFrameStats.https.html b/tests/wpt/tests/mediacapture-extensions/MediaStreamTrack-video-stats.https.html
similarity index 71%
rename from tests/wpt/tests/mediacapture-extensions/MediaStreamTrack-getFrameStats.https.html
rename to tests/wpt/tests/mediacapture-extensions/MediaStreamTrack-video-stats.https.html
index bc378d71b25..0f85f75b665 100644
--- a/tests/wpt/tests/mediacapture-extensions/MediaStreamTrack-getFrameStats.https.html
+++ b/tests/wpt/tests/mediacapture-extensions/MediaStreamTrack-video-stats.https.html
@@ -1,5 +1,6 @@
 <!doctype html>
 <meta charset=utf-8>
+<meta name="timeout" content="long">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script>
@@ -7,10 +8,12 @@
 
 async function getFrameStatsUntil(track, condition) {
   while (true) {
-    const stats = await track.getFrameStats();
+    const stats = track.stats.toJSON();
     if (condition(stats)) {
       return stats;
     }
+    // Repeat in the next task execution cycle.
+    await Promise.resolve();
   }
 }
 
@@ -22,7 +25,7 @@ promise_test(async t => {
   const firstStats =
       await getFrameStatsUntil(track, stats => stats.totalFrames > 0);
   await getFrameStatsUntil(track,
-                      stats => stats.totalFrames > firstStats.totalFrames);
+                           stats => stats.totalFrames > firstStats.totalFrames);
 }, `totalFrames increases over time`);
 
 promise_test(async t => {
@@ -45,11 +48,6 @@ promise_test(async t => {
   const [track] = stream.getTracks();
   t.add_cleanup(() => track.stop());
 
-  // No frames should be discarded initially.
-  const firstStats = await getFrameStatsUntil(
-      track, stats => stats.deliveredFrames > 0);
-  assert_equals(firstStats.discardedFrames, 0);
-
   // Assert test prerequisite is met: frames will be discarded if the track is
   // opened with a higher frame rate than we apply after it is opened.
   assert_greater_than(track.getSettings().frameRate, 10);
@@ -58,6 +56,34 @@ promise_test(async t => {
   await getFrameStatsUntil(track, stats => stats.discardedFrames > 0);
 }, `discardedFrames increases when frameRate decimation is happening`);
 
+promise_test(async t => {
+  const stream = await navigator.mediaDevices.getUserMedia({video:true});
+  const [track] = stream.getTracks();
+  t.add_cleanup(() => track.stop());
+
+  // Hold a reference directly to the [SameObject] stats, bypassing the
+  // `track.stats` getter in the subsequent getting of `totalFrames`.
+  const stats = track.stats;
+  const firstTotalFrames = stats.totalFrames;
+  while (stats.totalFrames == firstTotalFrames) {
+    await Promise.resolve();
+  }
+  assert_greater_than(stats.totalFrames, firstTotalFrames);
+}, `Counters increase even if we don't call the track.stats getter`);
+
+promise_test(async t => {
+  const stream = await navigator.mediaDevices.getUserMedia({video:true});
+  const [track] = stream.getTracks();
+  t.add_cleanup(() => track.stop());
+
+  const firstTotalFrames = track.stats.totalFrames;
+  // Busy-loop for 100 ms, all within the same task execution cycle.
+  const firstTimeMs = performance.now();
+  while (performance.now() - firstTimeMs < 100) {}
+  // The frame counter should not have changed.
+  assert_equals(track.stats.totalFrames, firstTotalFrames);
+}, `Counters do not increase in the same task execution cycle`);
+
 promise_test(async t => {
   const stream = await navigator.mediaDevices.getUserMedia({
           video:{frameRate:{ideal:20}}
@@ -80,6 +106,18 @@ promise_test(async t => {
                 stats.deliveredFrames + stats.discardedFrames);
 }, `totalFrames is the sum of deliveredFrames and discardedFrames`);
 
+promise_test(async t => {
+  const stream = await navigator.mediaDevices.getUserMedia({video:true});
+  const [track] = stream.getTracks();
+  t.add_cleanup(() => track.stop());
+
+  const a = track.stats;
+  await getFrameStatsUntil(track, stats => stats.totalFrames > 0);
+  const b = track.stats;
+  // The counters may have changed, but `a` and `b` are still the same object.
+  assert_equals(a, b);
+}, `SameObject policy applies`);
+
 promise_test(async t => {
   const stream = await navigator.mediaDevices.getUserMedia({
           video:{frameRate:{ideal:20}}
@@ -93,14 +131,12 @@ promise_test(async t => {
   await track.applyConstraints({frameRate:{ideal:10}});
 
   // Wait for media to flow before disabling the `track`.
-  const startTimeMs = performance.now();
   const initialStats = await getFrameStatsUntil(track, stats =>
       stats.deliveredFrames > 0 && stats.discardedFrames > 0 &&
       stats.totalFrames > 10);
-  const elapsedTimeMs = performance.now() - startTimeMs;
   track.enabled = false;
   // Upon disabling, the counters are not reset.
-  const disabledSnapshot = await track.getFrameStats();
+  const disabledSnapshot = track.stats.toJSON();
   assert_greater_than_equal(disabledSnapshot.deliveredFrames,
                             initialStats.deliveredFrames);
   assert_greater_than_equal(disabledSnapshot.discardedFrames,
@@ -109,14 +145,17 @@ promise_test(async t => {
                             initialStats.totalFrames);
 
   // Wait enough time that frames should have been produced.
-  // `elapsedTimeMs` should be enough to produce ~10 frames.
-  await new Promise(r => t.step_timeout(r, elapsedTimeMs));
+  await new Promise(r => t.step_timeout(r, 500));
 
-  // Frame metrics should be frozen.
-  const stats = await track.getFrameStats();
-  assert_equals(stats.deliveredFrames, disabledSnapshot.deliveredFrames);
-  assert_equals(stats.discardedFrames, disabledSnapshot.discardedFrames);
-  assert_equals(stats.totalFrames, disabledSnapshot.totalFrames);
+  // Frame metrics should be frozen, but because `enabled = false` does not
+  // return a promise, we allow some lee-way in case a frame was still in flight
+  // during the disabling.
+  assert_approx_equals(
+      track.stats.deliveredFrames, disabledSnapshot.deliveredFrames, 1);
+  assert_approx_equals(
+      track.stats.discardedFrames, disabledSnapshot.discardedFrames, 1);
+  assert_approx_equals(
+      track.stats.totalFrames, disabledSnapshot.totalFrames, 1);
 }, `Stats are frozen while disabled`);
 
 promise_test(async t => {
@@ -139,12 +178,11 @@ promise_test(async t => {
   // Re-enable the track. The stats counters should be greater than or equal to
   // what they were previously.
   track.enabled = true;
-  const stats = await track.getFrameStats();
-  assert_greater_than_equal(stats.deliveredFrames,
+  assert_greater_than_equal(track.stats.deliveredFrames,
                             initialStats.deliveredFrames);
-  assert_greater_than_equal(stats.discardedFrames,
+  assert_greater_than_equal(track.stats.discardedFrames,
                             initialStats.discardedFrames);
-  assert_greater_than_equal(stats.totalFrames,
+  assert_greater_than_equal(track.stats.totalFrames,
                             initialStats.totalFrames);
 }, `Disabling and re-enabling does not reset the counters`);
 
@@ -164,13 +202,13 @@ promise_test(async t => {
   await getFrameStatsUntil(originalTrack, stats =>
       stats.deliveredFrames > 0 && stats.discardedFrames > 0);
   originalTrack.enabled = false;
-  const originalTrackInitialStats = await originalTrack.getFrameStats();
+  const originalTrackInitialStats = originalTrack.stats.toJSON();
 
   // Clone the track, its counters should be zero initially.
   // This is not racy because the cloned track is also disabled.
   const clonedTrack = originalTrack.clone();
   t.add_cleanup(() => clonedTrack.stop());
-  const clonedTrackStats = await clonedTrack.getFrameStats();
+  const clonedTrackStats = clonedTrack.stats.toJSON();
   assert_equals(clonedTrackStats.deliveredFrames, 0);
   assert_equals(clonedTrackStats.discardedFrames, 0);
   assert_equals(clonedTrackStats.totalFrames, 0);
@@ -182,12 +220,11 @@ promise_test(async t => {
 
   // This does not affect the original track's stats, which are still frozen due
   // to the original track being disabled.
-  const originalTrackSecondStats = await originalTrack.getFrameStats();
-  assert_equals(originalTrackSecondStats.deliveredFrames,
+  assert_equals(originalTrack.stats.deliveredFrames,
                 originalTrackInitialStats.deliveredFrames);
-  assert_equals(originalTrackSecondStats.discardedFrames,
+  assert_equals(originalTrack.stats.discardedFrames,
                 originalTrackInitialStats.discardedFrames);
-  assert_equals(originalTrackSecondStats.totalFrames,
+  assert_equals(originalTrack.stats.totalFrames,
                 originalTrackInitialStats.totalFrames);
 }, `New stats baselines when a track is cloned from a disabled track`);
 
@@ -217,13 +254,12 @@ promise_test(async t => {
   // will have started from zero.
   const clonedTrackStats = await getFrameStatsUntil(clonedTrack, stats =>
       stats.deliveredFrames > 0 && stats.discardedFrames > 0);
-  const originalTrackStats = await originalTrack.getFrameStats();
   assert_less_than(clonedTrackStats.deliveredFrames,
-                   originalTrackStats.deliveredFrames);
+                   originalTrack.stats.deliveredFrames);
   assert_less_than(clonedTrackStats.discardedFrames,
-                   originalTrackStats.discardedFrames);
+                   originalTrack.stats.discardedFrames);
   assert_less_than(clonedTrackStats.totalFrames,
-                   originalTrackStats.totalFrames);
+                   originalTrack.stats.totalFrames);
 }, `New stats baselines when a track is cloned from an enabled track`);
 
 promise_test(async t => {
@@ -256,20 +292,39 @@ promise_test(async t => {
 
   // Because every clone reset its counters and every waits for media before
   // cloning, this must be true: originalStats > cloneAStats > cloneBStats.
-  const originalStats = await originalTrack.getFrameStats();
-  const cloneAStats = await cloneA.getFrameStats();
-  const cloneBStats = await cloneB.getFrameStats();
+  const originalStats = originalTrack.stats.toJSON();
+  const cloneAStats = cloneA.stats.toJSON();
+  const cloneBStats = cloneB.stats.toJSON();
   assert_greater_than(originalStats.totalFrames, cloneAStats.totalFrames);
   assert_greater_than(cloneAStats.totalFrames, cloneBStats.totalFrames);
 }, `New stats baselines for the clone of a clone`);
 
+promise_test(async t => {
+  const stream = await navigator.mediaDevices.getUserMedia({video:true});
+  const [originalTrack] = stream.getTracks();
+  t.add_cleanup(() => originalTrack.stop());
+
+  // Wait for some frames and assert that no frames are discarded.
+  const firstStats = await getFrameStatsUntil(originalTrack, stats =>
+      stats.deliveredFrames > 20);
+  assert_equals(firstStats.discardedFrames, 0);
+  // Make a clone that discards almost all frames. This should not affect the
+  // discarded frames counter of the original track.
+  const clonedTrack = originalTrack.clone();
+  await clonedTrack.applyConstraints({frameRate:{ideal:1}});
+  // Wait for some more frames. There should still be no frames discarded.
+  const secondStats = await getFrameStatsUntil(originalTrack, stats =>
+      stats.deliveredFrames > 40);
+  assert_equals(secondStats.discardedFrames, 0);
+}, `A low FPS clone does not affect the original track's discardedFrames`);
+
 promise_test(async t => {
   const stream = await navigator.mediaDevices.getUserMedia({audio:true});
   const [track] = stream.getTracks();
   t.add_cleanup(() => track.stop());
 
   try {
-    await track.getFrameStats();
+    track.stats.toJSON();
     assert_not_reached();
   } catch (e) {
     assert_equals(e.name, 'NotSupportedError');
diff --git a/tests/wpt/tests/mediacapture-streams/MediaStreamTrack-MediaElement-disabled-video-is-black.https.html b/tests/wpt/tests/mediacapture-streams/MediaStreamTrack-MediaElement-disabled-video-is-black.https.html
index f920eccdf2b..9215f931f0c 100644
--- a/tests/wpt/tests/mediacapture-streams/MediaStreamTrack-MediaElement-disabled-video-is-black.https.html
+++ b/tests/wpt/tests/mediacapture-streams/MediaStreamTrack-MediaElement-disabled-video-is-black.https.html
@@ -20,9 +20,23 @@ MediaStream is handled correctly by HTMLVideoElement.</p>
 <script src=/resources/testdriver-vendor.js></script>
 <script src=permission-helper.js></script>
 <script>
-const vid = document.getElementById("vid");
-const cv = document.createElement("canvas");
+
+function assertVideoElementIsBlack(vid) {
+  const cv = document.createElement("canvas");
+  cv.width = vid.videoWidth;
+  cv.height = vid.videoHeight;
+  const ctx = cv.getContext("2d");
+  ctx.drawImage(vid,0,0);
+  const imageData = ctx.getImageData(0, 0, cv.width, cv.height);
+  for (let i = 0; i < imageData.data.length / 4; ++i) {
+    assert_equals(imageData.data[i * 4], 0, "No red component in pixel #" + i);
+    assert_equals(imageData.data[i * 4 + 1], 0, "No green component in pixel #" + i);
+    assert_equals(imageData.data[i * 4 + 2], 0, "No blue component in pixel #" + i);
+  }
+}
+
 promise_test(async t => {
+  const vid = document.getElementById("vid");
   await setMediaPermission("granted", ["camera"]);
   const stream = await navigator.mediaDevices.getUserMedia({video: true});
   t.add_cleanup(() => {
@@ -36,21 +50,12 @@ promise_test(async t => {
   vid.srcObject = stream;
   vid.play();
   await new Promise(r => vid.onloadeddata = r);
-
-  cv.width = vid.videoWidth;
-  cv.height = vid.videoHeight;
-  const ctx = cv.getContext("2d");
-  ctx.drawImage(vid,0,0);
-  const imageData = ctx.getImageData(0, 0, cv.width, cv.height);
-  for (let i = 0; i < imageData.data.length / 4; ++i) {
-    assert_equals(imageData.data[i * 4], 0, "No red component in pixel #" + i);
-    assert_equals(imageData.data[i * 4 + 1], 0, "No green component in pixel #" + i);
-    assert_equals(imageData.data[i * 4 + 2], 0, "No blue component in pixel #" + i);
-    assert_equals(imageData.data[i * 4 + 3], 255, "No transparency in pixel #" + i);
-  }
+  assertVideoElementIsBlack(vid);
 }, "Tests that a disabled video track in a MediaStream is rendered as blackness");
 
 promise_test(async t => {
+  const vid = document.getElementById("vid");
+  const cv = document.createElement("canvas");
   const ctx = cv.getContext("2d");
   ctx.fillStyle = "red";
   ctx.fillRect(0, 0, cv.width, cv.height);
@@ -72,6 +77,8 @@ promise_test(async t => {
 }, "Test that a video element rendering a disabled video track reports correct intrinsic dimensions");
 
 promise_test(async t => {
+  const vid = document.getElementById("vid");
+  const cv = document.createElement("canvas");
   const originalWidth = cv.width;
   const originalHeight = cv.height;
 
@@ -103,13 +110,9 @@ promise_test(async t => {
   ]);
 
   // Test "flow" of the disabled track by checking for "resize" events on a
-  // video element rendering that track. They should not fire. As a reference,
-  // we look for two "resize" events on a different video element rendering an
-  // enabled clone of the disabled track. We look for two and not one event
-  // because then we don't rely on any ordering of events coming from the two
-  // video elements.
+  // video element rendering that track. Any delivered frames must be black.
   let resized = 0;
-  vid.addEventListener("resize", () => ++resized);
+  vid.addEventListener("resize", t.step_func(() => assertVideoElementIsBlack(vid)));
 
   for (let i = 0; i < 2; ++i) {
     cv.width = cv.width / 2;
@@ -117,9 +120,7 @@ promise_test(async t => {
     ctx.fillRect(0, 0, cv.width, cv.height);
     await new Promise(r => vid2.onresize = r);
   }
-
-  assert_equals(resized, 0);
-}, "Test that frames don't flow for a disabled video track");
+}, "Test that frames are black for a disabled video track with an enabled clone");
 </script>
 </body>
 </html>
diff --git a/tests/wpt/tests/mst-content-hint/RTCRtpSendParameters-degradationEffect.html b/tests/wpt/tests/mst-content-hint/RTCRtpSendParameters-degradationEffect.html
new file mode 100644
index 00000000000..e6a03c593f3
--- /dev/null
+++ b/tests/wpt/tests/mst-content-hint/RTCRtpSendParameters-degradationEffect.html
@@ -0,0 +1,120 @@
+<!doctype html>
+<meta charset=utf-8>
+<meta name="timeout" content="long">
+<title>RTCRtpSendParameters degradationPreference effect</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../webrtc/RTCPeerConnection-helper.js"></script>
+<script>
+  'use strict';
+
+// This file contains tests that check that degradation preference
+// actually has the desired effect. These tests take a long time to run.
+
+// Returns incoming bandwidth usage between stats1 and stats2
+// in bits per second.
+function bandwidth(stats1, stats2) {
+  const transport1 = [...stats1.values()].filter(({type}) => type === 'transport')[0];
+  const transport2 = [...stats2.values()].filter(({type}) => type === 'transport')[0];
+  const bytes = transport2.bytesReceived - transport1.bytesReceived;
+  // Multiply by 1000 to get per second, divide by 8 to get bits.
+  const bandwidth = 1000 * 8 * bytes /
+        (transport2.timestamp - transport1.timestamp);
+  return bandwidth;
+}
+
+// Returns tuple of { bandwidth, fps, x-res, y-res }
+async function measureStuff(t, pc, intervalMs) {
+  const stats1 = await pc.getStats();
+  await new Promise(r => t.step_timeout(r, intervalMs));
+  const stats2 = await pc.getStats();
+  // RTCInboundStreamStats
+  const inboundRtp1List = [...stats1.values()].filter(({type}) => type === 'inbound-rtp');
+  const inboundRtp2List = [...stats2.values()].filter(({type}) => type === 'inbound-rtp');
+  const inboundRtp1 = inboundRtp1List[0];
+  const inboundRtp2 = inboundRtp2List[0];
+  const fps = 1000 * (inboundRtp2.framesReceived - inboundRtp1.framesReceived) /
+        (inboundRtp2.timestamp - inboundRtp1.timestamp);
+  const result = {
+    bandwidth: bandwidth(stats1, stats2),
+    fps: fps,
+    width: inboundRtp2.frameWidth,
+    height: inboundRtp2.frameHeight
+  };
+  // Unbreak for debugging.
+  // con sole.log('Measure: ', performance.now(), " ", JSON.stringify(result));
+  return result;
+}
+
+// Wait for a certain condition to be true on the traffic measures
+// on the PC. Will typically be conditions on resolution, framerate
+// or bandwidth.
+async function waitForCondition(t, pc, condition, maxWait, stepName) {
+  let counter = 1;
+  let measure = await measureStuff(t, pc, 1000);
+  while (counter < maxWait && !condition(measure)) {
+    measure = await measureStuff(t, pc, 1000);
+    counter += 1;
+  }
+  assert_true(condition(measure),
+              `failure in ${stepName}, measure is ${JSON.stringify(measure)}`);
+  return condition(measure);
+}
+
+promise_test(async t => {
+  const pc1 = new RTCPeerConnection();
+  t.add_cleanup(() => pc1.close());
+  const stream = await getNoiseStream({video: true});
+  t.add_cleanup(() => stream.getTracks().forEach(track => track.stop()));
+  const track = stream.getTracks()[0];
+  const { sender } = pc1.addTransceiver(track);
+
+  let param = sender.getParameters();
+
+  assert_equals(param.degradationPreference, undefined,
+    'Expect initial param.degradationPreference to be undefined');
+
+  param.degradationPreference = 'maintain-framerate';
+  await sender.setParameters(param);
+
+  const pc2 = new RTCPeerConnection();
+  t.add_cleanup(() => pc2.close());
+
+  exchangeIceCandidates(pc1, pc2);
+  await exchangeOfferAnswer(pc1, pc2);
+  await listenToConnected(pc1);
+  // Wait a few seconds to allow things to settle (rampup)
+  // We know that the generator is supposed to produce 640x480
+  // at 10 fps with a bandwidth exceeding 30 kbits/second.
+  assert_true(await waitForCondition(t, pc2, (measure) => {
+    return (measure.bandwidth > 30000 &&
+            measure.width == 640 &&
+            measure.fps > 9);
+  }, 60, 'preconditions'));
+
+  // Measure BW, resolution and frame rate over one second
+  const stats1 = await measureStuff(t, pc2, 1000);
+
+  // Constrain BW to 1/2 of measured value
+  const newBandwidth = stats1.bandwidth / 2;
+
+  const parameters = sender.getParameters();
+  parameters.encodings[0].maxBitrate = newBandwidth;
+  await sender.setParameters(parameters);
+  // Wait until the expected result happens.
+  let stats2 = await measureStuff(t, pc2, 1000);
+  let counter = 1;
+  const maxWaitCount = 20;
+  const kBandwidthMargin = 1.3;
+  // It takes time to adapt to a new bandwidth, time to scale down,
+  // and time to acknowledge that framerate should not be reduced.
+  // Measured time is around 16 seconds.
+  assert_true(await waitForCondition(t, pc2, (measure) => {
+    return (measure.bandwidth < newBandwidth * kBandwidthMargin &&
+            measure.width < stats1.width &&
+            measure.fps > stats1.fps * 0.9);
+  }, 60, 'adaptation'),
+             `Target bandwidth ${newBandwidth * kBandwidthMargin}, target min FPS ${stats1.fps * 0.9}`);
+}, 'Maintain-framerate reduces resolution on bandwidth cut', { timeout: 35000 });
+
+</script>
diff --git a/tests/wpt/tests/navigation-api/navigate-event/event-constructor.html b/tests/wpt/tests/navigation-api/navigate-event/event-constructor.html
index 065884240e0..863681ced73 100644
--- a/tests/wpt/tests/navigation-api/navigate-event/event-constructor.html
+++ b/tests/wpt/tests/navigation-api/navigate-event/event-constructor.html
@@ -18,7 +18,8 @@ test(() => {
       signal: (new AbortController()).signal,
       formData: null,
       downloadRequest: null,
-      info: null
+      info: null,
+      sourceElement: null
     });
   });
 }, "destination is required");
@@ -35,7 +36,8 @@ async_test(t => {
         hashChange: false,
         formData: null,
         downloadRequest: null,
-        info: null
+        info: null,
+        sourceElement: null
       });
     });
   });
@@ -49,6 +51,8 @@ async_test(t => {
     const formData = new FormData();
     const signal = (new AbortController()).signal;
     const downloadRequest = "abc";
+    const hasUAVisualTransition = true;
+    const sourceElement = document.createElement("a");
 
     const event = new NavigateEvent("navigate", {
       navigationType: "replace",
@@ -59,7 +63,9 @@ async_test(t => {
       signal,
       formData,
       downloadRequest,
-      info
+      info,
+      hasUAVisualTransition,
+      sourceElement
     });
 
     assert_equals(event.navigationType, "replace");
@@ -71,6 +77,8 @@ async_test(t => {
     assert_equals(event.formData, formData);
     assert_equals(event.downloadRequest, downloadRequest);
     assert_equals(event.info, info);
+    assert_equals(event.hasUAVisualTransition, hasUAVisualTransition);
+    assert_equals(event.sourceElement, sourceElement);
   });
   history.pushState(2, null, "#2");
 }, "all properties are reflected back");
@@ -90,7 +98,20 @@ async_test(t => {
     assert_equals(event.formData, null);
     assert_equals(event.downloadRequest, null);
     assert_equals(event.info, undefined);
+    assert_equals(event.sourceElement, null);
   });
   history.pushState(3, null, "#3");
 }, "defaults are as expected");
+
+async_test(t => {
+  navigation.onnavigate = t.step_func_done(e => {
+    const event = new NavigateEvent("navigate", {
+      destination: e.destination,
+      signal: (new AbortController()).signal
+    });
+
+    assert_false(event.hasUAVisualTransition);
+  });
+  history.pushState(3, null, "#3");
+}, "hasUAVisualTransition is default false");
 </script>
diff --git a/tests/wpt/tests/navigation-api/navigate-event/intercept-and-navigate.html b/tests/wpt/tests/navigation-api/navigate-event/intercept-and-navigate.html
index dfbb67b6b6b..e689dd6974e 100644
--- a/tests/wpt/tests/navigation-api/navigate-event/intercept-and-navigate.html
+++ b/tests/wpt/tests/navigation-api/navigate-event/intercept-and-navigate.html
@@ -3,6 +3,9 @@
 <script src="/resources/testharnessreport.js"></script>
 <script>
 promise_test(async t => {
+  let start_length = navigation.entries().length;
+  let start_index = navigation.currentEntry.index;
+
   // Wait for after the load event so that the navigation doesn't get converted
   // into a replace navigation.
   await new Promise(r => window.onload = () => t.step_timeout(r, 0));
@@ -12,8 +15,8 @@ promise_test(async t => {
   navigation.oncurrententrychange = e => {
     if (e.navigationType == "traverse") {
       assert_equals(location.hash, "");
-      assert_equals(navigation.currentEntry.index, 0);
-      assert_equals(navigation.entries().length, 2);
+      assert_equals(navigation.currentEntry.index, start_index);
+      assert_equals(navigation.entries().length, start_length + 1);
       navigation.navigate("#2");
     }
   };
@@ -21,7 +24,7 @@ promise_test(async t => {
   await back_result.committed;
   assert_equals(location.hash, "#2");
   await promise_rejects_dom(t, "AbortError", back_result.finished);
-  assert_equals(navigation.currentEntry.index, 1);
-  assert_equals(navigation.entries().length, 2);
+  assert_equals(navigation.currentEntry.index, start_index + 1);
+  assert_equals(navigation.entries().length, start_length + 1);
 }, "Using intercept() then navigate() in the ensuing currententrychange should abort the finished promise (but not the committed promise)");
 </script>
diff --git a/tests/wpt/tests/navigation-api/navigate-event/intercept-navigation-back.html b/tests/wpt/tests/navigation-api/navigate-event/intercept-navigation-back.html
index 8babf2bcdcc..7c7b80d5100 100644
--- a/tests/wpt/tests/navigation-api/navigate-event/intercept-navigation-back.html
+++ b/tests/wpt/tests/navigation-api/navigate-event/intercept-navigation-back.html
@@ -3,6 +3,9 @@
 <script src="/resources/testharnessreport.js"></script>
 <script>
 async_test(t => {
+  let start_length = navigation.entries().length;
+  let start_index = navigation.currentEntry.index;
+
   // Wait for after the load event so that the navigation doesn't get converted
   // into a replace navigation.
   window.onload = () => t.step_timeout(() => {
@@ -10,8 +13,8 @@ async_test(t => {
       assert_true(navigation.canGoBack);
       navigation.onnavigate = t.step_func(e => e.intercept());
       navigation.back().committed.then(t.step_func_done(() => {
-        assert_equals(navigation.entries().length, 2);
-        assert_equals(navigation.currentEntry, navigation.entries()[0]);
+        assert_equals(navigation.entries().length, start_length + 1);
+        assert_equals(navigation.currentEntry, navigation.entries()[start_index]);
       }));
     });
   }, 0);
diff --git a/tests/wpt/tests/navigation-api/navigate-event/intercept-same-document-history-back.html b/tests/wpt/tests/navigation-api/navigate-event/intercept-same-document-history-back.html
index 6faabe19646..6f57d95b1af 100644
--- a/tests/wpt/tests/navigation-api/navigate-event/intercept-same-document-history-back.html
+++ b/tests/wpt/tests/navigation-api/navigate-event/intercept-same-document-history-back.html
@@ -3,6 +3,9 @@
 <script src="/resources/testharnessreport.js"></script>
 <script>
 async_test(t => {
+  let start_length = navigation.entries().length;
+  let start_index = navigation.currentEntry.index;
+
   // Wait for after the load event so that the navigation doesn't get converted
   // into a replace navigation.
   window.onload = () => t.step_timeout(() => {
@@ -15,13 +18,13 @@ async_test(t => {
     navigation.onnavigatesuccess = t.step_func(e => {
       onnavigatesuccess_calls++;
       if (onnavigatesuccess_calls == 3) {
-        assert_equals(navigation.entries().length, 3);
-        assert_equals(navigation.currentEntry.index, 1);
+        assert_equals(navigation.entries().length, start_length + 2);
+        assert_equals(navigation.currentEntry.index, start_index + 1);
         assert_equals(onnavigate_calls, 3);
         history.back();
       } else if (onnavigatesuccess_calls == 4) {
-        assert_equals(navigation.entries().length, 3);
-        assert_equals(navigation.currentEntry.index, 0);
+        assert_equals(navigation.entries().length, start_length + 2);
+        assert_equals(navigation.currentEntry.index, start_index);
         assert_equals(onnavigate_calls, 4);
         t.done();
       }
@@ -30,8 +33,8 @@ async_test(t => {
     navigation.navigate("?foo").finished
       .then(t.step_func(() => navigation.navigate("?bar").finished))
       .then(t.step_func(() => {
-        assert_equals(navigation.entries().length, 3);
-        assert_equals(navigation.currentEntry.index, 2);
+        assert_equals(navigation.entries().length, start_length + 2);
+        assert_equals(navigation.currentEntry.index, start_index + 2);
         assert_equals(onnavigate_calls, 2);
         history.back();
       }));
diff --git a/tests/wpt/tests/navigation-api/navigate-event/navigate-anchor-cross-origin.html b/tests/wpt/tests/navigation-api/navigate-event/navigate-anchor-cross-origin.html
index ee099248507..62e5adb20ae 100644
--- a/tests/wpt/tests/navigation-api/navigate-event/navigate-anchor-cross-origin.html
+++ b/tests/wpt/tests/navigation-api/navigate-event/navigate-anchor-cross-origin.html
@@ -17,6 +17,7 @@ async_test(t => {
     assert_equals(e.destination.key, "");
     assert_equals(e.destination.id, "");
     assert_equals(e.destination.index, -1);
+    assert_equals(e.sourceElement, document.getElementById("a"));
     e.preventDefault();
   });
   a.click();
diff --git a/tests/wpt/tests/navigation-api/navigate-event/navigate-anchor-download-userInitiated.html b/tests/wpt/tests/navigation-api/navigate-event/navigate-anchor-download-userInitiated.html
index b9506984dad..69181425292 100644
--- a/tests/wpt/tests/navigation-api/navigate-event/navigate-anchor-download-userInitiated.html
+++ b/tests/wpt/tests/navigation-api/navigate-event/navigate-anchor-download-userInitiated.html
@@ -21,6 +21,7 @@ async_test(t => {
     assert_equals(e.destination.key, "");
     assert_equals(e.destination.id, "");
     assert_equals(e.destination.index, -1);
+    assert_equals(e.sourceElement, document.getElementById("a"));
     e.preventDefault();
     t.step_timeout(t.step_func_done(() => assert_equals(location.hash, "")), 0);
   });
diff --git a/tests/wpt/tests/navigation-api/navigate-event/navigate-anchor-download.html b/tests/wpt/tests/navigation-api/navigate-event/navigate-anchor-download.html
index 05fb0ecf2fe..d04245ec253 100644
--- a/tests/wpt/tests/navigation-api/navigate-event/navigate-anchor-download.html
+++ b/tests/wpt/tests/navigation-api/navigate-event/navigate-anchor-download.html
@@ -25,6 +25,7 @@ for (const [tag, download_attr] of tests) {
       assert_equals(e.destination.key, "");
       assert_equals(e.destination.id, "");
       assert_equals(e.destination.index, -1);
+      assert_equals(e.sourceElement, a);
       e.preventDefault();
     });
     a.click();
diff --git a/tests/wpt/tests/navigation-api/navigate-event/navigate-anchor-fragment.html b/tests/wpt/tests/navigation-api/navigate-event/navigate-anchor-fragment.html
index 51221ebcad3..6443ccecd1d 100644
--- a/tests/wpt/tests/navigation-api/navigate-event/navigate-anchor-fragment.html
+++ b/tests/wpt/tests/navigation-api/navigate-event/navigate-anchor-fragment.html
@@ -17,6 +17,7 @@ async_test(t => {
     assert_equals(e.destination.key, "");
     assert_equals(e.destination.id, "");
     assert_equals(e.destination.index, -1);
+    assert_equals(e.sourceElement, document.getElementById("a"));
     e.preventDefault();
     t.step_timeout(t.step_func_done(() => assert_equals(location.hash, "")), 0);
   });
diff --git a/tests/wpt/tests/navigation-api/navigate-event/navigate-anchor-same-origin-cross-document.html b/tests/wpt/tests/navigation-api/navigate-event/navigate-anchor-same-origin-cross-document.html
index 68f5bf0627c..5a6dce7ec8b 100644
--- a/tests/wpt/tests/navigation-api/navigate-event/navigate-anchor-same-origin-cross-document.html
+++ b/tests/wpt/tests/navigation-api/navigate-event/navigate-anchor-same-origin-cross-document.html
@@ -18,6 +18,7 @@ async_test(t => {
     assert_equals(e.destination.key, "");
     assert_equals(e.destination.id, "");
     assert_equals(e.destination.index, -1);
+    assert_equals(e.sourceElement, document.getElementById("a"));
     e.preventDefault();
   });
   a.click();
diff --git a/tests/wpt/tests/navigation-api/navigate-event/navigate-anchor-userInitiated.html b/tests/wpt/tests/navigation-api/navigate-event/navigate-anchor-userInitiated.html
index 39192c91513..bb76e7a3fbe 100644
--- a/tests/wpt/tests/navigation-api/navigate-event/navigate-anchor-userInitiated.html
+++ b/tests/wpt/tests/navigation-api/navigate-event/navigate-anchor-userInitiated.html
@@ -20,6 +20,7 @@ async_test(t => {
     assert_equals(e.destination.key, "");
     assert_equals(e.destination.id, "");
     assert_equals(e.destination.index, -1);
+    assert_equals(e.sourceElement, document.getElementById("a"));
     e.preventDefault();
     t.step_timeout(t.step_func_done(() => assert_equals(location.hash, "")), 0);
   });
diff --git a/tests/wpt/tests/navigation-api/navigate-event/navigate-anchor-with-target.html b/tests/wpt/tests/navigation-api/navigate-event/navigate-anchor-with-target.html
index 6407b963beb..e4b897d82f3 100644
--- a/tests/wpt/tests/navigation-api/navigate-event/navigate-anchor-with-target.html
+++ b/tests/wpt/tests/navigation-api/navigate-event/navigate-anchor-with-target.html
@@ -23,6 +23,7 @@ async_test(t => {
     assert_equals(e.destination.key, "");
     assert_equals(e.destination.id, "");
       assert_equals(e.destination.index, -1);
+      assert_equals(e.sourceElement, null);
       e.preventDefault();
     });
     a.click();
diff --git a/tests/wpt/tests/navigation-api/navigate-event/navigate-destination-dynamic-index.html b/tests/wpt/tests/navigation-api/navigate-event/navigate-destination-dynamic-index.html
index 2e0f1ea4973..535e5cfee78 100644
--- a/tests/wpt/tests/navigation-api/navigate-event/navigate-destination-dynamic-index.html
+++ b/tests/wpt/tests/navigation-api/navigate-event/navigate-destination-dynamic-index.html
@@ -4,6 +4,8 @@
 <script src="../navigation-methods/return-value/resources/helpers.js"></script>
 <script>
 promise_test(async t => {
+  let start_index = navigation.currentEntry.index;
+
   // Wait for after the load event so that the navigation doesn't get converted
   // into a replace navigation.
   await new Promise(resolve => window.onload = () => t.step_timeout(resolve, 0));
@@ -12,7 +14,7 @@ promise_test(async t => {
   let back_destination;
   navigation.addEventListener("navigate", t.step_func(e => {
     back_destination = e.destination;
-    assert_equals(back_destination.index, 0);
+    assert_equals(back_destination.index, start_index);
   }), { once: true });
   await navigation.back().finished;
 
@@ -23,7 +25,7 @@ promise_test(async t => {
   assert_equals(back_destination.index, -1);
 
   navigation.addEventListener("navigate", t.step_func(e => {
-    assert_equals(e.destination.index, 1);
+    assert_equals(e.destination.index, start_index + 1);
 
     // Dispose the destination entry and destination.index should update.
     navigation.navigate("#clobber_forward");
diff --git a/tests/wpt/tests/navigation-api/navigate-event/navigate-destination-getState-back-forward.html b/tests/wpt/tests/navigation-api/navigate-event/navigate-destination-getState-back-forward.html
index c8b1043aba6..869fc164815 100644
--- a/tests/wpt/tests/navigation-api/navigate-event/navigate-destination-getState-back-forward.html
+++ b/tests/wpt/tests/navigation-api/navigate-event/navigate-destination-getState-back-forward.html
@@ -19,6 +19,7 @@ async_test(t => {
       assert_equals(e.destination.key, "");
       assert_equals(e.destination.id, "");
       assert_equals(e.destination.index, -1);
+      assert_equals(e.sourceElement, null);
     });
     navigation.back();
   }), 0);
diff --git a/tests/wpt/tests/navigation-api/navigate-event/navigate-destination-getState-navigate.html b/tests/wpt/tests/navigation-api/navigate-event/navigate-destination-getState-navigate.html
index 5dac40de566..d19a1685145 100644
--- a/tests/wpt/tests/navigation-api/navigate-event/navigate-destination-getState-navigate.html
+++ b/tests/wpt/tests/navigation-api/navigate-event/navigate-destination-getState-navigate.html
@@ -16,6 +16,7 @@ async_test(t => {
       assert_equals(e.destination.key, "");
       assert_equals(e.destination.id, "");
       assert_equals(e.destination.index, -1);
+      assert_equals(e.sourceElement, null);
     });
     navigation.navigate("#foo", { state: navState });
   }, 0);
diff --git a/tests/wpt/tests/navigation-api/navigate-event/navigate-destination-getState-reload.html b/tests/wpt/tests/navigation-api/navigate-event/navigate-destination-getState-reload.html
index a180e086a94..ac6528ce7ef 100644
--- a/tests/wpt/tests/navigation-api/navigate-event/navigate-destination-getState-reload.html
+++ b/tests/wpt/tests/navigation-api/navigate-event/navigate-destination-getState-reload.html
@@ -16,6 +16,7 @@ async_test(t => {
       assert_equals(e.destination.key, "");
       assert_equals(e.destination.id, "");
       assert_equals(e.destination.index, -1);
+      assert_equals(e.sourceElement, null);
       e.intercept();
     });
     navigation.updateCurrentEntry({ state: navState });
diff --git a/tests/wpt/tests/navigation-api/navigate-event/navigate-form-get.html b/tests/wpt/tests/navigation-api/navigate-event/navigate-form-get.html
index 87a102ddc05..7a71a1c3050 100644
--- a/tests/wpt/tests/navigation-api/navigate-event/navigate-form-get.html
+++ b/tests/wpt/tests/navigation-api/navigate-event/navigate-form-get.html
@@ -21,6 +21,7 @@ async_test(t => {
 
     // Because it's a GET, not a POST
     assert_equals(e.formData, null);
+    assert_equals(e.sourceElement, form);
   });
   window.onload = t.step_func(() => form.submit());
 }, "<form> submission with GET method fires navigate event but with formData null");
diff --git a/tests/wpt/tests/navigation-api/navigate-event/navigate-form-reload.html b/tests/wpt/tests/navigation-api/navigate-event/navigate-form-reload.html
index f18a11ebdac..21716905372 100644
--- a/tests/wpt/tests/navigation-api/navigate-event/navigate-form-reload.html
+++ b/tests/wpt/tests/navigation-api/navigate-event/navigate-form-reload.html
@@ -12,6 +12,7 @@ async_test(t => {
     iframe.contentWindow.navigation.onnavigate = t.step_func(e => {
       assert_equals(e.navigationType, "push");
       assert_not_equals(e.formData, null);
+      assert_equals(e.sourceElement, null);
 
       iframe.onload = t.step_func(() => {
         iframe.contentWindow.navigation.onnavigate = t.step_func_done(e => {
diff --git a/tests/wpt/tests/navigation-api/navigate-event/navigate-form-requestSubmit.html b/tests/wpt/tests/navigation-api/navigate-event/navigate-form-requestSubmit.html
new file mode 100644
index 00000000000..38dd9c7eee6
--- /dev/null
+++ b/tests/wpt/tests/navigation-api/navigate-event/navigate-form-requestSubmit.html
@@ -0,0 +1,35 @@
+<!doctype html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<form id="form" method="post" action="">
+<input type="submit" id="submit1">
+<input type="image" id="submit2">
+<button type="submit" id="submit3">
+</form>
+<script>
+promise_test(async () => {
+  await new Promise(r => window.onload = r);
+
+  let sourceElement;
+  navigation.onnavigate = e => {
+    e.preventDefault();
+    sourceElement = e.sourceElement;
+  };
+
+  form.requestSubmit(submit1);
+  await new Promise(r => navigation.onnavigateerror = r);
+  assert_equals(sourceElement, submit1);
+
+  form.requestSubmit(submit2);
+  await new Promise(r => navigation.onnavigateerror = r);
+  assert_equals(sourceElement, submit2);
+
+  form.requestSubmit(submit3);
+  await new Promise(r => navigation.onnavigateerror = r);
+  assert_equals(sourceElement, submit3);
+
+  form.requestSubmit();
+  await new Promise(r => navigation.onnavigateerror = r);
+  assert_equals(sourceElement, form);
+}, "<form> requestSubmit() sets sourceElement");
+</script>
diff --git a/tests/wpt/tests/navigation-api/navigate-event/navigate-form-traverse.html b/tests/wpt/tests/navigation-api/navigate-event/navigate-form-traverse.html
index d673537503e..b9665c80566 100644
--- a/tests/wpt/tests/navigation-api/navigate-event/navigate-form-traverse.html
+++ b/tests/wpt/tests/navigation-api/navigate-event/navigate-form-traverse.html
@@ -12,6 +12,7 @@ async_test(t => {
     iframe.contentWindow.navigation.onnavigate = t.step_func(e => {
       assert_equals(e.navigationType, "push");
       assert_not_equals(e.formData, null);
+      assert_equals(e.sourceElement, null);
 
       iframe.onload = t.step_func(() => {
         // Avoid the replace behavior that occurs if you navigate during the load handler
diff --git a/tests/wpt/tests/navigation-api/navigate-event/navigate-form-userInitiated.html b/tests/wpt/tests/navigation-api/navigate-event/navigate-form-userInitiated.html
index 40c5905447c..246e028a0db 100644
--- a/tests/wpt/tests/navigation-api/navigate-event/navigate-form-userInitiated.html
+++ b/tests/wpt/tests/navigation-api/navigate-event/navigate-form-userInitiated.html
@@ -24,6 +24,7 @@ async_test(t => {
     assert_equals(e.destination.id, "");
     assert_equals(e.destination.index, -1);
     assert_not_equals(e.formData, null);
+    assert_equals(e.sourceElement, submit);
   });
   window.onload = t.step_func(() => test_driver.click(submit));
 }, "<form> submission fires navigate event");
diff --git a/tests/wpt/tests/navigation-api/navigate-event/navigate-form-with-target.html b/tests/wpt/tests/navigation-api/navigate-event/navigate-form-with-target.html
index f6fe05c938f..4b1a8ce9d3a 100644
--- a/tests/wpt/tests/navigation-api/navigate-event/navigate-form-with-target.html
+++ b/tests/wpt/tests/navigation-api/navigate-event/navigate-form-with-target.html
@@ -22,6 +22,7 @@ async_test(t => {
       assert_equals(e.destination.id, "");
       assert_equals(e.destination.index, -1);
       assert_not_equals(e.formData, null);
+      assert_equals(e.sourceElement, null);
     });
     form.submit();
   });
diff --git a/tests/wpt/tests/navigation-api/navigate-event/navigate-form.html b/tests/wpt/tests/navigation-api/navigate-event/navigate-form.html
index c57d72c3deb..653ef3b8eba 100644
--- a/tests/wpt/tests/navigation-api/navigate-event/navigate-form.html
+++ b/tests/wpt/tests/navigation-api/navigate-event/navigate-form.html
@@ -19,6 +19,7 @@ async_test(t => {
     assert_equals(e.destination.id, "");
     assert_equals(e.destination.index, -1);
     assert_not_equals(e.formData, null);
+    assert_equals(e.sourceElement, form);
   });
   window.onload = t.step_func(() => form.submit());
 }, "<form> submission fires navigate event");
diff --git a/tests/wpt/tests/navigation-api/navigate-event/navigate-history-back-after-fragment.html b/tests/wpt/tests/navigation-api/navigate-event/navigate-history-back-after-fragment.html
index 57a30c85b87..9da4ddcd507 100644
--- a/tests/wpt/tests/navigation-api/navigate-event/navigate-history-back-after-fragment.html
+++ b/tests/wpt/tests/navigation-api/navigate-event/navigate-history-back-after-fragment.html
@@ -5,6 +5,7 @@
 async_test(t => {
   window.onload = () => t.step_timeout(() => {
     let start_length = history.length;
+    let start_index = navigation.currentEntry.index;
     let target_key = navigation.currentEntry.key;
     let target_id = navigation.currentEntry.id;
     location.hash = "#1";
@@ -21,8 +22,9 @@ async_test(t => {
       assert_true(e.destination.sameDocument);
       assert_equals(e.destination.key, target_key);
       assert_equals(e.destination.id, target_id);
-        assert_equals(e.destination.index, 0);
+        assert_equals(e.destination.index, start_index);
       assert_equals(e.formData, null);
+      assert_equals(e.sourceElement, null);
     });
 
     history.back();
diff --git a/tests/wpt/tests/navigation-api/navigate-event/navigate-history-back-after-pushState.html b/tests/wpt/tests/navigation-api/navigate-event/navigate-history-back-after-pushState.html
index bf2e6e4e300..fdee41a3121 100644
--- a/tests/wpt/tests/navigation-api/navigate-event/navigate-history-back-after-pushState.html
+++ b/tests/wpt/tests/navigation-api/navigate-event/navigate-history-back-after-pushState.html
@@ -4,11 +4,12 @@
 <script>
 async_test(t => {
   window.onload = () => t.step_timeout(() => {
-    let start_length = history.length;
+    let start_history_length = history.length;
+    let start_index = navigation.currentEntry.index;
     let target_key = navigation.currentEntry.key;
     let target_id = navigation.currentEntry.id;
     history.pushState(1, "", "pushState.html");
-    assert_equals(history.length, start_length + 1);
+    assert_equals(history.length, start_history_length + 1);
 
     navigation.onnavigate = t.step_func_done(e => {
       assert_equals(e.navigationType, "traverse");
@@ -21,8 +22,9 @@ async_test(t => {
       assert_true(e.destination.sameDocument);
       assert_equals(e.destination.key, target_key);
       assert_equals(e.destination.id, target_id);
-      assert_equals(e.destination.index, 0);
+      assert_equals(e.destination.index, start_index);
       assert_equals(e.formData, null);
+      assert_equals(e.sourceElement, null);
     });
 
     history.back();
diff --git a/tests/wpt/tests/navigation-api/navigate-event/navigate-history-back-cross-document.html b/tests/wpt/tests/navigation-api/navigate-event/navigate-history-back-cross-document.html
index cd7be6e9ad3..29c626a5221 100644
--- a/tests/wpt/tests/navigation-api/navigate-event/navigate-history-back-cross-document.html
+++ b/tests/wpt/tests/navigation-api/navigate-event/navigate-history-back-cross-document.html
@@ -23,6 +23,7 @@ async_test(t => {
         assert_equals(e.destination.index, 0);
         assert_equals(e.formData, null);
         assert_equals(e.info, undefined);
+        assert_equals(e.sourceElement, null);
       });
       assert_true(i.contentWindow.navigation.canGoBack);
       i.contentWindow.history.back();
diff --git a/tests/wpt/tests/navigation-api/navigate-event/navigate-history-back-noop.html b/tests/wpt/tests/navigation-api/navigate-event/navigate-history-back-noop.html
index 10763c93fd2..109106b77fc 100644
--- a/tests/wpt/tests/navigation-api/navigate-event/navigate-history-back-noop.html
+++ b/tests/wpt/tests/navigation-api/navigate-event/navigate-history-back-noop.html
@@ -4,6 +4,10 @@
 <iframe id="i" src="/common/blank.html"></iframe>
 <script>
 promise_test(async t => {
+  let start_length = navigation.entries().length;
+  let start_index = navigation.currentEntry.index;
+  let start_history_length = history.length;
+
   // Wait for after the load event so that the navigation doesn't get converted
   // into a replace navigation.
   await new Promise(resolve => window.onload = () => t.step_timeout(resolve, 0));
@@ -11,14 +15,14 @@ promise_test(async t => {
   await i.contentWindow.navigation.navigate("#").finished;
   assert_equals(i.contentWindow.navigation.entries().length, 2);
   assert_equals(i.contentWindow.navigation.currentEntry.index, 1);
-  assert_equals(navigation.entries().length, 1);
-  assert_equals(navigation.currentEntry.index, 0);
-  assert_equals(history.length, 2);
+  assert_equals(navigation.entries().length, start_length);
+  assert_equals(navigation.currentEntry.index, start_index);
+  assert_equals(history.length, start_history_length + 1);
 
   i.remove();
-  assert_equals(navigation.entries().length, 1);
-  assert_equals(navigation.currentEntry.index, 0);
-  assert_equals(history.length, 2);
+  assert_equals(navigation.entries().length, start_length);
+  assert_equals(navigation.currentEntry.index, start_index);
+  assert_equals(history.length, start_history_length + 1);
 
   // back() here should do nothing. The iframe that would have navigated has
   // been removed. No navigate event should be fired.
diff --git a/tests/wpt/tests/navigation-api/navigate-event/navigate-history-go-0.html b/tests/wpt/tests/navigation-api/navigate-event/navigate-history-go-0.html
index b1f41425b62..5508928e198 100644
--- a/tests/wpt/tests/navigation-api/navigate-event/navigate-history-go-0.html
+++ b/tests/wpt/tests/navigation-api/navigate-event/navigate-history-go-0.html
@@ -18,6 +18,7 @@ async_test(t => {
       assert_equals(e.destination.id, "");
       assert_equals(e.destination.index, -1);
       assert_equals(e.formData, null);
+      assert_equals(e.sourceElement, null);
       e.preventDefault();
     });
 
diff --git a/tests/wpt/tests/navigation-api/navigate-event/navigate-history-pushState.html b/tests/wpt/tests/navigation-api/navigate-event/navigate-history-pushState.html
index 266309a79e1..5079b210781 100644
--- a/tests/wpt/tests/navigation-api/navigate-event/navigate-history-pushState.html
+++ b/tests/wpt/tests/navigation-api/navigate-event/navigate-history-pushState.html
@@ -17,6 +17,7 @@ async_test(t => {
     assert_equals(e.destination.id, "");
     assert_equals(e.destination.index, -1);
     assert_equals(e.formData, null);
+    assert_equals(e.sourceElement, null);
     e.preventDefault();
     t.step_timeout(t.step_func_done(() => {
       assert_equals(location.hash, "");
diff --git a/tests/wpt/tests/navigation-api/navigate-event/navigate-history-replaceState.html b/tests/wpt/tests/navigation-api/navigate-event/navigate-history-replaceState.html
index ea6d3df455d..444116a6324 100644
--- a/tests/wpt/tests/navigation-api/navigate-event/navigate-history-replaceState.html
+++ b/tests/wpt/tests/navigation-api/navigate-event/navigate-history-replaceState.html
@@ -17,6 +17,7 @@ async_test(t => {
     assert_equals(e.destination.id, "");
     assert_equals(e.destination.index, -1);
     assert_equals(e.formData, null);
+    assert_equals(e.sourceElement, null);
     e.preventDefault();
     t.step_timeout(t.step_func_done(() => {
       assert_equals(location.hash, "");
diff --git a/tests/wpt/tests/navigation-api/navigate-event/navigate-iframe-location.html b/tests/wpt/tests/navigation-api/navigate-event/navigate-iframe-location.html
index 25d51476f3f..1bd79188231 100644
--- a/tests/wpt/tests/navigation-api/navigate-event/navigate-iframe-location.html
+++ b/tests/wpt/tests/navigation-api/navigate-event/navigate-iframe-location.html
@@ -21,6 +21,7 @@ async_test(t => {
       assert_equals(e.destination.id, "");
       assert_equals(e.destination.index, -1);
       assert_equals(e.formData, null);
+      assert_equals(e.sourceElement, null);
       e.preventDefault();
       t.step_timeout(t.step_func_done(() => assert_equals(location.hash, "")), 0);
     });
diff --git a/tests/wpt/tests/navigation-api/navigate-event/navigate-location.html b/tests/wpt/tests/navigation-api/navigate-event/navigate-location.html
index a4d0c60776d..a0ed4dc0aac 100644
--- a/tests/wpt/tests/navigation-api/navigate-event/navigate-location.html
+++ b/tests/wpt/tests/navigation-api/navigate-event/navigate-location.html
@@ -17,6 +17,7 @@ async_test(t => {
     assert_equals(e.destination.id, "");
     assert_equals(e.destination.index, -1);
     assert_equals(e.formData, null);
+    assert_equals(e.sourceElement, null);
   });
   location.href = "#1";
 }, "location API fires navigate event");
diff --git a/tests/wpt/tests/navigation-api/navigate-event/navigate-meta-refresh.html b/tests/wpt/tests/navigation-api/navigate-event/navigate-meta-refresh.html
index 9fa59b29f24..d4d5b1c8e13 100644
--- a/tests/wpt/tests/navigation-api/navigate-event/navigate-meta-refresh.html
+++ b/tests/wpt/tests/navigation-api/navigate-event/navigate-meta-refresh.html
@@ -20,6 +20,7 @@ async_test(t => {
       assert_equals(e.destination.id, "");
       assert_equals(e.destination.index, -1);
       assert_equals(e.formData, null);
+      assert_equals(e.sourceElement, null);
       e.preventDefault();
     });
   });
diff --git a/tests/wpt/tests/navigation-api/navigate-event/navigate-navigation-back-cross-document.html b/tests/wpt/tests/navigation-api/navigate-event/navigate-navigation-back-cross-document.html
index 2e1adbeee93..084051539b8 100644
--- a/tests/wpt/tests/navigation-api/navigate-event/navigate-navigation-back-cross-document.html
+++ b/tests/wpt/tests/navigation-api/navigate-event/navigate-navigation-back-cross-document.html
@@ -25,6 +25,7 @@ async_test(t => {
         assert_equals(e.destination.index, 0);
         assert_equals(e.formData, null);
         assert_equals(e.info, "hi");
+        assert_equals(e.sourceElement, null);
       });
       i.contentWindow.onbeforeunload = () => beforeunload_called = true;
       assert_true(i.contentWindow.navigation.canGoBack);
diff --git a/tests/wpt/tests/navigation-api/navigate-event/navigate-navigation-back-same-document-in-iframe.html b/tests/wpt/tests/navigation-api/navigate-event/navigate-navigation-back-same-document-in-iframe.html
index cebd2f3693c..42c694e2905 100644
--- a/tests/wpt/tests/navigation-api/navigate-event/navigate-navigation-back-same-document-in-iframe.html
+++ b/tests/wpt/tests/navigation-api/navigate-event/navigate-navigation-back-same-document-in-iframe.html
@@ -27,6 +27,7 @@ promise_test(async t => {
     assert_equals(e.destination.index, 0);
     assert_equals(e.formData, null);
     assert_equals(e.info, "hi");
+    assert_equals(e.sourceElement, null);
   }
   await i.contentWindow.navigation.back({ info: "hi" }).finished;
 }, "navigate event for navigation.back() - same-document in an iframe");
diff --git a/tests/wpt/tests/navigation-api/navigate-event/navigate-navigation-back-same-document.html b/tests/wpt/tests/navigation-api/navigate-event/navigate-navigation-back-same-document.html
index e587569a3c6..b08bbfcbf11 100644
--- a/tests/wpt/tests/navigation-api/navigate-event/navigate-navigation-back-same-document.html
+++ b/tests/wpt/tests/navigation-api/navigate-event/navigate-navigation-back-same-document.html
@@ -8,6 +8,7 @@ async_test(t => {
   window.onload = () => t.step_timeout(() => {
     let target_key = navigation.currentEntry.key;
     let target_id = navigation.currentEntry.id;
+    let target_index = navigation.currentEntry.index;
     navigation.navigate("#foo").committed.then(t.step_func(() => {
       navigation.onnavigate = t.step_func_done(e => {
         assert_equals(e.navigationType, "traverse");
@@ -20,10 +21,11 @@ async_test(t => {
         assert_true(e.destination.sameDocument);
         assert_equals(e.destination.key, target_key);
         assert_equals(e.destination.id, target_id);
-        assert_equals(e.destination.index, 0);
+        assert_equals(e.destination.index, target_index);
         assert_equals(e.formData, null);
         assert_equals(e.info, "hi");
         assert_not_equals(e.hasUAVisualTransition, undefined);
+        assert_equals(e.sourceElement, null);
       });
       assert_true(navigation.canGoBack);
       navigation.back({ info: "hi" });
diff --git a/tests/wpt/tests/navigation-api/navigate-event/navigate-navigation-navigate.html b/tests/wpt/tests/navigation-api/navigate-event/navigate-navigation-navigate.html
index ffc8ea867f7..c56af1b40df 100644
--- a/tests/wpt/tests/navigation-api/navigate-event/navigate-navigation-navigate.html
+++ b/tests/wpt/tests/navigation-api/navigate-event/navigate-navigation-navigate.html
@@ -16,6 +16,7 @@ async_test(t => {
     assert_equals(e.destination.id, "");
     assert_equals(e.destination.index, -1);
     assert_equals(e.formData, null);
+    assert_equals(e.sourceElement, null);
   });
   navigation.navigate("#foo");
 }, "navigate event for navigation.navigate()");
diff --git a/tests/wpt/tests/navigation-api/navigate-event/navigate-svg-anchor-fragment.html b/tests/wpt/tests/navigation-api/navigate-event/navigate-svg-anchor-fragment.html
new file mode 100644
index 00000000000..c6d210cccb1
--- /dev/null
+++ b/tests/wpt/tests/navigation-api/navigate-event/navigate-svg-anchor-fragment.html
@@ -0,0 +1,26 @@
+<!doctype html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<svg><a id="a" href="#1"></a></svg>
+<script>
+async_test(t => {
+  navigation.onnavigate = t.step_func(e => {
+    assert_equals(e.navigationType, "push");
+    assert_true(e.cancelable);
+    assert_true(e.canIntercept);
+    assert_false(e.userInitiated);
+    assert_true(e.hashChange);
+    assert_equals(e.downloadRequest, null);
+    assert_equals(e.formData, null);
+    assert_equals(new URL(e.destination.url).hash, "#1");
+    assert_true(e.destination.sameDocument);
+    assert_equals(e.destination.key, "");
+    assert_equals(e.destination.id, "");
+    assert_equals(e.destination.index, -1);
+    assert_equals(e.sourceElement, document.getElementById("a"));
+    e.preventDefault();
+    t.step_timeout(t.step_func_done(() => assert_equals(location.hash, "")), 0);
+  });
+  document.getElementById("a").dispatchEvent(new MouseEvent('click'));
+}, "<svg:a> click fires navigate event");
+</script>
diff --git a/tests/wpt/tests/navigation-api/navigate-event/navigate-to-srcdoc.html b/tests/wpt/tests/navigation-api/navigate-event/navigate-to-srcdoc.html
index 8bbb66a31fd..ea5c3f92168 100644
--- a/tests/wpt/tests/navigation-api/navigate-event/navigate-to-srcdoc.html
+++ b/tests/wpt/tests/navigation-api/navigate-event/navigate-to-srcdoc.html
@@ -21,6 +21,7 @@ async_test(t => {
       assert_equals(e.destination.id, "");
       assert_equals(e.destination.index, -1);
       assert_equals(e.formData, null);
+      assert_equals(e.sourceElement, null);
       e.preventDefault();
 
       // Make sure it doesn't navigate anyway.
diff --git a/tests/wpt/tests/navigation-api/navigate-event/navigate-window-open-self.html b/tests/wpt/tests/navigation-api/navigate-event/navigate-window-open-self.html
index a6e443fd5a1..4e569b6d548 100644
--- a/tests/wpt/tests/navigation-api/navigate-event/navigate-window-open-self.html
+++ b/tests/wpt/tests/navigation-api/navigate-event/navigate-window-open-self.html
@@ -16,6 +16,7 @@ async_test(t => {
     assert_equals(e.destination.id, "");
     assert_equals(e.destination.index, -1);
     assert_equals(e.formData, null);
+    assert_equals(e.sourceElement, null);
     e.preventDefault();
   });
   window.onload = t.step_func(() => window.open("#1", "_self"));
diff --git a/tests/wpt/tests/navigation-api/navigate-event/navigate-window-open.html b/tests/wpt/tests/navigation-api/navigate-event/navigate-window-open.html
index 1fe2402bc91..42828308d77 100644
--- a/tests/wpt/tests/navigation-api/navigate-event/navigate-window-open.html
+++ b/tests/wpt/tests/navigation-api/navigate-event/navigate-window-open.html
@@ -21,6 +21,7 @@ async_test(t => {
       assert_equals(e.destination.id, "");
       assert_equals(e.destination.index, -1);
       assert_equals(e.formData, null);
+      assert_equals(e.sourceElement, null);
       e.preventDefault();
     });
 
diff --git a/tests/wpt/tests/navigation-api/navigate-event/navigation-back-same-document-preventDefault.html b/tests/wpt/tests/navigation-api/navigate-event/navigation-back-same-document-preventDefault.html
index 7edb1888233..f8e31252a42 100644
--- a/tests/wpt/tests/navigation-api/navigate-event/navigation-back-same-document-preventDefault.html
+++ b/tests/wpt/tests/navigation-api/navigate-event/navigation-back-same-document-preventDefault.html
@@ -4,13 +4,16 @@
 <script src="../navigation-methods/return-value/resources/helpers.js"></script>
 <script>
 promise_test(async t => {
+  let start_length = navigation.entries().length;
+  let start_index = navigation.currentEntry.index;
+
   // Wait for after the load event so that the navigation doesn't get converted
   // into a replace navigation.
   await new Promise(resolve => window.onload = () => t.step_timeout(resolve, 0));
 
   await navigation.navigate("#").finished;
-  assert_equals(navigation.entries().length, 2);
-  assert_equals(navigation.currentEntry.index, 1);
+  assert_equals(navigation.entries().length, start_length + 1);
+  assert_equals(navigation.currentEntry.index, start_index + 1);
 
   navigation.onnavigate = e => e.preventDefault();
 
@@ -20,7 +23,7 @@ promise_test(async t => {
     navigateerror_called = true;
   });
   await assertBothRejectDOM(t, navigation.back(), "AbortError");
-  assert_equals(navigation.currentEntry.index, 1);
+  assert_equals(navigation.currentEntry.index, start_index + 1);
   assert_true(navigateerror_called);
 }, "navigation.back() same-document preventDefault");
 </script>
diff --git a/tests/wpt/tests/navigation-api/navigate-event/navigation-traverseTo-in-iframe-same-document-preventDefault.html b/tests/wpt/tests/navigation-api/navigate-event/navigation-traverseTo-in-iframe-same-document-preventDefault.html
index 463746e8f79..b3b57f2a1ab 100644
--- a/tests/wpt/tests/navigation-api/navigate-event/navigation-traverseTo-in-iframe-same-document-preventDefault.html
+++ b/tests/wpt/tests/navigation-api/navigate-event/navigation-traverseTo-in-iframe-same-document-preventDefault.html
@@ -5,6 +5,9 @@
 <iframe id="i" src="/common/blank.html"></iframe>
 <script>
 promise_test(async t => {
+  let start_length = navigation.entries().length;
+  let start_index = navigation.currentEntry.index;
+
   // Wait for after the load event so that the navigation doesn't get converted
   // into a replace navigation.
   await new Promise(resolve => window.onload = () => t.step_timeout(resolve, 0));
@@ -13,9 +16,9 @@ promise_test(async t => {
   // to its initial entry, the top window navigates as well.
   await i.contentWindow.navigation.navigate("#").finished;
   await navigation.navigate("#").finished;
-  assert_equals(navigation.entries().length, 2);
+  assert_equals(navigation.entries().length, start_length + 1);
   assert_equals(i.contentWindow.navigation.entries().length, 2);
-  assert_equals(navigation.currentEntry.index, 1);
+  assert_equals(navigation.currentEntry.index, start_index + 1);
   assert_equals(i.contentWindow.navigation.currentEntry.index, 1);
 
   // Ensure the top window, which is allowed to cancel the traversal, does so.
@@ -37,7 +40,7 @@ promise_test(async t => {
   const iDOMException = iWindow.DOMException;
   await assertBothRejectDOM(t, i.contentWindow.navigation.traverseTo(i.contentWindow.navigation.entries()[0].key), "AbortError", iWindow, iDOMException);
   assert_true(top_navigateerror_fired);
-  assert_equals(navigation.currentEntry.index, 1);
+  assert_equals(navigation.currentEntry.index, start_index + 1);
   assert_equals(i.contentWindow.navigation.currentEntry.index, 1);
 }, "navigation.traverseTo() in an iframe with same-document preventDefault in its parent");
 </script>
diff --git a/tests/wpt/tests/navigation-api/navigate-event/navigation-traverseTo-navigates-top-and-same-doc-child-and-cross-doc-child.html b/tests/wpt/tests/navigation-api/navigate-event/navigation-traverseTo-navigates-top-and-same-doc-child-and-cross-doc-child.html
index 31cb54fca2a..479f54213a9 100644
--- a/tests/wpt/tests/navigation-api/navigate-event/navigation-traverseTo-navigates-top-and-same-doc-child-and-cross-doc-child.html
+++ b/tests/wpt/tests/navigation-api/navigate-event/navigation-traverseTo-navigates-top-and-same-doc-child-and-cross-doc-child.html
@@ -5,6 +5,9 @@
 <iframe id="i2" src="/common/blank.html"></iframe>
 <script>
 promise_test(async t => {
+  let start_length = navigation.entries().length;
+  let start_index = navigation.currentEntry.index;
+
   // Wait for after the load event so that the navigation doesn't get converted
   // into a replace navigation.
   await new Promise(resolve => window.onload = () => t.step_timeout(resolve, 0));
@@ -13,10 +16,10 @@ promise_test(async t => {
   i2.contentWindow.navigation.navigate("?");
   await new Promise(resolve => i2.onload = () => t.step_timeout(resolve, 0));
 
-  assert_equals(navigation.entries().length, 2);
+  assert_equals(navigation.entries().length, start_length + 1);
   assert_equals(i1.contentWindow.navigation.entries().length, 2);
   assert_equals(i2.contentWindow.navigation.entries().length, 2);
-  assert_equals(navigation.currentEntry.index, 1);
+  assert_equals(navigation.currentEntry.index, start_index + 1);
   assert_equals(i1.contentWindow.navigation.currentEntry.index, 1);
   assert_equals(i2.contentWindow.navigation.currentEntry.index, 1);
 
@@ -37,12 +40,12 @@ promise_test(async t => {
     assert_false(e.cancelable);
   });
 
-  await navigation.traverseTo(navigation.entries()[0].key).finished;
+  await navigation.traverseTo(navigation.entries()[start_index].key).finished;
   // The top window will finish quickly, becuase it is same-document traversal.
   // i2 will be slower because it is cross-document, so wait for its onload.
   await new Promise(resolve => i2.onload = () => t.step_timeout(resolve, 0));
   assert_equals(navigate_event_count, 3);
-  assert_equals(navigation.currentEntry.index, 0);
+  assert_equals(navigation.currentEntry.index, start_index);
   assert_equals(i1.contentWindow.navigation.currentEntry.index, 0);
   assert_equals(i2.contentWindow.navigation.currentEntry.index, 0);
 }, "navigation.traverseTo() can navigate 3 frames of different types with correct navigate event cancelable values");
diff --git a/tests/wpt/tests/navigation-api/navigate-event/navigation-traverseTo-same-document-preventDefault-multiple-windows.html b/tests/wpt/tests/navigation-api/navigate-event/navigation-traverseTo-same-document-preventDefault-multiple-windows.html
index 9bb64fb7cc7..61859adb5ee 100644
--- a/tests/wpt/tests/navigation-api/navigate-event/navigation-traverseTo-same-document-preventDefault-multiple-windows.html
+++ b/tests/wpt/tests/navigation-api/navigate-event/navigation-traverseTo-same-document-preventDefault-multiple-windows.html
@@ -4,20 +4,23 @@
 <iframe id="i" src="/common/blank.html"></iframe>
 <script>
 promise_test(async t => {
+  let start_length = navigation.entries().length;
+  let start_index = navigation.currentEntry.index;
+
   // Wait for after the load event so that the navigation doesn't get converted
   // into a replace navigation.
   await new Promise(resolve => window.onload = () => t.step_timeout(resolve, 0));
   await navigation.navigate("#").finished;
   await i.contentWindow.navigation.navigate("#").finished;
-  assert_equals(navigation.entries().length, 2);
+  assert_equals(navigation.entries().length, start_length + 1);
   assert_equals(i.contentWindow.navigation.entries().length, 2);
-  assert_equals(navigation.currentEntry.index, 1);
+  assert_equals(navigation.currentEntry.index, start_index + 1);
   assert_equals(i.contentWindow.navigation.currentEntry.index, 1);
 
   navigation.onnavigate = e => e.preventDefault();
   i.contentWindow.navigation.onnavigate = t.unreached_func("navigate event should not fire in the iframe, because the traversal was cancelled in the top window");
-  await promise_rejects_dom(t, "AbortError", navigation.traverseTo(navigation.entries()[0].key).finished);
-  assert_equals(navigation.currentEntry.index, 1);
+  await promise_rejects_dom(t, "AbortError", navigation.traverseTo(navigation.entries()[start_index].key).finished);
+  assert_equals(navigation.currentEntry.index, start_index + 1);
   assert_equals(i.contentWindow.navigation.currentEntry.index, 1);
 }, "navigation.traverseTo() - if a top window cancels the traversal, any iframes should not fire navigate");
 </script>
diff --git a/tests/wpt/tests/navigation-api/navigate-event/navigation-traverseTo-top-cancels-cross-document-child.html b/tests/wpt/tests/navigation-api/navigate-event/navigation-traverseTo-top-cancels-cross-document-child.html
index 11f07afefc5..4ece3ca8cbc 100644
--- a/tests/wpt/tests/navigation-api/navigate-event/navigation-traverseTo-top-cancels-cross-document-child.html
+++ b/tests/wpt/tests/navigation-api/navigate-event/navigation-traverseTo-top-cancels-cross-document-child.html
@@ -5,6 +5,9 @@
 <iframe id="i" src="/common/blank.html"></iframe>
 <script>
 promise_test(async t => {
+  let start_length = navigation.entries().length;
+  let start_index = navigation.currentEntry.index;
+
   // Wait for after the load event so that the navigation doesn't get converted
   // into a replace navigation.
   await new Promise(resolve => window.onload = () => t.step_timeout(resolve, 0));
@@ -12,14 +15,14 @@ promise_test(async t => {
   i.contentWindow.navigation.navigate("?");
   await new Promise(resolve => i.onload = () => t.step_timeout(resolve, 0));
 
-  assert_equals(navigation.entries().length, 2);
+  assert_equals(navigation.entries().length, start_length + 1);
   assert_equals(i.contentWindow.navigation.entries().length, 2);
-  assert_equals(navigation.currentEntry.index, 1);
+  assert_equals(navigation.currentEntry.index, start_index + 1);
   assert_equals(i.contentWindow.navigation.currentEntry.index, 1);
 
   navigation.onnavigate = t.step_func(e => e.preventDefault());
   i.contentWindow.navigation.onnavigate = t.unreached_func("navigation should be cancelled before iframe fires navigate event");
-  await assertBothRejectDOM(t, navigation.traverseTo(navigation.entries()[0].key), "AbortError");
+  await assertBothRejectDOM(t, navigation.traverseTo(navigation.entries()[start_index].key), "AbortError");
   // Give the iframe time to navigate in case it was incorrectly permitted.
   await new Promise(resolve => t.step_timeout(resolve, 50));
 }, "navigate.traverseTo() cancelled by top frame cancels cross-document iframe");
diff --git a/tests/wpt/tests/navigation-api/navigate-event/same-url-replace-cross-document.html b/tests/wpt/tests/navigation-api/navigate-event/same-url-replace-cross-document.html
index 0a976cd51fd..b6bd0cdd883 100644
--- a/tests/wpt/tests/navigation-api/navigate-event/same-url-replace-cross-document.html
+++ b/tests/wpt/tests/navigation-api/navigate-event/same-url-replace-cross-document.html
@@ -5,10 +5,13 @@
 
 <script>
 promise_test(async t => {
+  let start_length = navigation.entries().length;
+  let start_index = navigation.currentEntry.index;
+
   // Wait for after the load event so that we are definitely testing the
   // same URL as the cause of the rejections.
   await new Promise(resolve => window.onload = () => t.step_timeout(resolve, 0));
-  assert_equals(navigation.entries().length, 1);
+  assert_equals(navigation.entries().length, start_length);
 
   navigation.onnavigate = t.step_func(e => {
     e.intercept();
@@ -17,7 +20,7 @@ promise_test(async t => {
   navigation.onnavigateerror = t.unreached_func("onnavigateerror should not be called");
 
   await navigation.navigate(location.href).finished;
-  assert_equals(navigation.entries().length, 1);
-  assert_equals(navigation.currentEntry.index, 0);
+  assert_equals(navigation.entries().length, start_length);
+  assert_equals(navigation.currentEntry.index, start_index);
 }, "navigate() to the current URL cross document should replace");
 </script>
diff --git a/tests/wpt/tests/navigation-api/navigate-event/same-url-replace-same-document.html b/tests/wpt/tests/navigation-api/navigate-event/same-url-replace-same-document.html
index 839c6879342..cc4faffe77a 100644
--- a/tests/wpt/tests/navigation-api/navigate-event/same-url-replace-same-document.html
+++ b/tests/wpt/tests/navigation-api/navigate-event/same-url-replace-same-document.html
@@ -5,19 +5,22 @@
 
 <script>
 promise_test(async t => {
+  let start_length = navigation.entries().length;
+  let start_index = navigation.currentEntry.index;
+
   // Wait for after the load event so that we are definitely testing the
   // same URL as the cause of the rejections.
   await new Promise(resolve => window.onload = () => t.step_timeout(resolve, 0));
-  assert_equals(navigation.entries().length, 1);
+  assert_equals(navigation.entries().length, start_length);
   await navigation.navigate("#").finished;
-  assert_equals(navigation.entries().length, 2);
-  assert_equals(navigation.currentEntry.index, 1);
+  assert_equals(navigation.entries().length, start_length + 1);
+  assert_equals(navigation.currentEntry.index, start_index + 1);
 
   navigation.onnavigate = t.step_func(e => {
     assert_equals(e.navigationType, "replace");
   });
   await navigation.navigate(location.href).finished;
-  assert_equals(navigation.entries().length, 2);
-  assert_equals(navigation.currentEntry.index, 1);
+  assert_equals(navigation.entries().length, start_length + 1);
+  assert_equals(navigation.currentEntry.index, start_index + 1);
 }, "navigate() to the current URL same document should replace");
 </script>
diff --git a/tests/wpt/tests/navigation-api/navigation-methods/back-forward-multiple-frames.html b/tests/wpt/tests/navigation-api/navigation-methods/back-forward-multiple-frames.html
index 738bfd37dcc..6c30987f759 100644
--- a/tests/wpt/tests/navigation-api/navigation-methods/back-forward-multiple-frames.html
+++ b/tests/wpt/tests/navigation-api/navigation-methods/back-forward-multiple-frames.html
@@ -6,20 +6,22 @@
 promise_test(async t => {
   // Wait for after the load event so that the navigation doesn't get converted
   // into a replace navigation.
+  let start_length = navigation.entries().length;
+  let start_index = navigation.currentEntry.index;
   await new Promise(resolve => window.onload = () => t.step_timeout(resolve, 0));
   // Step 1
-  assert_equals(navigation.entries().length, 1, "step 1 outer entries() length");
+  assert_equals(navigation.entries().length, start_length, "step 1 outer entries() length");
   assert_equals(i.contentWindow.navigation.entries().length, 1, "step 1 iframe entries() length");
   await navigation.navigate("#top").committed;
   // Step 2: iframe at initial entry, top on second entry
-  assert_equals(navigation.entries().length, 2, "step 2 outer entries() length");
+  assert_equals(navigation.entries().length, start_length+1, "step 2 outer entries() length");
   assert_equals(i.contentWindow.navigation.entries().length, 1, "step 2 iframe entries() length");
   await i.contentWindow.navigation.navigate("#iframe").committed;
 
   // Step 3: Both windows on second entry.
-  assert_equals(navigation.entries().length, 2, "step 3 outer entries() length");
+  assert_equals(navigation.entries().length, start_length+1, "step 3 outer entries() length");
   assert_equals(i.contentWindow.navigation.entries().length, 2, "step 3 iframe entries() length");
-  assert_equals(navigation.currentEntry.index, 1, "step 3 outer index");
+  assert_equals(navigation.currentEntry.index, start_index+1, "step 3 outer index");
   assert_equals(i.contentWindow.navigation.currentEntry.index, 1, "step 1 iframe index");
 
   // NOTE: the order of navigation in the two windows is not guaranteed; we need to wait for both.
@@ -29,7 +31,7 @@ promise_test(async t => {
     i.contentWindow.navigation.back().committed,
     new Promise(resolve => i.contentWindow.onpopstate = resolve)
   ]);
-  assert_equals(navigation.currentEntry.index, 1, "after iframe back() outer index");
+  assert_equals(navigation.currentEntry.index, start_index+1, "after iframe back() outer index");
   assert_equals(i.contentWindow.navigation.currentEntry.index, 0, "after iframe back() iframe index");
 
   // Going forward in iframe should go 2->3
@@ -37,7 +39,7 @@ promise_test(async t => {
     i.contentWindow.navigation.forward().commited,
     new Promise(resolve => i.contentWindow.onpopstate = resolve)
   ]);
-  assert_equals(navigation.currentEntry.index, 1, "after iframe forward() outer index");
+  assert_equals(navigation.currentEntry.index, start_index+1, "after iframe forward() outer index");
   assert_equals(i.contentWindow.navigation.currentEntry.index, 1, "after iframe forward() iframe index");
 
   // Going back in top should go 3->1 (navigating both windows).
@@ -45,7 +47,7 @@ promise_test(async t => {
     navigation.back().commited,
     new Promise(resolve => i.contentWindow.onpopstate = resolve)
   ]);
-  assert_equals(navigation.currentEntry.index, 0, "after outer back() outer index");
+  assert_equals(navigation.currentEntry.index, start_index, "after outer back() outer index");
   assert_equals(i.contentWindow.navigation.currentEntry.index, 0, "after outer back() iframe index");
 
   // Next two should not navigate the iframe
@@ -54,13 +56,13 @@ promise_test(async t => {
   // Going forward in top should go 1->2 (navigating top only)
   await navigation.forward().committed;
   await new Promise(resolve => t.step_timeout(resolve, 0));
-  assert_equals(navigation.currentEntry.index, 1, "after outer forward() outer index");
+  assert_equals(navigation.currentEntry.index, start_index+1, "after outer forward() outer index");
   assert_equals(i.contentWindow.navigation.currentEntry.index, 0, "after outer forward() iframe index");
 
   // Going back in top should go 2->1
   await navigation.back().committed;
   await new Promise(resolve => t.step_timeout(resolve, 0));
-  assert_equals(navigation.currentEntry.index, 0, "after outer second back() outer index");
+  assert_equals(navigation.currentEntry.index, start_index, "after outer second back() outer index");
   assert_equals(i.contentWindow.navigation.currentEntry.index, 0, "after outer second back() iframe index");
 
   // Going forward in iframe should go 1->3 (navigating both windows)
@@ -68,7 +70,7 @@ promise_test(async t => {
     i.contentWindow.navigation.forward().commited,
     new Promise(resolve => i.contentWindow.onpopstate = resolve)
   ]);
-  assert_equals(navigation.currentEntry.index, 1, "after iframe second forward() outer index");
+  assert_equals(navigation.currentEntry.index, start_index+1, "after iframe second forward() outer index");
   assert_equals(i.contentWindow.navigation.currentEntry.index, 1, "after iframe second forward() iframe index");
 }, "navigation.back() and navigation.forward() can navigate multiple frames");
 </script>
diff --git a/tests/wpt/tests/navigation-api/navigation-methods/disambigaute-back.html b/tests/wpt/tests/navigation-api/navigation-methods/disambigaute-back.html
index d44d435896d..a42000ca5fc 100644
--- a/tests/wpt/tests/navigation-api/navigation-methods/disambigaute-back.html
+++ b/tests/wpt/tests/navigation-api/navigation-methods/disambigaute-back.html
@@ -4,18 +4,20 @@
 <iframe id="i" src="/common/blank.html"></iframe>
 <script>
 async_test(t => {
+  let start_length = navigation.entries().length;
+  let start_index = navigation.currentEntry.index;
   // Wait for after the load event so that the navigation doesn't get converted
   // into a replace navigation.
   window.onload = () => t.step_timeout(() => {
-    assert_equals(navigation.entries().length, 1);
+    assert_equals(navigation.entries().length, start_length);
     assert_equals(i.contentWindow.navigation.entries().length, 1);
     navigation.navigate("#top");
-    assert_equals(navigation.entries().length, 2);
+    assert_equals(navigation.entries().length, start_length+1);
     assert_equals(i.contentWindow.navigation.entries().length, 1);
     i.contentWindow.navigation.navigate("#1");
-    assert_equals(navigation.entries().length, 2);
+    assert_equals(navigation.entries().length, start_length+1);
     assert_equals(i.contentWindow.navigation.entries().length, 2);
-    assert_equals(navigation.currentEntry.index, 1);
+    assert_equals(navigation.currentEntry.index, start_index+1);
     assert_equals(i.contentWindow.navigation.currentEntry.index, 1);
     assert_true(navigation.canGoBack);
     assert_true(i.contentWindow.navigation.canGoBack);
@@ -24,7 +26,7 @@ async_test(t => {
     // previous key. Navigate to the nearest one (which navigates the iframe
     // but not the top window).
     i.contentWindow.navigation.back().committed.then(t.step_func_done(() => {
-      assert_equals(navigation.currentEntry.index, 1);
+      assert_equals(navigation.currentEntry.index, start_index+1);
       assert_equals(i.contentWindow.navigation.currentEntry.index, 0);
     }));
   }, 0);
diff --git a/tests/wpt/tests/navigation-api/navigation-methods/disambigaute-forward.html b/tests/wpt/tests/navigation-api/navigation-methods/disambigaute-forward.html
index e252e309941..3062cb0bebf 100644
--- a/tests/wpt/tests/navigation-api/navigation-methods/disambigaute-forward.html
+++ b/tests/wpt/tests/navigation-api/navigation-methods/disambigaute-forward.html
@@ -4,33 +4,35 @@
 <iframe id="i" src="/common/blank.html"></iframe>
 <script>
 async_test(t => {
+  let start_length = navigation.entries().length;
+  let start_index = navigation.currentEntry.index;
   // Wait for after the load event so that the navigation doesn't get converted
   // into a replace navigation.
   window.onload = () => t.step_timeout(() => {
-    assert_equals(navigation.entries().length, 1);
+    assert_equals(navigation.entries().length, start_length);
     assert_equals(i.contentWindow.navigation.entries().length, 1);
     navigation.navigate("#top");
-    assert_equals(navigation.entries().length, 2);
+    assert_equals(navigation.entries().length, start_length+1);
     assert_equals(i.contentWindow.navigation.entries().length, 1);
     i.contentWindow.navigation.navigate("#1");
-    assert_equals(navigation.entries().length, 2);
+    assert_equals(navigation.entries().length, start_length+1);
     assert_equals(i.contentWindow.navigation.entries().length, 2);
-    assert_equals(navigation.currentEntry.index, 1);
+    assert_equals(navigation.currentEntry.index, start_index+1);
     assert_equals(i.contentWindow.navigation.currentEntry.index, 1);
     assert_true(navigation.canGoBack);
     assert_true(i.contentWindow.navigation.canGoBack);
 
     i.contentWindow.navigation.back().committed.then(t.step_func(() => {
-      assert_equals(navigation.currentEntry.index, 1);
+      assert_equals(navigation.currentEntry.index, start_index+1);
       assert_equals(i.contentWindow.navigation.currentEntry.index, 0);
       navigation.back().committed.then(t.step_func(() => {
-        assert_equals(navigation.currentEntry.index, 0);
+        assert_equals(navigation.currentEntry.index, start_index);
         assert_equals(i.contentWindow.navigation.currentEntry.index, 0);
         // There are 2 joint session history entries containing the top window's
         // final key. Navigate to the nearest one (which navigates only the
         // top window).
         navigation.forward().committed.then(t.step_func_done(() => {
-          assert_equals(navigation.currentEntry.index, 1);
+          assert_equals(navigation.currentEntry.index, start_index+1);
           assert_equals(i.contentWindow.navigation.currentEntry.index, 0);
         }));
       }));
diff --git a/tests/wpt/tests/navigation-api/navigation-methods/disambigaute-traverseTo-back-multiple.html b/tests/wpt/tests/navigation-api/navigation-methods/disambigaute-traverseTo-back-multiple.html
index 03a8eb10ede..7ecfc01b3fc 100644
--- a/tests/wpt/tests/navigation-api/navigation-methods/disambigaute-traverseTo-back-multiple.html
+++ b/tests/wpt/tests/navigation-api/navigation-methods/disambigaute-traverseTo-back-multiple.html
@@ -4,21 +4,23 @@
 <iframe id="i" src="/common/blank.html"></iframe>
 <script>
 async_test(t => {
+  let start_length = navigation.entries().length;
+  let start_index = navigation.currentEntry.index;
   // Wait for after the load event so that the navigation doesn't get converted
   // into a replace navigation.
   window.onload = () => t.step_timeout(() => {
-    assert_equals(navigation.entries().length, 1);
+    assert_equals(navigation.entries().length, start_length);
     assert_equals(i.contentWindow.navigation.entries().length, 1);
     navigation.navigate("#top");
-    assert_equals(navigation.entries().length, 2);
+    assert_equals(navigation.entries().length, start_length+1);
     assert_equals(i.contentWindow.navigation.entries().length, 1);
 
     let iframe_initial_key = i.contentWindow.navigation.currentEntry.key;
     i.contentWindow.navigation.navigate("#1");
     i.contentWindow.navigation.navigate("#2");
-    assert_equals(navigation.entries().length, 2);
+    assert_equals(navigation.entries().length, start_length+1);
     assert_equals(i.contentWindow.navigation.entries().length, 3);
-    assert_equals(navigation.currentEntry.index, 1);
+    assert_equals(navigation.currentEntry.index, start_index+1);
     assert_equals(i.contentWindow.navigation.currentEntry.index, 2);
     assert_true(navigation.canGoBack);
     assert_true(i.contentWindow.navigation.canGoBack);
@@ -27,7 +29,7 @@ async_test(t => {
     // initial key.  Navigate to the nearest one (which navigates the iframe
     // but not the top window).
     i.contentWindow.navigation.traverseTo(iframe_initial_key).committed.then(t.step_func_done(() => {
-      assert_equals(navigation.currentEntry.index, 1);
+      assert_equals(navigation.currentEntry.index, start_index+1);
       assert_equals(i.contentWindow.navigation.currentEntry.index, 0);
     }));
   }, 0);
diff --git a/tests/wpt/tests/navigation-api/navigation-methods/disambigaute-traverseTo-forward-multiple.html b/tests/wpt/tests/navigation-api/navigation-methods/disambigaute-traverseTo-forward-multiple.html
index f8e78c4b1d9..92f23f0acff 100644
--- a/tests/wpt/tests/navigation-api/navigation-methods/disambigaute-traverseTo-forward-multiple.html
+++ b/tests/wpt/tests/navigation-api/navigation-methods/disambigaute-traverseTo-forward-multiple.html
@@ -4,36 +4,38 @@
 <iframe id="i" src="/common/blank.html"></iframe>
 <script>
 promise_test(async t => {
+  let start_length = navigation.entries().length;
+  let start_index = navigation.currentEntry.index;
   // Wait for after the load event so that the navigation doesn't get converted
   // into a replace navigation.
   await new Promise(resolve => window.onload = () => t.step_timeout(resolve, 0));
-  assert_equals(navigation.entries().length, 1);
+  assert_equals(navigation.entries().length, start_length);
   assert_equals(i.contentWindow.navigation.entries().length, 1);
   let initial_key = navigation.currentEntry.key;
   await navigation.navigate("#top1").committed;
   await navigation.navigate("#top2").committed;
-  assert_equals(navigation.entries().length, 3);
+  assert_equals(navigation.entries().length, start_length+2);
   assert_equals(i.contentWindow.navigation.entries().length, 1);
   await i.contentWindow.navigation.navigate("#1").committed;
-  assert_equals(navigation.entries().length, 3);
+  assert_equals(navigation.entries().length, start_length+2);
   assert_equals(i.contentWindow.navigation.entries().length, 2);
-  assert_equals(navigation.currentEntry.index, 2);
+  assert_equals(navigation.currentEntry.index, start_index+2);
   assert_equals(i.contentWindow.navigation.currentEntry.index, 1);
   assert_true(navigation.canGoBack);
   assert_true(i.contentWindow.navigation.canGoBack);
   let final_key = navigation.currentEntry.key;
 
   await i.contentWindow.navigation.back().committed;
-  assert_equals(navigation.currentEntry.index, 2);
+  assert_equals(navigation.currentEntry.index, start_index+2);
   assert_equals(i.contentWindow.navigation.currentEntry.index, 0);
   await navigation.traverseTo(initial_key).committed;
-  assert_equals(navigation.currentEntry.index, 0);
+  assert_equals(navigation.currentEntry.index, start_index);
   assert_equals(i.contentWindow.navigation.currentEntry.index, 0);
   // There are 2 joint session history entries containing the top window's
   // final key. Navigate to the nearest one (which navigates only the
   // top window).
   await navigation.traverseTo(final_key).committed;
-  assert_equals(navigation.currentEntry.index, 2);
+  assert_equals(navigation.currentEntry.index, start_index+2);
   assert_equals(i.contentWindow.navigation.currentEntry.index, 0);
 }, "navigation.traverseTo() goes to the nearest entry when going forward");
 </script>
diff --git a/tests/wpt/tests/navigation-api/navigation-methods/forward-to-pruned-entry.html b/tests/wpt/tests/navigation-api/navigation-methods/forward-to-pruned-entry.html
index 05f70c5c2dc..18b30c620d5 100644
--- a/tests/wpt/tests/navigation-api/navigation-methods/forward-to-pruned-entry.html
+++ b/tests/wpt/tests/navigation-api/navigation-methods/forward-to-pruned-entry.html
@@ -3,13 +3,15 @@
 <script src="/resources/testharnessreport.js"></script>
 <script>
 promise_test(async t => {
+  let start_length = navigation.entries().length;
+  let start_index = navigation.currentEntry.index;
   // Wait for after the load event so that the navigation doesn't get converted
   // into a replace navigation.
   await new Promise(resolve => window.onload = () => t.step_timeout(resolve, 0));
   await navigation.navigate("#foo").finished;
-  assert_equals(navigation.entries().length, 2);
+  assert_equals(navigation.entries().length, start_length+1);
   await navigation.back().finished;
-  assert_equals(navigation.currentEntry.index, 0);
+  assert_equals(navigation.currentEntry.index, start_index);
 
   // Traverse forward then immediately do a same-document push. This will
   // truncate the back forward list, and by the time the traverse commits, the
@@ -19,15 +21,15 @@ promise_test(async t => {
   navigation.onnavigateerror = t.unreached_func("navigateerror should not fire");
   let forward_value = navigation.forward();
   await navigation.navigate("#clobber").finished;
-  assert_equals(navigation.currentEntry.index, 1);
+  assert_equals(navigation.currentEntry.index, start_index+1);
   await promise_rejects_dom(t, "AbortError", forward_value.committed);
   await promise_rejects_dom(t, "AbortError", forward_value.finished);
 
   // This leaves navigation.entries() in a consistent state where traversing
   // back and forward still works.
   await navigation.back().finished;
-  assert_equals(navigation.currentEntry.index, 0);
+  assert_equals(navigation.currentEntry.index, start_index);
   await navigation.forward().finished;
-  assert_equals(navigation.currentEntry.index, 1);
+  assert_equals(navigation.currentEntry.index, start_index+1);
 }, "If forward pruning clobbers the target of a traverse, abort");
 </script>
diff --git a/tests/wpt/tests/navigation-api/navigation-methods/navigate-history-push-not-loaded.html b/tests/wpt/tests/navigation-api/navigation-methods/navigate-history-push-not-loaded.html
index c1ecdaeeafd..f9194173325 100644
--- a/tests/wpt/tests/navigation-api/navigation-methods/navigate-history-push-not-loaded.html
+++ b/tests/wpt/tests/navigation-api/navigation-methods/navigate-history-push-not-loaded.html
@@ -5,8 +5,9 @@
 
 <script>
 promise_test(async t => {
+  let start_length = navigation.entries().length;
+  let start_index = navigation.currentEntry.index;
   // Purposefully do not wait until after the load event (unlike some sibling tests).
-  assert_equals(navigation.entries().length, 1);
   assert_equals(document.readyState, "loading", "Document must not have loaded yet");
 
   let navigateEventType;
@@ -14,7 +15,7 @@ promise_test(async t => {
 
   await navigation.navigate("#1", { history: "push" }).finished;
   assert_equals(navigateEventType, "push");
-  assert_equals(navigation.entries().length, 2);
-  assert_equals(navigation.currentEntry.index, 1);
+  assert_equals(navigation.entries().length, start_length+1);
+  assert_equals(navigation.currentEntry.index, start_index+1);
 }, "navigate() with history: 'push' in a document that has not yet had its load event");
 </script>
diff --git a/tests/wpt/tests/navigation-api/navigation-methods/navigate-history-push-same-url.html b/tests/wpt/tests/navigation-api/navigation-methods/navigate-history-push-same-url.html
index 339e8c3056b..a81215f7d46 100644
--- a/tests/wpt/tests/navigation-api/navigation-methods/navigate-history-push-same-url.html
+++ b/tests/wpt/tests/navigation-api/navigation-methods/navigate-history-push-same-url.html
@@ -5,10 +5,12 @@
 
 <script>
 promise_test(async t => {
+  let start_length = navigation.entries().length;
+  let start_index = navigation.currentEntry.index;
   // Wait for after the load event so that the navigation doesn't get converted
   // into a replace navigation due to onload not having completed.
   await new Promise(resolve => window.onload = () => t.step_timeout(resolve, 0));
-  assert_equals(navigation.entries().length, 1);
+  assert_equals(navigation.entries().length, start_length);
 
 
   let navigateEventType;
@@ -20,7 +22,7 @@ promise_test(async t => {
 
   await navigation.navigate(location.href, { history: "push" }).finished;
   assert_equals(navigateEventType, "push");
-  assert_equals(navigation.entries().length, 2);
-  assert_equals(navigation.currentEntry.index, 1);
+  assert_equals(navigation.entries().length, start_length+1);
+  assert_equals(navigation.currentEntry.index, start_index+1);
 }, "navigate() to the current URL with history: 'push' and intercept so it remains same-document");
 </script>
diff --git a/tests/wpt/tests/navigation-api/navigation-methods/navigate-replace-cross-document.html b/tests/wpt/tests/navigation-api/navigation-methods/navigate-replace-cross-document.html
index 7f016babe6b..0a36e25970f 100644
--- a/tests/wpt/tests/navigation-api/navigation-methods/navigate-replace-cross-document.html
+++ b/tests/wpt/tests/navigation-api/navigation-methods/navigate-replace-cross-document.html
@@ -7,6 +7,7 @@ async_test(t => {
   // Wait for after the load event so that the navigation doesn't get converted
   // into a replace navigation (which would defeat the point of the test).
   window.onload = () => t.step_timeout(() => {
+    let start_length = navigation.entries().length;
     let start_history_length = history.length;
     let start_entry_top = navigation.currentEntry;
     let start_entry_iframe_id = i.contentWindow.navigation.currentEntry.id;
@@ -16,7 +17,7 @@ async_test(t => {
     i.onload = t.step_func_done(() => {
       assert_equals(history.length, start_history_length);
 
-      assert_equals(navigation.entries().length, 1);
+      assert_equals(navigation.entries().length, start_length);
       assert_equals(navigation.currentEntry, start_entry_top);
 
       assert_equals(i.contentWindow.navigation.entries().length, 1);
diff --git a/tests/wpt/tests/navigation-api/navigation-methods/navigate-replace-same-document.html b/tests/wpt/tests/navigation-api/navigation-methods/navigate-replace-same-document.html
index 0d8493b7882..943ab377654 100644
--- a/tests/wpt/tests/navigation-api/navigation-methods/navigate-replace-same-document.html
+++ b/tests/wpt/tests/navigation-api/navigation-methods/navigate-replace-same-document.html
@@ -6,6 +6,7 @@ async_test(t => {
   // Wait for after the load event so that the navigation doesn't get converted
   // into a replace navigation.
   window.onload = () => t.step_timeout(t.step_func_done(async () => {
+    let start_length = navigation.entries().length;
     let start_history_length = history.length;
     let key1 = navigation.currentEntry.key;
     await navigation.navigate("#1").committed;
@@ -14,7 +15,7 @@ async_test(t => {
     await navigation.navigate("#2", { history: "replace" }).committed;
     let key3 = navigation.currentEntry.key;
     assert_equals(key2, key3);
-    assert_equals(navigation.entries().length, 2);
+    assert_equals(navigation.entries().length, start_length + 1);
     assert_equals(history.length, start_history_length + 1);
   }), 0);
 }, "navigate() with history: 'replace' option");
diff --git a/tests/wpt/tests/navigation-api/navigation-methods/return-value/back-forward-out-of-bounds.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/back-forward-out-of-bounds.html
index 015c090bf97..ac6d901ba52 100644
--- a/tests/wpt/tests/navigation-api/navigation-methods/return-value/back-forward-out-of-bounds.html
+++ b/tests/wpt/tests/navigation-api/navigation-methods/return-value/back-forward-out-of-bounds.html
@@ -2,15 +2,16 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/helpers.js"></script>
-
+<iframe id="i" src="/common/blank.html"></iframe>
 <script>
 promise_test(async t => {
-  assert_equals(navigation.entries().length, 1);
-  assert_equals(navigation.entries()[0], navigation.currentEntry);
-  assert_false(navigation.canGoBack);
-  assert_false(navigation.canGoForward);
+  await new Promise(resolve => window.onload = resolve);
+  assert_equals(i.contentWindow.navigation.entries().length, 1);
+  assert_equals(i.contentWindow.navigation.entries()[0], i.contentWindow.navigation.currentEntry);
+  assert_false(i.contentWindow.navigation.canGoBack);
+  assert_false(i.contentWindow.navigation.canGoForward);
 
-  await assertBothRejectDOM(t, navigation.back(), "InvalidStateError");
-  await assertBothRejectDOM(t, navigation.forward(), "InvalidStateError");
+  await assertBothRejectDOM(t, i.contentWindow.navigation.back(), "InvalidStateError", i.contentWindow);
+  await assertBothRejectDOM(t, i.contentWindow.navigation.forward(), "InvalidStateError", i.contentWindow);
 }, "back() and forward() out of bounds");
 </script>
diff --git a/tests/wpt/tests/navigation-api/navigation-methods/return-value/back-intercept-rejected.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/back-intercept-rejected.html
index 9d4238087ff..013ebf1e1e3 100644
--- a/tests/wpt/tests/navigation-api/navigation-methods/return-value/back-intercept-rejected.html
+++ b/tests/wpt/tests/navigation-api/navigation-methods/return-value/back-intercept-rejected.html
@@ -5,14 +5,16 @@
 
 <script>
 promise_test(async t => {
+  let start_length = navigation.entries().length;
+  let start_index = navigation.currentEntry.index;
   // Wait for after the load event so that the navigation doesn't get converted
   // into a replace navigation.
   await new Promise(resolve => window.onload = () => t.step_timeout(resolve, 0));
 
   location.href = "#1";
 
-  assert_equals(navigation.entries().length, 2);
-  const [entry0, entry1] = navigation.entries();
+  assert_equals(navigation.entries().length, start_length + 1);
+  const [entry0, entry1] = navigation.entries().slice(start_index);
   assert_equals((new URL(entry0.url)).hash, "");
   assert_equals((new URL(entry1.url)).hash, "#1");
 
diff --git a/tests/wpt/tests/navigation-api/navigation-methods/return-value/back-intercept.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/back-intercept.html
index 2654045c2b0..1db2f870d8d 100644
--- a/tests/wpt/tests/navigation-api/navigation-methods/return-value/back-intercept.html
+++ b/tests/wpt/tests/navigation-api/navigation-methods/return-value/back-intercept.html
@@ -5,14 +5,16 @@
 
 <script>
 promise_test(async t => {
+  let start_length = navigation.entries().length;
+  let start_index = navigation.currentEntry.index;
   // Wait for after the load event so that the navigation doesn't get converted
   // into a replace navigation.
   await new Promise(resolve => window.onload = () => t.step_timeout(resolve, 0));
 
   location.href = "#1";
 
-  assert_equals(navigation.entries().length, 2);
-  const [entry0, entry1] = navigation.entries();
+  assert_equals(navigation.entries().length, start_length + 1);
+  const [entry0, entry1] = navigation.entries().slice(start_index);
   assert_equals((new URL(entry0.url)).hash, "");
   assert_equals((new URL(entry1.url)).hash, "#1");
 
diff --git a/tests/wpt/tests/navigation-api/navigation-methods/return-value/back.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/back.html
index a2b13db901b..5521de25b79 100644
--- a/tests/wpt/tests/navigation-api/navigation-methods/return-value/back.html
+++ b/tests/wpt/tests/navigation-api/navigation-methods/return-value/back.html
@@ -5,14 +5,16 @@
 
 <script>
 promise_test(async t => {
+  let start_length = navigation.entries().length;
+  let start_index = navigation.currentEntry.index;
   // Wait for after the load event so that the navigation doesn't get converted
   // into a replace navigation.
   await new Promise(resolve => window.onload = () => t.step_timeout(resolve, 0));
 
   location.href = "#1";
 
-  assert_equals(navigation.entries().length, 2);
-  const [entry0, entry1] = navigation.entries();
+  assert_equals(navigation.entries().length, start_length + 1);
+  const [entry0, entry1] = navigation.entries().slice(start_index);
   assert_equals((new URL(entry0.url)).hash, "");
   assert_equals((new URL(entry1.url)).hash, "#1");
 
diff --git a/tests/wpt/tests/navigation-api/navigation-methods/return-value/forward-intercept-rejected.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/forward-intercept-rejected.html
index 9e86dcca197..9d5318a260d 100644
--- a/tests/wpt/tests/navigation-api/navigation-methods/return-value/forward-intercept-rejected.html
+++ b/tests/wpt/tests/navigation-api/navigation-methods/return-value/forward-intercept-rejected.html
@@ -5,6 +5,8 @@
 
 <script>
 promise_test(async t => {
+  let start_length = navigation.entries().length;
+  let start_index = navigation.currentEntry.index;
   // Wait for after the load event so that the navigation doesn't get converted
   // into a replace navigation.
   await new Promise(resolve => window.onload = () => t.step_timeout(resolve, 0));
@@ -12,8 +14,8 @@ promise_test(async t => {
   location.href = "#1";
   await navigation.back().committed;
 
-  assert_equals(navigation.entries().length, 2);
-  const [entry0, entry1] = navigation.entries();
+  assert_equals(navigation.entries().length, start_length + 1);
+  const [entry0, entry1] = navigation.entries().slice(start_index);
   assert_equals((new URL(entry0.url)).hash, "");
   assert_equals((new URL(entry1.url)).hash, "#1");
 
diff --git a/tests/wpt/tests/navigation-api/navigation-methods/return-value/forward-intercept.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/forward-intercept.html
index ce4ab321707..3c521197454 100644
--- a/tests/wpt/tests/navigation-api/navigation-methods/return-value/forward-intercept.html
+++ b/tests/wpt/tests/navigation-api/navigation-methods/return-value/forward-intercept.html
@@ -5,14 +5,16 @@
 
 <script>
 promise_test(async t => {
+  let start_length = navigation.entries().length;
+  let start_index = navigation.currentEntry.index;
   // Wait for after the load event so that the navigation doesn't get converted
   // into a replace navigation.
   await new Promise(resolve => window.onload = () => t.step_timeout(resolve, 0));
 
   location.href = "#1";
 
-  assert_equals(navigation.entries().length, 2);
-  const [entry0, entry1] = navigation.entries();
+  assert_equals(navigation.entries().length, start_length + 1);
+  const [entry0, entry1] = navigation.entries().slice(start_index);
   assert_equals((new URL(entry0.url)).hash, "");
   assert_equals((new URL(entry1.url)).hash, "#1");
 
diff --git a/tests/wpt/tests/navigation-api/navigation-methods/return-value/forward.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/forward.html
index 36bdba8daaf..5ba58f2c8ea 100644
--- a/tests/wpt/tests/navigation-api/navigation-methods/return-value/forward.html
+++ b/tests/wpt/tests/navigation-api/navigation-methods/return-value/forward.html
@@ -5,6 +5,8 @@
 
 <script>
 promise_test(async t => {
+  let start_length = navigation.entries().length;
+  let start_index = navigation.currentEntry.index;
   // Wait for after the load event so that the navigation doesn't get converted
   // into a replace navigation.
   await new Promise(resolve => window.onload = () => t.step_timeout(resolve, 0));
@@ -12,8 +14,8 @@ promise_test(async t => {
   location.href = "#1";
   await navigation.back().committed;
 
-  assert_equals(navigation.entries().length, 2);
-  const [entry0, entry1] = navigation.entries();
+  assert_equals(navigation.entries().length, start_length + 1);
+  const [entry0, entry1] = navigation.entries().slice(start_index);
   assert_equals((new URL(entry0.url)).hash, "");
   assert_equals((new URL(entry1.url)).hash, "#1");
 
diff --git a/tests/wpt/tests/navigation-api/navigation-methods/return-value/navigate-intercept-interrupted.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/navigate-intercept-interrupted.html
index 36403c892c6..7f661b80b6d 100644
--- a/tests/wpt/tests/navigation-api/navigation-methods/return-value/navigate-intercept-interrupted.html
+++ b/tests/wpt/tests/navigation-api/navigation-methods/return-value/navigate-intercept-interrupted.html
@@ -5,6 +5,8 @@
 
 <script>
 promise_test(async t => {
+  let start_length = navigation.entries().length;
+  let start_index = navigation.currentEntry.index;
   // Wait for after the load event so that the navigation doesn't get converted
   // into a replace navigation.
   await new Promise(resolve => window.onload = () => t.step_timeout(resolve, 0));
@@ -14,10 +16,10 @@ promise_test(async t => {
   const result1 = navigation.navigate("#1");
   const result2 = navigation.navigate("#2");
 
-  assert_equals(navigation.entries().length, 3);
-  assert_array_equals(navigation.entries().map(e => (new URL(e.url)).hash), ["", "#1", "#2"]);
+  assert_equals(navigation.entries().length, start_length + 2);
+  assert_array_equals(navigation.entries().slice(start_index).map(e => (new URL(e.url)).hash), ["", "#1", "#2"]);
 
-  await assertCommittedFulfillsFinishedRejectsDOM(t, result1, navigation.entries()[1], "AbortError");
+  await assertCommittedFulfillsFinishedRejectsDOM(t, result1, navigation.entries()[start_index + 1], "AbortError");
   await assertBothFulfill(t, result2, navigation.currentEntry);
 }, "interrupted navigate() promises with intercept()");
 </script>
diff --git a/tests/wpt/tests/navigation-api/navigation-methods/return-value/navigate-interrupted-within-onnavigate.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/navigate-interrupted-within-onnavigate.html
index 3db02c6931e..249a7df69c2 100644
--- a/tests/wpt/tests/navigation-api/navigation-methods/return-value/navigate-interrupted-within-onnavigate.html
+++ b/tests/wpt/tests/navigation-api/navigation-methods/return-value/navigate-interrupted-within-onnavigate.html
@@ -5,6 +5,8 @@
 
 <script>
 promise_test(async t => {
+  let start_length = navigation.entries().length;
+  let start_index = navigation.currentEntry.index;
   // Wait for after the load event so that the navigation doesn't get converted
   // into a replace navigation.
   await new Promise(resolve => window.onload = () => t.step_timeout(resolve, 0));
@@ -19,8 +21,8 @@ promise_test(async t => {
 
   const result1 = navigation.navigate("#1", { info: 1 });
 
-  assert_equals(navigation.entries().length, 2);
-  assert_array_equals(navigation.entries().map(e => (new URL(e.url)).hash), ["", "#2"]);
+  assert_equals(navigation.entries().length, start_length + 1);
+  assert_array_equals(navigation.entries().slice(start_index).map(e => (new URL(e.url)).hash), ["", "#2"]);
 
   await assertBothRejectDOM(t, result1, "AbortError");
   await assertBothFulfill(t, result2, navigation.currentEntry);
diff --git a/tests/wpt/tests/navigation-api/navigation-methods/return-value/navigate-interrupted.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/navigate-interrupted.html
index 2c928254e0b..d1ade5b423d 100644
--- a/tests/wpt/tests/navigation-api/navigation-methods/return-value/navigate-interrupted.html
+++ b/tests/wpt/tests/navigation-api/navigation-methods/return-value/navigate-interrupted.html
@@ -5,6 +5,8 @@
 
 <script>
 promise_test(async t => {
+  let start_length = navigation.entries().length;
+  let start_index = navigation.currentEntry.index;
   // Wait for after the load event so that the navigation doesn't get converted
   // into a replace navigation.
   await new Promise(resolve => window.onload = () => t.step_timeout(resolve, 0));
@@ -12,10 +14,10 @@ promise_test(async t => {
   const result1 = navigation.navigate("#1");
   const result2 = navigation.navigate("#2");
 
-  assert_equals(navigation.entries().length, 3);
-  assert_array_equals(navigation.entries().map(e => (new URL(e.url)).hash), ["", "#1", "#2"]);
+  assert_equals(navigation.entries().length, start_length + 2);
+  assert_array_equals(navigation.entries().slice(start_index).map(e => (new URL(e.url)).hash), ["", "#1", "#2"]);
 
-  await assertCommittedFulfillsFinishedRejectsDOM(t, result1, navigation.entries()[1], "AbortError");
+  await assertCommittedFulfillsFinishedRejectsDOM(t, result1, navigation.entries()[start_index + 1], "AbortError");
   await assertBothFulfill(t, result2, navigation.currentEntry);
 }, "interrupted navigate() promises");
 </script>
diff --git a/tests/wpt/tests/navigation-api/navigation-methods/return-value/traverseTo-current.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/traverseTo-current.html
index 212fe992cf7..3942faf77fb 100644
--- a/tests/wpt/tests/navigation-api/navigation-methods/return-value/traverseTo-current.html
+++ b/tests/wpt/tests/navigation-api/navigation-methods/return-value/traverseTo-current.html
@@ -5,13 +5,13 @@
 
 <script>
 promise_test(async t => {
-  assert_equals(navigation.entries().length, 1);
+  let start_length = navigation.entries().length;
   const entry = navigation.currentEntry;
 
   const result = navigation.traverseTo(navigation.currentEntry.key);
   await assertBothFulfill(t, result, entry);
 
-  assert_equals(navigation.entries().length, 1);
+  assert_equals(navigation.entries().length, start_length);
   assert_equals(navigation.currentEntry, entry);
 }, "traverseTo() with current key");
 </script>
diff --git a/tests/wpt/tests/navigation-api/navigation-methods/return-value/traverseTo-intercept-rejected.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/traverseTo-intercept-rejected.html
index f934eae5d4c..f39913e05b2 100644
--- a/tests/wpt/tests/navigation-api/navigation-methods/return-value/traverseTo-intercept-rejected.html
+++ b/tests/wpt/tests/navigation-api/navigation-methods/return-value/traverseTo-intercept-rejected.html
@@ -5,6 +5,8 @@
 
 <script>
 promise_test(async t => {
+  let start_length = navigation.entries().length;
+  let start_index = navigation.currentEntry.index;
   // Wait for after the load event so that the navigation doesn't get converted
   // into a replace navigation.
   await new Promise(resolve => window.onload = () => t.step_timeout(resolve, 0));
@@ -13,8 +15,8 @@ promise_test(async t => {
 
   location.href = "#1";
 
-  assert_equals(navigation.entries().length, 2);
-  const [entry0, entry1] = navigation.entries();
+  assert_equals(navigation.entries().length, start_length + 1);
+  const [entry0, entry1] = navigation.entries().slice(start_index);
   assert_equals((new URL(entry0.url)).hash, "");
   assert_equals((new URL(entry1.url)).hash, "#1");
 
diff --git a/tests/wpt/tests/navigation-api/navigation-methods/return-value/traverseTo-intercept.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/traverseTo-intercept.html
index a4cb4e711d8..e5baf8b1417 100644
--- a/tests/wpt/tests/navigation-api/navigation-methods/return-value/traverseTo-intercept.html
+++ b/tests/wpt/tests/navigation-api/navigation-methods/return-value/traverseTo-intercept.html
@@ -5,6 +5,8 @@
 
 <script>
 promise_test(async t => {
+  let start_length = navigation.entries().length;
+  let start_index = navigation.currentEntry.index;
   // Wait for after the load event so that the navigation doesn't get converted
   // into a replace navigation.
   await new Promise(resolve => window.onload = () => t.step_timeout(resolve, 0));
@@ -13,8 +15,8 @@ promise_test(async t => {
 
   location.href = "#1";
 
-  assert_equals(navigation.entries().length, 2);
-  const [entry0, entry1] = navigation.entries();
+  assert_equals(navigation.entries().length, start_length + 1);
+  const [entry0, entry1] = navigation.entries().slice(start_index);
   assert_equals((new URL(entry0.url)).hash, "");
   assert_equals((new URL(entry1.url)).hash, "#1");
 
diff --git a/tests/wpt/tests/navigation-api/navigation-methods/return-value/traverseTo.html b/tests/wpt/tests/navigation-api/navigation-methods/return-value/traverseTo.html
index 8e00f5ba918..5270bbb411d 100644
--- a/tests/wpt/tests/navigation-api/navigation-methods/return-value/traverseTo.html
+++ b/tests/wpt/tests/navigation-api/navigation-methods/return-value/traverseTo.html
@@ -5,6 +5,8 @@
 
 <script>
 promise_test(async t => {
+  let start_length = navigation.entries().length;
+  let start_index = navigation.currentEntry.index;
   // Wait for after the load event so that the navigation doesn't get converted
   // into a replace navigation.
   await new Promise(resolve => window.onload = () => t.step_timeout(resolve, 0));
@@ -13,8 +15,8 @@ promise_test(async t => {
 
   location.href = "#1";
 
-  assert_equals(navigation.entries().length, 2);
-  const [entry0, entry1] = navigation.entries();
+  assert_equals(navigation.entries().length, start_length+1);
+  const [entry0, entry1] = navigation.entries().slice(start_index);
   assert_equals((new URL(entry0.url)).hash, "");
   assert_equals((new URL(entry1.url)).hash, "#1");
 
diff --git a/tests/wpt/tests/navigation-api/navigation-methods/traverseTo-after-adding-iframe.html b/tests/wpt/tests/navigation-api/navigation-methods/traverseTo-after-adding-iframe.html
index 5ab28205510..0289c455f1b 100644
--- a/tests/wpt/tests/navigation-api/navigation-methods/traverseTo-after-adding-iframe.html
+++ b/tests/wpt/tests/navigation-api/navigation-methods/traverseTo-after-adding-iframe.html
@@ -4,13 +4,13 @@
 <body>
 <script>
 async_test(t => {
-  let start_length = history.length;
+  let start_length = navigation.entries().length;
 
   // Wait for after the load event so that the navigation doesn't get converted
   // into a replace navigation.
   window.onload = () => t.step_timeout(() => {
     navigation.navigate("#top");
-    assert_equals(navigation.entries().length, 2);
+    assert_equals(navigation.entries().length, start_length + 1);
 
     let i = document.createElement("iframe");
     i.src = "/common/blank.html";
diff --git a/tests/wpt/tests/navigation-api/navigation-methods/traverseTo-multiple-steps.html b/tests/wpt/tests/navigation-api/navigation-methods/traverseTo-multiple-steps.html
index 059eb214a8b..24cf0281845 100644
--- a/tests/wpt/tests/navigation-api/navigation-methods/traverseTo-multiple-steps.html
+++ b/tests/wpt/tests/navigation-api/navigation-methods/traverseTo-multiple-steps.html
@@ -3,23 +3,25 @@
 <script src="/resources/testharnessreport.js"></script>
 <script>
 promise_test(async t => {
+  let start_length = navigation.entries().length;
+  let start_index = navigation.currentEntry.index;
   // Wait for after the load event so that the navigation doesn't get converted
   // into a replace navigation.
   await new Promise(resolve => window.onload = () => t.step_timeout(resolve, 0));
-  assert_equals(navigation.entries().length, 1);
+  assert_equals(navigation.entries().length, start_length);
   let key0 = navigation.currentEntry.key;
   await navigation.navigate("#1").committed;
   await navigation.navigate("#2").committed;
   let key2 = navigation.currentEntry.key;
-  assert_equals(navigation.entries().length, 3);
+  assert_equals(navigation.entries().length, start_length + 2);
 
   await navigation.traverseTo(key0).committed;
-  assert_equals(navigation.entries().length, 3);
-  assert_equals(navigation.currentEntry, navigation.entries()[0]);
+  assert_equals(navigation.entries().length, start_length + 2);
+  assert_equals(navigation.currentEntry, navigation.entries()[start_index]);
   assert_equals(key0, navigation.currentEntry.key);
   await navigation.traverseTo(key2).committed;
-  assert_equals(navigation.entries().length, 3);
-  assert_equals(navigation.currentEntry, navigation.entries()[2]);
+  assert_equals(navigation.entries().length, start_length + 2);
+  assert_equals(navigation.currentEntry, navigation.entries()[start_index+2]);
   assert_equals(key2, navigation.currentEntry.key);
 }, "goto() can precisely traverse multiple steps in the joint session history");
 </script>
diff --git a/tests/wpt/tests/navigation-api/navigation-methods/traverseTo-navigates-multiple-iframes.html b/tests/wpt/tests/navigation-api/navigation-methods/traverseTo-navigates-multiple-iframes.html
index 3d6adb53413..1892ae065e2 100644
--- a/tests/wpt/tests/navigation-api/navigation-methods/traverseTo-navigates-multiple-iframes.html
+++ b/tests/wpt/tests/navigation-api/navigation-methods/traverseTo-navigates-multiple-iframes.html
@@ -6,6 +6,7 @@
 <iframe id="i2" src="resources/slow-no-store.py"></iframe>
 <script>
 promise_test(async t => {
+  let start_length = navigation.entries().length;
   // Wait for after the load event so that the navigation doesn't get converted
   // into a replace navigation.
   await new Promise(resolve => window.onload = () => t.step_timeout(resolve, 0));
@@ -14,7 +15,7 @@ promise_test(async t => {
   await new Promise(resolve => i1.onload = resolve);
   i2.src = "/common/blank.html?navigated";
   await new Promise(resolve => i2.onload = resolve);
-  assert_equals(navigation.entries().length, 1);
+  assert_equals(navigation.entries().length, start_length);
   assert_equals(i1.contentWindow.navigation.entries().length, 2);
   assert_equals(i2.contentWindow.navigation.entries().length, 2);
   assert_equals(i1.contentWindow.navigation.currentEntry.index, 1);
diff --git a/tests/wpt/tests/navigation-api/navigation-methods/traverseTo-same-document.html b/tests/wpt/tests/navigation-api/navigation-methods/traverseTo-same-document.html
index 1a32bce99c9..3bd7f4d3d2b 100644
--- a/tests/wpt/tests/navigation-api/navigation-methods/traverseTo-same-document.html
+++ b/tests/wpt/tests/navigation-api/navigation-methods/traverseTo-same-document.html
@@ -3,10 +3,12 @@
 <script src="/resources/testharnessreport.js"></script>
 <script>
 async_test(t => {
+  let start_length = navigation.entries().length;
+  let start_index = navigation.currentEntry.index;
   // Wait for after the load event so that the navigation doesn't get converted
   // into a replace navigation.
   window.onload = () => t.step_timeout(() => {
-    assert_equals(navigation.entries().length, 1);
+    assert_equals(navigation.entries().length, start_length);
 
     let onnavigate_count = 0;
     navigation.onnavigate = () => onnavigate_count++;
@@ -14,27 +16,27 @@ async_test(t => {
     let key = navigation.currentEntry.key;
     navigation.navigate("#").committed
       .then(t.step_func(() => {
-        assert_equals(navigation.entries().length, 2);
-        assert_equals(navigation.currentEntry, navigation.entries()[1]);
+        assert_equals(navigation.entries().length, start_length + 1);
+        assert_equals(navigation.currentEntry, navigation.entries()[start_index + 1]);
         assert_not_equals(key, navigation.currentEntry.key);
         return navigation.traverseTo(key).committed;
       }))
       .then(t.step_func(() => {
-        assert_equals(navigation.entries().length, 2);
-        assert_equals(navigation.currentEntry, navigation.entries()[0]);
+        assert_equals(navigation.entries().length, start_length + 1);
+        assert_equals(navigation.currentEntry, navigation.entries()[start_index]);
         assert_equals(key, navigation.currentEntry.key);
         assert_true(navigation.canGoForward);
         return navigation.forward().committed;
       }))
       .then(t.step_func(() => {
-        assert_equals(navigation.entries().length, 2);
-        assert_equals(navigation.currentEntry, navigation.entries()[1]);
+        assert_equals(navigation.entries().length, start_length + 1);
+        assert_equals(navigation.currentEntry, navigation.entries()[start_index + 1]);
         assert_true(navigation.canGoBack);
         return navigation.back().committed;
       }))
       .then(t.step_func_done(() => {
-        assert_equals(navigation.entries().length, 2);
-        assert_equals(navigation.currentEntry, navigation.entries()[0]);
+        assert_equals(navigation.entries().length, start_length + 1);
+        assert_equals(navigation.currentEntry, navigation.entries()[start_index]);
         assert_equals(key, navigation.currentEntry.key);
         assert_equals(onnavigate_count, 4);
       }));
diff --git a/tests/wpt/tests/navigation-timing/test-timing-attributes-dependent-on-document-load.html b/tests/wpt/tests/navigation-timing/test-timing-attributes-dependent-on-document-load.html
new file mode 100644
index 00000000000..9eac7bd0333
--- /dev/null
+++ b/tests/wpt/tests/navigation-timing/test-timing-attributes-dependent-on-document-load.html
@@ -0,0 +1,85 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>Navigation Timing 2 WPT</title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script>
+        setup({ single_test: true });
+        var reload_frame;
+
+        // Array of navigation timing entries dependent on Document Load Timing.
+        var navTimingAttributes = [
+          'fetchStart',
+          'loadEventEnd',
+          'loadEventStart',
+          'redirectCount',
+          'redirectEnd',
+          'redirectStart',
+          'responseEnd',
+          'unloadEventEnd',
+          'unloadEventStart',
+        ];
+
+        // Function to run the test when the page loads.
+        function onload_test() {
+            reload_frame = document.getElementById("frameContext");
+            reload_frame.onload = function() {
+                step_timeout(do_test, 0);
+            }
+            step_timeout(reload_the_frame, 0);
+        }
+
+        /*
+          Function to reload the iframe and observe values for navigation timing entries:
+          redirectStart, redirectEnd and redirectCount dependent on Document Load Timing.
+        */
+        function reload_the_frame() {
+            reload_frame.contentWindow.location.href =
+            "/common/redirect.py?location=/navigation-timing/resources/blank-page-green.html";
+        }
+
+        /*
+          Function to obtain navigation timing entries and,
+          check if the values are greater than 0.
+        */
+        function do_test() {
+            var nav_frame = document.getElementById("frameContext").contentWindow;
+            var pnt1 = nav_frame.performance.getEntriesByType("navigation")[0];
+            for (i in navTimingAttributes) {
+                assert_greater_than(pnt1[navTimingAttributes[i]], 0,
+                `Expected navigation timing entries: ${navTimingAttributes[i]} greater than 0`);
+            }
+            step_timeout(remove, 0);
+            done(); // Avoids scripting errors
+        }
+
+        /*
+         Function to remove the iframe from the parent body and,
+         check if the navigation timing entries of detached iframe are 0.
+         */
+        function remove() {
+            var nav_frame = document.getElementById("frameContext").contentWindow;
+            var pnt1 = nav_frame.performance.getEntriesByType("navigation")[0];
+            document.body.removeChild(document.getElementById("frameContext"));
+            for (i in navTimingAttributes) {
+                assert_equals(pnt1[navTimingAttributes[i]], 0,
+                `${navTimingAttributes[i]} dependent on Document Load Timing: returns 0`);
+            }
+        }
+    </script>
+</head>
+<body onload="onload_test();">
+    <h1>Description</h1>
+    <p>This test observes values of navigation timing entries,</p>
+    <p>dependent on Document Load Timing for a detached iframe.</p>
+    <br />
+    <p>This page should be loaded with a green background frame below,</p>
+    <p>which disappears after the iframe is detached.</p>
+    <br />
+    <iframe id="frameContext"
+            src="/navigation-timing/resources/blank-page-green.html"
+            style="width: 250px; height: 250px;"></iframe>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/tests/orientation-event/motion/page-visibility-manual.https.html b/tests/wpt/tests/orientation-event/motion/page-visibility-manual.https.html
deleted file mode 100644
index 37e48ce9791..00000000000
--- a/tests/wpt/tests/orientation-event/motion/page-visibility-manual.https.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<meta name="timeout" content="long">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script>
-'use strict';
-
-promise_test(t => {
-  return new Promise((resolve, reject) => {
-    document.addEventListener("visibilitychange", () => {
-      assert_true(document.hidden, "document is hidden");
-      window.addEventListener(
-          'devicemotion',
-          event => {
-            if (document.hidden) {
-              reject();
-            } else {
-              resolve();
-            }
-          },
-          { once: true });
-    }, { once: true });
-  });
-}, 'Tests to check that devicemotion events are not fired when the page is not visible.');
-</script>
-
-<p>Switch the page to the background, then switch back to it.</p>
diff --git a/tests/wpt/tests/orientation-event/motion/page-visibility.https.html b/tests/wpt/tests/orientation-event/motion/page-visibility.https.html
new file mode 100644
index 00000000000..ea67131151f
--- /dev/null
+++ b/tests/wpt/tests/orientation-event/motion/page-visibility.https.html
@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<html>
+<body>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="/page-visibility/resources/window_state_context.js"></script>
+<script src="../resources/orientation-event-helpers.js"></script>
+<script>
+'use strict';
+
+sensor_test(async (t, sensorProvider) => {
+  const motionData = generateMotionData(0, 0, 0,
+                                        0, 0, 0,
+                                        0, 0, 0);
+
+  setMockMotionData(sensorProvider, motionData);
+  const event = getExpectedMotionEvent(motionData);
+  await waitForEvent(event);
+
+  const {minimize, restore} = window_state_context(t);
+  await minimize();
+  assert_true(document.hidden);
+
+  let hiddenEventPromise = new Promise((resolve, reject) => {
+    window.addEventListener(
+      'devicemotion',
+      event => {
+        if (document.hidden) {
+          reject();
+        } else {
+          resolve();
+        }
+      },
+      { once: true });
+  });
+
+  // devicemotion events fire every 16ms when active, so we sleep for a while
+  // here to make sure we're not actually getting any events.
+  await new Promise(resolve => { t.step_timeout(resolve, 100); });
+  await restore();
+  assert_false(document.hidden);
+  return Promise.all([hiddenEventPromise, waitForEvent(event)]);
+}, 'Tests to check that devicemotion events are not fired when the page is not visible.');
+</script>
+</body>
+</html>
diff --git a/tests/wpt/tests/orientation-event/orientation/page-visibility-manual.https.html b/tests/wpt/tests/orientation-event/orientation/page-visibility-manual.https.html
deleted file mode 100644
index 033f17602b8..00000000000
--- a/tests/wpt/tests/orientation-event/orientation/page-visibility-manual.https.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<meta name="timeout" content="long">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script>
-'use strict';
-
-promise_test(t => {
-  return new Promise((resolve, reject) => {
-    document.addEventListener("visibilitychange", () => {
-      assert_true(document.hidden, "document is hidden");
-      window.addEventListener(
-          'deviceorientation',
-          event => {
-            if (document.hidden) {
-              reject();
-            } else {
-              resolve();
-            }
-          },
-          { once: true });
-    }, { once: true });
-  });
-}, 'Tests to check that deviceorientation events are not fired when the page is not visible.');
-</script>
-
-<p>Switch the page to the background, then switch back to it.</p>
diff --git a/tests/wpt/tests/orientation-event/orientation/page-visibility.https.html b/tests/wpt/tests/orientation-event/orientation/page-visibility.https.html
new file mode 100644
index 00000000000..37ca3681c91
--- /dev/null
+++ b/tests/wpt/tests/orientation-event/orientation/page-visibility.https.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<html>
+<body>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="/page-visibility/resources/window_state_context.js"></script>
+<script src="../resources/orientation-event-helpers.js"></script>
+<script>
+'use strict';
+
+sensor_test(async (t, sensorProvider) => {
+  const orientationData = generateOrientationData(1, 2, 3, false);
+
+  setMockOrientationData(sensorProvider, orientationData);
+  const event = getExpectedOrientationEvent(orientationData);
+  await waitForEvent(event);
+
+  const {minimize, restore} = window_state_context(t);
+  await minimize();
+  assert_true(document.hidden);
+
+  let hiddenEventPromise = new Promise((resolve, reject) => {
+    window.addEventListener(
+        'deviceorientation',
+        event => {
+          if (document.hidden) {
+            reject();
+          } else {
+            resolve();
+          }
+        },
+        { once: true });
+  });
+
+  // Sleep for a while to make sure no deviceorientation events are fired
+  // while the page is hidden.
+  await new Promise(resolve => { t.step_timeout(resolve, 100); });
+  await restore();
+  assert_false(document.hidden);
+  return Promise.all([hiddenEventPromise, waitForEvent(event)]);
+}, 'Tests to check that deviceorientation events are not fired when the page is not visible.');
+</script>
+</body>
+</html>
diff --git a/tests/wpt/tests/parakeet/finalizeAd.tentative.https.sub.window.js b/tests/wpt/tests/parakeet/finalizeAd.tentative.https.sub.window.js
index e8bf6753f04..cbb852151fc 100644
--- a/tests/wpt/tests/parakeet/finalizeAd.tentative.https.sub.window.js
+++ b/tests/wpt/tests/parakeet/finalizeAd.tentative.https.sub.window.js
@@ -4,7 +4,7 @@
 
 const okayAuctionRequest = {
   seller: "https://{{host}}:{{ports[https][0]}}",
-  decisionLogicUrl: "https://{{host}}:{{ports[https][0]}}",
+  decisionLogicURL: "https://{{host}}:{{ports[https][0]}}",
   perBuyerSignals: {"{{host}}": { randomParam: "value1" }},
   auctionSignals: "pubCode123",
   sellerSignals: { someKey: "sellerValue" }
@@ -22,18 +22,18 @@ promise_test(async t => {
 
 promise_test(async t => {
   const auctionRequest = Object.assign({}, okayAuctionRequest);
-  delete auctionRequest.decisionLogicUrl;
+  delete auctionRequest.decisionLogicURL;
 
   const finalizePromise = navigator.finalizeAd({}, auctionRequest);
 
   await promise_rejects_js(t, TypeError, finalizePromise);
-}, "finalizeAd() should reject a missing decisionLogicUrl.");
+}, "finalizeAd() should reject a missing decisionLogicURL.");
 
 promise_test(async t => {
   const auctionRequest = Object.assign({}, okayAuctionRequest);
-  auctionRequest.decisionLogicUrl = "http://{{host}}:{{ports[https][0]}}";
+  auctionRequest.decisionLogicURL = "http://{{host}}:{{ports[https][0]}}";
 
   const finalizePromise = navigator.finalizeAd({}, auctionRequest);
 
   await promise_rejects_js(t, TypeError, finalizePromise);
-}, "finalizeAd() should reject a non-HTTPS decisionLogicUrl.");
\ No newline at end of file
+}, "finalizeAd() should reject a non-HTTPS decisionLogicURL.");
diff --git a/tests/wpt/tests/pending-beacon/resources/pending_beacon-helper.js b/tests/wpt/tests/pending-beacon/resources/pending_beacon-helper.js
index 3e8bd20f766..e7b6ea5cb6e 100644
--- a/tests/wpt/tests/pending-beacon/resources/pending_beacon-helper.js
+++ b/tests/wpt/tests/pending-beacon/resources/pending_beacon-helper.js
@@ -84,12 +84,18 @@ function generateSequentialData(begin, end, skip) {
 }
 
 function generatePayload(size) {
-  let data = '';
-  if (size > 0) {
-    const prefix = String(size) + ':';
-    data = prefix + Array(size - prefix.length).fill('*').join('');
+  if (size == 0) {
+    return '';
   }
-  return data;
+  const prefix = String(size) + ':';
+  if (size < prefix.length) {
+    return Array(size).fill('*').join('');
+  }
+  if (size == prefix.length) {
+    return prefix;
+  }
+
+  return prefix + Array(size - prefix.length).fill('*').join('');
 }
 
 function generateSetBeaconURL(uuid, options) {
diff --git a/tests/wpt/tests/performance-timeline/not-restored-reasons/performance-navigation-timing-attributes.tentative.window.js b/tests/wpt/tests/performance-timeline/not-restored-reasons/performance-navigation-timing-attributes.tentative.window.js
index 95ca3dd6b4d..811fa515dc2 100644
--- a/tests/wpt/tests/performance-timeline/not-restored-reasons/performance-navigation-timing-attributes.tentative.window.js
+++ b/tests/wpt/tests/performance-timeline/not-restored-reasons/performance-navigation-timing-attributes.tentative.window.js
@@ -38,20 +38,20 @@ promise_test(async t => {
   await assertBFCacheEligibility(rc1, /*shouldRestoreFromBFCache=*/ false);
   await assertNotRestoredReasonsEquals(
       rc1,
-      /*blocked=*/ true,
+      /*preventedBackForwardCache=*/ "yes",
       /*url=*/ rc1_url,
       /*src=*/ null,
       /*id=*/ null,
       /*name=*/ null,
-      /*reasons=*/['WebSocket'],
+      /*reasons=*/['websocket'],
       /*children=*/[{
-        'blocked': false,
+        'preventedBackForwardCache': "no",
         'url': null,
         'src': rc1_child_url,
         // Id and name should be empty.
         'id': '',
         'name': '',
-        'reasons': [],
-        'children': []
+        'reasons': null,
+        'children': null
       }]);
 });
\ No newline at end of file
diff --git a/tests/wpt/tests/performance-timeline/not-restored-reasons/performance-navigation-timing-bfcache-reasons-stay.tentative.window.js b/tests/wpt/tests/performance-timeline/not-restored-reasons/performance-navigation-timing-bfcache-reasons-stay.tentative.window.js
index 36c1b92dca4..897a9900268 100644
--- a/tests/wpt/tests/performance-timeline/not-restored-reasons/performance-navigation-timing-bfcache-reasons-stay.tentative.window.js
+++ b/tests/wpt/tests/performance-timeline/not-restored-reasons/performance-navigation-timing-bfcache-reasons-stay.tentative.window.js
@@ -26,24 +26,24 @@ promise_test(async t => {
   await assertBFCacheEligibility(rc1, /*shouldRestoreFromBFCache=*/ false);
   await assertNotRestoredReasonsEquals(
       rc1,
-      /*blocked=*/ true,
+      /*preventedBackForwardCache=*/ "yes",
       /*url=*/ rc1_url,
       /*src=*/ null,
       /*id=*/ null,
       /*name=*/ null,
-      /*reasons=*/['WebSocket'],
-      /*children=*/[]);
+      /*reasons=*/['websocket'],
+      /*children=*/ []);
 
   // This time no blocking feature is used, so the page is restored
   // from BFCache. Ensure that the previous reasons stay there.
   await assertBFCacheEligibility(rc1, /*shouldRestoreFromBFCache=*/ true);
   await assertNotRestoredReasonsEquals(
       rc1,
-      /*blocked=*/ true,
+      /*preventedBackForwardCache=*/ "yes",
       /*url=*/ rc1_url,
       /*src=*/ null,
       /*id=*/ null,
       /*name=*/ null,
-      /*reasons=*/['WebSocket'],
-      /*children=*/[]);
+      /*reasons=*/['websocket'],
+      /*children=*/ []);
 });
diff --git a/tests/wpt/tests/performance-timeline/not-restored-reasons/performance-navigation-timing-cross-origin-bfcache.tentative.window.js b/tests/wpt/tests/performance-timeline/not-restored-reasons/performance-navigation-timing-cross-origin-bfcache.tentative.window.js
index 80adec007a2..851dd8c6508 100644
--- a/tests/wpt/tests/performance-timeline/not-restored-reasons/performance-navigation-timing-cross-origin-bfcache.tentative.window.js
+++ b/tests/wpt/tests/performance-timeline/not-restored-reasons/performance-navigation-timing-cross-origin-bfcache.tentative.window.js
@@ -44,20 +44,20 @@ promise_test(async t => {
   await assertBFCacheEligibility(rc1, /*shouldRestoreFromBFCache=*/ false);
   await assertNotRestoredReasonsEquals(
       rc1,
-      /*blocked=*/ false,
+      /*preventedBackForwardCache=*/ "no",
       /*url=*/ rc1_url,
       /*src=*/ null,
       /*id=*/ null,
       /*name=*/ null,
       /*reasons=*/[],
       /*children=*/[{
-        'blocked': true,
+        'preventedBackForwardCache': "yes",
         'url': null,
         'src': rc1_child_url,
         'id': 'test-id',
         // Iframes that are generated by addIframe have an empty name.
         'name': '',
-        'reasons': [],
-        'children': []
+        'reasons': null,
+        'children': null
       }]);
 });
\ No newline at end of file
diff --git a/tests/wpt/tests/performance-timeline/not-restored-reasons/performance-navigation-timing-fetch.tentative.window.js b/tests/wpt/tests/performance-timeline/not-restored-reasons/performance-navigation-timing-fetch.tentative.window.js
new file mode 100644
index 00000000000..5cd35c7ba36
--- /dev/null
+++ b/tests/wpt/tests/performance-timeline/not-restored-reasons/performance-navigation-timing-fetch.tentative.window.js
@@ -0,0 +1,41 @@
+// META: title=Ensure that ongoing fetch upon entering bfcache blocks bfcache and recorded.
+// META: script=./test-helper.js
+// META: script=/common/dispatcher/dispatcher.js
+// META: script=/common/get-host-info.sub.js
+// META: script=/common/utils.js
+// META: script=/html/browsers/browsing-the-web/back-forward-cache/resources/rc-helper.js
+// META: script=/html/browsers/browsing-the-web/remote-context-helper/resources/remote-context-helper.js
+// META: timeout=long
+
+'use strict';
+
+promise_test(async t => {
+  const rcHelper = new RemoteContextHelper();
+  // Open a window with noopener so that BFCache will work.
+  const rc1 = await rcHelper.addWindow(
+      /*config=*/ null, /*options=*/ {features: 'noopener'});
+  const rc1_url = await rc1.executeScript(() => {
+    return location.href;
+  });
+  const wavURL = new URL(get_host_info().HTTP_REMOTE_ORIGIN + '/fetch/range/resources/long-wav.py');
+  await rc1.executeScript((wavURL) => {
+    // Register pagehide handler to create a fetch request.
+    addEventListener('pagehide', (wavURL) => {
+      fetch(wavURL, {
+        keepalive: true
+      });
+    })
+  });
+
+  // Check the BFCache result and the reported reasons.
+  await assertBFCacheEligibility(rc1, /*shouldRestoreFromBFCache=*/ false);
+  await assertNotRestoredReasonsEquals(
+      rc1,
+      /*blocked=*/ "yes",
+      /*url=*/ rc1_url,
+      /*src=*/ null,
+      /*id=*/ null,
+      /*name=*/ null,
+      /*reasons=*/['fetch'],
+      /*children=*/[]);
+});
\ No newline at end of file
diff --git a/tests/wpt/tests/performance-timeline/not-restored-reasons/performance-navigation-timing-lock.https.tentative.window.js b/tests/wpt/tests/performance-timeline/not-restored-reasons/performance-navigation-timing-lock.https.tentative.window.js
new file mode 100644
index 00000000000..46d8752f20d
--- /dev/null
+++ b/tests/wpt/tests/performance-timeline/not-restored-reasons/performance-navigation-timing-lock.https.tentative.window.js
@@ -0,0 +1,32 @@
+// META: title=Ensure that if WebLock is held upon entering bfcache, it cannot enter bfcache and gets reported.
+// META: script=./test-helper.js
+// META: script=/common/dispatcher/dispatcher.js
+// META: script=/common/get-host-info.sub.js
+// META: script=/common/utils.js
+// META: script=/html/browsers/browsing-the-web/back-forward-cache/resources/rc-helper.js
+// META: script=/html/browsers/browsing-the-web/remote-context-helper/resources/remote-context-helper.js
+// META: timeout=long
+
+promise_test(async t => {
+  const rcHelper = new RemoteContextHelper();
+  // Open a window with noopener so that BFCache will work.
+  const rc1 = await rcHelper.addWindow(
+      /*config=*/ null, /*options=*/ {features: 'noopener'});
+  const rc1_url = await rc1.executeScript(() => {
+    return location.href;
+  });
+
+  // Request a WebLock.
+  let return_value = await rc1.executeScript(() => {
+    return new Promise((resolve) => {
+      navigator.locks.request('resource', () => {
+        resolve(42);
+      });
+    })
+  });
+  assert_equals(return_value, 42);
+
+  // Check the BFCache result and the reported reasons.
+  await assertBFCacheEligibility(rc1, /*shouldRestoreFromBFCache=*/ false);
+  await assertNotRestoredFromBFCache(rc1, ['lock']);
+});
\ No newline at end of file
diff --git a/tests/wpt/tests/performance-timeline/not-restored-reasons/performance-navigation-timing-navigation-failure.tentative.window.js b/tests/wpt/tests/performance-timeline/not-restored-reasons/performance-navigation-timing-navigation-failure.tentative.window.js
new file mode 100644
index 00000000000..4022e6e59f1
--- /dev/null
+++ b/tests/wpt/tests/performance-timeline/not-restored-reasons/performance-navigation-timing-navigation-failure.tentative.window.js
@@ -0,0 +1,26 @@
+// META: title=Ensure that navigation failure blocks bfcache and gets recorded.
+// META: script=./test-helper.js
+// META: script=/common/dispatcher/dispatcher.js
+// META: script=/common/get-host-info.sub.js
+// META: script=/common/utils.js
+// META: script=/html/browsers/browsing-the-web/back-forward-cache/resources/rc-helper.js
+// META: script=/html/browsers/browsing-the-web/back-forward-cache/resources/404.py
+// META: script=/html/browsers/browsing-the-web/remote-context-helper/resources/remote-context-helper.js
+// META: timeout=long
+
+'use strict';
+const {ORIGIN} = get_host_info();
+
+promise_test(async t => {
+  const rcHelper = new RemoteContextHelper();
+  // Open a window with noopener so that BFCache will work.
+  const rc1 = await rcHelper.addWindow(
+      /*config=*/ {status: 404}, /*options=*/ {features: 'noopener'});
+  const rc1_url = await rc1.executeScript(() => {
+    return location.href;
+  });
+
+  // Check the BFCache result and the reported reasons.
+  await assertBFCacheEligibility(rc1, /*shouldRestoreFromBFCache=*/ false);
+  await assertNotRestoredFromBFCache(rc1, ['error-document']);
+});
\ No newline at end of file
diff --git a/tests/wpt/tests/performance-timeline/not-restored-reasons/performance-navigation-timing-not-bfcached.tentative.window.js b/tests/wpt/tests/performance-timeline/not-restored-reasons/performance-navigation-timing-not-bfcached.tentative.window.js
index 3afce4b9755..0dc1519d1bb 100644
--- a/tests/wpt/tests/performance-timeline/not-restored-reasons/performance-navigation-timing-not-bfcached.tentative.window.js
+++ b/tests/wpt/tests/performance-timeline/not-restored-reasons/performance-navigation-timing-not-bfcached.tentative.window.js
@@ -27,11 +27,11 @@ promise_test(async t => {
   await assertBFCacheEligibility(rc1, /*shouldRestoreFromBFCache=*/ false);
   await assertNotRestoredReasonsEquals(
       rc1,
-      /*blocked=*/ true,
+      /*preventedBackForwardCache=*/ "yes",
       /*url=*/ rc1_url,
       /*src=*/ null,
       /*id=*/ null,
       /*name=*/ null,
-      /*reasons=*/['WebSocket'],
-      /*children=*/[]);
+      /*reasons=*/['websocket'],
+      /*children=*/ []);
 });
\ No newline at end of file
diff --git a/tests/wpt/tests/performance-timeline/not-restored-reasons/performance-navigation-timing-reload.tentative.window.js b/tests/wpt/tests/performance-timeline/not-restored-reasons/performance-navigation-timing-reload.tentative.window.js
index 3e94c3a4487..58584390cd3 100644
--- a/tests/wpt/tests/performance-timeline/not-restored-reasons/performance-navigation-timing-reload.tentative.window.js
+++ b/tests/wpt/tests/performance-timeline/not-restored-reasons/performance-navigation-timing-reload.tentative.window.js
@@ -27,13 +27,13 @@ promise_test(async t => {
   await assertBFCacheEligibility(rc1, /*shouldRestoreFromBFCache=*/ false);
   await assertNotRestoredReasonsEquals(
       rc1,
-      /*blocked=*/ true,
+      /*preventedBackForwardCache=*/ "yes",
       /*url=*/ rc1_url,
       /*src=*/ null,
       /*id=*/ null,
       /*name=*/ null,
-      /*reasons=*/['WebSocket'],
-      /*children=*/[]);
+      /*reasons=*/['websocket'],
+      /*children=*/ []);
 
   // Reload.
   await rc1.navigate(() => {
diff --git a/tests/wpt/tests/performance-timeline/not-restored-reasons/performance-navigation-timing-same-origin-bfcache.tentative.window.js b/tests/wpt/tests/performance-timeline/not-restored-reasons/performance-navigation-timing-same-origin-bfcache.tentative.window.js
index 26fea56bbbc..44b44a865c0 100644
--- a/tests/wpt/tests/performance-timeline/not-restored-reasons/performance-navigation-timing-same-origin-bfcache.tentative.window.js
+++ b/tests/wpt/tests/performance-timeline/not-restored-reasons/performance-navigation-timing-same-origin-bfcache.tentative.window.js
@@ -38,21 +38,21 @@ promise_test(async t => {
   await assertBFCacheEligibility(rc1, /*shouldRestoreFromBFCache=*/ false);
   await assertNotRestoredReasonsEquals(
       rc1,
-      /*blocked=*/ false,
+      /*preventedBackForwardCache=*/ "no",
       /*url=*/ rc1_url,
       /*src=*/ null,
       /*id=*/ null,
       /*name=*/ null,
       /*reasons=*/[],
       /*children=*/[{
-        'blocked': true,
+        'preventedBackForwardCache': "yes",
         'url': rc1_child_url,
         'src': rc1_child_url,
         'id': 'test-id',
         'name': '',
-        'reasons': ['WebSocket'],
+        'reasons': ['websocket'],
         'children': [{
-          'blocked': false,
+          'preventedBackForwardCache': "no",
           'url': rc1_grand_child_url,
           'src': rc1_grand_child_url,
           'id': '',
diff --git a/tests/wpt/tests/performance-timeline/not-restored-reasons/performance-navigation-timing-same-origin-replace.tentative.window.js b/tests/wpt/tests/performance-timeline/not-restored-reasons/performance-navigation-timing-same-origin-replace.tentative.window.js
index e1bfafd7798..c833db75139 100644
--- a/tests/wpt/tests/performance-timeline/not-restored-reasons/performance-navigation-timing-same-origin-replace.tentative.window.js
+++ b/tests/wpt/tests/performance-timeline/not-restored-reasons/performance-navigation-timing-same-origin-replace.tentative.window.js
@@ -31,17 +31,14 @@ promise_test(async t => {
   // Go back.
   await newRemoteContextHelper.historyBack();
 
-  const navigation_entry = await rc1.executeScript(() => {
-    return performance.getEntriesByType('navigation')[0];
-  });
   // Reasons are not reset for same-origin replace.
   await assertNotRestoredReasonsEquals(
       rc1,
-      /*blocked=*/ true,
+      /*preventedBackForwardCache=*/ "yes",
       /*url=*/ rc1_url,
       /*src=*/ null,
       /*id=*/ null,
       /*name=*/ null,
-      /*reasons=*/['WebSocket'],
-      /*children=*/[]);
+      /*reasons=*/['websocket'],
+      /*children=*/ []);
 });
diff --git a/tests/wpt/tests/performance-timeline/not-restored-reasons/test-helper.js b/tests/wpt/tests/performance-timeline/not-restored-reasons/test-helper.js
index 0737f719bfb..a172546512a 100644
--- a/tests/wpt/tests/performance-timeline/not-restored-reasons/test-helper.js
+++ b/tests/wpt/tests/performance-timeline/not-restored-reasons/test-helper.js
@@ -1,3 +1,5 @@
+// META: script=../../html/browsers/browsing-the-web/back-forward-cache/resources/rc-helper.js
+
 async function assertNotRestoredReasonsEquals(
     remoteContextHelper, blocked, url, src, id, name, reasons, children) {
   let result = await remoteContextHelper.executeScript(() => {
@@ -9,27 +11,24 @@ async function assertNotRestoredReasonsEquals(
 
 function assertReasonsStructEquals(
     result, blocked, url, src, id, name, reasons, children) {
-  assert_equals(result.blocked, blocked);
+  assert_equals(result.preventedBackForwardCache, blocked);
   assert_equals(result.url, url);
   assert_equals(result.src, src);
   assert_equals(result.id, id);
   assert_equals(result.name, name);
   // Reasons should match.
-  assert_equals(result.reasons.length, reasons.length);
-  reasons.sort();
-  result.reasons.sort();
-  for (let i = 0; i < reasons.length; i++) {
-    assert_equals(result.reasons[i], reasons[i]);
-  }
+  matchReasons(new Set(reasons), new Set(result.reasons));
+
   // Children should match.
-  assert_equals(result.children.length, children.length);
-  children.sort();
-  result.children.sort();
-  for (let j = 0; j < children.length; j++) {
-    assertReasonsStructEquals(
-        result.children[0], children[0].blocked, children[0].url,
-        children[0].src, children[0].id, children[0].name, children[0].reasons,
-        children[0].children);
+  if (children == null) {
+    assert_equals(result.children, children);
+  } else {
+    for (let j = 0; j < children.length; j++) {
+      assertReasonsStructEquals(
+          result.children[0], children[0].preventedBackForwardCache, children[0].url,
+          children[0].src, children[0].id, children[0].name, children[0].reasons,
+          children[0].children);
+    }
   }
 }
 
diff --git a/tests/wpt/tests/permissions-policy/reporting/report-to-multiple-endpoints.https.sub.html b/tests/wpt/tests/permissions-policy/reporting/report-to-multiple-endpoints.https.sub.html
new file mode 100644
index 00000000000..ce392ed9412
--- /dev/null
+++ b/tests/wpt/tests/permissions-policy/reporting/report-to-multiple-endpoints.https.sub.html
@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <script src='/resources/testharness.js'></script>
+    <script src='/resources/testharnessreport.js'></script>
+    <script src='/resources/testdriver.js'></script>
+    <script src='/resources/testdriver-vendor.js'></script>
+    <script src='../../mediacapture-streams/permission-helper.js'></script>
+    <script src='/reporting/resources/report-helper.js'></script>
+  </head>
+  <body>
+    <script>
+  const base_url = `${location.protocol}//${location.host}`;
+  const endpoint = `${base_url}/reporting/resources/report.py`;
+  const camera_id = '6e0f343f-0a7a-4fee-82d9-00eb64531c26';
+  const microphone_id = 'c63eecea-490b-4c38-8c4b-d72ecccd4e31';
+
+  promise_test(async t => {
+    await setMediaPermission("granted", ["camera","microphone"]);
+    await promise_rejects_dom(
+        t, "NotAllowedError", navigator.mediaDevices.getUserMedia({video: true}),
+        "UserMedia camera access should not be allowed in this document.");
+    await promise_rejects_dom(
+        t, "NotAllowedError", navigator.mediaDevices.getUserMedia({audio: true}),
+        "UserMedia microphone access should not be allowed in this document.");
+
+    let camera_reports=[], microphone_reports=[];
+    while(true) {
+      await wait(100);
+      if (!camera_reports.length) {
+        camera_reports = await pollReports(endpoint, camera_id);
+      }
+      if (!microphone_reports.length) {
+        microphone_reports = await pollReports(endpoint, microphone_id);
+      }
+      if (camera_reports.length && microphone_reports.length) {
+        checkReportExists(camera_reports, 'permissions-policy-violation', location.href);
+        checkReportExists(microphone_reports, 'permissions-policy-violation', location.href);
+        break;
+      }
+    }
+  }, "Reporting-Endpoints defined endpoint received reports.");
+    </script>
+  </body>
+</html>
diff --git a/tests/wpt/tests/permissions-policy/reporting/report-to-multiple-endpoints.https.sub.html.sub.headers b/tests/wpt/tests/permissions-policy/reporting/report-to-multiple-endpoints.https.sub.html.sub.headers
new file mode 100644
index 00000000000..14b742c5587
--- /dev/null
+++ b/tests/wpt/tests/permissions-policy/reporting/report-to-multiple-endpoints.https.sub.html.sub.headers
@@ -0,0 +1,2 @@
+Permissions-Policy: camera=();report-to=camera-endpoint, microphone=();report-to=microphone-endpoint
+Reporting-Endpoints: camera-endpoint="https://{{host}}:{{ports[https][0]}}/reporting/resources/report.py?reportID=6e0f343f-0a7a-4fee-82d9-00eb64531c26", microphone-endpoint="https://{{host}}:{{ports[https][0]}}/reporting/resources/report.py?reportID=c63eecea-490b-4c38-8c4b-d72ecccd4e31"
diff --git a/tests/wpt/tests/permissions-policy/reporting/report-to-single-endpoint.https.sub.html b/tests/wpt/tests/permissions-policy/reporting/report-to-single-endpoint.https.sub.html
new file mode 100644
index 00000000000..bcedd242d25
--- /dev/null
+++ b/tests/wpt/tests/permissions-policy/reporting/report-to-single-endpoint.https.sub.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <script src='/resources/testharness.js'></script>
+    <script src='/resources/testharnessreport.js'></script>
+    <script src='/resources/testdriver.js'></script>
+    <script src='/resources/testdriver-vendor.js'></script>
+    <script src='../../mediacapture-streams/permission-helper.js'></script>
+    <script src='/reporting/resources/report-helper.js'></script>
+  </head>
+  <body>
+    <script>
+  const base_url = `${location.protocol}//${location.host}`;
+  const endpoint = `${base_url}/reporting/resources/report.py`;
+  const id = 'c898489f-00d2-40af-a480-4e8d9f907469';
+
+  promise_test(async t => {
+    await setMediaPermission("granted", ["camera","microphone"]);
+    await promise_rejects_dom(
+        t, "NotAllowedError", navigator.mediaDevices.getUserMedia({video: true}),
+        "UserMedia camera access should not be allowed in this document.");
+    while(true) {
+      await wait(100);
+      const reports = await pollReports(endpoint, id);
+      if (reports.length) {
+        checkReportExists(reports, 'permissions-policy-violation', location.href);
+        break;
+      }
+    }
+  }, "Reporting-Endpoints defined endpoint received reports.");
+    </script>
+  </body>
+</html>
diff --git a/tests/wpt/tests/permissions-policy/reporting/report-to-single-endpoint.https.sub.html.sub.headers b/tests/wpt/tests/permissions-policy/reporting/report-to-single-endpoint.https.sub.html.sub.headers
new file mode 100644
index 00000000000..bbfe7e8afa4
--- /dev/null
+++ b/tests/wpt/tests/permissions-policy/reporting/report-to-single-endpoint.https.sub.html.sub.headers
@@ -0,0 +1,2 @@
+Permissions-Policy: camera=();report-to=camera-endpoint
+Reporting-Endpoints: camera-endpoint="https://{{host}}:{{ports[https][0]}}/reporting/resources/report.py?reportID=c898489f-00d2-40af-a480-4e8d9f907469"
diff --git a/tests/wpt/tests/pointerevents/coalesced_events_attributes_under_load.html b/tests/wpt/tests/pointerevents/coalesced_events_attributes_under_load.html
index 442aecb73ee..262742558ec 100644
--- a/tests/wpt/tests/pointerevents/coalesced_events_attributes_under_load.html
+++ b/tests/wpt/tests/pointerevents/coalesced_events_attributes_under_load.html
@@ -57,8 +57,8 @@
       // Every pointerdown blocks the main thread for a certain time limit,
       // and then increases the time limit for next round in case the
       // current limit fails to cause event coalescing.
-      let now = performance.now();
-      while (performance.now() < now + current_busyloop_ms)
+      let start = performance.now();
+      while (performance.now() < start + current_busyloop_ms)
         continue;
       current_busyloop_ms *= 2;
     });
@@ -85,7 +85,7 @@
       actions = actions.pointerUp();
 
       await actions.send();
-      await await pointerup_promise;
+      await pointerup_promise;
     }
 
     assert_true(coalesced_event_received, "Coalesed pointermoves received");
diff --git a/tests/wpt/tests/pointerevents/pointerevent_after_target_appended.html b/tests/wpt/tests/pointerevents/pointerevent_after_target_appended.html
new file mode 100644
index 00000000000..08af43626b3
--- /dev/null
+++ b/tests/wpt/tests/pointerevents/pointerevent_after_target_appended.html
@@ -0,0 +1,224 @@
+<!DOCTYPE HTML>
+<title>Enter/leave events fired to parent after child is added</title>
+<meta name="variant" content="?mouse">
+<meta name="variant" content="?touch">
+<meta name="variant" content="?pen">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="pointerevent_support.js"></script>
+
+<style>
+  div.target {
+      width: 100px;
+      height: 100px;
+  }
+</style>
+<div class="target" id="parent">
+  <div class="target" id="child">child</div>
+</div>
+<div id="done">done</div>
+
+<script>
+  'use strict';
+  const pointer_type = location.search.substring(1);
+
+  const parent = document.getElementById("parent");
+  const child = document.getElementById("child");
+  const done = document.getElementById("done");
+
+  let event_log = [];
+  let logged_event_prefix = "";
+  let received_compat_mouse_events = false;
+
+  function logEvent(e) {
+    if (e.type.startsWith(logged_event_prefix) && e.eventPhase == e.AT_TARGET) {
+      event_log.push(e.type + "@" + e.target.id);
+    }
+    if (e.type.startsWith("mouse")) {
+      received_compat_mouse_events = true;
+    }
+  }
+
+  function attachChild(e) {
+    if (e.eventPhase == e.AT_TARGET) {
+      parent.appendChild(child);
+      event_log.push("(child-attached)");
+    }
+  }
+
+  let child_moved = false;
+
+  function moveChild(e) {
+    if (!child_moved) {
+      child_moved = true;
+      parent.appendChild(child);
+      event_log.push("(child-moved)");
+    }
+  }
+
+  function setup() {
+    const logged_event_suffixes =
+        ["over", "out", "enter", "leave", "down", "up"];
+    let targets = document.getElementsByClassName("target");
+    for (let i = 0; i < targets.length; i++) {
+      logged_event_suffixes.forEach(suffix => {
+        targets[i].addEventListener("pointer" + suffix, logEvent);
+        targets[i].addEventListener("mouse" + suffix, logEvent);
+      });
+    }
+  }
+
+  function addPromiseTestForNewChild(attaching_event,
+      tested_event_prefix, expected_events) {
+    const test_name = `${tested_event_prefix} events from ${pointer_type} `+
+        `received before/after child attached at ${attaching_event}`;
+
+    promise_test(async test => {
+      event_log = [];
+      logged_event_prefix = tested_event_prefix;
+
+      // We started with child attached to ease event listener setup above.
+      parent.removeChild(child);
+
+      parent.addEventListener(attaching_event, attachChild);
+      test.add_cleanup(() => {
+        parent.removeEventListener(attaching_event, attachChild);
+      });
+
+      let done_click_promise = getEvent("click", done);
+
+      let actions = new test_driver.Actions()
+          .addPointer("TestPointer", pointer_type)
+          .pointerMove(-30, -30, {origin: parent})
+          .pointerDown()
+          .pointerUp()
+          .pointerMove(30, 30, {origin: parent})
+          .pointerDown()
+          .pointerUp()
+          .pointerMove(0, 0, {origin: done})
+          .pointerDown()
+          .pointerUp();
+
+      await actions.send();
+      await done_click_promise;
+
+      if (tested_event_prefix == "mouse" && !received_compat_mouse_events) {
+        expected_events = [];
+      }
+
+      assert_equals(event_log.toString(), expected_events.toString(),
+          "events received");
+    }, test_name);
+  }
+
+  function addPromiseTestForMovedChild(mover_event,
+      tested_event_prefix, expected_events) {
+    const test_name = `${tested_event_prefix} events from ${pointer_type} `+
+        `received before/after child moved at ${mover_event}`;
+
+    promise_test(async test => {
+      event_log = [];
+      logged_event_prefix = tested_event_prefix;
+      child_moved = false;
+
+      child.addEventListener(mover_event, moveChild);
+      test.add_cleanup(() => {
+        child.removeEventListener(mover_event, moveChild);
+      });
+
+      let done_click_promise = getEvent("click", done);
+
+      let actions = new test_driver.Actions()
+          .addPointer("TestPointer", pointer_type)
+          .pointerMove(-30, -30, {origin: parent})
+          .pointerDown()
+          .pointerUp()
+          .pointerMove(30, 30, {origin: parent})
+          .pointerDown()
+          .pointerUp()
+          .pointerMove(0, 0, {origin: done})
+          .pointerDown()
+          .pointerUp();
+
+      await actions.send();
+      await done_click_promise;
+
+      if (tested_event_prefix == "mouse" && !received_compat_mouse_events) {
+        expected_events = [];
+      }
+
+      assert_equals(event_log.toString(), expected_events.toString(),
+          "events received");
+    }, test_name);
+  }
+
+  setup();
+
+  // Tests for dispatched pointer events.
+  addPromiseTestForNewChild("pointerdown", "pointer", [
+    "pointerover@parent", "pointerenter@parent",
+    "pointerdown@parent", "(child-attached)",
+    "pointerover@child", "pointerenter@child",
+    "pointerup@child",
+    "pointerdown@child", "pointerup@child",
+    "pointerout@child", "pointerleave@child", "pointerleave@parent"
+  ]);
+  addPromiseTestForNewChild("pointerup", "pointer", [
+    "pointerover@parent", "pointerenter@parent",
+    "pointerdown@parent", "pointerup@parent", "(child-attached)",
+    "pointerover@child", "pointerenter@child",
+    "pointerdown@child", "pointerup@child",
+    "pointerout@child", "pointerleave@child", "pointerleave@parent"
+  ]);
+  addPromiseTestForMovedChild("pointerdown", "pointer", [
+    "pointerover@child", "pointerenter@parent", "pointerenter@child",
+    "pointerdown@child", "(child-moved)",
+    "pointerover@child", "pointerenter@child",
+    "pointerup@child",
+    "pointerdown@child", "pointerup@child",
+    "pointerout@child", "pointerleave@child", "pointerleave@parent"
+  ]);
+  addPromiseTestForMovedChild("pointerup", "pointer", [
+    "pointerover@child", "pointerenter@parent", "pointerenter@child",
+    "pointerdown@child", "pointerup@child", "(child-moved)",
+    "pointerover@child", "pointerenter@child",
+    "pointerdown@child", "pointerup@child",
+    "pointerout@child", "pointerleave@child", "pointerleave@parent"
+  ]);
+
+  // Same tests for dispatched compatibility mouse events.
+  addPromiseTestForNewChild("pointerdown", "mouse", [
+    "mouseover@parent", "mouseenter@parent",
+    "mousedown@parent", "(child-attached)",
+    "mouseover@child", "mouseenter@child",
+    "mouseup@child",
+    "mousedown@child", "mouseup@child",
+    "mouseout@child", "mouseleave@child", "mouseleave@parent"
+  ]);
+  addPromiseTestForNewChild("pointerup", "mouse", [
+    "mouseover@parent", "mouseenter@parent",
+    "mousedown@parent", "mouseup@parent", "(child-attached)",
+    "mouseover@child", "mouseenter@child",
+    "mousedown@child", "mouseup@child",
+    "mouseout@child", "mouseleave@child", "mouseleave@parent"
+  ]);
+
+  addPromiseTestForMovedChild("pointerdown", "mouse", [
+    "mouseover@child", "mouseenter@parent", "mouseenter@child",
+    "mousedown@child", "(child-moved)",
+    "mouseover@child", "mouseenter@child",
+    "mouseup@child",
+    "mousedown@child", "mouseup@child",
+    "mouseout@child", "mouseleave@child", "mouseleave@parent"
+  ]);
+  addPromiseTestForMovedChild("pointerup", "mouse", [
+    "mouseover@child", "mouseenter@parent", "mouseenter@child",
+    "mousedown@child", "mouseup@child", "(child-moved)",
+    "mouseover@child", "mouseenter@child",
+    "mousedown@child", "mouseup@child",
+    "mouseout@child", "mouseleave@child", "mouseleave@parent"
+  ]);
+</script>
diff --git a/tests/wpt/tests/pointerevents/pointerevent_after_target_removed.html b/tests/wpt/tests/pointerevents/pointerevent_after_target_removed.html
index e426f4db6c9..2c5d88708d0 100644
--- a/tests/wpt/tests/pointerevents/pointerevent_after_target_removed.html
+++ b/tests/wpt/tests/pointerevents/pointerevent_after_target_removed.html
@@ -13,7 +13,7 @@
 <style>
   div.target {
       width: 100px;
-      height: 50px;
+      height: 100px;
   }
 </style>
 <div class="target" id="parent">
@@ -31,43 +31,58 @@
 
   let event_log = [];
   let logged_event_prefix = "";
+  let received_compat_mouse_events = false;
 
   function logEvent(e) {
-    if (e.type.startsWith(logged_event_prefix) && e.eventPhase == e.AT_TARGET)
-      event_log.push(e.type);
+    if (e.type.startsWith(logged_event_prefix) && e.eventPhase == e.AT_TARGET) {
+      event_log.push(e.type + "@" + e.target.id);
+    }
+    if (e.type.startsWith("mouse")) {
+      received_compat_mouse_events = true;
+    }
+  }
+
+  function removeChild() {
+    parent.removeChild(child);
+    event_log.push("(child-removed)");
   }
 
   function setup() {
-    const logged_events = [
-      "pointerover", "pointerout", "pointerenter", "pointerleave",
-      "mouseover", "mouseout", "mouseenter", "mouseleave"
-    ];
-    logged_events.forEach(ename => parent.addEventListener(ename, logEvent));
+    const logged_event_suffixes =
+        ["over", "out", "enter", "leave", "down", "up"];
+    let targets = document.getElementsByClassName("target");
+    for (let i = 0; i < targets.length; i++) {
+      logged_event_suffixes.forEach(suffix => {
+        targets[i].addEventListener("pointer" + suffix, logEvent);
+        targets[i].addEventListener("mouse" + suffix, logEvent);
+      });
+    }
   }
 
-  function addPromiseTest(remover_event, tested_event_prefix) {
+  function addPromiseTest(remover_event, tested_event_prefix, expected_events) {
     const test_name = `${tested_event_prefix} events from ${pointer_type} `+
-        `at parent after child is removed at ${remover_event}`;
-    const expected_events = ["enter", "over", "out", "leave"]
-        .map(suffix => tested_event_prefix + suffix);
+          `received before/after child removal at ${remover_event}`;
 
-    promise_test(async () => {
+    promise_test(async test => {
       event_log = [];
       logged_event_prefix = tested_event_prefix;
 
-      // Bring the child back if it was removed in the previous promise_test.
-      if (!child.parentElement)
-        parent.appendChild(child);
-
-      child.addEventListener(remover_event,
-          () => parent.removeChild(child),
-          { once:true });
+      child.addEventListener(remover_event, removeChild);
+      test.add_cleanup(() => {
+        child.removeEventListener(remover_event, removeChild);
+        if (!child.parentElement) {
+          parent.appendChild(child);
+        }
+      });
 
       let done_click_promise = getEvent("click", done);
 
       let actions = new test_driver.Actions()
           .addPointer("TestPointer", pointer_type)
-          .pointerMove(0, 0, {origin: parent})
+          .pointerMove(-30, -30, {origin: parent})
+          .pointerDown()
+          .pointerUp()
+          .pointerMove(30, 30, {origin: parent})
           .pointerDown()
           .pointerUp()
           .pointerMove(0, 0, {origin: done})
@@ -77,14 +92,42 @@
       await actions.send();
       await done_click_promise;
 
+      if (tested_event_prefix == "mouse" && !received_compat_mouse_events) {
+        expected_events = [];
+      }
+
       assert_equals(event_log.toString(), expected_events.toString(),
-          "received events");
+          "events received");
     }, test_name);
   }
 
   setup();
-  addPromiseTest("pointerdown", "pointer");
-  addPromiseTest("pointerdown", "mouse");
-  addPromiseTest("pointerup", "pointer");
-  addPromiseTest("pointerup", "mouse");
+
+  // Tests for dispatched pointer events.
+  addPromiseTest("pointerdown", "pointer", [
+    "pointerover@child", "pointerenter@parent", "pointerenter@child",
+    "pointerdown@child", "(child-removed)", "pointerup@parent",
+    "pointerdown@parent", "pointerup@parent",
+    "pointerout@parent", "pointerleave@parent"
+  ]);
+  addPromiseTest("pointerup", "pointer", [
+    "pointerover@child", "pointerenter@parent", "pointerenter@child",
+    "pointerdown@child", "pointerup@child", "(child-removed)",
+    "pointerdown@parent", "pointerup@parent",
+    "pointerout@parent", "pointerleave@parent"
+  ]);
+
+  // Same tests for dispatched compatibility mouse events.
+  addPromiseTest("pointerdown", "mouse", [
+    "mouseover@child", "mouseenter@parent", "mouseenter@child",
+    "(child-removed)", "mouseup@parent",
+    "mousedown@parent", "mouseup@parent",
+    "mouseout@parent", "mouseleave@parent"
+  ]);
+  addPromiseTest("pointerup", "mouse", [
+    "mouseover@child", "mouseenter@parent", "mouseenter@child",
+    "mousedown@child", "(child-removed)",
+    "mousedown@parent", "mouseup@parent",
+    "mouseout@parent", "mouseleave@parent"
+  ]);
 </script>
diff --git a/tests/wpt/tests/pointerevents/pointerevent_fractional_coordinates.html b/tests/wpt/tests/pointerevents/pointerevent_fractional_coordinates.html
index f7947977044..7d18b9f2b77 100644
--- a/tests/wpt/tests/pointerevents/pointerevent_fractional_coordinates.html
+++ b/tests/wpt/tests/pointerevents/pointerevent_fractional_coordinates.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <html>
     <head>
-        <title>Pointer Events coordinates can have fractional value<</title>
+        <title>Pointer Events coordinates with fractional values</title>
         <meta name="viewport" content="width=device-width">
         <meta name="variant" content="?mouse">
         <meta name="variant" content="?touch">
@@ -24,54 +24,53 @@
             }
         </style>
         <script>
-            var input = location.search.substring(1);
-            var eventList = [
-                  "pointerdown",
-                  "pointerup",
-                  "pointermove",
-                  "pointerover",
-                  "pointerout",
-                  "pointerenter",
-                  "pointerleave"];
-            var eventsRecieved = {};
-            var clickedTargetList = [];
+            "use strict";
+            const input = location.search.substring(1);
+            const eventList = [
+                "pointerdown",
+                "pointerup",
+                "pointermove",
+                "pointerover",
+                "pointerout",
+                "pointerenter",
+                "pointerleave",
+                "click"
+            ];
+            let eventsWithFractions = {};
+            let clickedTargetList = [];
 
             function resetTestState() {
-                eventsRecieved = {};
+                eventsWithFractions = {};
                 clickedTargetList = [];
-                ['s1', 's2', 's3'].forEach(function(id){
-                    var target = document.getElementById('innerFrame').contentDocument.getElementById(id);
-                    target.style.background = "black"
-                });
             }
 
             function checkPointerEventCoordinates(event) {
-              if (event.clientX != Math.floor(event.clientX) || event.clientY != Math.floor(event.clientY))
-                eventsRecieved[event.type] = true;
+              if (event.clientX != Math.floor(event.clientX) ||
+                    event.clientY != Math.floor(event.clientY))
+                eventsWithFractions[event.type] = true;
             }
 
             function testInputType(inputSource) {
               const scale = 5;
               const width = 3;
               const height = 3;
-              var targetFrame = document.querySelector('#innerFrame');
-              var frameRect = targetFrame.getBoundingClientRect();
-              frameLeft = frameRect.left;
-              frameTop = frameRect.top;
+              const targetFrame = document.querySelector('#innerFrame');
+              const frameRect = targetFrame.getBoundingClientRect();
+              const frameLeft = frameRect.left;
+              const frameTop = frameRect.top;
 
-              target = [{x: 10, y: 10}, {x: 30, y: 50}, {x: 50, y: 30}]
-              xPosition = []
-              yPosition = []
-              for (var i = 0; i < target.length; i++) {
-                xPosition.push((target[i].x + width / 2.0) * scale + frameLeft);
-                yPosition.push((target[i].y + height / 2.0) * scale + frameTop);
+              const targets = [{x: 10, y: 10}, {x: 30, y: 50}, {x: 50, y: 30}]
+              const xPositions = []
+              const yPositions = []
+              for (let i = 0; i < targets.length; i++) {
+                xPositions.push((targets[i].x + width / 2.0) * scale + frameLeft);
+                yPositions.push((targets[i].y + height / 2.0) * scale + frameTop);
               }
-              return sendInputAt(inputSource, xPosition[0], yPosition[0]).then(function() {
-                return sendInputAt(inputSource, xPosition[1], yPosition[1]);
+              return sendInputAt(inputSource, xPositions[0], yPositions[0]).then(function() {
+                return sendInputAt(inputSource, xPositions[1], yPositions[1]);
               }).then(function() {
-                return sendInputAt(inputSource, xPosition[2], yPosition[2]);
+                return sendInputAt(inputSource, xPositions[2], yPositions[2]);
               });
-
             }
 
             function sendInputAt(inputSource, xPosition, yPosition) {
@@ -93,11 +92,11 @@
             }
 
             function run() {
-                var test_pointerEvent = setup_pointerevent_test("pointerevent events in capturing", [input]);
-                var innerFrame = document.getElementById('innerFrame');
-                var innerDocument = innerFrame.contentDocument;
+                const test_pointerEvent = setup_pointerevent_test("pointerevent events in capturing", [input]);
+                const innerFrame = document.getElementById('innerFrame');
+                const innerDocument = innerFrame.contentDocument;
                 ['s1', 's2', 's3'].forEach(function(id){
-                    var target = innerDocument.getElementById(id);
+                    const target = innerDocument.getElementById(id);
                     eventList.forEach(function(eventName) {
                         on_event(target, eventName, checkPointerEventCoordinates);
                     });
@@ -105,15 +104,24 @@
                     on_event(target, "click", function (event) {
                       if (!(event.target.id in clickedTargetList)) {
                           clickedTargetList.push(event.target.id);
-                          event.target.style.background = "red"
                       }
                       if (clickedTargetList.length == 3) {
                           test(function () {
-                              if (Object.keys(eventsRecieved).length != eventList.length){
-                                  eventList.forEach(function(eventName){
-                                     assert_true(eventName in eventsRecieved, eventName + " should have fractional coordinates");
-                                  });
-                              }
+                            eventList.forEach(function(eventName){
+                                if (eventName == "click") {
+                                    assert_false(eventName in eventsWithFractions,
+                                        eventName + " should not have fractional coordinates");
+                                } else {
+                                    assert_true(eventName in eventsWithFractions,
+                                        eventName + " should have fractional coordinates");
+                                }
+                            });
+                            // At this point, we know that `eventsWithFractions` contains all
+                            // of `eventList` except "click".  The assert below rules out any
+                            // extra entry in `eventsWithFractions`.
+                            assert_equals(Object.keys(eventsWithFractions).length,
+                                  eventList.length - 1,
+                                  "eventsWithFractions list does not have any redundant entry");
                           }, expectedPointerType);
                           test_pointerEvent.done();
                       }
@@ -146,4 +154,3 @@
         <div id="log"></div>
     </body>
 </html>
-
diff --git a/tests/wpt/tests/presentation-api/META.yml b/tests/wpt/tests/presentation-api/META.yml
index beba8906215..64802e5cb44 100644
--- a/tests/wpt/tests/presentation-api/META.yml
+++ b/tests/wpt/tests/presentation-api/META.yml
@@ -1,4 +1,3 @@
 spec: https://w3c.github.io/presentation-api/
 suggested_reviewers:
   - tidoust
-  - zqzhang
diff --git a/tests/wpt/tests/print/crashtests/reload-crash.html b/tests/wpt/tests/print/crashtests/reload-crash.html
new file mode 100644
index 00000000000..6741c3c9a9d
--- /dev/null
+++ b/tests/wpt/tests/print/crashtests/reload-crash.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+        <link rel="author" title="Chenguang Shao" href="chenguangshao1@gmail.com">
+        <link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1478487">
+        <title>Reload Crash Test</title>
+        <script>
+            function PrintAndRefreshPage() {
+                var queryParams = new URLSearchParams(window.location.search);
+                var isFirstLoad = queryParams.get('isFirstLoad');
+                if (isFirstLoad === null) {
+                    window.print();
+                    setTimeout(function() {
+                        var url = window.location.href;
+                        var updatedUrl = url + '?isFirstLoad=false';
+                        window.location.href = updatedUrl;
+                    },
+                    0);
+                }
+            }
+        </script>
+    </head>
+    <body onload="PrintAndRefreshPage()">
+        <p>The pop-up print preview box is for refreshing the page</p>
+        <image id="image" loading="lazy" src="test.png"></image>
+    </body>
+</html>
diff --git a/tests/wpt/tests/private-aggregation/protected-audience-surface-failure.https.html b/tests/wpt/tests/private-aggregation/protected-audience-surface-failure.https.html
index 800bf503cf3..b512afc25db 100644
--- a/tests/wpt/tests/private-aggregation/protected-audience-surface-failure.https.html
+++ b/tests/wpt/tests/private-aggregation/protected-audience-surface-failure.https.html
@@ -1,4 +1,5 @@
 <!doctype html>
+<meta name=timeout content=long>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/common/utils.js"></script>
@@ -17,7 +18,7 @@ promise_test(async test => {
     `try {
       privateAggregation.contributeToHistogram(${contribution});
     } catch {
-      forDebuggingOnly.reportAdAuctionWin('${createWritingUrl(uuid)}');
+      forDebuggingOnly.reportAdAuctionWin('${createWritingURL(uuid)}');
     }`},
     /*expectedNumReports=*/ 1);
 }, 'contributeToHistogram() with too large bucket in scoreAd()');
@@ -31,7 +32,7 @@ promise_test(async test => {
     `try {
       privateAggregation.contributeToHistogram(${contribution});
     } catch {
-      sendReportTo('${createWritingUrl(uuid)}');
+      sendReportTo('${createWritingURL(uuid)}');
     }`},
     /*expectedNumReports=*/ 1);
 }, 'contributeToHistogram() with negative bucket in reportResult()');
@@ -46,7 +47,7 @@ promise_test(async test => {
     `try {
       privateAggregation.contributeToHistogram(${contribution});
     } catch {
-      forDebuggingOnly.reportAdAuctionWin('${createWritingUrl(uuid)}');
+      forDebuggingOnly.reportAdAuctionWin('${createWritingURL(uuid)}');
     }`},
     /*expectedNumReports=*/ 1);
 }, 'contributeToHistogram() with non-BigInt bucket in generateBid()');
@@ -60,7 +61,7 @@ promise_test(async test => {
     `try {
       privateAggregation.contributeToHistogram(${contribution});
     } catch {
-      sendReportTo('${createWritingUrl(uuid)}');
+      sendReportTo('${createWritingURL(uuid)}');
     }`},
     /*expectedNumReports=*/ 1);
 }, 'contributeToHistogram() with negative value in reportWin()');
diff --git a/tests/wpt/tests/private-aggregation/protected-audience-surface-success.https.html b/tests/wpt/tests/private-aggregation/protected-audience-surface-success.https.html
index b688d76c7f8..1d890321098 100644
--- a/tests/wpt/tests/private-aggregation/protected-audience-surface-success.https.html
+++ b/tests/wpt/tests/private-aggregation/protected-audience-surface-success.https.html
@@ -1,4 +1,5 @@
 <!doctype html>
+<meta name=timeout content=long>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/common/utils.js"></script>
@@ -15,7 +16,7 @@ promise_test(async test => {
   await runReportTest(test, uuid,
     { scoreAd:
     `privateAggregation.contributeToHistogram(${contribution});
-    forDebuggingOnly.reportAdAuctionWin('${createWritingUrl(uuid)}');`
+    forDebuggingOnly.reportAdAuctionWin('${createWritingURL(uuid)}');`
     },
     /*expectedNumReports=*/ 1);
 }, 'contributeToHistogram() with positive bucket in scoreAd()');
@@ -27,7 +28,7 @@ promise_test(async test => {
   await runReportTest(test, uuid,
     { reportResult:
     `privateAggregation.contributeToHistogram(${contribution});
-    sendReportTo('${createWritingUrl(uuid)}');`
+    sendReportTo('${createWritingURL(uuid)}');`
     },
     /*expectedNumReports=*/ 1);
 }, 'contributeToHistogram() with zero bucket in reportResult()');
@@ -40,7 +41,7 @@ promise_test(async test => {
   await runReportTest(test, uuid,
     { generateBid:
     `privateAggregation.contributeToHistogram(${contribution});
-    forDebuggingOnly.reportAdAuctionWin('${createWritingUrl(uuid)}');`
+    forDebuggingOnly.reportAdAuctionWin('${createWritingURL(uuid)}');`
     },
     /*expectedNumReports=*/ 1);
 }, 'contributeToHistogram() with large bucket in generateBid()');
@@ -52,7 +53,7 @@ promise_test(async test => {
   await runReportTest(test, uuid,
     { reportWin:
     `privateAggregation.contributeToHistogram(${contribution});
-    sendReportTo('${createWritingUrl(uuid)}');`
+    sendReportTo('${createWritingURL(uuid)}');`
     },
     /*expectedNumReports=*/ 1);
 }, 'contributeToHistogram() with max bucket in reportWin()');
@@ -64,7 +65,7 @@ promise_test(async test => {
   await runReportTest(test, uuid,
     { scoreAd:
     `privateAggregation.contributeToHistogram(${contribution});
-    forDebuggingOnly.reportAdAuctionWin('${createWritingUrl(uuid)}');`
+    forDebuggingOnly.reportAdAuctionWin('${createWritingURL(uuid)}');`
     },
     /*expectedNumReports=*/ 1);
 }, 'contributeToHistogram() with positive value in scoreAd()');
@@ -76,7 +77,7 @@ promise_test(async test => {
   await runReportTest(test, uuid,
     { reportResult:
     `privateAggregation.contributeToHistogram(${contribution});
-    sendReportTo('${createWritingUrl(uuid)}');`
+    sendReportTo('${createWritingURL(uuid)}');`
     },
     /*expectedNumReports=*/ 1);
 }, 'contributeToHistogram() with zero value in reportResult()');
@@ -88,7 +89,7 @@ promise_test(async test => {
   await runReportTest(test, uuid,
     { generateBid:
     `privateAggregation.contributeToHistogram(${contribution});
-    forDebuggingOnly.reportAdAuctionWin('${createWritingUrl(uuid)}');`
+    forDebuggingOnly.reportAdAuctionWin('${createWritingURL(uuid)}');`
     },
     /*expectedNumReports=*/ 1);
 }, 'contributeToHistogram() with non-integer value in generateBid()');
diff --git a/tests/wpt/tests/private-aggregation/resources/protected-audience-helper-module.js b/tests/wpt/tests/private-aggregation/resources/protected-audience-helper-module.js
index abec6408862..53b79c0a893 100644
--- a/tests/wpt/tests/private-aggregation/resources/protected-audience-helper-module.js
+++ b/tests/wpt/tests/private-aggregation/resources/protected-audience-helper-module.js
@@ -26,7 +26,7 @@ function generateUuid() {
 // `uuid` is used to identify the stash shard to use.
 // `operate` is used to set action as write or read.
 // `report` is used to carry the message for write requests.
-function createReportingUrl(uuid, operation, report = 'default-report') {
+function createReportingURL(uuid, operation, report = 'default-report') {
   let url = new URL(`${window.location.origin}${BASE_PATH}resources/protected_audience_event_level_report_handler.py`);
   url.searchParams.append('uuid', uuid);
   url.searchParams.append('operation', operation);
@@ -37,21 +37,21 @@ function createReportingUrl(uuid, operation, report = 'default-report') {
   return url.toString();
 }
 
-function createWritingUrl(uuid, report) {
-  return createReportingUrl(uuid, 'write');
+function createWritingURL(uuid, report) {
+  return createReportingURL(uuid, 'write');
 }
 
-function createReadingUrl(uuid) {
-  return createReportingUrl(uuid, 'read');
+function createReadingURL(uuid) {
+  return createReportingURL(uuid, 'read');
 }
 
-async function waitForObservedReports(uuid, expectedNumReports, timeout = 1000 /*ms*/) {
+async function waitForObservedReports(uuid, expectedNumReports, timeout = 5000 /*ms*/) {
   expectedReports = Array(expectedNumReports).fill('default-report');
-  const reportUrl = createReadingUrl(uuid);
+  const reportURL = createReadingURL(uuid);
   let startTime = performance.now();
 
   while (performance.now() - startTime < timeout) {
-    let response = await fetch(reportUrl, { credentials: 'omit', mode: 'cors' });
+    let response = await fetch(reportURL, { credentials: 'omit', mode: 'cors' });
     let actualReports = await response.json();
 
     // If expected number of reports have been observed, compare with list of
@@ -72,7 +72,7 @@ async function waitForObservedReports(uuid, expectedNumReports, timeout = 1000 /
 // run, unless it returns something or throws.
 //
 // The default reportWin() method is empty.
-function createBiddingScriptUrl(params = {}) {
+function createBiddingScriptURL(params = {}) {
   let url = new URL(`${FLEDGE_BASE_URL}resources/bidding-logic.sub.py`);
   if (params.generateBid)
     url.searchParams.append('generateBid', params.generateBid);
@@ -86,13 +86,13 @@ function createBiddingScriptUrl(params = {}) {
 }
 
 // Creates a decision script with the provided code in the method bodies. The
-// decision script's scoreAd() method will reject ads with renderUrls that
+// decision script's scoreAd() method will reject ads with renderURLs that
 // don't ends with "uuid", and will return a score equal to the bid, after the
 // passed in code in the "scoreAd" input argument has been run, unless it
 // returns something or throws.
 //
 // The default reportResult() method is empty.
-function createDecisionScriptUrl(uuid, params = {}) {
+function createDecisionScriptURL(uuid, params = {}) {
   let url = new URL(`${FLEDGE_BASE_URL}resources/decision-logic.sub.py`);
   url.searchParams.append('uuid', uuid);
   if (params.scoreAd)
@@ -104,11 +104,11 @@ function createDecisionScriptUrl(uuid, params = {}) {
   return url.toString();
 }
 
-// Creates a renderUrl for an ad that runs the passed in "script". "uuid" has
+// Creates a renderURL for an ad that runs the passed in "script". "uuid" has
 // no effect, beyond making the URL distinct between tests, and being verified
 // by the decision logic script before accepting a bid. "uuid" is expected to
 // be last.
-function createRenderUrl(uuid, script) {
+function createRenderURL(uuid, script) {
   let url = new URL(`${FLEDGE_BASE_URL}resources/fenced-frame.sub.py`);
   if (script)
     url.searchParams.append('script', script);
@@ -118,7 +118,7 @@ function createRenderUrl(uuid, script) {
 
 // Joins an interest group that, by default, is owned by the current frame's
 // origin, is named DEFAULT_INTEREST_GROUP_NAME, has a bidding script that
-// issues a bid of 9 with a renderUrl of "https://not.checked.test/${uuid}".
+// issues a bid of 9 with a renderURL of "https://not.checked.test/${uuid}".
 // `interestGroupOverrides` is required to override fields in the joined
 // interest group.
 async function joinInterestGroup(test, uuid, interestGroupOverrides) {
@@ -127,7 +127,7 @@ async function joinInterestGroup(test, uuid, interestGroupOverrides) {
   let interestGroup = {
     owner: window.location.origin,
     name: DEFAULT_INTEREST_GROUP_NAME,
-    ads: [{renderUrl: createRenderUrl(uuid)}],
+    ads: [{renderURL: createRenderURL(uuid)}],
     ...interestGroupOverrides
   };
 
@@ -186,12 +186,13 @@ async function runReportTest(test, uuid, codeToInsert, expectedNumReports = 0) {
   let reportResult = codeToInsert.reportResult;
 
   let interestGroupOverrides =
-    { biddingLogicUrl: createBiddingScriptUrl({ generateBid, reportWin }) };
+    { biddingLogicURL: createBiddingScriptURL({ generateBid, reportWin }) };
 
   await joinInterestGroup(test, uuid, interestGroupOverrides);
   await runBasicFledgeAuctionAndNavigate(
       test, uuid,
-      { decisionLogicUrl: createDecisionScriptUrl(
+    {
+      decisionLogicURL: createDecisionScriptURL(
         uuid, { scoreAd, reportResult })
     });
 
diff --git a/tests/wpt/tests/remote-playback/README.md b/tests/wpt/tests/remote-playback/README.md
index b9342275937..da9bbc387f4 100644
--- a/tests/wpt/tests/remote-playback/README.md
+++ b/tests/wpt/tests/remote-playback/README.md
@@ -8,7 +8,13 @@ File an issue: https://github.com/w3c/remote-playback/issues/new
 
 ## Hardware/network dependency
 
-The Remote Playback API requires to communicate with a device over the network.
-Some behavior would require a real devices to be implemented. In order to keep
-these tests automated, only behaviors that can be run without user gesture or
-specific configurations are available here.
+The Remote Playback API requires communication with a device over the network.
+Tests that end in `-manual.html` require a compatible device available on the
+local area network to run the tests; these tests must be run manually.
+
+Known browser/device combinations that can be used to run manual tests:
+
+| Browser             | Device |
+| -------             | ------ |
+| Chrome for Android  | [Chromecast](https://store.google.com/product/chromecast_google_tv?pli=1&hl=en-US) |
+| Safari              | Apple TV |
diff --git a/tests/wpt/tests/remote-playback/cancel-watch-availability.html b/tests/wpt/tests/remote-playback/cancel-watch-availability.html
index d83c8cecb00..41cad7c272e 100644
--- a/tests/wpt/tests/remote-playback/cancel-watch-availability.html
+++ b/tests/wpt/tests/remote-playback/cancel-watch-availability.html
@@ -1,44 +1,63 @@
 <!DOCTYPE html>
 <html>
-<title>Tests various ways to call cancelWatchAvailability()</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/common/media.js"></script>
-<script>
-async_test(t => {
-  var v = document.createElement('video');
-  v.src = getVideoURI('/media/movie_5');
+  <title>Tests cancelWatchAvailability()</title>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <script src="/common/media.js"></script>
+  <script>
+    async_test(t => {
+      let v = document.createElement("video");
+      v.src = getVideoURI("/media/movie_5");
 
-  v.remote.watchAvailability(function() {})
-    .then(t.step_func(id => {
-      v.remote.cancelWatchAvailability(id).then(t.step_func(function() {
-        v.remote.cancelWatchAvailability(id).then(
-          t.unreached_func(), t.step_func_done(e => {
-            assert_equals(e.name, 'NotFoundError');
-          })
+      v.remote
+        .watchAvailability(() => {})
+        .then(
+          t.step_func(id => {
+            v.remote.cancelWatchAvailability(id).then(
+              t.step_func(() => {
+                v.remote.cancelWatchAvailability(id).then(
+                  t.unreached_func(),
+                  t.step_func_done(e => {
+                    assert_equals(e.name, "NotFoundError");
+                  })
+                );
+              }),
+              t.unreached_func()
+            );
+          }),
+          t.unreached_func()
         );
-      }), t.unreached_func());
-    }), t.unreached_func());
-}, 'Test that calling cancelWatchAvailability() with an id does remove the callback.');
+    }, "Test that calling cancelWatchAvailability() with an id does remove the callback, and calling cancelWatchAvailability with a removed id throws NotFoundError.");
 
-async_test(t => {
-  var v = document.createElement('video');
-  v.src = getVideoURI('/media/movie_5');
+    async_test(t => {
+      let v = document.createElement("video");
+      v.src = getVideoURI("/media/movie_5");
 
-  Promise.all([
-      v.remote.watchAvailability(function() {}),
-      v.remote.watchAvailability(function() {})
-  ]).then(t.step_func(ids => {
-    v.remote.cancelWatchAvailability().then(t.step_func(function() {
-      v.remote.cancelWatchAvailability(ids[0]).then(t.unreached_func(), t.step_func(function(e) {
-        assert_equals(e.name, 'NotFoundError');
-        v.remote.cancelWatchAvailability(ids[1])
-          .then(t.unreached_func(), t.step_func_done(function(e) {
-            assert_equals(e.name, 'NotFoundError');
-          }));
-      }));
-    }), t.unreached_func());
-  }), t.unreached_func());
-}, 'Test that calling cancelWatchAvailability() without an id removes all the callbacks.');
-</script>
+      Promise.all([
+        v.remote.watchAvailability(() => {}),
+        v.remote.watchAvailability(() => {}),
+      ]).then(
+        t.step_func(ids =>
+          v.remote.cancelWatchAvailability().then(
+            t.step_func(() =>
+              v.remote.cancelWatchAvailability(ids[0]).then(
+                t.unreached_func(),
+                t.step_func(e => {
+                  assert_equals(e.name, "NotFoundError");
+                  v.remote.cancelWatchAvailability(ids[1]).then(
+                    t.unreached_func(),
+                    t.step_func_done(e =>
+                      assert_equals(e.name, "NotFoundError")
+                    )
+                  );
+                })
+              )
+            ),
+            t.unreached_func()
+          )
+        ),
+        t.unreached_func()
+      );
+    }, "Test that calling cancelWatchAvailability() without an id removes all the callbacks, and calling cancelWatchAvailability() with a removed id throws NotFoundError.");
+  </script>
 </html>
diff --git a/tests/wpt/tests/remote-playback/disable-remote-playback-cancel-watch-availability-throws.html b/tests/wpt/tests/remote-playback/disable-remote-playback-cancel-watch-availability-throws.html
index bdd35d8101b..7b93f8e3af7 100644
--- a/tests/wpt/tests/remote-playback/disable-remote-playback-cancel-watch-availability-throws.html
+++ b/tests/wpt/tests/remote-playback/disable-remote-playback-cancel-watch-availability-throws.html
@@ -1,29 +1,33 @@
 <!DOCTYPE html>
 <html>
-<title>Test that calling cancelWatchAvailability() when disableRemotePlayback attribute is set throws an exception</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/common/media.js"></script>
-<script>
-async_test(t => {
-  var v = document.createElement('video');
-  v.src = getVideoURI('/media/movie_5');
+  <title>
+    Test that calling cancelWatchAvailability() when disableRemotePlayback attribute is set throws InvalidStateError
+  </title>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <script src="/common/media.js"></script>
+  <script>
+    async_test(t => {
+      let v = document.createElement("video");
+      v.src = getVideoURI("/media/movie_5");
 
-  v.remote.watchAvailability(function() {})
-    .then(id => {
-      v.disableRemotePlayback = true;
-      v.remote.cancelWatchAvailability(id).then(
-        t.unreached_func(),
-        t.step_func(e => {
-          assert_equals(e.name, 'InvalidStateError');
-          v.remote.cancelWatchAvailability().then(
+      v.remote
+        .watchAvailability(() => {})
+        .then(id => {
+          v.disableRemotePlayback = true;
+          v.remote.cancelWatchAvailability(id).then(
             t.unreached_func(),
-            t.step_func_done(e => {
-              assert_equals(e.name, 'InvalidStateError');
+            t.step_func(e => {
+              assert_equals(e.name, "InvalidStateError");
+              v.remote.cancelWatchAvailability().then(
+                t.unreached_func(),
+                t.step_func_done(e => {
+                  assert_equals(e.name, "InvalidStateError");
+                })
+              );
             })
           );
-        }));
-    }, t.unreached_func());
-}, 'Test that calling cancelWatchAvailability() when disableRemotePlayback attribute is set throws an exception.');
-</script>
+        }, t.unreached_func());
+    }, "Test that calling cancelWatchAvailability() when disableRemotePlayback attribute is set throws InvalidStateError.");
+  </script>
 </html>
diff --git a/tests/wpt/tests/remote-playback/disable-remote-playback-prompt-throws.html b/tests/wpt/tests/remote-playback/disable-remote-playback-prompt-throws.html
index 18333842b6a..b47e30eebaa 100644
--- a/tests/wpt/tests/remote-playback/disable-remote-playback-prompt-throws.html
+++ b/tests/wpt/tests/remote-playback/disable-remote-playback-prompt-throws.html
@@ -1,16 +1,18 @@
 <!DOCTYPE html>
 <html>
-<title>Test that calling prompt() when disableRemotePlayback attribute is set throws an exception</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/common/media.js"></script>
-<script>
-promise_test(t => {
-  var v = document.createElement('video');
-  v.src = getVideoURI('/media/movie_5');
-  v.disableRemotePlayback = true;
+  <title>
+    Test that calling prompt() when disableRemotePlayback attribute is set throws an exception
+  </title>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <script src="/common/media.js"></script>
+  <script>
+    promise_test(t => {
+      let v = document.createElement("video");
+      v.src = getVideoURI("/media/movie_5");
+      v.disableRemotePlayback = true;
 
-  return promise_rejects_dom(t, 'InvalidStateError', v.remote.prompt());
-}, 'Test that calling prompt() when disableRemotePlayback attribute is set throws an exception.');
-</script>
+      return promise_rejects_dom(t, "InvalidStateError", v.remote.prompt());
+    }, "Test that calling prompt() when disableRemotePlayback attribute is set throws an exception.");
+  </script>
 </html>
diff --git a/tests/wpt/tests/remote-playback/disable-remote-playback-watch-availability-throws.html b/tests/wpt/tests/remote-playback/disable-remote-playback-watch-availability-throws.html
index b671d9f944d..7496b86fcde 100644
--- a/tests/wpt/tests/remote-playback/disable-remote-playback-watch-availability-throws.html
+++ b/tests/wpt/tests/remote-playback/disable-remote-playback-watch-availability-throws.html
@@ -1,17 +1,22 @@
 <!DOCTYPE html>
 <html>
-<title>Test that calling watchAvailability() when disableRemotePlayback attribute is set throws an exception</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/common/media.js"></script>
-<script>
-promise_test(t => {
-  var v = document.createElement('video');
-  v.src = getVideoURI('/media/movie_5');
-  v.disableRemotePlayback = true;
+  <title>
+    Test that calling watchAvailability() when disableRemotePlayback attribute is set throws an exception
+  </title>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <script src="/common/media.js"></script>
+  <script>
+    promise_test(t => {
+      let v = document.createElement("video");
+      v.src = getVideoURI("/media/movie_5");
+      v.disableRemotePlayback = true;
 
-  return promise_rejects_dom(t, 'InvalidStateError',
-                         v.remote.watchAvailability(function() {}));
-}, 'Test that calling watchAvailability() when disableRemotePlayback attribute is set throws an exception.');
-</script>
+      return promise_rejects_dom(
+        t,
+        "InvalidStateError",
+        v.remote.watchAvailability(() => {})
+      );
+    }, "Test that calling watchAvailability() when disableRemotePlayback attribute is set throws an exception.");
+  </script>
 </html>
diff --git a/tests/wpt/tests/remote-playback/event-handlers-manual.html b/tests/wpt/tests/remote-playback/event-handlers-manual.html
new file mode 100644
index 00000000000..b57a24b9324
--- /dev/null
+++ b/tests/wpt/tests/remote-playback/event-handlers-manual.html
@@ -0,0 +1,62 @@
+<!DOCTYPE html>
+<html>
+  <title>
+    Test that all event handlers are called when a remote playback device is connected
+  </title>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <script src="/common/media.js"></script>
+  <script>
+    setup({ explicit_timeout: true });
+  </script>
+  <body>
+    <div id="prep">
+      <p>Please make sure a device for remote playback is <b>available.</b></p>
+      <button id="prompt-button-prep">Show devices</button>
+      <button id="start-button">Start test</button>
+    </div>
+    <div id="pick-device" style="display: none">
+      <p>
+        Click the button below to prompt for a remote playback device and select
+        one! After connecting to the device, please click again and disconnect
+        from device.
+      </p>
+      <button id="prompt-button">Pick device</button>
+      <button id="disconnect-button" style="display: none">
+        Disconnect device
+      </button>
+    </div>
+  </body>
+  <script src="./prepare-device.js"></script>
+  <script>
+    let v = document.createElement("video");
+    v.src = getVideoURI("/media/movie_5");
+
+    async_test(t => {
+      let onConnectingCalled = false;
+      let onConnectCalled = false;
+      let onDisconnectCalled = false;
+      v.remote.onconnecting = () => (onConnectingCalled = true);
+      v.remote.onconnect = () => (onConnectCalled = true);
+      v.remote.ondisconnect = () => (onDisconnectCalled = true);
+      let button = document.getElementById("prompt-button");
+      let disconnectButton = document.getElementById("disconnect-button");
+      button.onclick = promise_test(
+        () =>
+          v.remote.prompt().then(() => {
+            button.style.display = "none";
+            disconnectButton.style.display = "inline";
+          }),
+        "Prompt to connect device"
+      );
+      disconnectButton.onclick = () =>
+        v.remote.prompt().then(
+          t.step_func_done(() => {
+            assert_true(onConnectingCalled, "onconnecting was called");
+            assert_true(onConnectCalled, "onconnect was called");
+            assert_true(onDisconnectCalled, "ondisconnect was called");
+          })
+        );
+    }, "Test that all event handlers are called when a remote playback device is connected.");
+  </script>
+</html>
diff --git a/tests/wpt/tests/remote-playback/prepare-device.js b/tests/wpt/tests/remote-playback/prepare-device.js
new file mode 100644
index 00000000000..a12dbaf2871
--- /dev/null
+++ b/tests/wpt/tests/remote-playback/prepare-device.js
@@ -0,0 +1,10 @@
+document.getElementById("start-button").onclick = () => {
+  document.getElementById("prep").style.display = "none";
+  document.getElementById("pick-device").style.display = "block";
+};
+document.getElementById("prompt-button-prep").onclick = () => {
+  v.remote
+    .prompt()
+    .then(() => {})
+    .catch(() => {});
+};
diff --git a/tests/wpt/tests/remote-playback/prompt-and-cancel-selection-manual.html b/tests/wpt/tests/remote-playback/prompt-and-cancel-selection-manual.html
new file mode 100644
index 00000000000..89a73730efa
--- /dev/null
+++ b/tests/wpt/tests/remote-playback/prompt-and-cancel-selection-manual.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html>
+  <title>
+    Test that the Promise returned by prompt() is rejected when user cancels device selection
+  </title>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <script src="/common/media.js"></script>
+  <script>
+    setup({ explicit_timeout: true });
+  </script>
+  <body>
+    <p>
+      Click the button below to prompt for a remote playback device and
+      <b>cancel the selection</b> of a device!
+    </p>
+    <button id="prompt-button">Pick device</button>
+  </body>
+  <script>
+    async_test(t => {
+      let v = document.createElement("video");
+      v.src = getVideoURI("/media/movie_5");
+
+      let button = document.getElementById("prompt-button");
+      button.onclick = t.step_func(() =>
+        v.remote
+          .prompt()
+          .then(t.unreached_func())
+          .catch(
+            t.step_func_done(error =>
+              assert_equals(error.name, "NotAllowedError")
+            )
+          )
+      );
+    }, "Test that the Promise returned by prompt() is rejected when user cancels device selection.");
+  </script>
+</html>
diff --git a/tests/wpt/tests/remote-playback/prompt-and-select-device-manual.html b/tests/wpt/tests/remote-playback/prompt-and-select-device-manual.html
new file mode 100644
index 00000000000..77973af6667
--- /dev/null
+++ b/tests/wpt/tests/remote-playback/prompt-and-select-device-manual.html
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<html>
+  <title>Test that the Promise returned by prompt() is resolved when user selects a device</title>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <script src="/common/media.js"></script>
+  <script>
+    setup({ explicit_timeout: true });
+  </script>
+  <body>
+    <div id="prep">
+      <p>Please make sure a device for remote playback is <b>available.</b></p>
+      <button id="prompt-button-prep">Show devices</button>
+      <button id="start-button">Start test</button>
+    </div>
+    <div id="pick-device" style="display: none">
+      <p>
+        Click the button below to prompt for a remote playback device and select
+        one!
+      </p>
+      <button id="prompt-button">Pick device</button>
+    </div>
+  </body>
+  <script src="./prepare-device.js"></script>
+  <script>
+    let v = document.createElement("video");
+    v.src = getVideoURI("/media/movie_5");
+
+    async_test(t => {
+      let button = document.getElementById("prompt-button");
+      button.onclick = t.step_func_done(() => {
+        promise_test(() => {
+          return v.remote.prompt();
+        }, "Prompt resolves");
+      });
+    }, "Test that the Promise returned by prompt() is resolved when user selects a device.");
+  </script>
+</html>
diff --git a/tests/wpt/tests/remote-playback/prompt-and-watch-availability-no-device-manual.html b/tests/wpt/tests/remote-playback/prompt-and-watch-availability-no-device-manual.html
new file mode 100644
index 00000000000..7d69f09afcc
--- /dev/null
+++ b/tests/wpt/tests/remote-playback/prompt-and-watch-availability-no-device-manual.html
@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<html>
+  <title>
+    Test that watchAvailability() runs the callback with false when there is no device for the user to select
+  </title>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <script src="/common/media.js"></script>
+  <script>
+    setup({ explicit_timeout: true });
+  </script>
+  <body>
+    <div id="prep">
+      <p>Please make sure <b>no device is available</b> for remote playback.</p>
+      <button id="prompt-button-prep">Show devices</button>
+      <button id="start-button">Start test</button>
+    </div>
+    <div id="pick-device" style="display: none">
+      <p>
+        Click the button below to prompt for a remote playback device and
+        cancel!
+      </p>
+      <button id="prompt-button">Pick device</button>
+    </div>
+  </body>
+  <script src="./prepare-device.js"></script>
+  <script>
+    let v = document.createElement("video");
+    v.src = getVideoURI("/media/movie_5");
+
+    async_test(t => {
+      let deviceAvailable = false;
+      let button = document.getElementById("prompt-button");
+      button.onclick = function () {
+        v.remote
+          .watchAvailability(t.step_func(avail => (deviceAvailable = avail)))
+          .then(
+            t.step_func(() => {
+              promise_rejects_js(t, NotFoundError, v.remote.prompt());
+              assert_false(deviceAvailable);
+            }),
+            t.unreached_func()
+          );
+      };
+    }, "Test that watchAvailability() runs the callback with false when there is no device for the user to select.");
+  </script>
+</html>
diff --git a/tests/wpt/tests/remote-playback/prompt-and-watch-availability-with-device-manual.html b/tests/wpt/tests/remote-playback/prompt-and-watch-availability-with-device-manual.html
new file mode 100644
index 00000000000..fa8644931bf
--- /dev/null
+++ b/tests/wpt/tests/remote-playback/prompt-and-watch-availability-with-device-manual.html
@@ -0,0 +1,56 @@
+<!DOCTYPE html>
+<html>
+  <title>
+    Test that watchAvailability() runs the callback with true when user selects a device
+  </title>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <script src="/common/media.js"></script>
+  <script>
+    setup({ explicit_timeout: true });
+  </script>
+  <body>
+    <div id="prep">
+      <p>Please make sure a device for remote playback is <b>available.</b></p>
+      <button id="prompt-button-prep">Show devices</button>
+      <button id="start-button">Start test</button>
+    </div>
+    <div id="pick-device" style="display: none">
+      <p>
+        Click the button below to prompt for a remote playback device and select
+        one!
+      </p>
+      <button id="prompt-button">Pick device</button>
+    </div>
+  </body>
+  <script src="./prepare-device.js"></script>
+  <script>
+    let v = document.createElement("video");
+    v.src = getVideoURI("/media/movie_5");
+
+    async_test(t => {
+      let deviceAvailable = false;
+      let button = document.getElementById("prompt-button");
+      button.onclick = () => {
+        v.remote
+          .watchAvailability(t.step_func(avail => (deviceAvailable = avail)))
+          .then(
+            t.step_func(() => {
+              v.remote
+                .prompt()
+                .then(() => {
+                  assert_true(deviceAvailable);
+                  t.done();
+                })
+                .catch(
+                  t.unreached_func(
+                    "Selecting a remote device was not successful."
+                  )
+                );
+            }),
+            t.unreached_func()
+          );
+      };
+    }, "Test that watchAvailability() runs the callback with true when user selects a device.");
+  </script>
+</html>
diff --git a/tests/wpt/tests/remote-playback/remote-video-control-pausing-manual.html b/tests/wpt/tests/remote-playback/remote-video-control-pausing-manual.html
new file mode 100644
index 00000000000..8dfc19bf774
--- /dev/null
+++ b/tests/wpt/tests/remote-playback/remote-video-control-pausing-manual.html
@@ -0,0 +1,72 @@
+<!DOCTYPE html>
+<html>
+  <link rel="stylesheet" href="styles.css" />
+  <title>Test that pause() on the local video is reflected on the remote device</title>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <script src="/common/media.js"></script>
+  <script>
+    setup({ explicit_timeout: true });
+  </script>
+  <body>
+    <div id="pick-device">
+      <p>
+        Click the button below to prompt for a remote playback device and select
+        one!
+      </p>
+      <p>
+        <button id="prompt-button">Pick device</button>
+      </p>
+    </div>
+    <video src="/media/green-at-15.mp4" id="video"></video>
+    <div id="evaluate" style="display: none">
+      <p>
+        Did the playback on the remote device pause and show the following
+        timestamp? (can vary by some frames)
+      </p>
+      <p id="timestamp" style="font-weight: bold"></p>
+      <p>
+        <button id="yes">Yes</button>
+      </p>
+      <p>
+        <button id="no">No</button>
+      </p>
+    </div>
+  </body>
+  <script>
+    let v = document.getElementById("video");
+
+    async_test(t => {
+      let button = document.getElementById("prompt-button");
+      button.onclick = t.step_func(() => {
+        promise_test(() => {
+          return v.remote.prompt().then(() => {
+            v.play();
+          });
+        }, "Prompt resolves");
+      });
+
+      let timestampLabel = document.getElementById("timestamp");
+      v.ontimeupdate = () => {
+        let seconds = Math.floor(v.currentTime) + "";
+        let frames = Math.ceil((v.currentTime - seconds) * 30) + "";
+        timestampLabel.innerText =
+          seconds.padStart(2, "0") + ":" + frames.padStart(2, "0");
+        if (v.currentTime >= 2) {
+          v.pause();
+          document.getElementById("evaluate").style.display = "block";
+        }
+      };
+
+      let evaluate = success =>
+        assert_true(success, "Video paused and has correct play position.");
+
+      document.getElementById("yes").onclick = t.step_func_done(() =>
+        evaluate(true)
+      );
+      document.getElementById("no").onclick = t.step_func_done(() =>
+        evaluate(false)
+      );
+    }, "Test that pause() on the local video is reflected on the remote device.");
+  </script>
+</html>
diff --git a/tests/wpt/tests/remote-playback/remote-video-control-seek-manual.html b/tests/wpt/tests/remote-playback/remote-video-control-seek-manual.html
new file mode 100644
index 00000000000..56156d98710
--- /dev/null
+++ b/tests/wpt/tests/remote-playback/remote-video-control-seek-manual.html
@@ -0,0 +1,78 @@
+<!DOCTYPE html>
+<html>
+  <link rel="stylesheet" href="styles.css" />
+  <title>Test that seek() on the local video is reflected on the remote device</title>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <script src="/common/media.js"></script>
+  <script>
+    setup({ explicit_timeout: true });
+  </script>
+  <body>
+    <div id="pick-device">
+      <p>
+        Click the button below to prompt for a remote playback device and select
+        one!
+      </p>
+      <p>
+        Wait a few seconds for the video to initialize, play and seek.
+      </p>
+      <p>
+        <button id="prompt-button">Pick device</button>
+      </p>
+    </div>
+    <video src="/media/green-at-15.mp4" id="video"></video>
+    <div id="evaluate" style="display: none">
+      <p>
+        Did the playback on the remote device pause and show the following
+        timestamp? (can vary by some frames)
+      </p>
+      <p id="timestamp" style="font-weight: bold"></p>
+      <p>
+        <button id="yes">Yes</button>
+      </p>
+      <p>
+        <button id="no">No</button>
+      </p>
+    </div>
+  </body>
+  <script>
+    let v = document.getElementById("video");
+
+    async_test(t => {
+      let button = document.getElementById("prompt-button");
+      button.onclick = t.step_func(() => {
+        promise_test(() => {
+          return v.remote.prompt().then(() => {
+            v.play();
+          });
+        }, "Prompt resolves");
+      });
+
+      let timestampLabel = document.getElementById("timestamp");
+      v.ontimeupdate = () => {
+        let seconds = Math.floor(v.currentTime) + "";
+        let frames = Math.ceil((v.currentTime - seconds) * 30) + "";
+        timestampLabel.innerText =
+          seconds.padStart(2, "0") + ":" + frames.padStart(2, "0");
+        if (v.currentTime >= 2 && v.currentTime < 18) {
+          v.currentTime = 18;
+        }
+        if (v.currentTime >= 20) {
+          v.pause();
+          document.getElementById("evaluate").style.display = "block";
+        }
+      };
+
+      let evaluate = success =>
+        assert_true(success, "Video paused and has correct play position.");
+
+      document.getElementById("yes").onclick = t.step_func_done(() =>
+        evaluate(true)
+      );
+      document.getElementById("no").onclick = t.step_func_done(() =>
+        evaluate(false)
+      );
+    }, "Test that seek() on the local video is reflected on the remote device.");
+  </script>
+</html>
diff --git a/tests/wpt/tests/remote-playback/remote-video-playback-manual.html b/tests/wpt/tests/remote-playback/remote-video-playback-manual.html
new file mode 100644
index 00000000000..223a5b4a289
--- /dev/null
+++ b/tests/wpt/tests/remote-playback/remote-video-playback-manual.html
@@ -0,0 +1,61 @@
+<!DOCTYPE html>
+<html>
+  <title>Test if video is playing on remote device</title>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <script src="/common/media.js"></script>
+  <script>
+    setup({ explicit_timeout: true });
+  </script>
+  <style>
+    button {
+      padding: 2em;
+    }
+  </style>
+  <body>
+    <div id="pick-device">
+      <p>
+        Click the button below to prompt for a remote playback device and select
+        one!
+      </p>
+      <p>
+        <button id="prompt-button">Pick device</button>
+      </p>
+    </div>
+    <video src="/media/green-at-15.mp4" id="video"></video>
+    <div id="evaluate" style="display: none">
+      <p>Does the video play back on the remote device?</p>
+      <p>
+        <button id="yes">Yes</button>
+      </p>
+      <p>
+        <button id="no">No</button>
+      </p>
+    </div>
+  </body>
+  <script>
+    let v = document.getElementById("video");
+
+    async_test(t => {
+      let button = document.getElementById("prompt-button");
+      button.onclick = t.step_func(() => {
+        promise_test(() => {
+          return v.remote.prompt().then(() => {
+            v.play();
+            document.getElementById("evaluate").style.display = "block";
+          });
+        }, "Prompt resolves");
+      });
+
+      let evaluate = success =>
+        assert_true(success, "Video paused and has correct play position.");
+
+      document.getElementById("yes").onclick = t.step_func_done(() =>
+        evaluate(true)
+      );
+      document.getElementById("no").onclick = t.step_func_done(() =>
+        evaluate(false)
+      );
+    }, "Test if video is playing on remote device.");
+  </script>
+</html>
diff --git a/tests/wpt/tests/remote-playback/state-attribute-changes-when-selecting-device-manual.html b/tests/wpt/tests/remote-playback/state-attribute-changes-when-selecting-device-manual.html
new file mode 100644
index 00000000000..90f51af1d7a
--- /dev/null
+++ b/tests/wpt/tests/remote-playback/state-attribute-changes-when-selecting-device-manual.html
@@ -0,0 +1,53 @@
+<!DOCTYPE html>
+<html>
+  <title>
+    Test that the remote playback state changes when selecting a device
+  </title>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <script src="/common/media.js"></script>
+  <script>
+    setup({ explicit_timeout: true });
+  </script>
+  <body>
+    <div id="prep">
+      <p>Please make sure a device for remote playback is <b>available.</b></p>
+      <button id="prompt-button-prep">Show devices</button>
+      <button id="start-button">Start test</button>
+    </div>
+    <div id="pick-device" style="display: none">
+      <p>
+        Click the button below to prompt for a remote playback device and select
+        one!
+      </p>
+      <button id="prompt-button">Pick device</button>
+    </div>
+  </body>
+  <script src="./prepare-device.js"></script>
+  <script>
+    let v = document.createElement("video");
+    v.src = getVideoURI("/media/movie_5");
+
+    async_test(t => {
+      assert_equals(v.remote.state, "disconnected");
+
+      function callback(available) {
+        promise_test(() => {
+          return v.remote.prompt().then(
+            t.step_func(() => {
+              assert_equals(v.remote.state, "connecting");
+            })
+          );
+        }, "Prompt call resolves");
+      }
+
+      let button = document.getElementById("prompt-button");
+      button.onclick = () => {
+        v.remote.watchAvailability(t.step_func_done(callback)).then(
+          t.step_func(() => {}),
+          t.unreached_func()
+        );
+      };
+    }, "Test that the remote playback state changes when selecting a device.");
+  </script>
+</html>
diff --git a/tests/wpt/tests/remote-playback/state-attribute-changes-with-event-handlers-manual.html b/tests/wpt/tests/remote-playback/state-attribute-changes-with-event-handlers-manual.html
new file mode 100644
index 00000000000..725613e413c
--- /dev/null
+++ b/tests/wpt/tests/remote-playback/state-attribute-changes-with-event-handlers-manual.html
@@ -0,0 +1,58 @@
+<!DOCTYPE html>
+<html>
+  <title>
+    Test that remote playback state changes when connecting and disconnecting
+  </title>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <script src="/common/media.js"></script>
+  <script>
+    setup({ explicit_timeout: true });
+  </script>
+  <body>
+    <div id="prep">
+      <p>Please make sure a device for remote playback is <b>available.</b></p>
+      <button id="prompt-button-prep">Show devices</button>
+      <button id="start-button">Start test</button>
+    </div>
+    <div id="pick-device" style="display: none">
+      <p>
+        Click the button below to prompt for a remote playback device and select
+        one! After connecting to the device, please click again and disconnect
+        from device.
+      </p>
+      <button id="prompt-button">Pick device</button>
+      <button id="disconnect-button" style="display: none">
+        Disconnect device
+      </button>
+    </div>
+  </body>
+  <script src="./prepare-device.js"></script>
+  <script>
+    let v = document.createElement("video");
+    v.src = getVideoURI("/media/movie_5");
+
+    async_test(t => {
+      v.remote.onconnecting = () => assert_equals(v.remote.state, "connecting");
+      v.remote.onconneced = () => assert_equals(v.remote.state, "connected");
+      v.remote.ondisconnected = () =>
+        assert_equals(v.remote.state, "disconnected");
+
+      let button = document.getElementById("prompt-button");
+      let disconnectButton = document.getElementById("disconnect-button");
+      button.onclick = () => {
+        promise_test(() => {
+          return v.remote.prompt().then(() => {
+            button.style.display = "none";
+            disconnectButton.style.display = "inline";
+          });
+        }, "Prompt to connect device");
+      };
+      disconnectButton.onclick = () => {
+        promise_test(() => {
+          return v.remote.prompt().then(() => t.done());
+        }, "Prompt to disconnect device");
+      };
+    }, "Test that remote playback state changes when connecting and disconnecting.");
+  </script>
+</html>
diff --git a/tests/wpt/tests/remote-playback/styles.css b/tests/wpt/tests/remote-playback/styles.css
new file mode 100644
index 00000000000..7c3dc811482
--- /dev/null
+++ b/tests/wpt/tests/remote-playback/styles.css
@@ -0,0 +1,3 @@
+button {
+  padding: 2em;
+}
diff --git a/tests/wpt/tests/remote-playback/watch-availability-callback-parameter.html b/tests/wpt/tests/remote-playback/watch-availability-callback-parameter.html
new file mode 100644
index 00000000000..fe407a9c03c
--- /dev/null
+++ b/tests/wpt/tests/remote-playback/watch-availability-callback-parameter.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html>
+  <title>
+    Test that the callback is called with boolean parameter when calling
+    watchAvailability()
+  </title>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <script src="/common/media.js"></script>
+  <script>
+    async_test(t => {
+      let v = document.createElement("video");
+      v.src = getVideoURI("/media/movie_5");
+
+      v.remote
+        .watchAvailability(
+          t.step_func_done(() => assert_true(typeof available === "boolean"))
+        )
+        .then(
+          t.step_func(() => {}),
+          t.unreached_func()
+        )
+        .catch(
+          t.step_func_done(error =>
+            assert_equals(error.name, "NotSupportedError")
+          )
+        );
+    }, "Test that the callback is called with boolean parameter when calling watchAvailability().");
+  </script>
+</html>
diff --git a/tests/wpt/tests/remote-playback/watch-availability-initial-callback.html b/tests/wpt/tests/remote-playback/watch-availability-initial-callback.html
index 352321b06ae..b540d835b9b 100644
--- a/tests/wpt/tests/remote-playback/watch-availability-initial-callback.html
+++ b/tests/wpt/tests/remote-playback/watch-availability-initial-callback.html
@@ -1,22 +1,26 @@
 <!DOCTYPE html>
 <html>
-<title>Test that the callback is called once watchAvailability() resolves.</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/common/media.js"></script>
-<script>
-async_test(t => {
-  var v = document.createElement('video');
-  v.src = getVideoURI('/media/movie_5');
+  <title>
+    Test that the callback is called after the Promise returned by watchAvailability() resolves
+  </title>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <script src="/common/media.js"></script>
+  <script>
+    async_test(t => {
+      let v = document.createElement("video");
+      v.src = getVideoURI("/media/movie_5");
 
-  var promiseResolved = false;
+      let promiseResolved = false;
 
-  function callback(available) {
-    assert_true(promiseResolved);
-  }
-
-  v.remote.watchAvailability(t.step_func_done(callback)).then(
-    t.step_func(() => { promiseResolved = true; }), t.unreached_func());
-}, 'Test that the callback is called once watchAvailability() resolves.');
-</script>
+      v.remote
+        .watchAvailability(t.step_func_done(() => assert_true(promiseResolved)))
+        .then(
+          t.step_func(() => {
+            promiseResolved = true;
+          }),
+          t.unreached_func()
+        );
+    }, "Test that the callback is called after the Promise returned by watchAvailability() resolves.");
+  </script>
 </html>
diff --git a/tests/wpt/tests/remote-playback/watch-availability-promise-return-callback-id.html b/tests/wpt/tests/remote-playback/watch-availability-promise-return-callback-id.html
new file mode 100644
index 00000000000..c3df0b31f16
--- /dev/null
+++ b/tests/wpt/tests/remote-playback/watch-availability-promise-return-callback-id.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html>
+  <title>
+    Test that the Promise returned by watchAvailability() resolves with a numeric callback id
+  </title>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <script src="/common/media.js"></script>
+  <script>
+    async_test(t => {
+      let v = document.createElement("video");
+      v.src = getVideoURI("/media/movie_5");
+
+      v.remote
+        .watchAvailability(() => {})
+        .then(
+          t.step_func_done(callbackId => {
+            assert_true(typeof callbackId === "number");
+          }),
+          t.unreached_func()
+        );
+    }, "Test that the Promise returned by watchAvailability() resolves with a numeric callback id.");
+  </script>
+</html>
diff --git a/tests/wpt/tests/resource-timing/META.yml b/tests/wpt/tests/resource-timing/META.yml
index 662c42cb664..153654eae8b 100644
--- a/tests/wpt/tests/resource-timing/META.yml
+++ b/tests/wpt/tests/resource-timing/META.yml
@@ -1,6 +1,5 @@
 spec: https://w3c.github.io/resource-timing/
 suggested_reviewers:
   - plehegar
-  - zqzhang
   - igrigorik
   - yoavweiss
diff --git a/tests/wpt/tests/resource-timing/resource-timing-failed-fetch-web-bundle.tentative.html b/tests/wpt/tests/resource-timing/resource-timing-failed-fetch-web-bundle.tentative.html
new file mode 100644
index 00000000000..b99183a49cd
--- /dev/null
+++ b/tests/wpt/tests/resource-timing/resource-timing-failed-fetch-web-bundle.tentative.html
@@ -0,0 +1,53 @@
+<!DOCTYPE html>
+<meta charset="utf-8" />
+<title>
+  Resource timing attributes are consistent for the same-origin subresources.
+</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/web-bundle/resources/test-helpers.js"></script>
+
+<body>
+  <script>
+    setup(() => {
+      assert_true(HTMLScriptElement.supports("webbundle"));
+    });
+
+    promise_test(async (t) => {
+      const script_url = 'dynamic1:resource1.js';
+      const non_exist_script_url = 'dynamic1:non_exist_resource.js';
+      // Using functions from /web-bundle/resources/test-helpers.js.
+      const element = createWebBundleElement(
+        "../web-bundle/resources/wbn/dynamic1.wbn",
+        /*resources=*/[script_url]
+      );
+
+      document.body.appendChild(element);
+
+      // Fetch the script that is in the web bundle.
+      const script = document.createElement("script");
+      script.type = "module";
+      script.src = script_url;
+      document.body.appendChild(script);
+
+      // Fetch the script that is not in the web bundle.
+      // Using functions from /web-bundle/resources/test-helpers.js.
+      await fetchAndWaitForReject(non_exist_script_url);
+
+      let resource1_entries = [];
+      let non_exist_resource_entries = [];
+
+      await new Promise((resolve) => {
+        new PerformanceObserver(list => {
+          resource1_entries.push(list.getEntries().filter(e => e.name.includes('resource1.js')));
+          non_exist_resource_entries.push(
+            list.getEntries().filter(e => e.name.includes('non_exist_resource.js')));
+          if (resource1_entries.length == 1 && non_exist_resource_entries.length == 1) {
+            resolve();
+          }
+        }
+        ).observe({ type: 'resource', buffered: true });
+      });
+    }, "Web bundle resources should have resource timing entries, even when the fetch failed.");
+  </script>
+</body>
\ No newline at end of file
diff --git a/tests/wpt/tests/resource-timing/resource-timing-failed-fetch.html b/tests/wpt/tests/resource-timing/resource-timing-failed-fetch.html
new file mode 100644
index 00000000000..5bab39e2760
--- /dev/null
+++ b/tests/wpt/tests/resource-timing/resource-timing-failed-fetch.html
@@ -0,0 +1,34 @@
+<!doctype html>
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<link rel="stylesheet" href="resources/empty_style.css">
+<link rel="stylesheet" href="resources/non_exist.css">
+
+<script>
+  promise_test(async () => {
+    const css_resource_timing_entries = await new Promise(resolve => {
+      new PerformanceObserver((list, observer) => {
+        let css_resource_timing_entries = list.getEntries().filter(e => e.name.includes('css'));
+        if (css_resource_timing_entries.length >= 2) {
+          resolve(css_resource_timing_entries);
+        }
+      }).observe({ 'type': 'resource', 'buffered': true });
+    });
+
+    assert_equals(css_resource_timing_entries.length, 2,
+      'There should be two resource timing entries for css resources');
+
+    assert_equals(css_resource_timing_entries.filter(
+      e => e.name.includes('empty_style.css')).length, 1,
+      'There should be one resource timing entry for successfully fetched resource.');
+
+    assert_equals(css_resource_timing_entries.filter(
+      e => e.name.includes('non_exist.css')).length, 1,
+      'There should be one resource timing entry for fetching failed resource.');
+
+  }, 'Resource fetched by HTTP protocol should have resource timing entry emitted, \
+  even when the fetch failed.');
+</script>
+
+</html>
\ No newline at end of file
diff --git a/tests/wpt/tests/resources/chromium/webxr-test.js b/tests/wpt/tests/resources/chromium/webxr-test.js
index c5eb1bd14b8..aba3447982b 100644
--- a/tests/wpt/tests/resources/chromium/webxr-test.js
+++ b/tests/wpt/tests/resources/chromium/webxr-test.js
@@ -196,7 +196,7 @@ class MockVRService {
 
       // If there were no successful results, returns a null session.
       return {
-        result: {failureReason: vrMojom.RequestSessionError.NO_RUNTIME_FOUND}
+        result: {failureReason: xrSessionMojom.RequestSessionError.NO_RUNTIME_FOUND}
       };
     });
   }
@@ -1212,11 +1212,14 @@ class MockRuntime {
             deviceConfig: {
               defaultFramebufferScale: this.defaultFramebufferScale_,
               supportsViewportScaling: true,
-              depthConfiguration:
-                enabled_features.includes(xrSessionMojom.XRSessionFeature.DEPTH) ? {
-                  depthUsage: vrMojom.XRDepthUsage.kCPUOptimized,
-                  depthDataFormat: vrMojom.XRDepthDataFormat.kLuminanceAlpha,
-                } : null,
+              depthConfiguration: enabled_features.includes(
+                                      xrSessionMojom.XRSessionFeature.DEPTH) ?
+                  {
+                    depthUsage: xrSessionMojom.XRDepthUsage.kCPUOptimized,
+                    depthDataFormat:
+                        xrSessionMojom.XRDepthDataFormat.kLuminanceAlpha,
+                  } :
+                  null,
               views: this._getDefaultViews(),
             },
             enviromentBlendMode: this.enviromentBlendMode_,
@@ -1234,8 +1237,10 @@ class MockRuntime {
 
     if (options.requiredFeatures.includes(xrSessionMojom.XRSessionFeature.DEPTH)
     || options.optionalFeatures.includes(xrSessionMojom.XRSessionFeature.DEPTH)) {
-      result &= options.depthOptions.usagePreferences.includes(vrMojom.XRDepthUsage.kCPUOptimized);
-      result &= options.depthOptions.dataFormatPreferences.includes(vrMojom.XRDepthDataFormat.kLuminanceAlpha);
+      result &= options.depthOptions.usagePreferences.includes(
+          xrSessionMojom.XRDepthUsage.kCPUOptimized);
+      result &= options.depthOptions.dataFormatPreferences.includes(
+          xrSessionMojom.XRDepthDataFormat.kLuminanceAlpha);
     }
 
     return Promise.resolve({
diff --git a/tests/wpt/tests/resources/test/tests/functional/step_wait.html b/tests/wpt/tests/resources/test/tests/functional/step_wait.html
index ae3442c7595..8235d9d48a1 100644
--- a/tests/wpt/tests/resources/test/tests/functional/step_wait.html
+++ b/tests/wpt/tests/resources/test/tests/functional/step_wait.html
@@ -25,6 +25,22 @@ promise_test(async t => {
 promise_test(async t => {
   await t.step_wait(); // Throws
 }, "step_wait() takes an argument");
+
+promise_test(async t => {
+  function wait(ms) {
+    return new Promise(resolve => step_timeout(resolve, ms));
+  }
+  let x = 1;
+  step_timeout(() => {
+    ++x;
+  }, 100);
+
+  await t.step_wait(async () => {
+    await wait(1);
+    return x === 2;
+  });
+  assert_equals(x, 2);
+}, "async step_wait()");
 </script>
 <script type="text/json" id="expected">
 {
@@ -46,6 +62,12 @@ promise_test(async t => {
       "message": "cond is not a function",
       "properties": {},
       "status_string": "FAIL"
+    },
+    {
+      "name": "async step_wait()",
+      "message": null,
+      "properties": {},
+      "status_string": "PASS"
     }
   ],
   "type": "complete",
diff --git a/tests/wpt/tests/resources/testdriver.js b/tests/wpt/tests/resources/testdriver.js
index a23d6eaf4cf..4b8656b276e 100644
--- a/tests/wpt/tests/resources/testdriver.js
+++ b/tests/wpt/tests/resources/testdriver.js
@@ -262,7 +262,9 @@
          * occurs.
          *
          * If ``element`` is from a different browsing context, the
-         * command will be run in that context.
+         * command will be run in that context. The test must not depend
+         * on the ``window.name`` property being unset on the target
+         * window.
          *
          * To send special keys, send the respective key's codepoint,
          * as defined by `WebDriver
@@ -417,8 +419,9 @@
         /**
          * Sets the state of a permission
          *
-         * This function simulates a user setting a permission into a
-         * particular state.
+         * This function causes permission requests and queries for the status
+         * of a certain permission type (e.g. "push", or "background-fetch") to
+         * always return ``state``.
          *
          * Matches the `Set Permission
          * <https://w3c.github.io/permissions/#set-permission-command>`_
@@ -430,8 +433,10 @@
          *
          * @param {PermissionDescriptor} descriptor - a `PermissionDescriptor
          *                              <https://w3c.github.io/permissions/#dom-permissiondescriptor>`_
-         *                              dictionary.
-         * @param {String} state - the state of the permission
+         *                              or derived object.
+         * @param {PermissionState} state - a `PermissionState
+         *                          <https://w3c.github.io/permissions/#dom-permissionstate>`_
+         *                          value.
          * @param {WindowProxy} context - Browsing context in which
          *                                to run the call, or null for the current
          *                                browsing context.
@@ -693,6 +698,24 @@
             return window.test_driver_internal.cancel_fedcm_dialog(context);
         },
 
+        /**
+         * Accepts a FedCM "Confirm IDP login" dialog.
+         *
+         * Matches the `Confirm IDP Login
+         * <https://fedidcg.github.io/FedCM/#webdriver-confirmidplogin>`_
+         * WebDriver command.
+         *
+         * @param {WindowProxy} context - Browsing context in which
+         *                                to run the call, or null for the current
+         *                                browsing context.
+         *
+         * @returns {Promise} Fulfilled after the IDP login has started,
+         *                    or rejected in case the WebDriver command errors
+         */
+        confirm_idp_login: function(context=null) {
+          return window.test_driver_internal.confirm_idp_login(context);
+        },
+
         /**
          * Selects an account from the Federated Credential Management dialog
          *
@@ -931,6 +954,10 @@
             throw new Error("cancel_fedcm_dialog() is not implemented by testdriver-vendor.js");
         },
 
+        async confirm_idp_login(context=null) {
+            throw new Error("confirm_idp_login() is not implemented by testdriver-vendor.js");
+        },
+
         async select_fedcm_account(account_index, context=null) {
             throw new Error("select_fedcm_account() is not implemented by testdriver-vendor.js");
         },
diff --git a/tests/wpt/tests/resources/testharness.js b/tests/wpt/tests/resources/testharness.js
index 413993089be..497ae23f0e8 100644
--- a/tests/wpt/tests/resources/testharness.js
+++ b/tests/wpt/tests/resources/testharness.js
@@ -1497,7 +1497,7 @@
     /**
      * Assert that ``actual`` is the same value as ``expected``.
      *
-     * For objects this compares by cobject identity; for primitives
+     * For objects this compares by object identity; for primitives
      * this distinguishes between 0 and -0, and has correct handling
      * of NaN.
      *
@@ -2729,8 +2729,9 @@
      * speed when the condition is quickly met.
      *
      * @param {Function} cond A function taking no arguments and
-     *                        returning a boolean. The callback is called
-     *                        when this function returns true.
+     *                        returning a boolean or a Promise. The callback is
+     *                        called when this function returns true, or the
+     *                        returned Promise is resolved with true.
      * @param {Function} func A function taking no arguments to call once
      *                        the condition is met.
      * @param {string} [description] Error message to add to assert in case of
@@ -2746,11 +2747,11 @@
         var remaining = Math.ceil(timeout_full / interval);
         var test_this = this;
 
-        var wait_for_inner = test_this.step_func(() => {
-            if (cond()) {
+        const step = test_this.step_func((result) => {
+            if (result) {
                 func();
             } else {
-                if(remaining === 0) {
+                if (remaining === 0) {
                     assert(false, "step_wait_func", description,
                            "Timed out waiting on condition");
                 }
@@ -2759,6 +2760,12 @@
             }
         });
 
+        var wait_for_inner = test_this.step_func(() => {
+            Promise.resolve(cond()).then(
+                step,
+                test_this.unreached_func("step_wait_func"));
+        });
+
         wait_for_inner();
     };
 
@@ -2784,8 +2791,9 @@
      * }, "Navigating a popup to about:blank");
      *
      * @param {Function} cond A function taking no arguments and
-     *                        returning a boolean. The callback is called
-     *                        when this function returns true.
+     *                        returning a boolean or a Promise. The callback is
+     *                        called when this function returns true, or the
+     *                        returned Promise is resolved with true.
      * @param {Function} func A function taking no arguments to call once
      *                        the condition is met.
      * @param {string} [description] Error message to add to assert in case of
@@ -2821,7 +2829,7 @@
      * }, "");
      *
      * @param {Function} cond A function taking no arguments and
-     *                        returning a boolean.
+     *                        returning a boolean or a Promise.
      * @param {string} [description] Error message to add to assert in case of
      *                              failure.
      * @param {number} timeout Timeout in ms. This is multiplied by the global
diff --git a/tests/wpt/tests/screen-capture/getdisplaymedia-capture-controller.https.window.js b/tests/wpt/tests/screen-capture/getdisplaymedia-capture-controller.https.window.js
index fa1fd84b367..0fe1a9fd26b 100644
--- a/tests/wpt/tests/screen-capture/getdisplaymedia-capture-controller.https.window.js
+++ b/tests/wpt/tests/screen-capture/getdisplaymedia-capture-controller.https.window.js
@@ -4,7 +4,9 @@
 
 'use strict';
 
-const validFocusBehaviors = ['focus-captured-surface', 'no-focus-change'];
+const validFocusBehaviors = [
+  'focus-capturing-application', 'focus-captured-surface', 'no-focus-change'
+];
 const validDisplaySurfaces = ['window', 'browser'];
 
 test(() => {
diff --git a/tests/wpt/tests/screen-capture/getdisplaymedia.https.html b/tests/wpt/tests/screen-capture/getdisplaymedia.https.html
index 095b98dea4c..4558786faa1 100644
--- a/tests/wpt/tests/screen-capture/getdisplaymedia.https.html
+++ b/tests/wpt/tests/screen-capture/getdisplaymedia.https.html
@@ -223,6 +223,7 @@ promise_test(async t => {
  {selfBrowserSurface: "invalid"},
  {surfaceSwitching: "invalid"},
  {systemAudio: "invalid"},
+ {monitorTypeSurfaces: "invalid"},
 ].forEach(constraints => promise_test(async t => {
   await test_driver.bless('getDisplayMedia()');
   const p = navigator.mediaDevices.getDisplayMedia(constraints);
@@ -276,4 +277,38 @@ promise_test(async t => {
       ['monitor', 'window', 'browser']);
 }, 'getDisplayMedia() with getCapabilities');
 
+promise_test(async (t) => {
+  const constraints = {
+    video: { displaySurface: "monitor" },
+    monitorTypeSurfaces: "exclude",
+  };
+  await test_driver.bless('getDisplayMedia()');
+  const p = navigator.mediaDevices.getDisplayMedia(constraints);
+  t.add_cleanup(async () => {
+    try { stopTracks(await p) } catch {}
+  });
+  await promise_rejects_js(
+    t, TypeError, Promise.race([p, Promise.resolve()]),
+    'getDisplayMedia should have returned an already-rejected promise.');
+  }, `getDisplayMedia({"video":{"displaySurface":"monitor"},"monitorTypeSurfaces":"exclude"}) rejects with TypeError`);
+
+promise_test(async (t) => {
+  const stream = await getDisplayMedia({
+    video: { displaySurface: "monitor" },
+    monitorTypeSurfaces: "include",
+  });
+  t.add_cleanup(() => stopTracks(stream));
+  const { displaySurface } = stream.getTracks()[0].getSettings();
+  assert_equals(displaySurface, "monitor");
+}, `getDisplayMedia({"video":{"displaySurface":"monitor"},"monitorTypeSurfaces":"include"}) resolves with a monitor track`);
+
+promise_test(async (t) => {
+  const stream = await getDisplayMedia({
+    monitorTypeSurfaces: "exclude",
+  });
+  t.add_cleanup(() => stopTracks(stream));
+  const { displaySurface } = stream.getTracks()[0].getSettings();
+  assert_any(assert_equals, displaySurface, ["window", "browser"]);
+}, `getDisplayMedia({"monitorTypeSurfaces":"exclude"}) resolves with a non monitor track`);
+
 </script>
diff --git a/tests/wpt/tests/scroll-animations/css/animation-events.html b/tests/wpt/tests/scroll-animations/css/animation-events.html
new file mode 100644
index 00000000000..be53af487a0
--- /dev/null
+++ b/tests/wpt/tests/scroll-animations/css/animation-events.html
@@ -0,0 +1,87 @@
+<!DOCTYPE html>
+<html id="top">
+<meta charset="utf-8">
+<title>View timeline animation events</title>
+<link rel="help" href="https://drafts.csswg.org/scroll-animations-1/#events">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/web-animations/testcommon.js"></script>
+<style type="text/css">
+  @keyframes anim {
+    from { transform: translateX(0); }
+    to   { transform: translateX(100px); }
+  }
+  #target {
+    background: green;
+    height: 100px;
+    width: 100px;
+    margin-bottom: 150vh;
+    animation-timeline: view();
+  }
+  .animate {
+    animation:  anim auto;
+  }
+</style>
+<body>
+  <div id="target"></div>
+</body>
+<script type="text/javascript">
+  promise_test(async t => {
+    const target = document.getElementById('target');
+
+    // Create a timeline and advance to the next frame to ensure that the
+    // timeline has a value for currentTime.
+    await waitForNextFrame();
+    const timeline = new ViewTimeline({ subject: target });
+    await waitForNextFrame();
+
+    let animationstart_events = 0;
+    let animationend_events = 0;
+    document.addEventListener('animationstart', () => {
+      animationstart_events++;
+    });
+    document.addEventListener('animationend', () => {
+      animationend_events++;
+    });
+
+    // Start the animation and swap out its timeline while still play-pending
+    // so that it already has a value for current time.
+    target.classList.add('animate');
+    const anim = target.getAnimations();
+    anim.timeline = timeline;
+    // Introduce a style change that will make the timeline state stale when
+    // "ticked" at the start of the next animation frame.
+    target.style = 'margin-top: 150vh';
+
+    assert_false(!!anim.startTime,
+                 'Start time deferred until timeline is updated');
+
+    // Verify that we are not evaluating a start time based on a stale timeline.
+    await waitForNextFrame();
+    await waitForNextFrame();
+    assert_equals(animationstart_events, 0,
+                  'Target initially off-screen and no animationstart event');
+    assert_equals(animationend_events, 0,
+                  'Target initially off-screen and no animationend event');
+
+    const scroller = document.scrollingElement;
+    scroller.scrollTop = target.getBoundingClientRect().top;
+    await waitForNextFrame();
+    await waitForNextFrame();
+
+    assert_equals(animationstart_events, 1,
+                  'scrollstart event received after scrolling into view.');
+    assert_equals(animationend_events, 0,
+                  "No scrollend event until after scrolling out of view");
+
+    scroller.scrollTop = target.getBoundingClientRect().bottom;
+
+    await waitForNextFrame();
+    await waitForNextFrame();
+
+    assert_equals(animationstart_events, 1,
+                  'No additional scrollstart event');
+    assert_equals(animationend_events, 1,
+                  'scrollend event received after scrolling out of view');
+  }, 'View timelime generates animationstart and animationend events');
+</script>
diff --git a/tests/wpt/tests/scroll-animations/css/animation-inactive-outside-range-ref.html b/tests/wpt/tests/scroll-animations/css/animation-inactive-outside-range-ref.html
index b9ed25d012b..e744055140a 100644
--- a/tests/wpt/tests/scroll-animations/css/animation-inactive-outside-range-ref.html
+++ b/tests/wpt/tests/scroll-animations/css/animation-inactive-outside-range-ref.html
@@ -1,10 +1,11 @@
 <!DOCTYPE html>
-<html>
+<html class="reftest-wait">
 <head>
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <link rel="help" src="https://drafts.csswg.org/scroll-animations-1/">
 <script src="/web-animations/testcommon.js"></script>
+<script src="/common/reftest-wait.js"></script>
 <style>
   .scroller {
     height: 200px;
@@ -74,7 +75,7 @@
   }
 </style>
 </head>
-<body>
+<body onload="run()">
   <p>None of the activity indicators should be active all of the animations are outside of their active range.</p>
   <div class="scroller">
     <div class="anim after"><div class="indicator">After cover phase: <div><div></div></div></div></div>
@@ -87,7 +88,13 @@
   </div>
 </body>
 <script>
-  let scroller = document.querySelector('.scroller');
-  scroller.scrollTo(0, 200);
+  async function run() {
+    // Ensure we don't take the screenshot while paint-holding.
+    await waitForCompositorReady();
+    let scroller = document.querySelector('.scroller');
+    scroller.scrollTo(0, 200);
+    await waitForNextFrame();
+    takeScreenshot();
+  }
 </script>
 </html>
diff --git a/tests/wpt/tests/scroll-animations/css/animation-inactive-outside-range-test.html b/tests/wpt/tests/scroll-animations/css/animation-inactive-outside-range-test.html
index a17cdb04a9d..8034e451be5 100644
--- a/tests/wpt/tests/scroll-animations/css/animation-inactive-outside-range-test.html
+++ b/tests/wpt/tests/scroll-animations/css/animation-inactive-outside-range-test.html
@@ -91,7 +91,7 @@
 
 </style>
 </head>
-<body>
+<body onload="run()">
   <p>None of the activity indicators should be active all of the animations are outside of their active range.</p>
   <div class="scroller">
     <div class="anim after"><div class="indicator">After cover phase: <div><div></div></div></div></div>
@@ -105,10 +105,13 @@
 </body>
 <script>
   async function run() {
+    await waitForCompositorReady();
+    await waitForNextFrame();
+
     let scroller = document.querySelector('.scroller');
     // Scroll such that each animation becomes active.
     scroller.scrollTo({top: 0});
-    await waitForCompositorReady();
+    await waitForNextFrame();
     scroller.scrollTo({top: 400});
     await waitForNextFrame();
 
@@ -117,6 +120,5 @@
     await waitForNextFrame();
     takeScreenshot();
   }
-  run();
 </script>
 </html>
diff --git a/tests/wpt/tests/scroll-animations/css/scroll-timeline-shorthand.tentative.html b/tests/wpt/tests/scroll-animations/css/scroll-timeline-shorthand.html
similarity index 100%
rename from tests/wpt/tests/scroll-animations/css/scroll-timeline-shorthand.tentative.html
rename to tests/wpt/tests/scroll-animations/css/scroll-timeline-shorthand.html
diff --git a/tests/wpt/tests/scroll-animations/css/view-timeline-shorthand.tentative.html b/tests/wpt/tests/scroll-animations/css/view-timeline-shorthand.html
similarity index 57%
rename from tests/wpt/tests/scroll-animations/css/view-timeline-shorthand.tentative.html
rename to tests/wpt/tests/scroll-animations/css/view-timeline-shorthand.html
index e5bf8822932..c14c1c88067 100644
--- a/tests/wpt/tests/scroll-animations/css/view-timeline-shorthand.tentative.html
+++ b/tests/wpt/tests/scroll-animations/css/view-timeline-shorthand.html
@@ -1,7 +1,5 @@
 <!DOCTYPE html>
 <link rel="help" href="https://drafts.csswg.org/scroll-animations-1/#view-timeline-shorthand">
-<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/7627">
-<link rel="help" href="https://github.com/w3c/csswg-drafts/pull/7694">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/css/support/computed-testcommon.js"></script>
@@ -22,6 +20,15 @@ test_valid_value('view-timeline', '--x block', '--x');
 test_valid_value('view-timeline', '--a, --b, --c');
 test_valid_value('view-timeline', '--a inline, --b block, --c y', '--a inline, --b, --c y');
 test_valid_value('view-timeline', '--auto');
+test_valid_value('view-timeline', '--abcd block auto', '--abcd');
+test_valid_value('view-timeline', '--abcd block auto auto', '--abcd');
+test_valid_value('view-timeline', '--abcd block 1px 2px', '--abcd 1px 2px');
+test_valid_value('view-timeline', '--abcd inline 1px 2px', '--abcd inline 1px 2px');
+test_valid_value('view-timeline', '--abcd 1px 2px inline', '--abcd inline 1px 2px');
+test_valid_value('view-timeline', '--abcd 1px 2px block', '--abcd 1px 2px');
+test_valid_value('view-timeline', '--abcd auto auto block', '--abcd');
+test_valid_value('view-timeline', '--abcd auto block', '--abcd');
+test_valid_value('view-timeline', '--abcd block 1px 1px', '--abcd 1px');
 
 test_invalid_value('view-timeline', '--abc --abc');
 test_invalid_value('view-timeline', 'block none');
@@ -29,6 +36,11 @@ test_invalid_value('view-timeline', 'none none');
 test_invalid_value('view-timeline', 'default');
 test_invalid_value('view-timeline', ',');
 test_invalid_value('view-timeline', ',,--block,,');
+test_invalid_value('view-timeline', 'auto');
+test_invalid_value('view-timeline', 'auto auto');
+test_invalid_value('view-timeline', '--abc 500kg');
+test_invalid_value('view-timeline', '--abc #ff0000');
+test_invalid_value('view-timeline', '--abc red red');
 
 test_computed_value('view-timeline', '--abcd');
 test_computed_value('view-timeline', 'none block', 'none');
@@ -39,26 +51,57 @@ test_computed_value('view-timeline', '--y block', '--y');
 test_computed_value('view-timeline', '--x block', '--x');
 test_computed_value('view-timeline', '--a, --b, --c');
 test_computed_value('view-timeline', '--a inline, --b block, --c y', '--a inline, --b, --c y');
+test_computed_value('view-timeline', '--abcd block auto', '--abcd');
+test_computed_value('view-timeline', '--abcd block auto auto', '--abcd');
+test_computed_value('view-timeline', '--abcd block 1px 2px', '--abcd 1px 2px');
+test_computed_value('view-timeline', '--abcd inline 1px 2px', '--abcd inline 1px 2px');
+test_computed_value('view-timeline', '--abcd 1px 2px inline', '--abcd inline 1px 2px');
+test_computed_value('view-timeline', '--abcd 1px 2px block', '--abcd 1px 2px');
+test_computed_value('view-timeline', '--abcd auto auto block', '--abcd');
+test_computed_value('view-timeline', '--abcd auto block', '--abcd');
+test_computed_value('view-timeline', '--abcd block 1px 1px', '--abcd 1px');
 
 test_shorthand_value('view-timeline', '--abc y',
 {
   'view-timeline-name': '--abc',
   'view-timeline-axis': 'y',
+  'view-timeline-inset': 'auto',
 });
 test_shorthand_value('view-timeline', '--abc y, --def',
 {
   'view-timeline-name': '--abc, --def',
   'view-timeline-axis': 'y, block',
+  'view-timeline-inset': 'auto, auto',
 });
 test_shorthand_value('view-timeline', '--abc, --def',
 {
   'view-timeline-name': '--abc, --def',
   'view-timeline-axis': 'block, block',
+  'view-timeline-inset': 'auto, auto',
 });
 test_shorthand_value('view-timeline', '--inline x',
 {
   'view-timeline-name': '--inline',
   'view-timeline-axis': 'x',
+  'view-timeline-inset': 'auto',
+});
+test_shorthand_value('view-timeline', '--abc 1px 2px',
+{
+  'view-timeline-name': '--abc',
+  'view-timeline-axis': 'block',
+  'view-timeline-inset': '1px 2px',
+});
+test_shorthand_value('view-timeline', '--abc 1px',
+{
+  'view-timeline-name': '--abc',
+  'view-timeline-axis': 'block',
+  'view-timeline-inset': '1px',
+});
+test_shorthand_value('view-timeline', '--abc 1px inline',
+{
+  'view-timeline-name': '--abc',
+  'view-timeline-axis': 'inline',
+  'view-timeline-inset': '1px',
 });
 
 function test_shorthand_contraction(shorthand, longhands, expected) {
@@ -78,16 +121,25 @@ function test_shorthand_contraction(shorthand, longhands, expected) {
 test_shorthand_contraction('view-timeline', {
   'view-timeline-name': '--abc',
   'view-timeline-axis': 'inline',
+  'view-timeline-inset': 'auto',
 }, '--abc inline');
 
 test_shorthand_contraction('view-timeline', {
   'view-timeline-name': '--a, --b',
   'view-timeline-axis': 'inline, block',
+  'view-timeline-inset': 'auto, auto',
 }, '--a inline, --b');
 
+test_shorthand_contraction('view-timeline', {
+  'view-timeline-name': '--a, --b',
+  'view-timeline-axis': 'inline, block',
+  'view-timeline-inset': '1px 2px, 3px 3px',
+}, '--a inline 1px 2px, --b 3px');
+
 test_shorthand_contraction('view-timeline', {
   'view-timeline-name': 'none, none',
   'view-timeline-axis': 'block, block',
+  'view-timeline-inset': 'auto auto, auto',
 }, 'none, none');
 
 // Longhands with different lengths:
@@ -95,10 +147,18 @@ test_shorthand_contraction('view-timeline', {
 test_shorthand_contraction('view-timeline', {
   'view-timeline-name': '--a, --b, --c',
   'view-timeline-axis': 'inline, inline',
+  'view-timeline-inset': 'auto, auto',
 }, '');
 
 test_shorthand_contraction('view-timeline', {
   'view-timeline-name': '--a, --b',
   'view-timeline-axis': 'inline, inline, inline',
+  'view-timeline-inset': 'auto, auto, auto',
+}, '');
+
+test_shorthand_contraction('view-timeline', {
+  'view-timeline-name': '--a, --b',
+  'view-timeline-axis': 'inline, inline',
+  'view-timeline-inset': 'auto, auto, auto',
 }, '');
 </script>
diff --git a/tests/wpt/tests/scroll-animations/view-timelines/svg-graphics-element.html b/tests/wpt/tests/scroll-animations/view-timelines/svg-graphics-element-001.html
similarity index 100%
rename from tests/wpt/tests/scroll-animations/view-timelines/svg-graphics-element.html
rename to tests/wpt/tests/scroll-animations/view-timelines/svg-graphics-element-001.html
diff --git a/tests/wpt/tests/scroll-animations/view-timelines/svg-graphics-element-002.html b/tests/wpt/tests/scroll-animations/view-timelines/svg-graphics-element-002.html
new file mode 100644
index 00000000000..e173a649efc
--- /dev/null
+++ b/tests/wpt/tests/scroll-animations/view-timelines/svg-graphics-element-002.html
@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <title>View Timeline attached to an SVG graphics element in a nested &lt;svg></title>
+</head>
+<style type="text/css">
+  @keyframes stroke {
+    from { stroke: rgb(0, 0, 254); }
+    to { stroke: rgb(0, 128, 0); }
+  }
+
+  #line {
+    animation: stroke auto linear both;
+    animation-timeline: view();
+    animation-range: exit-crossing;
+  }
+  .spacer {
+    height:  100vh;
+  }
+</style>
+<body>
+<svg width="100" height="3000" stroke="red" stroke-width="5">
+  <svg>
+    <path id="line" d="M 50 0 V 3000"></path>
+  </svg>
+</svg>
+<div class="spacer"></div>
+</body>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/web-animations/testcommon.js"></script>
+<script>
+  promise_test(async t => {
+    const scroller = document.scrollingElement;
+    const target = document.getElementById('line');
+    const anim = target.getAnimations()[0];
+    await anim.ready;
+    assert_equals(getComputedStyle(target).stroke, 'rgb(0, 0, 254)');
+    scroller.scrollTop =
+        0.5*(scroller.scrollHeight - scroller.clientHeight);
+    await waitForNextFrame();
+    assert_equals(getComputedStyle(target).stroke, 'rgb(0, 64, 127)');
+  }, 'View timeline attached to SVG graphics element');
+</script>
+</html>
diff --git a/tests/wpt/tests/scroll-animations/view-timelines/svg-graphics-element-003.html b/tests/wpt/tests/scroll-animations/view-timelines/svg-graphics-element-003.html
new file mode 100644
index 00000000000..48e238c8edd
--- /dev/null
+++ b/tests/wpt/tests/scroll-animations/view-timelines/svg-graphics-element-003.html
@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <title>View Timeline attached to an SVG graphics element (&lt;foreignObject>)</title>
+</head>
+<style type="text/css">
+  @keyframes color {
+    from { color: rgb(0, 0, 254); }
+    to { color: rgb(0, 128, 0); }
+  }
+
+  #fo {
+    animation: color auto linear both;
+    animation-timeline: view();
+    animation-range: exit-crossing;
+  }
+  .spacer {
+    height:  100vh;
+  }
+</style>
+<body>
+<svg width="100" height="3000" color="red">
+  <foreignObject id="fo" x="47.5" width="3000" height="5"
+                 transform="rotate(90, 47.5, 0)">
+    <div style="width: 100%; height: 200%; background-color: currentcolor"></div>
+  </foreignObject>
+</svg>
+<div class="spacer"></div>
+</body>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/web-animations/testcommon.js"></script>
+<script>
+  promise_test(async t => {
+    const scroller = document.scrollingElement;
+    const target = document.getElementById('fo');
+    const anim = target.getAnimations()[0];
+    await anim.ready;
+    assert_equals(getComputedStyle(target).color, 'rgb(0, 0, 254)');
+    scroller.scrollTop =
+        0.5*(scroller.scrollHeight - scroller.clientHeight);
+    await waitForNextFrame();
+    assert_equals(getComputedStyle(target).color, 'rgb(0, 64, 127)');
+  }, 'View timeline attached to SVG graphics element');
+</script>
+</html>
diff --git a/tests/wpt/tests/scroll-to-text-fragment/percent-encoding.html b/tests/wpt/tests/scroll-to-text-fragment/percent-encoding.html
new file mode 100644
index 00000000000..696734b663d
--- /dev/null
+++ b/tests/wpt/tests/scroll-to-text-fragment/percent-encoding.html
@@ -0,0 +1,121 @@
+<!DOCTYPE html>
+<title>Percent-encoding in a text directive</title>
+<meta charset=utf-8>
+<link rel="help" href="https://wicg.github.io/ScrollToTextFragment/">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="/common/utils.js"></script>
+<script src="stash.js"></script>
+<script src="resources/util.js"></script>
+<style>
+  .target {
+    margin-top: 2000px;
+    margin-bottom: 2000px;
+  }
+</style>
+<script>
+const params = new URLSearchParams(location.search);
+const is_popup = params.has('key');
+
+// This test opens a popup to this document which invokes a text directive. The
+// popup checks the result of navigating the text directive and communicates it
+// back to the original page via Stash (since text fragments require noopener).
+if (is_popup) {
+  const key = params.get('key');
+
+  function sendResult() {
+    let result = 'unknown';
+    if (window.scrollY == 0)
+      result = 'noscroll';
+    else {
+      for (let target of document.querySelectorAll('.target')) {
+        if (isInViewport(target)) {
+          result = target.id;
+          break;
+        }
+      }
+    }
+
+    stashResultsThenClose(key, result);
+  }
+
+  // Ensure two animation frames on load to test the fallback to element anchor,
+  // which gets queued for the next frame if the text fragment is not found.
+  onload = () => { requestAnimationFrame( () => requestAnimationFrame(sendResult) ); };
+} else {
+  let test_cases = [
+    {
+      fragment: '#:~:text=%25',
+      expect: 'singlepercent',
+      description: 'Percent-encoded "%" char.'
+    },
+    {
+      fragment: '#:~:text=%',
+      expect: 'noscroll',
+      description: 'Percent char without hex digits is invalid.'
+    },
+    {
+      fragment: '#:~:text=%%',
+      expect: 'noscroll',
+      description: 'Percent char followed by percent char is invalid.'
+    },
+    {
+      fragment: '#:~:text=%F',
+      expect: 'noscroll',
+      description: 'Single digit percent-encoding is invalid.'
+    },
+    {
+      fragment: '#:~:text=%25F',
+      expect: 'percentf',
+      description: 'Percent-encoding limited to two digits.'
+    },
+    {
+      fragment: '#:~:text=%25%25F',
+      expect: 'doublepercentf',
+      description: 'Percent-encoded "%%F"'
+    },
+    {
+      fragment: '#:~:text=%E2%9C%85',
+      expect: 'checkmark',
+      description: 'Percent-encoding multibyte codepoint (CHECKMARK).'
+    },
+  ];
+
+  for (const test_case of test_cases) {
+    promise_test(t => new Promise((resolve, reject) => {
+      let key = token();
+
+      test_driver.bless('Open a URL with a text fragment directive', () => {
+        window.open(`${location.href}?key=${key}${test_case.fragment}`, '_blank', 'noopener');
+      });
+
+      fetchResults(key, resolve, reject);
+    }).then(result => {
+      assert_equals(result, test_case.expect);
+    }), `Test navigation with fragment: ${test_case.description}.`);
+  }
+}
+</script>
+
+<p class="target" id="singlepercent">
+  %
+</p>
+<p class="target" id="doublepercent">
+  %%
+</p>
+<p class="target" id="percentf">
+  %F
+</p>
+<p class="target" id="doublepercentf">
+  %%f
+</p>
+<p class="target" id="checkmark">
+  <!-- U+2705 WHITE HEAVY CHECK MARK - UTF-8 percent encoding: %E2%9C%85 -->
+  &#x2705;
+</p>
+<p class="target" id="helloworld">
+  Hello world
+</p>
+
diff --git a/tests/wpt/tests/scroll-to-text-fragment/resources/util.js b/tests/wpt/tests/scroll-to-text-fragment/resources/util.js
new file mode 100644
index 00000000000..00e12929880
--- /dev/null
+++ b/tests/wpt/tests/scroll-to-text-fragment/resources/util.js
@@ -0,0 +1,21 @@
+// Returns true if element's center is within the visual viewport bounds.
+function isInViewport(element) {
+  const viewportRect = {
+    left: visualViewport.offsetLeft,
+    top: visualViewport.offsetTop,
+    right: visualViewport.offsetLeft + visualViewport.width,
+    bottom: visualViewport.offsetTop + visualViewport.height
+  };
+
+  const elementRect = element.getBoundingClientRect();
+  const elementCenter = {
+    x: elementRect.left + elementRect.width / 2,
+    y: elementRect.top + elementRect.height / 2
+  };
+
+  return elementCenter.x > viewportRect.left &&
+         elementCenter.x < viewportRect.right &&
+         elementCenter.y > viewportRect.top &&
+         elementCenter.y < viewportRect.bottom;
+}
+
diff --git a/tests/wpt/tests/scroll-to-text-fragment/same-document-tests.html b/tests/wpt/tests/scroll-to-text-fragment/same-document-tests.html
index be9bed9fd8b..85db2de0a22 100644
--- a/tests/wpt/tests/scroll-to-text-fragment/same-document-tests.html
+++ b/tests/wpt/tests/scroll-to-text-fragment/same-document-tests.html
@@ -4,32 +4,13 @@
 <link rel="help" href="https://wicg.github.io/ScrollToTextFragment/">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+<script src="resources/util.js"></script>
 <script>
   function reset() {
     location.hash = '';
     window.scrollTo(0, 0);
   }
 
-  function isInViewport(element) {
-    const viewportRect = {
-      left: visualViewport.offsetLeft,
-      top: visualViewport.offsetTop,
-      right: visualViewport.offsetLeft + visualViewport.width,
-      bottom: visualViewport.offsetTop + visualViewport.height
-    };
-
-    const elementRect = element.getBoundingClientRect();
-    const elementCenter = {
-      x: elementRect.left + elementRect.width / 2,
-      y: elementRect.top + elementRect.height / 2
-    };
-
-    return elementCenter.x > viewportRect.left &&
-           elementCenter.x < viewportRect.right &&
-           elementCenter.y > viewportRect.top &&
-           elementCenter.y < viewportRect.bottom;
-  }
-
   function runTests() {
     // Ensure a simple text directive works correctly when navigated to the
     // same document using `location.hash`.
diff --git a/tests/wpt/tests/service-workers/service-worker/tentative/static-router/README.md b/tests/wpt/tests/service-workers/service-worker/tentative/static-router/README.md
index 8826b3c7827..5429b61d40e 100644
--- a/tests/wpt/tests/service-workers/service-worker/tentative/static-router/README.md
+++ b/tests/wpt/tests/service-workers/service-worker/tentative/static-router/README.md
@@ -1,4 +1,4 @@
-A test stuite for the ServiceWorker Static Routing API.
+A test suite for the ServiceWorker Static Routing API.
 
 WICG proposal: https://github.com/WICG/proposals/issues/102
 Specification PR: https://github.com/w3c/ServiceWorker/pull/1686
diff --git a/tests/wpt/tests/service-workers/service-worker/tentative/static-router/resources/simple.csv b/tests/wpt/tests/service-workers/service-worker/tentative/static-router/resources/simple.csv
new file mode 100644
index 00000000000..ecbef786e73
--- /dev/null
+++ b/tests/wpt/tests/service-workers/service-worker/tentative/static-router/resources/simple.csv
@@ -0,0 +1 @@
+matched,with,non-url,conditions
diff --git a/tests/wpt/tests/service-workers/service-worker/tentative/static-router/resources/static-router-sw.js b/tests/wpt/tests/service-workers/service-worker/tentative/static-router/resources/static-router-sw.js
index 4655ab5321c..e95bdadaddb 100644
--- a/tests/wpt/tests/service-workers/service-worker/tentative/static-router/resources/static-router-sw.js
+++ b/tests/wpt/tests/service-workers/service-worker/tentative/static-router/resources/static-router-sw.js
@@ -5,7 +5,11 @@ var requests = [];
 self.addEventListener('install', e => {
   e.registerRouter([
     {
-      condition: {urlPattern: '/**/*.txt??*'},
+      condition: { requestMode: 'no-cors' },
+      source: 'network'
+    },
+    {
+      condition: { urlPattern: '/**/*.txt??*' },
       // Note: "??*" is for allowing arbitrary query strings.
       // Upon my experiment, the URLPattern needs two '?'s for specifying
       // a coming string as a query.
diff --git a/tests/wpt/tests/service-workers/service-worker/tentative/static-router/static-router-subresource.https.html b/tests/wpt/tests/service-workers/service-worker/tentative/static-router/static-router-subresource.https.html
index 721c2797603..7d956363e68 100644
--- a/tests/wpt/tests/service-workers/service-worker/tentative/static-router/static-router-subresource.https.html
+++ b/tests/wpt/tests/service-workers/service-worker/tentative/static-router/static-router-subresource.https.html
@@ -10,6 +10,7 @@ const SCRIPT = 'resources/static-router-sw.js';
 const SCOPE = 'resources/';
 const HTML_FILE = 'resources/simple.html';
 const TXT_FILE = 'resources/direct.txt';
+const CSV_FILE = 'resources/simple.csv';
 
 // Register a service worker, then create an iframe at url.
 function iframeTest(url, callback, name) {
@@ -36,13 +37,19 @@ iframeTest(HTML_FILE, async (t, iwin) => {
   const rnd = randomString();
   const response = await iwin.fetch('?nonce=' + rnd);
   assert_equals(await response.text(), rnd);
-}, 'Subresource load not matched with the condition');
+}, 'Subresource load not matched with URLPattern condition');
 
 iframeTest(TXT_FILE, async (t, iwin) => {
   const rnd = randomString();
   const response = await iwin.fetch('?nonce=' + rnd);
   assert_equals(await response.text(), "Network\n");
-}, 'Subresource load matched with the condition');
+}, 'Subresource load matched with URLPattern condition');
+
+iframeTest(CSV_FILE, async (t, iwin) => {
+  const rnd = randomString();
+  const response = await iwin.fetch('?nonce=' + rnd, { mode: 'no-cors' });
+  assert_equals(await response.text(), "matched,with,non-url,conditions\n");
+}, 'Subresource load matched with RequestMode condition');
 
 </script>
 </body>
diff --git a/tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation-slot-fallback-default-tabindex.html b/tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation-slot-fallback-default-tabindex.html
index e8e0293e77b..365edb00b81 100644
--- a/tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation-slot-fallback-default-tabindex.html
+++ b/tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation-slot-fallback-default-tabindex.html
@@ -66,9 +66,7 @@ promise_test(async () => {
     'host/i7'
   ];
 
-  await assert_focus_navigation_forward(elements);
-  elements.reverse();
-  await assert_focus_navigation_backward(elements);
+  await assert_focus_navigation_bidirectional(elements);
 }, 'Default tabindex for a slot node should be 0.');
 
 </script>
diff --git a/tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation-slot-fallback.html b/tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation-slot-fallback.html
index 8b29558b504..54ee14c34be 100644
--- a/tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation-slot-fallback.html
+++ b/tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation-slot-fallback.html
@@ -64,8 +64,6 @@ promise_test(async () => {
       'x-foo/l1'
     ];
 
-    await assert_focus_navigation_forward(elements);
-    elements.reverse();
-    await assert_focus_navigation_backward(elements);
+    await assert_focus_navigation_bidirectional(elements);
 }, 'Focus should jump to fallback elements when a slot does not have any assigned nodes.');
 </script>
diff --git a/tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation-slot-nested-2levels.html b/tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation-slot-nested-2levels.html
index 54def5ce7e5..7d733ea7c2e 100644
--- a/tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation-slot-nested-2levels.html
+++ b/tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation-slot-nested-2levels.html
@@ -56,8 +56,6 @@ promise_test(async () => {
     'i1'
   ];
 
-  await assert_focus_navigation_forward(elements);
-  elements.reverse();
-  await assert_focus_navigation_backward(elements);
+  await assert_focus_navigation_bidirectional(elements);
 }, 'Focus controller should treat each slot as a focus scope.');
 </script>
diff --git a/tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation-slot-nested-delegatesFocus.html b/tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation-slot-nested-delegatesFocus.html
index 94d8ce8e1f0..5e4ab3ce4ba 100644
--- a/tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation-slot-nested-delegatesFocus.html
+++ b/tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation-slot-nested-delegatesFocus.html
@@ -44,8 +44,6 @@ promise_test(async () => {
     'i1'
   ];
 
-  await assert_focus_navigation_forward(elements);
-  elements.reverse();
-  await assert_focus_navigation_backward(elements);
+  await assert_focus_navigation_bidirectional(elements);
 }, 'Focus controller should treat each slot as a focus scope.');
 </script>
diff --git a/tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation-slot-nested-fallback.html b/tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation-slot-nested-fallback.html
index 93a6240fe3e..66d8c14b2b9 100644
--- a/tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation-slot-nested-fallback.html
+++ b/tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation-slot-nested-fallback.html
@@ -63,9 +63,7 @@ promise_test(async () => {
        'sixth'
   ];
 
-  await assert_focus_navigation_forward(elements);
-  elements.reverse();
-  await assert_focus_navigation_backward(elements);
+  await assert_focus_navigation_bidirectional(elements);
 }, 'Focus should cover assigned elements of an assigned slot espacially there are fallback contents.');
 
 </script>
diff --git a/tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation-slot-nested.html b/tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation-slot-nested.html
index 7bfe5dc7844..ae966afc76a 100644
--- a/tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation-slot-nested.html
+++ b/tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation-slot-nested.html
@@ -44,8 +44,6 @@ promise_test(async () => {
     'i1'
   ];
 
-  await assert_focus_navigation_forward(elements);
-  elements.reverse();
-  await assert_focus_navigation_backward(elements);
+  await assert_focus_navigation_bidirectional(elements);
 }, 'Focus controller should treat each slot as a focus scope.');
 </script>
diff --git a/tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation-slot-shadow-in-fallback.html b/tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation-slot-shadow-in-fallback.html
index 7192a42584b..418da8f5ff7 100644
--- a/tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation-slot-shadow-in-fallback.html
+++ b/tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation-slot-shadow-in-fallback.html
@@ -41,8 +41,6 @@ promise_test(async () => {
         'fallback/x-foo/a2'
     ];
 
-    await assert_focus_navigation_forward(elements);
-    elements.reverse();
-    await assert_focus_navigation_backward(elements);
+    await assert_focus_navigation_bidirectional(elements);
 }, 'Focus should cover assigned elements of an assigned slot, as well as elements that are directly assigned to a slot.');
 </script>
diff --git a/tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation-slot-shadow-in-slot.html b/tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation-slot-shadow-in-slot.html
index 4f320574ed5..eef3e1b6119 100644
--- a/tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation-slot-shadow-in-slot.html
+++ b/tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation-slot-shadow-in-slot.html
@@ -40,8 +40,6 @@ promise_test(async () => {
         'assigned/x-foo/a2'
     ];
 
-    await assert_focus_navigation_forward(elements);
-    elements.reverse();
-    await assert_focus_navigation_backward(elements);
+    await assert_focus_navigation_bidirectional(elements);
 }, 'Focus should cover assigned elements of an assigned slot, as well as elements that are directly assigned to a slot.');
 </script>
diff --git a/tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation-slot-with-tabindex.html b/tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation-slot-with-tabindex.html
index 880fb83130b..d43085e9845 100644
--- a/tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation-slot-with-tabindex.html
+++ b/tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation-slot-with-tabindex.html
@@ -58,8 +58,6 @@ promise_test(async () => {
         'x-foo/x-bar/k1',
     ];
 
-    await assert_focus_navigation_forward(elements);
-    elements.reverse();
-    await assert_focus_navigation_backward(elements);
+    await assert_focus_navigation_bidirectional(elements);
 }, 'Slots tabindex should be considred in focus navigation.');
 </script>
diff --git a/tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation-slots-in-slot.html b/tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation-slots-in-slot.html
index 5cc8abbf019..39b08066034 100644
--- a/tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation-slots-in-slot.html
+++ b/tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation-slots-in-slot.html
@@ -63,9 +63,7 @@ promise_test(async () => {
     'b2',
   ];
 
-  await assert_focus_navigation_forward(elements);
-  elements.reverse();
-  await assert_focus_navigation_backward(elements);
+  await assert_focus_navigation_bidirectional(elements);
 }, 'Focus should cover assigned nodes of slot, especially for nested slots in slot scope.');
 
 </script>
diff --git a/tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation-slots.html b/tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation-slots.html
index f2de50f6eba..0d129ae7712 100644
--- a/tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation-slots.html
+++ b/tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation-slots.html
@@ -60,8 +60,6 @@ promise_test(async () => {
         'i5'
     ];
 
-    await assert_focus_navigation_forward(elements);
-    elements.reverse();
-    await assert_focus_navigation_backward(elements);
+    await assert_focus_navigation_bidirectional(elements);
 }, 'Focus should cover assigned elements of an assigned slot, as well as elements that are directly assigned to a slot.');
 </script>
diff --git a/tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation-with-delegatesFocus.html b/tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation-with-delegatesFocus.html
index e0972615267..64942a109e0 100644
--- a/tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation-with-delegatesFocus.html
+++ b/tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation-with-delegatesFocus.html
@@ -54,9 +54,7 @@ promise_test(async () => {
     'input-after',
   ];
 
-  await assert_focus_navigation_forward(elements, false);
-  elements.reverse();
-  await assert_focus_navigation_backward(elements, false);
+  await assert_focus_navigation_bidirectional(elements);
 }, 'Testing tab navigation order with mode open, no tabindex and delegatesFocus=false.');
 
 promise_test(async () => {
@@ -70,9 +68,7 @@ promise_test(async () => {
     'input-after',
   ];
 
-  await assert_focus_navigation_forward(elements, false);
-  elements.reverse();
-  await assert_focus_navigation_backward(elements, false);
+  await assert_focus_navigation_bidirectional(elements);
 }, 'Testing tab navigation order with mode open, no tabindex and delegatesFocus=true.');
 
 promise_test(async () => {
@@ -87,9 +83,7 @@ promise_test(async () => {
     'input-after',
   ];
 
-  await assert_focus_navigation_forward(elements, false);
-  elements.reverse();
-  await assert_focus_navigation_backward(elements, false);
+  await assert_focus_navigation_bidirectional(elements);
 }, 'Testing tab navigation order with mode open, tabindex=0 and delegatesFocus=false.');
 
 promise_test(async () => {
@@ -104,9 +98,7 @@ promise_test(async () => {
     'input-after',
   ];
 
-  await assert_focus_navigation_forward(elements, false);
-  elements.reverse();
-  await assert_focus_navigation_backward(elements, false);
+  await assert_focus_navigation_bidirectional(elements);
 }, 'Testing tab navigation order with mode open, tabindex=0 and delegatesFocus=true.');
 
 promise_test(async () => {
@@ -119,9 +111,7 @@ promise_test(async () => {
     'input-after',
   ];
 
-  await assert_focus_navigation_forward(elements, false);
-  elements.reverse();
-  await assert_focus_navigation_backward(elements, false);
+  await assert_focus_navigation_bidirectional(elements);
 }, 'Testing tab navigation order with mode open, tabindex=-1 and delegatesFocus=false.');
 
 promise_test(async () => {
@@ -135,9 +125,7 @@ promise_test(async () => {
     'input-after',
   ];
 
-  await assert_focus_navigation_forward(elements, false);
-  elements.reverse();
-  await assert_focus_navigation_backward(elements, false);
+  await assert_focus_navigation_bidirectional(elements);
 }, 'Testing tab navigation order with mode open, tabindex=-1 and delegatesFocus=true.');
 
 promise_test(async () => {
@@ -152,9 +140,7 @@ promise_test(async () => {
     'input-after',
   ];
 
-  await assert_focus_navigation_forward(elements, false);
-  elements.reverse();
-  await assert_focus_navigation_backward(elements, false);
+  await assert_focus_navigation_bidirectional(elements);
 }, 'Testing tab navigation order with mode open, tabindex=1 and delegatesFocus=false.');
 
 promise_test(async () => {
@@ -169,9 +155,7 @@ promise_test(async () => {
     'input-after',
   ];
 
-  await assert_focus_navigation_forward(elements, false);
-  elements.reverse();
-  await assert_focus_navigation_backward(elements, false);
+  await assert_focus_navigation_bidirectional(elements);
 }, 'Testing tab navigation order with mode open, tabindex=1 and delegatesFocus=true.');
 
 
@@ -192,9 +176,7 @@ promise_test(async () => {
     [inputAfter],
   ];
 
-  await assert_focus_navigation_forward_with_shadow_root(elements, false);
-  elements.reverse();
-  await assert_focus_navigation_backward_with_shadow_root(elements, false);
+  await assert_focus_navigation_bidirectional_with_shadow_root(elements, false);
 }, 'Testing tab navigation order with mode closed, no tabindex and delegatesFocus=false.');
 
 promise_test(async () => {
@@ -214,9 +196,7 @@ promise_test(async () => {
     [inputAfter],
   ];
 
-  await assert_focus_navigation_forward_with_shadow_root(elements, false);
-  elements.reverse();
-  await assert_focus_navigation_backward_with_shadow_root(elements, false);
+  await assert_focus_navigation_bidirectional_with_shadow_root(elements, false);
 }, 'Testing tab navigation order with mode closed, no tabindex and delegatesFocus=true.');
 
 promise_test(async () => {
@@ -237,9 +217,7 @@ promise_test(async () => {
     [inputAfter],
   ];
 
-  await assert_focus_navigation_forward_with_shadow_root(elements, false);
-  elements.reverse();
-  await assert_focus_navigation_backward_with_shadow_root(elements, false);
+  await assert_focus_navigation_bidirectional_with_shadow_root(elements, false);
 }, 'Testing tab navigation order with mode closed, tabindex=0 and delegatesFocus=false.');
 
 promise_test(async () => {
@@ -260,9 +238,7 @@ promise_test(async () => {
     [inputAfter],
   ];
 
-  await assert_focus_navigation_forward_with_shadow_root(elements, false);
-  elements.reverse();
-  await assert_focus_navigation_backward_with_shadow_root(elements, false);
+  await assert_focus_navigation_bidirectional_with_shadow_root(elements, false);
 }, 'Testing tab navigation order with mode closed, tabindex=0 and delegatesFocus=true.');
 
 promise_test(async () => {
@@ -281,9 +257,7 @@ promise_test(async () => {
     [inputAfter],
   ];
 
-  await assert_focus_navigation_forward_with_shadow_root(elements, false);
-  elements.reverse();
-  await assert_focus_navigation_backward_with_shadow_root(elements, false);
+  await assert_focus_navigation_bidirectional_with_shadow_root(elements, false);
 }, 'Testing tab navigation order with mode closed, tabindex=-1 and delegatesFocus=false.');
 
 promise_test(async () => {
@@ -303,9 +277,7 @@ promise_test(async () => {
     [inputAfter],
   ];
 
-  await assert_focus_navigation_forward_with_shadow_root(elements, false);
-  elements.reverse();
-  await assert_focus_navigation_backward_with_shadow_root(elements, false);
+  await assert_focus_navigation_bidirectional_with_shadow_root(elements, false);
 }, 'Testing tab navigation order with mode closed, tabindex=-1 and delegatesFocus=true.');
 
 promise_test(async () => {
@@ -326,9 +298,7 @@ promise_test(async () => {
     [inputAfter],
   ];
 
-  await assert_focus_navigation_forward_with_shadow_root(elements, false);
-  elements.reverse();
-  await assert_focus_navigation_backward_with_shadow_root(elements, false);
+  await assert_focus_navigation_bidirectional_with_shadow_root(elements, false);
 }, 'Testing tab navigation order with mode closed, tabindex=1 and delegatesFocus=false.');
 
 promise_test(async () => {
@@ -349,9 +319,7 @@ promise_test(async () => {
     [inputAfter],
   ];
 
-  await assert_focus_navigation_forward_with_shadow_root(elements, false);
-  elements.reverse();
-  await assert_focus_navigation_backward_with_shadow_root(elements, false);
+  await assert_focus_navigation_bidirectional_with_shadow_root(elements, false);
 }, 'Testing tab navigation order with mode closed, tabindex=1 and delegatesFocus=true.');
 
 
diff --git a/tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation.html b/tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation.html
index fabcf881708..9e593eb1003 100644
--- a/tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation.html
+++ b/tests/wpt/tests/shadow-dom/focus-navigation/focus-navigation.html
@@ -66,8 +66,6 @@ promise_test(async () => {
         'x-foo/j6'
     ];
 
-    await assert_focus_navigation_forward(elements);
-    elements.reverse();
-    await assert_focus_navigation_backward(elements);
+    await assert_focus_navigation_bidirectional(elements);
 }, 'Focus controller should treat slots as a focus scope.');
 </script>
diff --git a/tests/wpt/tests/shadow-dom/focus-navigation/focus-with-negative-index.html b/tests/wpt/tests/shadow-dom/focus-navigation/focus-with-negative-index.html
index 95dc98fc02d..ed3fac9a6cf 100644
--- a/tests/wpt/tests/shadow-dom/focus-navigation/focus-with-negative-index.html
+++ b/tests/wpt/tests/shadow-dom/focus-navigation/focus-with-negative-index.html
@@ -64,9 +64,7 @@ promise_test(async () => {
         'x-foo/j6'
     ];
 
-    await assert_focus_navigation_forward(elements);
-    elements.reverse();
-    await assert_focus_navigation_backward(elements);
+    await assert_focus_navigation_bidirectional(elements);
 }, 'Focus controller should treat slots as a focus scope.');
 
 promise_test(async () => {
diff --git a/tests/wpt/tests/shadow-dom/focus-navigation/resources/focus-utils.js b/tests/wpt/tests/shadow-dom/focus-navigation/resources/focus-utils.js
index 0cd4fd26f49..f593267cc31 100644
--- a/tests/wpt/tests/shadow-dom/focus-navigation/resources/focus-utils.js
+++ b/tests/wpt/tests/shadow-dom/focus-navigation/resources/focus-utils.js
@@ -85,6 +85,12 @@ async function assert_focus_navigation_backward(elements) {
   return assert_focus_navigation_elements(elements, 'backward');
 }
 
+async function assert_focus_navigation_bidirectional(elements) {
+  await assert_focus_navigation_forward(elements);
+  elements.reverse();
+  await assert_focus_navigation_backward(elements);
+}
+
 
 // If shadow root is closed, need to pass shadowRoot and element to find
 // innermost active element
@@ -149,3 +155,10 @@ async function assert_focus_navigation_forward_with_shadow_root(elements) {
 async function assert_focus_navigation_backward_with_shadow_root(elements) {
   return assert_focus_navigation_elements_with_shadow_root(elements, 'backward');
 }
+
+async function assert_focus_navigation_bidirectional_with_shadow_root(elements) {
+  await assert_focus_navigation_forward_with_shadow_root(elements);
+  elements.reverse();
+  await assert_focus_navigation_backward_with_shadow_root(elements);
+}
+
diff --git a/tests/wpt/tests/shared-storage-selecturl-limit/run-url-selection-operation-limit-multiple-origins.tentative.https.sub.html b/tests/wpt/tests/shared-storage-selecturl-limit/run-url-selection-operation-limit-multiple-sites.tentative.https.sub.html
similarity index 67%
rename from tests/wpt/tests/shared-storage-selecturl-limit/run-url-selection-operation-limit-multiple-origins.tentative.https.sub.html
rename to tests/wpt/tests/shared-storage-selecturl-limit/run-url-selection-operation-limit-multiple-sites.tentative.https.sub.html
index df69597ee85..b71c368704b 100644
--- a/tests/wpt/tests/shared-storage-selecturl-limit/run-url-selection-operation-limit-multiple-origins.tentative.https.sub.html
+++ b/tests/wpt/tests/shared-storage-selecturl-limit/run-url-selection-operation-limit-multiple-sites.tentative.https.sub.html
@@ -11,9 +11,9 @@
 <script>
 'use strict';
 
-function getOtherOriginURL(url) {
+function getCrossSiteURL(url) {
   return new URL(url.toString().replace(location.origin,
-                                        get_host_info().AUTHENTICATED_ORIGIN));
+                                        get_host_info().HTTPS_NOTSAMESITE_ORIGIN));
 }
 
 promise_test(async () => {
@@ -26,14 +26,21 @@ promise_test(async () => {
         "resources/run-url-selection-operation-limit-inner.https.html",
       [ancestorKey]);
 
-  // The per origin per pageload limit is 6 bits.
+  // The per site per pageload limit is 6 bits.
   url0.searchParams.append(bitsKey, perOriginBitLimit.toString());
   attachIFrame(url0);
   const result0 = await nextValueFromServer(ancestorKey);
   assert_equals(result0, "run_url_selection_limit_inner_succeeded");
 
-  // This url will already have a search param of ("bits", "6") appended.
-  let url1 = getRemoteOriginURL(url0);
+  let url1 = generateURL(
+      "/shared-storage-selecturl-limit/" +
+        "resources/run-url-selection-operation-limit-inner.https.html",
+      [ancestorKey]);
+
+  // The overall pageload budget should have 3 bits remaining, as we have set
+  // it to start at 9.
+  url1.searchParams.append(bitsKey, "3");
+  url1 = getCrossSiteURL(url1);
   attachIFrame(url1);
   const result1 = await nextValueFromServer(ancestorKey);
   assert_equals(result1, "run_url_selection_limit_inner_succeeded");
@@ -43,11 +50,11 @@ promise_test(async () => {
         "resources/run-url-selection-operation-limit-inner.https.html",
       [ancestorKey]);
 
-  // Since the overall per pageload limit is 12 bits, it should have already
-  // been reached, but we need to verify this using a third origin whose per
-  // origin budget is fresh.
+  // Since the overall per pageload limit is 9 bits here, it should have
+  // already been reached, even though `url2`'s site should have 3 bits
+  // remaining in the per-site budget, since it is same-site with `url1`.
   url2.searchParams.append(bitsKey, "0");
-  url2 = getOtherOriginURL(url2);
+  url2 = getCrossSiteURL(url2);
   attachIFrame(url2);
   const result2 = await nextValueFromServer(ancestorKey);
   assert_equals(result2, "run_url_selection_limit_inner_succeeded");
diff --git a/tests/wpt/tests/shared-storage/resources/delete-key.https.html.headers b/tests/wpt/tests/shared-storage/resources/delete-key.https.html.headers
new file mode 100644
index 00000000000..1b63235b7cd
--- /dev/null
+++ b/tests/wpt/tests/shared-storage/resources/delete-key.https.html.headers
@@ -0,0 +1 @@
+Supports-Loading-Mode: fenced-frame
diff --git a/tests/wpt/tests/shared-storage/resources/shared-storage-writable-iframe-in-fenced-inner.https.sub.html b/tests/wpt/tests/shared-storage/resources/shared-storage-writable-iframe-in-fenced-inner.https.sub.html
new file mode 100644
index 00000000000..87dbe81a2b5
--- /dev/null
+++ b/tests/wpt/tests/shared-storage/resources/shared-storage-writable-iframe-in-fenced-inner.https.sub.html
@@ -0,0 +1,29 @@
+<!doctype html>
+<body>
+  <script src=/resources/testharness.js></script>
+  <script src=/common/utils.js></script>
+  <script src=/fenced-frame/resources/utils.js></script>
+  <script src=/shared-storage/resources/util.js></script>
+  <script src=/shared-storage/resources/util.sub.js></script>
+  <script>
+
+async function init() {
+  const sameOrigin = new URL("", location.href).origin;
+  const [outerKey] = parseKeylist();
+  let {expectedKey, expectedValue} = parseExpectedKeyAndValueData();
+  const promise = navigateSharedStorageIframe({
+    hasSharedStorageWritableAttribute: true,
+    rawWriteHeader: `set;key=${expectedKey};value=${expectedValue}`,
+    isSameOrigin: true,
+    expectSharedStorageWritableHeader: true,
+  });
+  promise.then(() => {
+    verifyKeyValueForOrigin(expectedKey, expectedValue, sameOrigin);
+    deleteKeyForOrigin(expectedKey, sameOrigin);
+    writeValueToServer(outerKey, "writable_iframe_in_fenced_inner_loaded");
+  });
+}
+
+init();
+  </script>
+</body>
diff --git a/tests/wpt/tests/shared-storage/resources/shared-storage-writable-iframe-in-fenced-inner.https.sub.html.headers b/tests/wpt/tests/shared-storage/resources/shared-storage-writable-iframe-in-fenced-inner.https.sub.html.headers
new file mode 100644
index 00000000000..1b63235b7cd
--- /dev/null
+++ b/tests/wpt/tests/shared-storage/resources/shared-storage-writable-iframe-in-fenced-inner.https.sub.html.headers
@@ -0,0 +1 @@
+Supports-Loading-Mode: fenced-frame
diff --git a/tests/wpt/tests/shared-storage/resources/shared-storage-write-notify-parent.py b/tests/wpt/tests/shared-storage/resources/shared-storage-write-notify-parent.py
new file mode 100644
index 00000000000..0f72fb728c4
--- /dev/null
+++ b/tests/wpt/tests/shared-storage/resources/shared-storage-write-notify-parent.py
@@ -0,0 +1,23 @@
+from wptserve.utils import isomorphic_decode
+from wptserve.utils import isomorphic_encode
+from urllib.parse import unquote
+
+def unescape_query_value(query_value_bytes):
+    return isomorphic_encode(unquote(isomorphic_decode(query_value_bytes)))
+
+def main(request, response):
+    writable_header = request.headers.get(
+        b"Shared-Storage-Writable",
+        b"NO_SHARED_STORAGE_WRITABLE_HEADER")
+    response.headers.append(b"Content-Type", b"text/html")
+    response.headers.append(b"Access-Control-Allow-Origin", b"*")
+    response.headers.append(b"Supports-Loading-Mode", b"fenced-frame")
+    if writable_header == b"?1" and b'write' in request.GET:
+        write_header = unescape_query_value(request.GET[b'write'])
+        response.headers.append(b"Shared-Storage-Write", write_header)
+    response.content = b'''
+<script>
+  let parentOrOpener = window.opener || window.parent;
+  parentOrOpener.postMessage({ sharedStorageWritableHeader: '%s'}, "*");
+</script>
+''' % (writable_header)
diff --git a/tests/wpt/tests/shared-storage/resources/util.js b/tests/wpt/tests/shared-storage/resources/util.js
index b829864c625..f82765846c2 100644
--- a/tests/wpt/tests/shared-storage/resources/util.js
+++ b/tests/wpt/tests/shared-storage/resources/util.js
@@ -152,7 +152,7 @@ async function verifyKeyValueForOrigin(key, value, origin) {
       '/shared-storage/resources/verify-key-value.https.html',
       [outerKey, innerKey]);
   iframeUrl = updateUrlToUseNewOrigin(iframeUrl, origin);
-  appendExpectedKeyAndValue(iframeUrl, key, value);
+  iframeUrl = appendExpectedKeyAndValue(iframeUrl, key, value);
 
   attachIFrame(iframeUrl);
   const result = await nextValueFromServer(outerKey);
@@ -166,7 +166,7 @@ async function verifyKeyNotFoundForOrigin(key, origin) {
       '/shared-storage/resources/verify-key-not-found.https.html',
       [outerKey, innerKey]);
   iframeUrl = updateUrlToUseNewOrigin(iframeUrl, origin);
-  appendExpectedKey(iframeUrl, key);
+  iframeUrl = appendExpectedKey(iframeUrl, key);
 
   attachIFrame(iframeUrl);
   const result = await nextValueFromServer(outerKey);
@@ -178,7 +178,7 @@ async function setKeyValueForOrigin(key, value, origin) {
   let setIframeUrl = generateURL(
       '/shared-storage/resources/set-key-value.https.html', [outerKey]);
   setIframeUrl = updateUrlToUseNewOrigin(setIframeUrl, origin);
-  appendExpectedKeyAndValue(setIframeUrl, key, value);
+  setIframeUrl = appendExpectedKeyAndValue(setIframeUrl, key, value);
 
   attachIFrame(setIframeUrl);
   const result = await nextValueFromServer(outerKey);
@@ -190,7 +190,7 @@ async function deleteKeyForOrigin(key, origin) {
   let deleteIframeUrl = generateURL(
       '/shared-storage/resources/delete-key.https.html', [outerKey]);
   deleteIframeUrl = updateUrlToUseNewOrigin(deleteIframeUrl, origin);
-  appendExpectedKey(deleteIframeUrl, key);
+  deleteIframeUrl = appendExpectedKey(deleteIframeUrl, key);
 
   attachIFrame(deleteIframeUrl);
   const result = await nextValueFromServer(outerKey);
diff --git a/tests/wpt/tests/shared-storage/resources/util.sub.js b/tests/wpt/tests/shared-storage/resources/util.sub.js
index d92dbf539c3..970c33b7f25 100644
--- a/tests/wpt/tests/shared-storage/resources/util.sub.js
+++ b/tests/wpt/tests/shared-storage/resources/util.sub.js
@@ -23,3 +23,49 @@ function loadSharedStorageImage(data) {
   document.body.appendChild(image);
   return promise;
 }
+
+function navigateSharedStorageIframe(data) {
+  let {
+    hasSharedStorageWritableAttribute,
+    rawWriteHeader,
+    isSameOrigin,
+    expectSharedStorageWritableHeader
+  } = data;
+  const writeHeader = encodeURIComponent(rawWriteHeader);
+  const sameOriginSrc =
+      `/shared-storage/resources/shared-storage-write-notify-parent.py` +
+      `?write=${writeHeader}`;
+  const crossOriginSrc =
+      'https://{{domains[www]}}:{{ports[https][0]}}' + sameOriginSrc;
+
+  let frame = document.createElement('iframe');
+  frame.src = isSameOrigin ? sameOriginSrc : crossOriginSrc;
+  if (hasSharedStorageWritableAttribute) {
+    frame.sharedStorageWritable = true;
+  }
+
+  const expectedResult = expectSharedStorageWritableHeader ?
+      '?1' :
+      'NO_SHARED_STORAGE_WRITABLE_HEADER';
+
+  function checkExpectedResult(data) {
+    assert_equals(data.sharedStorageWritableHeader, expectedResult);
+  }
+
+  const promise = new Promise((resolve, reject) => {
+    window.addEventListener('message', async function handler(evt) {
+      if (evt.source === frame.contentWindow) {
+        checkExpectedResult(evt.data);
+        document.body.removeChild(frame);
+        window.removeEventListener('message', handler);
+        resolve();
+      }
+    });
+    window.addEventListener('error', () => {
+      reject(new Error('Navigation error'));
+    });
+  });
+
+  document.body.appendChild(frame);
+  return promise;
+}
diff --git a/tests/wpt/tests/shared-storage/resources/verify-key-value.https.html.headers b/tests/wpt/tests/shared-storage/resources/verify-key-value.https.html.headers
new file mode 100644
index 00000000000..1b63235b7cd
--- /dev/null
+++ b/tests/wpt/tests/shared-storage/resources/verify-key-value.https.html.headers
@@ -0,0 +1 @@
+Supports-Loading-Mode: fenced-frame
diff --git a/tests/wpt/tests/shared-storage/shared-storage-writable-iframe-content-attribute.tentative.https.sub.html b/tests/wpt/tests/shared-storage/shared-storage-writable-iframe-content-attribute.tentative.https.sub.html
new file mode 100644
index 00000000000..f27c8548cb1
--- /dev/null
+++ b/tests/wpt/tests/shared-storage/shared-storage-writable-iframe-content-attribute.tentative.https.sub.html
@@ -0,0 +1,22 @@
+<!doctype html>
+<body>
+  <script src=/resources/testharness.js></script>
+  <script src=/resources/testharnessreport.js></script>
+  <script src=/common/utils.js></script>
+  <script src=/fenced-frame/resources/utils.js></script>
+  <script src=/shared-storage/resources/util.js></script>
+  <iframe src="/shared-storage/resources/shared-storage-write-notify-parent.py?write=set%3Bkey%3Dhello%3Bvalue%3Dworld" sharedstoragewritable></iframe>
+  <iframe src="/shared-storage/resources/shared-storage-write-notify-parent.py?write=set%3Bkey%3Dwont%3Bvalue%3Dset"></iframe>
+  <iframe src="/shared-storage/resources/shared-storage-write-notify-parent.py?write=set%3Bkey%3Dgoodnight%3Bvalue%3Dmoon" sharedstoragewritable></iframe>
+  <script>
+    const sameOrigin = new URL("", location.href).origin;
+
+    promise_test(async t => {
+      await verifyKeyValueForOrigin('hello', 'world', sameOrigin);
+      await verifyKeyNotFoundForOrigin('wont', sameOrigin);
+      await verifyKeyValueForOrigin('goodnight', 'moon', sameOrigin);
+      await deleteKeyForOrigin('hello', sameOrigin);
+      await deleteKeyForOrigin('goodnight', sameOrigin);
+    }, 'test <iframe sharedstoragewritable src=[url]> for same origin iframe');
+  </script>
+</body>
diff --git a/tests/wpt/tests/shared-storage/shared-storage-writable-iframe-idl-attribute-included.tentative.https.sub.html b/tests/wpt/tests/shared-storage/shared-storage-writable-iframe-idl-attribute-included.tentative.https.sub.html
new file mode 100644
index 00000000000..2947ea51e0e
--- /dev/null
+++ b/tests/wpt/tests/shared-storage/shared-storage-writable-iframe-idl-attribute-included.tentative.https.sub.html
@@ -0,0 +1,37 @@
+<!doctype html>
+<body>
+  <script src=/resources/testharness.js></script>
+  <script src=/resources/testharnessreport.js></script>
+  <script src=/common/utils.js></script>
+  <script src=/fenced-frame/resources/utils.js></script>
+  <script src=/shared-storage/resources/util.js></script>
+  <script src=/shared-storage/resources/util.sub.js></script>
+  <script>
+    const sameOrigin = new URL("", location.href).origin;
+    const crossOrigin = 'https://{{domains[www]}}:{{ports[https][0]}}';
+
+    promise_test(async () => {
+      await navigateSharedStorageIframe({
+        hasSharedStorageWritableAttribute: true,
+        rawWriteHeader: "set;key=a;value=b",
+        isSameOrigin: true,
+        expectSharedStorageWritableHeader: true,
+      });
+      await verifyKeyValueForOrigin('a', 'b', sameOrigin);
+      await deleteKeyForOrigin('a', sameOrigin);
+    }, 'test <iframe sharedstoragewritable src=[url]></iframe> via JS for'
+       + ' same origin iframe');
+
+    promise_test(async () => {
+      await navigateSharedStorageIframe({
+        hasSharedStorageWritableAttribute: true,
+        rawWriteHeader: "set;key=c;value=d",
+        isSameOrigin: false,
+        expectSharedStorageWritableHeader: true,
+      });
+      await verifyKeyValueForOrigin('c', 'd', crossOrigin);
+      await deleteKeyForOrigin('c', crossOrigin);
+    }, 'test <iframe sharedstoragewritable src=[url]></iframe> via JS for'
+       + ' cross origin iframe');
+  </script>
+</body>
diff --git a/tests/wpt/tests/shared-storage/shared-storage-writable-iframe-idl-attribute-not-included.tentative.https.sub.html b/tests/wpt/tests/shared-storage/shared-storage-writable-iframe-idl-attribute-not-included.tentative.https.sub.html
new file mode 100644
index 00000000000..13a45a275be
--- /dev/null
+++ b/tests/wpt/tests/shared-storage/shared-storage-writable-iframe-idl-attribute-not-included.tentative.https.sub.html
@@ -0,0 +1,33 @@
+<!doctype html>
+<body>
+  <script src=/resources/testharness.js></script>
+  <script src=/resources/testharnessreport.js></script>
+  <script src=/common/utils.js></script>
+  <script src=/fenced-frame/resources/utils.js></script>
+  <script src=/shared-storage/resources/util.js></script>
+  <script src=/shared-storage/resources/util.sub.js></script>
+  <script>
+    const sameOrigin = new URL("", location.href).origin;
+    const crossOrigin = 'https://{{domains[www]}}:{{ports[https][0]}}';
+
+    promise_test(async () => {
+      await navigateSharedStorageIframe({
+        hasSharedStorageWritableAttribute: false,
+        rawWriteHeader: "set;key=e;value=f",
+        isSameOrigin: true,
+        expectSharedStorageWritableHeader: false,
+      });
+      await verifyKeyNotFoundForOrigin('e', sameOrigin);
+    }, 'test <iframe src=[url]></iframe> via JS for same origin iframe');
+
+    promise_test(async () => {
+      await navigateSharedStorageIframe({
+        hasSharedStorageWritableAttribute: false,
+        rawWriteHeader: "set;key=g;value=h",
+        isSameOrigin: false,
+        expectSharedStorageWritableHeader: false,
+      });
+      await verifyKeyNotFoundForOrigin('g', crossOrigin);
+    }, 'test <iframe src=[url]></iframe> via JS for cross origin iframe');
+  </script>
+</body>
diff --git a/tests/wpt/tests/shared-storage/shared-storage-writable-iframe-in-fenced.tentative.https.sub.html b/tests/wpt/tests/shared-storage/shared-storage-writable-iframe-in-fenced.tentative.https.sub.html
new file mode 100644
index 00000000000..e3a9803f016
--- /dev/null
+++ b/tests/wpt/tests/shared-storage/shared-storage-writable-iframe-in-fenced.tentative.https.sub.html
@@ -0,0 +1,27 @@
+<!doctype html>
+<body>
+  <script src=/resources/testharness.js></script>
+  <script src=/resources/testharnessreport.js></script>
+  <script src=/common/utils.js></script>
+  <script src=/fenced-frame/resources/utils.js></script>
+  <script src=/shared-storage/resources/util.js></script>
+  <script src=/shared-storage/resources/util.sub.js></script>
+  <script>
+    promise_test(async t => {
+      const outerKey = token();
+      let url = generateURL(
+        '/shared-storage/resources/'
+          + 'shared-storage-writable-iframe-in-fenced-inner.https.sub.html',
+        [outerKey]);
+      url = appendExpectedKeyAndValue(url, 'a', 'b');
+
+      let fencedFrameConfig = await runSelectRawURL(url, true);
+      assert_true(validateSelectURLResult(fencedFrameConfig, true));
+
+      attachFencedFrame(fencedFrameConfig, 'opaque-ads');
+      const result = await nextValueFromServer(outerKey);
+      assert_equals(result, "writable_iframe_in_fenced_inner_loaded");
+    }, 'test <iframe sharedstoragewritable src=[url]></iframe> via JS inside'
+       + ' a fenced frame');
+  </script>
+</body>
diff --git a/tests/wpt/tests/soft-navigation-heuristics/disabled.html b/tests/wpt/tests/soft-navigation-heuristics/disabled.html
new file mode 100644
index 00000000000..b53c2f70122
--- /dev/null
+++ b/tests/wpt/tests/soft-navigation-heuristics/disabled.html
@@ -0,0 +1,31 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+<meta charset="utf-8">
+<title>Detect simple soft navigation.</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="resources/soft-navigation-helper.js"></script>
+</head>
+<body>
+  <main id=main>
+  <a id=link>Click me!</a>
+  </main>
+    <script>
+    const link = document.getElementById("link");
+    testSoftNavigationNotDetected({
+      eventHandler: url => {
+        addTextToDivOnMain();
+        history.pushState({}, '', 'foobar.html');
+      },
+      link: link,
+      eventName: "click",
+      eventTarget: link,
+      testName: "Test that a soft navigation is not detected when the feature "
+                + "is disabled"});
+  </script>
+</body>
+</html>
+
diff --git a/tests/wpt/tests/soft-navigation-heuristics/image-lcp-followed-by-two-image-softnavs-lcp.tentative.html b/tests/wpt/tests/soft-navigation-heuristics/image-lcp-followed-by-two-image-softnavs-lcp.tentative.html
index 25151cdd79e..0e1b9a4d679 100644
--- a/tests/wpt/tests/soft-navigation-heuristics/image-lcp-followed-by-two-image-softnavs-lcp.tentative.html
+++ b/tests/wpt/tests/soft-navigation-heuristics/image-lcp-followed-by-two-image-softnavs-lcp.tentative.html
@@ -31,7 +31,7 @@
 
       const first_click_paint_promise = waitOnPaintEntriesPromise();
 
-      click(link);
+      interact(link);
       await new Promise(resolve => {
         (new PerformanceObserver(resolve)).observe({
           type: 'soft-navigation'
@@ -54,7 +54,7 @@
 
       const second_click_paint_promise = waitOnPaintEntriesPromise();
       const preClickLcp2 = await getLcpEntries();
-      click(link);
+      interact(link);
       await new Promise(resolve => {
         (new PerformanceObserver(() => resolve())).observe({
           type: 'soft-navigation'
diff --git a/tests/wpt/tests/soft-navigation-heuristics/keydown.tentative.html b/tests/wpt/tests/soft-navigation-heuristics/keydown.tentative.html
new file mode 100644
index 00000000000..fac86d71d2c
--- /dev/null
+++ b/tests/wpt/tests/soft-navigation-heuristics/keydown.tentative.html
@@ -0,0 +1,30 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+<meta charset="utf-8">
+<title>Detect hashchange event.</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="resources/soft-navigation-helper.js"></script>
+</head>
+<!-- Not including a body element to ensure the keydown heuristic works on
+     malformed HTML -->
+  <main id=main>
+    <div>
+      First LCP!
+    </div>
+  </main>
+  <script>
+    testSoftNavigation({
+      addContent: () => {
+        addTextToDivOnMain();
+      },
+      link: document.body,
+      interactionType: "keydown",
+      eventType: "keydown",
+      test: "Keydown on body triggers SoftNavigationHeuristics"});
+  </script>
+</html>
+
diff --git a/tests/wpt/tests/soft-navigation-heuristics/load-classic-script-history-push.tentative.html b/tests/wpt/tests/soft-navigation-heuristics/load-classic-script-history-push.tentative.html
new file mode 100644
index 00000000000..4e375b2164d
--- /dev/null
+++ b/tests/wpt/tests/soft-navigation-heuristics/load-classic-script-history-push.tentative.html
@@ -0,0 +1,31 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+<meta charset="utf-8">
+<title>Detect a soft navigation triggered by an external classic script.</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="resources/soft-navigation-helper.js"></script>
+</head>
+<body>
+  <main id=main>
+  <a id=link>Click me!</a>
+  </main>
+  <script>
+    const link = document.getElementById("link");
+    testSoftNavigation({
+      addContent: async () => {
+        await addImageToMain();
+      },
+      link: link,
+      pushState: async (url) => {
+        const script = document.createElement("script");
+        script.src = "resources/history_push.js";
+        document.body.appendChild(script);
+      },
+      test: "Detect a soft navigation triggered from external classic script"});
+  </script>
+</body>
+</html>
diff --git a/tests/wpt/tests/soft-navigation-heuristics/load-module-script-history-push.tentative.html b/tests/wpt/tests/soft-navigation-heuristics/load-module-script-history-push.tentative.html
new file mode 100644
index 00000000000..e82cd13f4a5
--- /dev/null
+++ b/tests/wpt/tests/soft-navigation-heuristics/load-module-script-history-push.tentative.html
@@ -0,0 +1,32 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+<meta charset="utf-8">
+<title>Detect a soft navigation triggered by an external module script.</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="resources/soft-navigation-helper.js"></script>
+</head>
+<body>
+  <main id=main>
+  <a id=link>Click me!</a>
+  </main>
+  <script>
+    const link = document.getElementById("link");
+    testSoftNavigation({
+      addContent: async () => {
+        await addImageToMain();
+      },
+      link: link,
+      pushState: async (url) => {
+        const script = document.createElement("script");
+        script.src = "resources/history_push.js";
+        script.type = "module";
+        document.body.appendChild(script);
+      },
+      test: "Detect a soft navigation triggered from external module script"});
+  </script>
+</body>
+</html>
diff --git a/tests/wpt/tests/soft-navigation-heuristics/navigate-child.html b/tests/wpt/tests/soft-navigation-heuristics/navigate-child.html
index 63a8adb208f..e3c17e2dbaa 100644
--- a/tests/wpt/tests/soft-navigation-heuristics/navigate-child.html
+++ b/tests/wpt/tests/soft-navigation-heuristics/navigate-child.html
@@ -20,7 +20,7 @@
         await new Promise(r => t.step_timeout(r, 10));
       }
       const link = document.getElementById("link");
-      click(link);
+      interact(link);
       while (!child.location.href.includes("2")) {
         await new Promise(r => t.step_timeout(r, 10));
       }
diff --git a/tests/wpt/tests/soft-navigation-heuristics/popstate-multiple-backs.tentative.html b/tests/wpt/tests/soft-navigation-heuristics/popstate-multiple-backs.tentative.html
new file mode 100644
index 00000000000..2a12a352bff
--- /dev/null
+++ b/tests/wpt/tests/soft-navigation-heuristics/popstate-multiple-backs.tentative.html
@@ -0,0 +1,61 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+<meta charset="utf-8">
+<title>Soft navigation with multiple popstate calls.</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="resources/soft-navigation-helper.js"></script>
+</head>
+<body>
+  <main id=main>
+    <div>
+      <a id=link>Click me!</a>
+    </div>
+  </main>
+  <script>
+    // Push state 4 times, as history.back() calls will trigger popstate
+   //  events.
+    history.pushState({}, "", "foobar.html");
+    history.pushState({}, "", "another_one.html");
+    history.pushState({}, "", "and_another.html");
+    history.pushState({}, "", "and_yet_another.html");
+
+    // This function runs at the start of the popstate event.
+    const eventPrepWork = t => {
+      // If this is an event due to the first click, go back() twice more.
+      if (!t.popped) {
+        step_timeout(()=>history.back(), 0);
+        step_timeout(()=>history.back(), 0);
+        t.popped = 0;
+      }
+      ++t.popped;
+      // return true for the second time the event fires, which is the first
+      // back() triggered by the popstate event. The means that the first one
+      // of those back() navigations would trigger a soft navigation, but not
+      // the last one.
+      return t.popped == 2;
+    }
+    const link = document.getElementById("link");
+    link.addEventListener("click", () => history.back());
+    testSoftNavigation({
+      addContent: () => {
+        // Add the content to the main element
+        const main = document.getElementById("main");
+        main.removeChild(document.getElementsByTagName("div")[0]);
+        const div = document.createElement("div");
+        const text = document.createTextNode("Lorem ipsum");
+        div.appendChild(text);
+        div.style="font-size: 3em";
+        main.appendChild(div);
+      },
+      link: link,
+      eventPrepWork: eventPrepWork,
+      testName: "A soft navigation that started from a back() call inside a "
+        + "popstate event is recognized by SoftNavigationHeuristics",
+      eventType: "popstate"});
+  </script>
+</body>
+</html>
diff --git a/tests/wpt/tests/soft-navigation-heuristics/resources/history_push.js b/tests/wpt/tests/soft-navigation-heuristics/resources/history_push.js
new file mode 100644
index 00000000000..6647dd740a2
--- /dev/null
+++ b/tests/wpt/tests/soft-navigation-heuristics/resources/history_push.js
@@ -0,0 +1 @@
+history.pushState({}, '', URL);
diff --git a/tests/wpt/tests/soft-navigation-heuristics/resources/soft-navigation-helper.js b/tests/wpt/tests/soft-navigation-heuristics/resources/soft-navigation-helper.js
index edc9331c263..7f83df75f8f 100644
--- a/tests/wpt/tests/soft-navigation-heuristics/resources/soft-navigation-helper.js
+++ b/tests/wpt/tests/soft-navigation-heuristics/resources/soft-navigation-helper.js
@@ -1,5 +1,5 @@
 var counter = 0;
-var clicked;
+var interacted;
 var timestamps = []
 const MAX_CLICKS = 50;
 // Entries for one hard navigation + 50 soft navigations.
@@ -20,17 +20,19 @@ const testSoftNavigation =
       const testName = options.testName;
       const pushUrl = readValue(options.pushUrl, true);
       const eventType = readValue(options.eventType, "click");
+      const interactionType = readValue(options.interactionType, 'click');
       const expectLCP = options.validate != 'no-lcp';
+      const eventPrepWork = options.eventPrepWork;
       promise_test(async t => {
         await waitInitialLCP();
         const preClickLcp = await getLcpEntries();
-        setEvent(t, link, pushState, addContent, pushUrl, eventType);
+        setEvent(t, link, pushState, addContent, pushUrl, eventType, eventPrepWork);
         for (let i = 0; i < clicks; ++i) {
           const firstClick = (i === 0);
           let paint_entries_promise =
               waitOnPaintEntriesPromise(expectLCP && firstClick);
-          clicked = false;
-          click(link);
+          interacted = false;
+          interact(link, interactionType);
 
           await new Promise(resolve => {
             (new PerformanceObserver(() => resolve())).observe({
@@ -61,7 +63,7 @@ const testNavigationApi = (testName, navigateEventHandler, link) => {
     await waitInitialLCP();
     const preClickLcp = await getLcpEntries();
     let paint_entries_promise = waitOnPaintEntriesPromise();
-    click(link);
+    interact(link);
     await new Promise(resolve => {
       (new PerformanceObserver(() => resolve())).observe({
         type: 'soft-navigation'
@@ -80,7 +82,7 @@ const testSoftNavigationNotDetected = options => {
     promise_test(async t => {
       const preClickLcp = await getLcpEntries();
       options.eventTarget.addEventListener(options.eventName, options.eventHandler);
-      click(options.link);
+      interact(options.link);
       await new Promise((resolve, reject) => {
         (new PerformanceObserver(() =>
             reject("Soft navigation should not be triggered"))).observe({
@@ -89,8 +91,13 @@ const testSoftNavigationNotDetected = options => {
         });
         t.step_timeout(resolve, 1000);
       });
-      assert_equals(
+      if (document.softNavigations) {
+        assert_equals(
           document.softNavigations, 0, 'Soft Navigation not detected');
+      }
+      const postClickLcp = await getLcpEntries();
+      assert_equals(
+          preClickLcp.length, postClickLcp.length, 'No LCP entries accumulated');
     }, options.testName);
   };
 
@@ -128,16 +135,25 @@ const runEntryValidations =
   }
 };
 
-const click = link => {
-  if (test_driver) {
-    test_driver.click(link);
-    timestamps[counter] = {"syncPostClick": performance.now()};
-  }
-}
+const interact =
+    (link, interactionType = 'click') => {
+      if (test_driver) {
+        if (interactionType == 'click') {
+          test_driver.click(link);
+        } else {
+          test_driver.send_keys(link, 'j');
+        }
+        timestamps[counter] = {"syncPostInteraction": performance.now()};
+      }
+    }
 
-const setEvent = (t, button, pushState, addContent, pushUrl, eventType) => {
-  const eventObject = (eventType == "click") ? button : window;
+const setEvent = (t, button, pushState, addContent, pushUrl, eventType, prepWork) => {
+  const eventObject =
+      (eventType == 'click' || eventType == 'keydown') ? button : window;
   eventObject.addEventListener(eventType, async e => {
+    if (prepWork &&!prepWork(t)) {
+      return;
+    }
     timestamps[counter]["eventStart"] = performance.now();
     // Jump through a task, to ensure task tracking is working properly.
     await new Promise(r => t.step_timeout(r, 0));
@@ -158,7 +174,7 @@ const setEvent = (t, button, pushState, addContent, pushUrl, eventType) => {
     await addContent(url);
     ++counter;
 
-    clicked = true;
+    interacted = true;
   });
 };
 
@@ -178,7 +194,7 @@ const validateSoftNavigationEntry = async (clicks, extraValidations,
     assert_true(entry.name.includes(pushUrl ? URL : document.location.href),
                 "The soft navigation name is properly set");
     const entryTimestamp = entry.startTime;
-    assert_less_than_equal(timestamps[i]["syncPostClick"], entryTimestamp);
+    assert_less_than_equal(timestamps[i]["syncPostInteraction"], entryTimestamp);
     assert_greater_than_equal(
         timestamps[i]['eventStart'], entryTimestamp,
         'Event start timestamp matches');
diff --git a/tests/wpt/tests/speculation-rules/prefetch/document-rules.https.html b/tests/wpt/tests/speculation-rules/prefetch/document-rules.https.html
index 0eed29dbefc..070037704ff 100644
--- a/tests/wpt/tests/speculation-rules/prefetch/document-rules.https.html
+++ b/tests/wpt/tests/speculation-rules/prefetch/document-rules.https.html
@@ -23,6 +23,9 @@
 <meta name="variant" content="?include=selectorMatchesDisplayLocked">
 <meta name="variant" content="?include=unslottedLink">
 <meta name="variant" content="?include=immediateMutation">
+<meta name="variant" content="?include=baseURLChangedBySameDocumentNavigation">
+<meta name="variant" content="?include=baseURLChangedByBaseElement">
+<meta name="variant" content="?include=linkToSelfFragment">
 
 <body>
 <script>
@@ -268,5 +271,48 @@
     await new Promise(resolve => t.step_timeout(resolve, 2000));
     assert_equals(await isUrlPrefetched(url), 1);
   }, 'test that selector_matches predicates respect changes immediately');
+
+  const baseURLChangedTestFixture = (testName, modifyBaseURLFunc) => {
+    return subsetTestByKey(testName, promise_test, async t => {
+      const url = getPrefetchUrl();
+      const link = addLink(url);
+      const url_pattern_string = `prefetch.py${url.search}`;
+
+      // Insert a document rule with a url pattern predicate that uses a
+      // relative URL which will not match with |url|, due to |document.baseURI|
+      // being different from |url|'s path.
+      assert_false((new URLPattern(url_pattern_string, document.baseURI)).test(url));
+      insertDocumentRule({ href_matches: url_pattern_string });
+      await new Promise(resolve => t.step_timeout(resolve, 2000));
+      assert_equals(await isUrlPrefetched(url), 0);
+
+      // Change the baseURL of the document to |url|. |url| should now be
+      // prefetched.
+      modifyBaseURLFunc(url);
+      assert_true((new URLPattern(url_pattern_string, document.baseURI)).test(url));
+      await new Promise(resolve => t.step_timeout(resolve, 2000));
+      assert_equals(await isUrlPrefetched(url), 1);
+    });
+  }
+
+  baseURLChangedTestFixture('baseURLChangedBySameDocumentNavigation', url => {
+    history.pushState({}, "", url);
+  });
+
+  baseURLChangedTestFixture('baseURLChangedByBaseElement', url => {
+    const base = document.createElement('base');
+    base.href = url;
+    document.head.appendChild(base);
+  });
+
+  subsetTestByKey('linkToSelfFragment', promise_test, async t => {
+    const url = getPrefetchUrl();
+    history.pushState({}, "", url);
+    addLink(new URL('#fragment', url));
+    insertDocumentRule();
+    await new Promise(resolve => t.step_timeout(resolve, 2000));
+    assert_equals(await isUrlPrefetched(url), 0);
+  }, 'test that a fragment link to the current document does not prefetch');
+
 </script>
 </body>
diff --git a/tests/wpt/tests/speculation-rules/prefetch/fragment.https.html b/tests/wpt/tests/speculation-rules/prefetch/fragment.https.html
new file mode 100644
index 00000000000..7b35500303e
--- /dev/null
+++ b/tests/wpt/tests/speculation-rules/prefetch/fragment.https.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/dispatcher/dispatcher.js"></script>
+<script src="/common/utils.js"></script>
+<script src="../resources/utils.js"></script>
+<script src="resources/utils.sub.js"></script>
+<script>
+setup(() => assertSpeculationRulesIsSupported());
+
+promise_test(async t => {
+  const testUrl = document.URL;
+  const [prefetchUrl, anotherPrefetchUrl] = getPrefetchUrlList(2);
+  try {
+    history.pushState({}, '', prefetchUrl);
+    const urls = [
+      new URL('#fragment', prefetchUrl),
+      new URL('#fragment', anotherPrefetchUrl),
+    ];
+    insertSpeculationRules({prefetch: [{source: 'list', urls}]});
+    await new Promise(resolve => t.step_timeout(resolve, 2000));
+    assert_equals(await isUrlPrefetched(prefetchUrl), 0);
+    assert_equals(await isUrlPrefetched(anotherPrefetchUrl), 1);
+  } finally {
+    // We needed to temporarily change the document URL to do the previous
+    // test. Undo that to avoid breaking any other test cases.
+    history.back();
+    await new Promise(resolve => {
+      addEventListener('popstate', () => resolve(), {once: true});
+    });
+    await new Promise(resolve => t.step_timeout(resolve, 0));
+    assert_equals(document.URL, testUrl);
+  }
+}, "fragment links to the current document URL are not prefetched");
+</script>
diff --git a/tests/wpt/tests/speculation-rules/prefetch/redirect-url.sub.https.html b/tests/wpt/tests/speculation-rules/prefetch/redirect-url.sub.https.html
index 324bdd0b589..02bb35349ff 100644
--- a/tests/wpt/tests/speculation-rules/prefetch/redirect-url.sub.https.html
+++ b/tests/wpt/tests/speculation-rules/prefetch/redirect-url.sub.https.html
@@ -26,9 +26,9 @@
 
   promise_test(async t => {
     const agent = await spawnWindow(t);
-    // Because `forceSinglePrefetch()` waits for 2 seconds, we put 4-second delay
+    // Because `forceSinglePrefetch()` waits for 2 seconds, we put 2.5-second delay
     // here to make the redirect response is received after `navigate()` below.
-    const nextUrl = new URL('/common/slow-redirect.py?delay=4', location.href);
+    const nextUrl = new URL('/common/slow-redirect.py?delay=2.5', location.href);
     const finalUrl = agent.getExecutorURL({ page: 2 });
     nextUrl.searchParams.set('location', finalUrl);
     await agent.forceSinglePrefetch(nextUrl);
@@ -40,9 +40,9 @@
 
   promise_test(async t => {
     const agent = await spawnWindow(t);
-    // Because `forceSinglePrefetch()` waits for 2 seconds, we put 4-second delay
+    // Because `forceSinglePrefetch()` waits for 2 seconds, we put 2.5-second delay
     // here to make the redirect response is received after `navigate()` below.
-    const nextUrl = new URL('/common/slow-redirect.py?delay=4', location.href);
+    const nextUrl = new URL('/common/slow-redirect.py?delay=2.5', location.href);
     const finalUrl = agent.getExecutorURL({ page: 2, hostname: '{{hosts[alt][www]}}' });
     nextUrl.searchParams.set('location', finalUrl);
     await agent.forceSinglePrefetch(nextUrl);
diff --git a/tests/wpt/tests/speculation-rules/prerender/resources/web-database-access.html b/tests/wpt/tests/speculation-rules/prerender/resources/web-database-access.html
deleted file mode 100644
index fb00852caa9..00000000000
--- a/tests/wpt/tests/speculation-rules/prerender/resources/web-database-access.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="utils.js"></script>
-<script>
-
-const bc = new PrerenderChannel('prerender-channel');
-assert_true(document.prerendering);
-
-let result = "Success";
-const db = openDatabase("test", "1.0", "test database", 1024);
-db.transaction(function (tx) {
-  tx.executeSql('CREATE TABLE IF NOT EXISTS foo (text)');
-  tx.executeSql('INSERT INTO foo (text) VALUES ("bar")');
-}, function(error) {
-  result = error;
-}, function() {
-  bc.postMessage(result);
-  bc.close();
-});
-
-</script>
diff --git a/tests/wpt/tests/speculation-rules/prerender/web-database.https.html b/tests/wpt/tests/speculation-rules/prerender/web-database.https.html
deleted file mode 100644
index b6d2d7ddeb9..00000000000
--- a/tests/wpt/tests/speculation-rules/prerender/web-database.https.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<!DOCTYPE html>
-<title>Same-origin prerendering can access Web Database</title>
-<meta name="timeout" content="long">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/common/utils.js"></script>
-<script src="../resources/utils.js"></script>
-<script src="resources/utils.js"></script>
-
-<body>
-<script>
-setup(() => assertSpeculationRulesIsSupported());
-
-async function insertQuery() {
-  return new Promise(resolve => {
-    const db = openDatabase("test", "1.0", "test database", 1024);
-    db.transaction(function (tx) {
-      tx.executeSql('CREATE TABLE IF NOT EXISTS foo (text)');
-      tx.executeSql('INSERT INTO foo (text) VALUES ("bar")');
-    }, function(error) {
-      resolve(error);
-    }, function() {
-      resolve("Success");
-    });
-  });
-}
-
-async function selectQuery() {
-  return new Promise(resolve => {
-    const db = openDatabase("test", "1.0", "test database", 1024);
-    db.transaction(function (tx) {
-        tx.executeSql('CREATE TABLE IF NOT EXISTS foo (text)');
-        tx.executeSql('SELECT * FROM foo', [], function (tx, results) {
-          resolve(results.rows.length);
-        });
-      }, function(tx, error) {
-        resolve(error);
-      });
-  });
-}
-
-promise_test(async t => {
-  const uid = token();
-  const bc = new PrerenderChannel('prerender-channel', uid);
-
-  const gotMessage = new Promise(resolve => {
-    bc.addEventListener('message', e => {
-      resolve(e.data);
-    }, {
-      once: true
-    });
-  });
-
-  const insertResult = await insertQuery();
-  assert_equals(insertResult, "Success",
-        'primary page should be able to execute statements from Web Database.');
-
-  // Start prerendering a page that attempts to access Web Database.
-  startPrerendering(`resources/web-database-access.html?uid=${uid}`);
-  const result = await gotMessage;
-
-  assert_equals(
-    result, "Success",
-    'prerendering page should be able to read from Web Database');
-
-  const selectResult = await selectQuery();
-  assert_equals(
-    selectResult, 2,
-    'prerendering page should be able to write to Web Database');
-}, 'prerendering page should be able to access Web Database');
-</script>
diff --git a/tests/wpt/tests/storage-access-api/helpers.js b/tests/wpt/tests/storage-access-api/helpers.js
index 0a89c6d7f99..7d259b21676 100644
--- a/tests/wpt/tests/storage-access-api/helpers.js
+++ b/tests/wpt/tests/storage-access-api/helpers.js
@@ -150,10 +150,34 @@ async function CanFrameWriteCookies(frame, keep_after_writing = false) {
   return can_write;
 }
 
+// Sets a cookie in an unpartitioned context by creating a new frame
+// and requesting storage access in the frame.
+async function SetFirstPartyCookieAndUnsetStorageAccessPermission(origin) {
+  let frame = await CreateFrame(`${origin}/storage-access-api/resources/script-with-cookie-header.py?script=embedded_responder.js`);
+  await SetPermissionInFrame(frame, [{ name: 'storage-access' }, 'granted']);
+  await RequestStorageAccessInFrame(frame);
+  await SetDocumentCookieFromFrame(frame, `cookie=unpartitioned;Secure;SameSite=None;Path=/`);
+  await SetPermissionInFrame(frame, [{ name: 'storage-access' }, 'prompt']);
+}
+
+// Tests for the presence of the unpartitioned cookie set by SetFirstPartyCookieAndUnsetStorageAccessPermission
+// in both the `document.cookie` variable and same-origin subresource \
+// Request Headers in the given frame
+async function HasUnpartitionedCookie(frame) {
+  let frameDocumentCookie = await GetJSCookiesFromFrame(frame);
+  let jsAccess = cookieStringHasCookie("cookie", "unpartitioned", frameDocumentCookie);
+  const httpCookie = await FetchSubresourceCookiesFromFrame(frame, "");
+  let httpAccess = cookieStringHasCookie("cookie", "unpartitioned", httpCookie);
+  assert_equals(jsAccess, httpAccess, "HTTP and Javascript cookies must be in sync");
+  return jsAccess && httpAccess;
+}
+
 // Tests whether the current frame can read and write cookies via HTTP headers.
 // This deletes, writes, reads, then deletes a cookie named "cookie".
 async function CanAccessCookiesViaHTTP() {
-  await create_cookie(window.location.origin, "cookie", "1", "samesite=None;Secure");
+  // We avoid reusing SetFirstPartyCookieAndUnsetStorageAccessPermission here, since that bypasses the
+  // cookie-accessibility settings that we want to check here.
+  await fetch(`${window.location.origin}/storage-access-api/resources/set-cookie-header.py?cookie=1;path=/;SameSite=None;Secure`);
   const http_cookies = await fetch(`${window.location.origin}/storage-access-api/resources/echo-cookie-header.py`)
       .then((resp) => resp.text());
   const can_access = cookieStringHasCookie("cookie", "1", http_cookies);
diff --git a/tests/wpt/tests/storage-access-api/requestStorageAccess-cross-origin-iframe-navigation.sub.https.window.js b/tests/wpt/tests/storage-access-api/requestStorageAccess-cross-origin-iframe-navigation.sub.https.window.js
index 24595ed3408..691c8c86b62 100644
--- a/tests/wpt/tests/storage-access-api/requestStorageAccess-cross-origin-iframe-navigation.sub.https.window.js
+++ b/tests/wpt/tests/storage-access-api/requestStorageAccess-cross-origin-iframe-navigation.sub.https.window.js
@@ -24,43 +24,43 @@
     });
 
     assert_false(await FrameHasStorageAccess(frame), "frame initially does not have storage access.");
-    assert_false(await CanFrameWriteCookies(frame), "frame initially cannot write cookies via document.cookie.");
-    assert_false(cookieStringHasCookie("cookie", "monster", await GetHTTPCookiesFromFrame(frame)), "frame's fetch was done without credentials.");
+    assert_false(await HasUnpartitionedCookie(frame), "frame initially does not have access to cookies.");
 
     assert_true(await RequestStorageAccessInFrame(frame), "requestStorageAccess resolves without requiring a gesture.");
 
     assert_true(await FrameHasStorageAccess(frame), "frame has storage access after request.");
-    assert_true(await CanFrameWriteCookies(frame, /* keep_after_writing=*/true), "frame can write cookies via JS after request.");
+    assert_true(await HasUnpartitionedCookie(frame), "frame has access to cookies after request.");
 
     return frame;
   }
 
   promise_test(async (t) => {
     await MaybeSetStorageAccess("*", "*", "blocked");
+    await SetFirstPartyCookieAndUnsetStorageAccessPermission(altWww);
 
     const frame = await SetUpResponderFrame(t, altWwwResponder);
 
     await FrameInitiatedReload(frame);
 
-    assert_true(cookieStringHasCookie('cookie', 'monster', await GetHTTPCookiesFromFrame(frame)), "The frame's navigation request included cookies.");
     assert_true(await FrameHasStorageAccess(frame), "frame has storage access after refresh.");
-    assert_true(await CanFrameWriteCookies(frame), "frame can write cookies via JS after refresh.");
+    assert_true(await HasUnpartitionedCookie(frame), "frame has access to cookies after refresh.");
   }, "Self-initiated reloads preserve storage access");
 
   promise_test(async (t) => {
     await MaybeSetStorageAccess("*", "*", "blocked");
+    await SetFirstPartyCookieAndUnsetStorageAccessPermission(altWww);
 
     const frame = await SetUpResponderFrame(t, altWwwResponder);
 
     await FrameInitiatedNavigation(frame, altWwwResponder);
 
-    assert_true(cookieStringHasCookie('cookie', 'monster', await GetHTTPCookiesFromFrame(frame)), "The frame's navigation request included cookies.");
     assert_true(await FrameHasStorageAccess(frame), "frame has storage access after refresh.");
-    assert_true(await CanFrameWriteCookies(frame), "frame can write cookies via JS after refresh.");
+    assert_true(await HasUnpartitionedCookie(frame), "frame has access to cookies after refresh.");
   }, "Self-initiated same-origin navigations preserve storage access");
 
   promise_test(async (t) => {
     await MaybeSetStorageAccess("*", "*", "blocked");
+    await SetFirstPartyCookieAndUnsetStorageAccessPermission(altWww);
 
     const frame = await SetUpResponderFrame(t, altWwwResponder);
 
@@ -70,17 +70,18 @@
     });
 
     assert_false(await FrameHasStorageAccess(frame), "frame does not have storage access after refresh.");
-    assert_false(await CanFrameWriteCookies(frame), "frame cannot write cookies via JS after refresh.");
+    assert_false(await HasUnpartitionedCookie(frame), "frame has access to cookies after refresh.");
   }, "Non-self-initiated same-origin navigations do not preserve storage access");
 
   promise_test(async (t) => {
     await MaybeSetStorageAccess("*", "*", "blocked");
+    await SetFirstPartyCookieAndUnsetStorageAccessPermission(altWww);
 
     const frame = await SetUpResponderFrame(t, altWwwResponder);
 
     await FrameInitiatedNavigation(frame, altRootResponder);
 
     assert_false(await FrameHasStorageAccess(frame), "frame does not have storage access after refresh.");
-    assert_false(await CanFrameWriteCookies(frame), "frame cannot write cookies via JS after refresh.");
+    assert_false(await HasUnpartitionedCookie(frame), "frame has access to cookies after refresh.");
   }, "Self-initiated cross-origin navigations do not preserve storage access");
 })();
diff --git a/tests/wpt/tests/storage-access-api/requestStorageAccess-cross-site-sibling-iframes.sub.https.window.js b/tests/wpt/tests/storage-access-api/requestStorageAccess-cross-site-sibling-iframes.sub.https.window.js
index c93673887c4..06ee80e5a08 100644
--- a/tests/wpt/tests/storage-access-api/requestStorageAccess-cross-site-sibling-iframes.sub.https.window.js
+++ b/tests/wpt/tests/storage-access-api/requestStorageAccess-cross-site-sibling-iframes.sub.https.window.js
@@ -13,6 +13,7 @@
 
   promise_test(async (t) => {
     await MaybeSetStorageAccess("*", "*", "blocked");
+    await SetFirstPartyCookieAndUnsetStorageAccessPermission(wwwAlt);
     const responder_html = `${wwwAlt}${url_suffix}`;
     const [frame1, frame2] = await Promise.all([
       CreateFrame(responder_html),
@@ -30,21 +31,21 @@
     assert_false(await FrameHasStorageAccess(frame1), "frame1 should not have storage access initially.");
     assert_false(await FrameHasStorageAccess(frame2), "frame2 should not have storage access initially.");
 
-    assert_false(await CanFrameWriteCookies(frame1), "frame1 should not have access via document.cookie.");
-    assert_false(await CanFrameWriteCookies(frame2), "frame2 should not have access via document.cookie.");
+    assert_false(await HasUnpartitionedCookie(frame1), "frame1 should not have cookie access.");
+    assert_false(await HasUnpartitionedCookie(frame2), "frame2 should not have cookie access.");
 
     assert_true(await RequestStorageAccessInFrame(frame1), "requestStorageAccess doesn't require a gesture since the permission has already been granted.");
 
     assert_true(await FrameHasStorageAccess(frame1), "frame1 should have storage access now.");
-    assert_true(await CanFrameWriteCookies(frame1), "frame1 should now be able to write cookies via document.cookie.");
+    assert_true(await HasUnpartitionedCookie(frame1), "frame1 should now have cookie access.");
 
     assert_false(await FrameHasStorageAccess(frame2), "frame2 should still not have storage access.");
-    assert_false(await CanFrameWriteCookies(frame2), "frame2 should still be unable to write cookies via document.cookie");
+    assert_false(await HasUnpartitionedCookie(frame2), "frame2 should still have cookie access.");
 
     assert_true(await RequestStorageAccessInFrame(frame2), "frame2 should be able to get storage access without a gesture.");
 
     assert_true(await FrameHasStorageAccess(frame2), "frame2 should have storage access after it requested it.");
-    assert_true(await CanFrameWriteCookies(frame2), "frame2 should be able to write cookies via document.cookie after getting storage access.");
+    assert_true(await HasUnpartitionedCookie(frame2), "frame2 should have cookie access after getting storage access.");
   }, "Grants have per-frame scope");
 
   promise_test(async (t) => {
diff --git a/tests/wpt/tests/storage-access-api/requestStorageAccess-insecure.sub.window.js b/tests/wpt/tests/storage-access-api/requestStorageAccess-insecure.sub.window.js
index 1b00aee00a5..1ad04321db7 100644
--- a/tests/wpt/tests/storage-access-api/requestStorageAccess-insecure.sub.window.js
+++ b/tests/wpt/tests/storage-access-api/requestStorageAccess-insecure.sub.window.js
@@ -33,6 +33,7 @@ if (topLevelDocument) {
     return CreateDetachedFrame().requestStorageAccess()
       .then(t.unreached_func("Should have rejected: " + description), (e) => {
         assert_equals(e.name, 'InvalidStateError', description);
+        t.done();
       });
   }, "[non-fully-active] document.requestStorageAccess() should reject when run in a detached frame");
 
@@ -62,22 +63,20 @@ if (topLevelDocument) {
   // Because the iframe tests expect no user activation, and because they
   // load asynchronously, we want to first run those tests before simulating
   // clicks on the page.
-  Promise
-      .all([
-        sameOriginFramePromise,
-        crossOriginFramePromise,
-        nestedSameOriginFramePromise,
-        nestedCrossOriginFramePromise,
-      ])
-      .then(() => {
-        promise_test(
-            async t => {
-              await RunCallbackWithGesture(() => {
-                return promise_rejects_dom(t, "NotAllowedError", document.requestStorageAccess(),
-                "should reject in insecure context");
-              });
-            },
-            '[' + testPrefix +
-                '] document.requestStorageAccess() should be rejected when called with a user gesture in insecure context');
-      });
+  const testsWithoutUserActivation = [
+    sameOriginFramePromise,
+    crossOriginFramePromise,
+    nestedSameOriginFramePromise,
+    nestedCrossOriginFramePromise,
+  ];
+
+  promise_test(async t => {
+    await Promise .all(testsWithoutUserActivation);
+    await RunCallbackWithGesture(() => {
+      return promise_rejects_dom(t, "NotAllowedError", document.requestStorageAccess(),
+      "should reject in insecure context");
+    });
+  },
+  '[' + testPrefix +
+      '] document.requestStorageAccess() should be rejected when called with a user gesture in insecure context');
 }
diff --git a/tests/wpt/tests/storage-access-api/requestStorageAccess-non-fully-active.sub.https.window.js b/tests/wpt/tests/storage-access-api/requestStorageAccess-non-fully-active.sub.https.window.js
index 18f451975ad..79b4a7959f4 100644
--- a/tests/wpt/tests/storage-access-api/requestStorageAccess-non-fully-active.sub.https.window.js
+++ b/tests/wpt/tests/storage-access-api/requestStorageAccess-non-fully-active.sub.https.window.js
@@ -9,6 +9,7 @@ promise_test(t => {
   // Can't use `promise_rejects_dom` here, since the error comes from the wrong global.
   return promise.then(t.unreached_func("Should have rejected: " + description), (e) => {
     assert_equals(e.name, 'InvalidStateError', description);
+    t.done();
   });
 }, "[non-fully-active] document.requestStorageAccess() should not resolve when run in a detached frame");
 
diff --git a/tests/wpt/tests/storage-access-api/resources/set-cookie-header.py b/tests/wpt/tests/storage-access-api/resources/set-cookie-header.py
new file mode 100644
index 00000000000..e937ba2ca4e
--- /dev/null
+++ b/tests/wpt/tests/storage-access-api/resources/set-cookie-header.py
@@ -0,0 +1,12 @@
+from urllib.parse import unquote
+from wptserve.utils import isomorphic_encode
+
+def main(request, response):
+  # Cookies may require whitespace (e.g. in the `Expires` attribute), so the
+  # query string should be decoded.
+  cookie = unquote(request.url_parts.query)
+  headers = []
+  headers.append((b"Set-Cookie", isomorphic_encode(cookie)))
+
+  return (200, headers, "")
+
diff --git a/tests/wpt/tests/storage/buckets/bucket-quota-indexeddb.tentative.https.any.js b/tests/wpt/tests/storage/buckets/bucket-quota-indexeddb.tentative.https.any.js
index ba82edb72ec..e03aaa802d0 100644
--- a/tests/wpt/tests/storage/buckets/bucket-quota-indexeddb.tentative.https.any.js
+++ b/tests/wpt/tests/storage/buckets/bucket-quota-indexeddb.tentative.https.any.js
@@ -7,7 +7,7 @@ promise_test(async t => {
   const dbname =
       this.window ? window.location.pathname : 'estimate-worker.https.html';
 
-  let quota = arraySize / 2;
+  let quota = arraySize * 1.5;
   const bucket = await navigator.storageBuckets.open('idb', {quota});
 
   await indexedDbDeleteRequest(bucket.indexedDB, dbname);
@@ -25,8 +25,13 @@ promise_test(async t => {
     view[i] = Math.floor(Math.random() * 255);
   }
 
-  const testBlob = new Blob([buffer], {type: 'binary/random'});
-  txn.objectStore(objectStoreName).add(testBlob, 1);
+  // Two puts in one transaction to ensure that both are counted towards quota.
+  txn.objectStore(objectStoreName).add(new Blob([buffer], {
+    type: 'binary/random'
+  }), 1);
+  txn.objectStore(objectStoreName).add(new Blob([buffer], {
+    type: 'binary/random'
+  }), 2);
 
   await promise_rejects_dom(
       t, 'QuotaExceededError', transactionPromise(txn));
diff --git a/tests/wpt/tests/streams/piping/abort.any.js b/tests/wpt/tests/streams/piping/abort.any.js
index 503de9dcaf0..c9929df91cf 100644
--- a/tests/wpt/tests/streams/piping/abort.any.js
+++ b/tests/wpt/tests/streams/piping/abort.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 // META: script=../resources/recording-streams.js
 // META: script=../resources/test-utils.js
 'use strict';
diff --git a/tests/wpt/tests/streams/piping/close-propagation-backward.any.js b/tests/wpt/tests/streams/piping/close-propagation-backward.any.js
index 5ea47ab85c0..25bd475ed13 100644
--- a/tests/wpt/tests/streams/piping/close-propagation-backward.any.js
+++ b/tests/wpt/tests/streams/piping/close-propagation-backward.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 // META: script=../resources/recording-streams.js
 'use strict';
 
diff --git a/tests/wpt/tests/streams/piping/close-propagation-forward.any.js b/tests/wpt/tests/streams/piping/close-propagation-forward.any.js
index 71b6e262840..0ec94f80abf 100644
--- a/tests/wpt/tests/streams/piping/close-propagation-forward.any.js
+++ b/tests/wpt/tests/streams/piping/close-propagation-forward.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 // META: script=../resources/test-utils.js
 // META: script=../resources/recording-streams.js
 'use strict';
diff --git a/tests/wpt/tests/streams/piping/error-propagation-backward.any.js b/tests/wpt/tests/streams/piping/error-propagation-backward.any.js
index ec74592f86e..f786469d6c1 100644
--- a/tests/wpt/tests/streams/piping/error-propagation-backward.any.js
+++ b/tests/wpt/tests/streams/piping/error-propagation-backward.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 // META: script=../resources/test-utils.js
 // META: script=../resources/recording-streams.js
 'use strict';
diff --git a/tests/wpt/tests/streams/piping/error-propagation-forward.any.js b/tests/wpt/tests/streams/piping/error-propagation-forward.any.js
index 482da2f8a88..e9260f9ea22 100644
--- a/tests/wpt/tests/streams/piping/error-propagation-forward.any.js
+++ b/tests/wpt/tests/streams/piping/error-propagation-forward.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 // META: script=../resources/test-utils.js
 // META: script=../resources/recording-streams.js
 'use strict';
diff --git a/tests/wpt/tests/streams/piping/flow-control.any.js b/tests/wpt/tests/streams/piping/flow-control.any.js
index 09c4420f872..e2318da375a 100644
--- a/tests/wpt/tests/streams/piping/flow-control.any.js
+++ b/tests/wpt/tests/streams/piping/flow-control.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 // META: script=../resources/test-utils.js
 // META: script=../resources/rs-utils.js
 // META: script=../resources/recording-streams.js
diff --git a/tests/wpt/tests/streams/piping/general-addition.any.js b/tests/wpt/tests/streams/piping/general-addition.any.js
index 2562b706433..cf4aa9bea6a 100644
--- a/tests/wpt/tests/streams/piping/general-addition.any.js
+++ b/tests/wpt/tests/streams/piping/general-addition.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 'use strict';
 
 promise_test(async t => {
diff --git a/tests/wpt/tests/streams/piping/general.any.js b/tests/wpt/tests/streams/piping/general.any.js
index bec3480f653..09e01536325 100644
--- a/tests/wpt/tests/streams/piping/general.any.js
+++ b/tests/wpt/tests/streams/piping/general.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 // META: script=../resources/test-utils.js
 // META: script=../resources/recording-streams.js
 'use strict';
diff --git a/tests/wpt/tests/streams/piping/multiple-propagation.any.js b/tests/wpt/tests/streams/piping/multiple-propagation.any.js
index a78652fc067..9be828a2326 100644
--- a/tests/wpt/tests/streams/piping/multiple-propagation.any.js
+++ b/tests/wpt/tests/streams/piping/multiple-propagation.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 // META: script=../resources/test-utils.js
 // META: script=../resources/recording-streams.js
 'use strict';
diff --git a/tests/wpt/tests/streams/piping/pipe-through.any.js b/tests/wpt/tests/streams/piping/pipe-through.any.js
index 26b1cd26a3c..339cee19993 100644
--- a/tests/wpt/tests/streams/piping/pipe-through.any.js
+++ b/tests/wpt/tests/streams/piping/pipe-through.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 // META: script=../resources/rs-utils.js
 // META: script=../resources/test-utils.js
 // META: script=../resources/recording-streams.js
diff --git a/tests/wpt/tests/streams/piping/then-interception.any.js b/tests/wpt/tests/streams/piping/then-interception.any.js
index 543f916d940..fc48c368311 100644
--- a/tests/wpt/tests/streams/piping/then-interception.any.js
+++ b/tests/wpt/tests/streams/piping/then-interception.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 // META: script=../resources/test-utils.js
 // META: script=../resources/recording-streams.js
 'use strict';
diff --git a/tests/wpt/tests/streams/piping/throwing-options.any.js b/tests/wpt/tests/streams/piping/throwing-options.any.js
index b9f906778f6..186f8ded196 100644
--- a/tests/wpt/tests/streams/piping/throwing-options.any.js
+++ b/tests/wpt/tests/streams/piping/throwing-options.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 'use strict';
 
 class ThrowingOptions {
diff --git a/tests/wpt/tests/streams/piping/transform-streams.any.js b/tests/wpt/tests/streams/piping/transform-streams.any.js
index caae9fbad88..e079bb637ca 100644
--- a/tests/wpt/tests/streams/piping/transform-streams.any.js
+++ b/tests/wpt/tests/streams/piping/transform-streams.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 'use strict';
 
 promise_test(() => {
diff --git a/tests/wpt/tests/streams/queuing-strategies.any.js b/tests/wpt/tests/streams/queuing-strategies.any.js
index fa959ebba28..9efc4570cf2 100644
--- a/tests/wpt/tests/streams/queuing-strategies.any.js
+++ b/tests/wpt/tests/streams/queuing-strategies.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 'use strict';
 
 const highWaterMarkConversions = new Map([
diff --git a/tests/wpt/tests/streams/readable-byte-streams/bad-buffers-and-views.any.js b/tests/wpt/tests/streams/readable-byte-streams/bad-buffers-and-views.any.js
index 3322116b191..afcc61e6800 100644
--- a/tests/wpt/tests/streams/readable-byte-streams/bad-buffers-and-views.any.js
+++ b/tests/wpt/tests/streams/readable-byte-streams/bad-buffers-and-views.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 'use strict';
 
 promise_test(() => {
diff --git a/tests/wpt/tests/streams/readable-byte-streams/construct-byob-request.any.js b/tests/wpt/tests/streams/readable-byte-streams/construct-byob-request.any.js
index 8d460a1c81b..a26f949ee29 100644
--- a/tests/wpt/tests/streams/readable-byte-streams/construct-byob-request.any.js
+++ b/tests/wpt/tests/streams/readable-byte-streams/construct-byob-request.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 // META: script=../resources/rs-utils.js
 'use strict';
 
diff --git a/tests/wpt/tests/streams/readable-byte-streams/enqueue-with-detached-buffer.any.js b/tests/wpt/tests/streams/readable-byte-streams/enqueue-with-detached-buffer.any.js
index d2b37f00a9d..92bd0a26a0e 100644
--- a/tests/wpt/tests/streams/readable-byte-streams/enqueue-with-detached-buffer.any.js
+++ b/tests/wpt/tests/streams/readable-byte-streams/enqueue-with-detached-buffer.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 
 promise_test(async t => {
   const error = new Error('cannot proceed');
diff --git a/tests/wpt/tests/streams/readable-byte-streams/general.any.js b/tests/wpt/tests/streams/readable-byte-streams/general.any.js
index dd4fdc85578..cdce2244c3c 100644
--- a/tests/wpt/tests/streams/readable-byte-streams/general.any.js
+++ b/tests/wpt/tests/streams/readable-byte-streams/general.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 // META: script=../resources/rs-utils.js
 // META: script=../resources/test-utils.js
 'use strict';
diff --git a/tests/wpt/tests/streams/readable-byte-streams/non-transferable-buffers.any.js b/tests/wpt/tests/streams/readable-byte-streams/non-transferable-buffers.any.js
index e8ea3c4f966..47d7b2e653e 100644
--- a/tests/wpt/tests/streams/readable-byte-streams/non-transferable-buffers.any.js
+++ b/tests/wpt/tests/streams/readable-byte-streams/non-transferable-buffers.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 'use strict';
 
 promise_test(async t => {
diff --git a/tests/wpt/tests/streams/readable-byte-streams/respond-after-enqueue.any.js b/tests/wpt/tests/streams/readable-byte-streams/respond-after-enqueue.any.js
index b93cec97391..e51efa061a6 100644
--- a/tests/wpt/tests/streams/readable-byte-streams/respond-after-enqueue.any.js
+++ b/tests/wpt/tests/streams/readable-byte-streams/respond-after-enqueue.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 
 'use strict';
 
diff --git a/tests/wpt/tests/streams/readable-byte-streams/tee.any.js b/tests/wpt/tests/streams/readable-byte-streams/tee.any.js
index 85844669cd9..7dd5ba3f3fb 100644
--- a/tests/wpt/tests/streams/readable-byte-streams/tee.any.js
+++ b/tests/wpt/tests/streams/readable-byte-streams/tee.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 // META: script=../resources/rs-utils.js
 // META: script=../resources/test-utils.js
 // META: script=../resources/recording-streams.js
diff --git a/tests/wpt/tests/streams/readable-streams/async-iterator.any.js b/tests/wpt/tests/streams/readable-streams/async-iterator.any.js
index 3ccaca17bc1..4b674bea843 100644
--- a/tests/wpt/tests/streams/readable-streams/async-iterator.any.js
+++ b/tests/wpt/tests/streams/readable-streams/async-iterator.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 // META: script=../resources/rs-utils.js
 // META: script=../resources/test-utils.js
 // META: script=../resources/recording-streams.js
diff --git a/tests/wpt/tests/streams/readable-streams/bad-strategies.any.js b/tests/wpt/tests/streams/readable-streams/bad-strategies.any.js
index 409c63b8177..49fa4bdbece 100644
--- a/tests/wpt/tests/streams/readable-streams/bad-strategies.any.js
+++ b/tests/wpt/tests/streams/readable-streams/bad-strategies.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 'use strict';
 
 test(() => {
diff --git a/tests/wpt/tests/streams/readable-streams/bad-underlying-sources.any.js b/tests/wpt/tests/streams/readable-streams/bad-underlying-sources.any.js
index e9cf4c92493..3d77b923d17 100644
--- a/tests/wpt/tests/streams/readable-streams/bad-underlying-sources.any.js
+++ b/tests/wpt/tests/streams/readable-streams/bad-underlying-sources.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 'use strict';
 
 
diff --git a/tests/wpt/tests/streams/readable-streams/cancel.any.js b/tests/wpt/tests/streams/readable-streams/cancel.any.js
index 800bd994417..9915c1fb633 100644
--- a/tests/wpt/tests/streams/readable-streams/cancel.any.js
+++ b/tests/wpt/tests/streams/readable-streams/cancel.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 // META: script=../resources/test-utils.js
 // META: script=../resources/rs-utils.js
 'use strict';
diff --git a/tests/wpt/tests/streams/readable-streams/constructor.any.js b/tests/wpt/tests/streams/readable-streams/constructor.any.js
index 608dc48cfa3..0b995f0cb16 100644
--- a/tests/wpt/tests/streams/readable-streams/constructor.any.js
+++ b/tests/wpt/tests/streams/readable-streams/constructor.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 'use strict';
 
 const error1 = new Error('error1');
diff --git a/tests/wpt/tests/streams/readable-streams/count-queuing-strategy-integration.any.js b/tests/wpt/tests/streams/readable-streams/count-queuing-strategy-integration.any.js
index 02ac5bae5c2..a8c1b91d006 100644
--- a/tests/wpt/tests/streams/readable-streams/count-queuing-strategy-integration.any.js
+++ b/tests/wpt/tests/streams/readable-streams/count-queuing-strategy-integration.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 'use strict';
 
 test(() => {
diff --git a/tests/wpt/tests/streams/readable-streams/default-reader.any.js b/tests/wpt/tests/streams/readable-streams/default-reader.any.js
index 59d7ab2f74d..f92862719e4 100644
--- a/tests/wpt/tests/streams/readable-streams/default-reader.any.js
+++ b/tests/wpt/tests/streams/readable-streams/default-reader.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 // META: script=../resources/rs-utils.js
 'use strict';
 
diff --git a/tests/wpt/tests/streams/readable-streams/floating-point-total-queue-size.any.js b/tests/wpt/tests/streams/readable-streams/floating-point-total-queue-size.any.js
index 50cca3d951a..8b88c21d7f0 100644
--- a/tests/wpt/tests/streams/readable-streams/floating-point-total-queue-size.any.js
+++ b/tests/wpt/tests/streams/readable-streams/floating-point-total-queue-size.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 'use strict';
 
 // Due to the limitations of floating-point precision, the calculation of desiredSize sometimes gives different answers
diff --git a/tests/wpt/tests/streams/readable-streams/from.any.js b/tests/wpt/tests/streams/readable-streams/from.any.js
index d53206d4aec..58ad4d4add1 100644
--- a/tests/wpt/tests/streams/readable-streams/from.any.js
+++ b/tests/wpt/tests/streams/readable-streams/from.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 // META: script=../resources/test-utils.js
 'use strict';
 
diff --git a/tests/wpt/tests/streams/readable-streams/garbage-collection.any.js b/tests/wpt/tests/streams/readable-streams/garbage-collection.any.js
index e578176777a..13bd1fb3437 100644
--- a/tests/wpt/tests/streams/readable-streams/garbage-collection.any.js
+++ b/tests/wpt/tests/streams/readable-streams/garbage-collection.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 // META: script=../resources/test-utils.js
 // META: script=/common/gc.js
 'use strict';
diff --git a/tests/wpt/tests/streams/readable-streams/general.any.js b/tests/wpt/tests/streams/readable-streams/general.any.js
index 2a32b27943c..eee3f62215e 100644
--- a/tests/wpt/tests/streams/readable-streams/general.any.js
+++ b/tests/wpt/tests/streams/readable-streams/general.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 // META: script=../resources/test-utils.js
 // META: script=../resources/rs-utils.js
 'use strict';
diff --git a/tests/wpt/tests/streams/readable-streams/owning-type-message-port.any.js b/tests/wpt/tests/streams/readable-streams/owning-type-message-port.any.js
index e9961ce0422..282c1f41148 100644
--- a/tests/wpt/tests/streams/readable-streams/owning-type-message-port.any.js
+++ b/tests/wpt/tests/streams/readable-streams/owning-type-message-port.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 // META: script=../resources/test-utils.js
 // META: script=../resources/rs-utils.js
 'use strict';
diff --git a/tests/wpt/tests/streams/readable-streams/owning-type-video-frame.any.js b/tests/wpt/tests/streams/readable-streams/owning-type-video-frame.any.js
index ec01fda0b3c..b652f9c5fcb 100644
--- a/tests/wpt/tests/streams/readable-streams/owning-type-video-frame.any.js
+++ b/tests/wpt/tests/streams/readable-streams/owning-type-video-frame.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 // META: script=../resources/test-utils.js
 // META: script=../resources/rs-utils.js
 'use strict';
diff --git a/tests/wpt/tests/streams/readable-streams/owning-type.any.js b/tests/wpt/tests/streams/readable-streams/owning-type.any.js
index 27a3dda894e..34c2a55d513 100644
--- a/tests/wpt/tests/streams/readable-streams/owning-type.any.js
+++ b/tests/wpt/tests/streams/readable-streams/owning-type.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 // META: script=../resources/test-utils.js
 // META: script=../resources/rs-utils.js
 'use strict';
diff --git a/tests/wpt/tests/streams/readable-streams/patched-global.any.js b/tests/wpt/tests/streams/readable-streams/patched-global.any.js
index a64a054a97f..c208824c864 100644
--- a/tests/wpt/tests/streams/readable-streams/patched-global.any.js
+++ b/tests/wpt/tests/streams/readable-streams/patched-global.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 'use strict';
 
 // Tests which patch the global environment are kept separate to avoid
diff --git a/tests/wpt/tests/streams/readable-streams/reentrant-strategies.any.js b/tests/wpt/tests/streams/readable-streams/reentrant-strategies.any.js
index b4988bc2433..8ae7b98e8d5 100644
--- a/tests/wpt/tests/streams/readable-streams/reentrant-strategies.any.js
+++ b/tests/wpt/tests/streams/readable-streams/reentrant-strategies.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 // META: script=../resources/recording-streams.js
 // META: script=../resources/rs-utils.js
 // META: script=../resources/test-utils.js
diff --git a/tests/wpt/tests/streams/readable-streams/tee.any.js b/tests/wpt/tests/streams/readable-streams/tee.any.js
index 00397932f4b..c2c2e482307 100644
--- a/tests/wpt/tests/streams/readable-streams/tee.any.js
+++ b/tests/wpt/tests/streams/readable-streams/tee.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 // META: script=../resources/rs-utils.js
 // META: script=../resources/test-utils.js
 // META: script=../resources/recording-streams.js
diff --git a/tests/wpt/tests/streams/readable-streams/templated.any.js b/tests/wpt/tests/streams/readable-streams/templated.any.js
index ecae3f4d8b1..dc75b805a10 100644
--- a/tests/wpt/tests/streams/readable-streams/templated.any.js
+++ b/tests/wpt/tests/streams/readable-streams/templated.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 // META: script=../resources/test-utils.js
 // META: script=../resources/rs-test-templates.js
 'use strict';
diff --git a/tests/wpt/tests/streams/transferable/transform-stream-members.any.js b/tests/wpt/tests/streams/transferable/transform-stream-members.any.js
index fca060b0c05..05914e12ccb 100644
--- a/tests/wpt/tests/streams/transferable/transform-stream-members.any.js
+++ b/tests/wpt/tests/streams/transferable/transform-stream-members.any.js
@@ -1,3 +1,5 @@
+// META: global=window,dedicatedworker,shadowrealm
+
 const combinations = [
   (t => [t, t.readable])(new TransformStream()),
   (t => [t.readable, t])(new TransformStream()),
diff --git a/tests/wpt/tests/streams/transform-streams/backpressure.any.js b/tests/wpt/tests/streams/transform-streams/backpressure.any.js
index 6befba41b79..47a21fb7e71 100644
--- a/tests/wpt/tests/streams/transform-streams/backpressure.any.js
+++ b/tests/wpt/tests/streams/transform-streams/backpressure.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 // META: script=../resources/recording-streams.js
 // META: script=../resources/test-utils.js
 'use strict';
diff --git a/tests/wpt/tests/streams/transform-streams/cancel.any.js b/tests/wpt/tests/streams/transform-streams/cancel.any.js
new file mode 100644
index 00000000000..5c7fc4eae5d
--- /dev/null
+++ b/tests/wpt/tests/streams/transform-streams/cancel.any.js
@@ -0,0 +1,115 @@
+// META: global=window,worker,shadowrealm
+// META: script=../resources/test-utils.js
+'use strict';
+
+const thrownError = new Error('bad things are happening!');
+thrownError.name = 'error1';
+
+const originalReason = new Error('original reason');
+originalReason.name = 'error2';
+
+promise_test(async t => {
+  let cancelled = undefined;
+  const ts = new TransformStream({
+    cancel(reason) {
+      cancelled = reason;
+    }
+  });
+  const res = await ts.readable.cancel(thrownError);
+  assert_equals(res, undefined, 'readable.cancel() should return undefined');
+  assert_equals(cancelled, thrownError, 'transformer.cancel() should be called with the passed reason');
+}, 'cancelling the readable side should call transformer.cancel()');
+
+promise_test(async t => {
+  const ts = new TransformStream({
+    cancel(reason) {
+      assert_equals(reason, originalReason, 'transformer.cancel() should be called with the passed reason');
+      throw thrownError;
+    }
+  });
+  const writer = ts.writable.getWriter();
+  const cancelPromise = ts.readable.cancel(originalReason);
+  await promise_rejects_exactly(t, thrownError, cancelPromise, 'readable.cancel() should reject with thrownError');
+  await promise_rejects_exactly(t, thrownError, writer.closed, 'writer.closed should reject with thrownError');
+}, 'cancelling the readable side should reject if transformer.cancel() throws');
+
+promise_test(async t => {
+  let aborted = undefined;
+  const ts = new TransformStream({
+    cancel(reason) {
+      aborted = reason;
+    },
+    flush: t.unreached_func('flush should not be called')
+  });
+  const res = await ts.writable.abort(thrownError);
+  assert_equals(res, undefined, 'writable.abort() should return undefined');
+  assert_equals(aborted, thrownError, 'transformer.abort() should be called with the passed reason');
+}, 'aborting the writable side should call transformer.abort()');
+
+promise_test(async t => {
+  const ts = new TransformStream({
+    cancel(reason) {
+      assert_equals(reason, originalReason, 'transformer.cancel() should be called with the passed reason');
+      throw thrownError;
+    },
+    flush: t.unreached_func('flush should not be called')
+  });
+  const reader = ts.readable.getReader();
+  const abortPromise = ts.writable.abort(originalReason);
+  await promise_rejects_exactly(t, thrownError, abortPromise, 'writable.abort() should reject with thrownError');
+  await promise_rejects_exactly(t, thrownError, reader.closed, 'reader.closed should reject with thrownError');
+}, 'aborting the writable side should reject if transformer.cancel() throws');
+
+promise_test(async t => {
+  const ts = new TransformStream({
+    async cancel(reason) {
+      assert_equals(reason, originalReason, 'transformer.cancel() should be called with the passed reason');
+      throw thrownError;
+    },
+    flush: t.unreached_func('flush should not be called')
+  });
+  const cancelPromise = ts.readable.cancel(originalReason);
+  const closePromise = ts.writable.close();
+  await Promise.all([
+    promise_rejects_exactly(t, thrownError, cancelPromise, 'cancelPromise should reject with thrownError'),
+    promise_rejects_exactly(t, thrownError, closePromise, 'closePromise should reject with thrownError'),
+  ]);
+}, 'closing the writable side should reject if a parallel transformer.cancel() throws');
+
+promise_test(async t => {
+  let controller;
+  const ts = new TransformStream({
+    start(c) {
+      controller = c;
+    },
+    async cancel(reason) {
+      assert_equals(reason, originalReason, 'transformer.cancel() should be called with the passed reason');
+      controller.error(thrownError);
+    },
+    flush: t.unreached_func('flush should not be called')
+  });
+  const cancelPromise = ts.readable.cancel(originalReason);
+  const closePromise = ts.writable.close();
+  await Promise.all([
+    promise_rejects_exactly(t, thrownError, cancelPromise, 'cancelPromise should reject with thrownError'),
+    promise_rejects_exactly(t, thrownError, closePromise, 'closePromise should reject with thrownError'),
+  ]);
+}, 'readable.cancel() and a parallel writable.close() should reject if a transformer.cancel() calls controller.error()');
+
+promise_test(async t => {
+  let controller;
+  const ts = new TransformStream({
+    start(c) {
+      controller = c;
+    },
+    async cancel(reason) {
+      assert_equals(reason, originalReason, 'transformer.cancel() should be called with the passed reason');
+      controller.error(thrownError);
+    },
+    flush: t.unreached_func('flush should not be called')
+  });
+  const cancelPromise = ts.writable.abort(originalReason);
+  await promise_rejects_exactly(t, thrownError, cancelPromise, 'cancelPromise should reject with thrownError');
+  const closePromise = ts.readable.cancel(1);
+  await promise_rejects_exactly(t, thrownError, closePromise, 'closePromise should reject with thrownError');
+}, 'writable.abort() and readable.cancel() should reject if a transformer.cancel() calls controller.error()');
diff --git a/tests/wpt/tests/streams/transform-streams/errors.any.js b/tests/wpt/tests/streams/transform-streams/errors.any.js
index 0cca4c75479..bea060b6590 100644
--- a/tests/wpt/tests/streams/transform-streams/errors.any.js
+++ b/tests/wpt/tests/streams/transform-streams/errors.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 // META: script=../resources/test-utils.js
 'use strict';
 
@@ -9,7 +9,8 @@ promise_test(t => {
   const ts = new TransformStream({
     transform() {
       throw thrownError;
-    }
+    },
+    cancel: t.unreached_func('cancel should not be called')
   });
 
   const reader = ts.readable.getReader();
@@ -34,7 +35,8 @@ promise_test(t => {
     },
     flush() {
       throw thrownError;
-    }
+    },
+    cancel: t.unreached_func('cancel should not be called')
   });
 
   const reader = ts.readable.getReader();
@@ -54,13 +56,14 @@ promise_test(t => {
   ]);
 }, 'TransformStream errors thrown in flush put the writable and readable in an errored state');
 
-test(() => {
+test(t => {
   new TransformStream({
     start(c) {
       c.enqueue('a');
       c.error(new Error('generic error'));
       assert_throws_js(TypeError, () => c.enqueue('b'), 'enqueue() should throw');
-    }
+    },
+    cancel: t.unreached_func('cancel should not be called')
   });
 }, 'errored TransformStream should not enqueue new chunks');
 
@@ -72,7 +75,8 @@ promise_test(t => {
       });
     },
     transform: t.unreached_func('transform should not be called'),
-    flush: t.unreached_func('flush should not be called')
+    flush: t.unreached_func('flush should not be called'),
+    cancel: t.unreached_func('cancel should not be called')
   });
 
   const writer = ts.writable.getWriter();
@@ -96,7 +100,8 @@ promise_test(t => {
         });
     },
     transform: t.unreached_func('transform should never be called if start() fails'),
-    flush: t.unreached_func('flush should never be called if start() fails')
+    flush: t.unreached_func('flush should never be called if start() fails'),
+    cancel: t.unreached_func('cancel should never be called if start() fails')
   });
 
   const writer = ts.writable.getWriter();
@@ -202,9 +207,10 @@ promise_test(t => {
   return Promise.all([
     abortPromise,
     cancelPromise,
-    promise_rejects_exactly(t, thrownError, writer.closed, 'writer.closed should reject with thrownError')]);
-}, 'abort should set the close reason for the writable when it happens before cancel during start, but cancel should ' +
-             'still succeed');
+    promise_rejects_exactly(t, thrownError, writer.closed, 'writer.closed should reject'),
+  ]);
+}, 'abort should set the close reason for the writable when it happens before cancel during start, and cancel should ' +
+             'reject');
 
 promise_test(t => {
   let resolveTransform;
@@ -251,13 +257,26 @@ promise_test(t => {
       controller = c;
     }
   });
-  const cancelPromise = ts.readable.cancel(thrownError);
-  controller.error(ignoredError);
+  const cancelPromise = ts.readable.cancel(ignoredError);
+  controller.error(thrownError);
   return Promise.all([
     cancelPromise,
     promise_rejects_exactly(t, thrownError, ts.writable.getWriter().closed, 'closed should reject with thrownError')
   ]);
-}, 'controller.error() should do nothing after readable.cancel()');
+}, 'controller.error() should close writable immediately after readable.cancel()');
+
+promise_test(t => {
+  let controller;
+  const ts = new TransformStream({
+    start(c) {
+      controller = c;
+    }
+  });
+  return ts.readable.cancel(thrownError).then(() => {
+    controller.error(ignoredError);
+    return promise_rejects_exactly(t, thrownError, ts.writable.getWriter().closed, 'closed should reject with thrownError');
+  });
+}, 'controller.error() should do nothing after readable.cancel() resolves');
 
 promise_test(t => {
   let controller;
diff --git a/tests/wpt/tests/streams/transform-streams/flush.any.js b/tests/wpt/tests/streams/transform-streams/flush.any.js
index 9287f6f5eb7..c95d8ae1186 100644
--- a/tests/wpt/tests/streams/transform-streams/flush.any.js
+++ b/tests/wpt/tests/streams/transform-streams/flush.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 // META: script=../resources/test-utils.js
 'use strict';
 
@@ -129,3 +129,18 @@ promise_test(t => {
   });
   return promise_rejects_exactly(t, error1, ts.writable.getWriter().close(), 'close() should reject');
 }, 'error() during flush should cause writer.close() to reject');
+
+promise_test(async t => {
+  let flushed = false;
+  const ts = new TransformStream({
+    flush() {
+      flushed = true;
+    },
+    cancel: t.unreached_func('cancel should not be called')
+  });
+  const closePromise = ts.writable.close();
+  await delay(0);
+  const cancelPromise = ts.readable.cancel(error1);
+  await Promise.all([closePromise, cancelPromise]);
+  assert_equals(flushed, true, 'transformer.flush() should be called');
+}, 'closing the writable side should call transformer.flush() and a parallel readable.cancel() should not reject');
diff --git a/tests/wpt/tests/streams/transform-streams/general.any.js b/tests/wpt/tests/streams/transform-streams/general.any.js
index c95691f7bf4..a40ef30843e 100644
--- a/tests/wpt/tests/streams/transform-streams/general.any.js
+++ b/tests/wpt/tests/streams/transform-streams/general.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 // META: script=../resources/test-utils.js
 // META: script=../resources/rs-utils.js
 'use strict';
@@ -388,9 +388,24 @@ promise_test(t => {
   controller.terminate();
   return Promise.all([
     cancelPromise,
-    promise_rejects_exactly(t, cancelReason, ts.writable.getWriter().closed, 'closed should reject with cancelReason')
+    promise_rejects_js(t, TypeError, ts.writable.getWriter().closed, 'closed should reject with TypeError')
   ]);
-}, 'terminate() should do nothing after readable.cancel()');
+}, 'terminate() should abort writable immediately after readable.cancel()');
+
+promise_test(t => {
+  let controller;
+  const ts = new TransformStream({
+    start(c) {
+      controller = c;
+    }
+  });
+  const cancelReason = { name: 'cancelReason' };
+  return ts.readable.cancel(cancelReason).then(() => {
+    controller.terminate();
+    return promise_rejects_exactly(t, cancelReason, ts.writable.getWriter().closed, 'closed should reject with TypeError');
+  })
+}, 'terminate() should do nothing after readable.cancel() resolves');
+
 
 promise_test(() => {
   let calls = 0;
diff --git a/tests/wpt/tests/streams/transform-streams/lipfuzz.any.js b/tests/wpt/tests/streams/transform-streams/lipfuzz.any.js
index f9f148aaf1c..e334705db44 100644
--- a/tests/wpt/tests/streams/transform-streams/lipfuzz.any.js
+++ b/tests/wpt/tests/streams/transform-streams/lipfuzz.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 'use strict';
 
 class LipFuzzTransformer {
diff --git a/tests/wpt/tests/streams/transform-streams/patched-global.any.js b/tests/wpt/tests/streams/transform-streams/patched-global.any.js
index 2d04e3b948b..cc111eda452 100644
--- a/tests/wpt/tests/streams/transform-streams/patched-global.any.js
+++ b/tests/wpt/tests/streams/transform-streams/patched-global.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 'use strict';
 
 // Tests which patch the global environment are kept separate to avoid
diff --git a/tests/wpt/tests/streams/transform-streams/properties.any.js b/tests/wpt/tests/streams/transform-streams/properties.any.js
index 02981b8bc76..dbfd1aa372b 100644
--- a/tests/wpt/tests/streams/transform-streams/properties.any.js
+++ b/tests/wpt/tests/streams/transform-streams/properties.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 'use strict';
 
 const transformerMethods = {
diff --git a/tests/wpt/tests/streams/transform-streams/reentrant-strategies.any.js b/tests/wpt/tests/streams/transform-streams/reentrant-strategies.any.js
index fc2f9188665..a6d45965585 100644
--- a/tests/wpt/tests/streams/transform-streams/reentrant-strategies.any.js
+++ b/tests/wpt/tests/streams/transform-streams/reentrant-strategies.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 // META: script=../resources/recording-streams.js
 // META: script=../resources/rs-utils.js
 // META: script=../resources/test-utils.js
@@ -314,6 +314,10 @@ promise_test(t => {
   // call to TransformStreamDefaultSink.
   return delay(0).then(() => {
     controller.enqueue('a');
+    return reader.read();
+  }).then(({ value, done }) => {
+    assert_false(done, 'done should be false');
+    assert_equals(value, 'a', 'value should be correct');
     return Promise.all([promise_rejects_exactly(t, error1, reader.read(), 'read() should reject'), abortPromise]);
   });
 }, 'writer.abort() inside size() should work');
diff --git a/tests/wpt/tests/streams/transform-streams/strategies.any.js b/tests/wpt/tests/streams/transform-streams/strategies.any.js
index 94055ad99dc..57e113e668c 100644
--- a/tests/wpt/tests/streams/transform-streams/strategies.any.js
+++ b/tests/wpt/tests/streams/transform-streams/strategies.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 // META: script=../resources/recording-streams.js
 // META: script=../resources/test-utils.js
 'use strict';
diff --git a/tests/wpt/tests/streams/transform-streams/terminate.any.js b/tests/wpt/tests/streams/transform-streams/terminate.any.js
index 670006366db..a959e70fe69 100644
--- a/tests/wpt/tests/streams/transform-streams/terminate.any.js
+++ b/tests/wpt/tests/streams/transform-streams/terminate.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 // META: script=../resources/recording-streams.js
 // META: script=../resources/test-utils.js
 'use strict';
diff --git a/tests/wpt/tests/streams/writable-streams/aborting.any.js b/tests/wpt/tests/streams/writable-streams/aborting.any.js
index e016cd191b8..9171dbe158f 100644
--- a/tests/wpt/tests/streams/writable-streams/aborting.any.js
+++ b/tests/wpt/tests/streams/writable-streams/aborting.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 // META: script=../resources/test-utils.js
 // META: script=../resources/recording-streams.js
 'use strict';
diff --git a/tests/wpt/tests/streams/writable-streams/bad-strategies.any.js b/tests/wpt/tests/streams/writable-streams/bad-strategies.any.js
index 63fa443065e..a1ef0791168 100644
--- a/tests/wpt/tests/streams/writable-streams/bad-strategies.any.js
+++ b/tests/wpt/tests/streams/writable-streams/bad-strategies.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 'use strict';
 
 const error1 = new Error('a unique string');
diff --git a/tests/wpt/tests/streams/writable-streams/bad-underlying-sinks.any.js b/tests/wpt/tests/streams/writable-streams/bad-underlying-sinks.any.js
index d0b3467978e..3c434ffe60c 100644
--- a/tests/wpt/tests/streams/writable-streams/bad-underlying-sinks.any.js
+++ b/tests/wpt/tests/streams/writable-streams/bad-underlying-sinks.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 // META: script=../resources/test-utils.js
 // META: script=../resources/recording-streams.js
 'use strict';
diff --git a/tests/wpt/tests/streams/writable-streams/byte-length-queuing-strategy.any.js b/tests/wpt/tests/streams/writable-streams/byte-length-queuing-strategy.any.js
index ce1962e8917..eed86ee7004 100644
--- a/tests/wpt/tests/streams/writable-streams/byte-length-queuing-strategy.any.js
+++ b/tests/wpt/tests/streams/writable-streams/byte-length-queuing-strategy.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 'use strict';
 
 promise_test(t => {
diff --git a/tests/wpt/tests/streams/writable-streams/close.any.js b/tests/wpt/tests/streams/writable-streams/close.any.js
index 88855a92efd..45261e7ca7e 100644
--- a/tests/wpt/tests/streams/writable-streams/close.any.js
+++ b/tests/wpt/tests/streams/writable-streams/close.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 // META: script=../resources/test-utils.js
 // META: script=../resources/recording-streams.js
 'use strict';
diff --git a/tests/wpt/tests/streams/writable-streams/constructor.any.js b/tests/wpt/tests/streams/writable-streams/constructor.any.js
index eaac90e48b8..0abc7ef545e 100644
--- a/tests/wpt/tests/streams/writable-streams/constructor.any.js
+++ b/tests/wpt/tests/streams/writable-streams/constructor.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 'use strict';
 
 const error1 = new Error('error1');
diff --git a/tests/wpt/tests/streams/writable-streams/count-queuing-strategy.any.js b/tests/wpt/tests/streams/writable-streams/count-queuing-strategy.any.js
index 064e16e8150..8211757530d 100644
--- a/tests/wpt/tests/streams/writable-streams/count-queuing-strategy.any.js
+++ b/tests/wpt/tests/streams/writable-streams/count-queuing-strategy.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 'use strict';
 
 test(() => {
diff --git a/tests/wpt/tests/streams/writable-streams/error.any.js b/tests/wpt/tests/streams/writable-streams/error.any.js
index faf3fdd9521..d08c8a54863 100644
--- a/tests/wpt/tests/streams/writable-streams/error.any.js
+++ b/tests/wpt/tests/streams/writable-streams/error.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 'use strict';
 
 const error1 = new Error('error1');
diff --git a/tests/wpt/tests/streams/writable-streams/floating-point-total-queue-size.any.js b/tests/wpt/tests/streams/writable-streams/floating-point-total-queue-size.any.js
index bd34cc53a69..20a14fc19a5 100644
--- a/tests/wpt/tests/streams/writable-streams/floating-point-total-queue-size.any.js
+++ b/tests/wpt/tests/streams/writable-streams/floating-point-total-queue-size.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 'use strict';
 
 // Due to the limitations of floating-point precision, the calculation of desiredSize sometimes gives different answers
diff --git a/tests/wpt/tests/streams/writable-streams/general.any.js b/tests/wpt/tests/streams/writable-streams/general.any.js
index cede7fd0845..48f8eeb89e4 100644
--- a/tests/wpt/tests/streams/writable-streams/general.any.js
+++ b/tests/wpt/tests/streams/writable-streams/general.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 'use strict';
 
 test(() => {
diff --git a/tests/wpt/tests/streams/writable-streams/properties.any.js b/tests/wpt/tests/streams/writable-streams/properties.any.js
index c95bd7d0c08..ae0549f0871 100644
--- a/tests/wpt/tests/streams/writable-streams/properties.any.js
+++ b/tests/wpt/tests/streams/writable-streams/properties.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 'use strict';
 
 const sinkMethods = {
diff --git a/tests/wpt/tests/streams/writable-streams/reentrant-strategy.any.js b/tests/wpt/tests/streams/writable-streams/reentrant-strategy.any.js
index eb05cc06804..18ce9e84759 100644
--- a/tests/wpt/tests/streams/writable-streams/reentrant-strategy.any.js
+++ b/tests/wpt/tests/streams/writable-streams/reentrant-strategy.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 // META: script=../resources/test-utils.js
 // META: script=../resources/recording-streams.js
 'use strict';
diff --git a/tests/wpt/tests/streams/writable-streams/start.any.js b/tests/wpt/tests/streams/writable-streams/start.any.js
index 82d869430dd..17972b568ce 100644
--- a/tests/wpt/tests/streams/writable-streams/start.any.js
+++ b/tests/wpt/tests/streams/writable-streams/start.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 // META: script=../resources/test-utils.js
 // META: script=../resources/recording-streams.js
 'use strict';
diff --git a/tests/wpt/tests/streams/writable-streams/write.any.js b/tests/wpt/tests/streams/writable-streams/write.any.js
index f0246f6cad3..20a2885bf35 100644
--- a/tests/wpt/tests/streams/writable-streams/write.any.js
+++ b/tests/wpt/tests/streams/writable-streams/write.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker
+// META: global=window,worker,shadowrealm
 // META: script=../resources/test-utils.js
 // META: script=../resources/recording-streams.js
 'use strict';
diff --git a/tests/wpt/tests/svg/animations/scripted/clear-mapped-animation.svg b/tests/wpt/tests/svg/animations/scripted/clear-mapped-animation.svg
new file mode 100644
index 00000000000..518fe6129fa
--- /dev/null
+++ b/tests/wpt/tests/svg/animations/scripted/clear-mapped-animation.svg
@@ -0,0 +1,17 @@
+<svg class="reftest-wait" onload="load()" xmlns="http://www.w3.org/2000/svg"
+  xmlns:html="http://www.w3.org/1999/xhtml">
+  <html:link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1717312"/>
+  <html:script src="/common/reftest-wait.js"/>
+  <html:script src="/common/rendering-utils.js"/>
+  <html:link rel="match" href="../../embedded/reference/green-rect-100x100.svg"/>
+  <rect id="r" width="100" height="50" fill="green">
+    <animate attributeName="height" values="0" dur="20ms"/>
+  </rect>
+  <script>
+    function load() {
+      document.documentElement.setCurrentTime(1);
+      document.getElementById("r").setAttribute("height", 100);
+      waitForAtLeastOneFrame().then(takeScreenshot);
+    }
+  </script>
+</svg>
diff --git a/tests/wpt/tests/svg/crashtests/chrome-bug-1474157.html b/tests/wpt/tests/svg/crashtests/chrome-bug-1474157.html
new file mode 100644
index 00000000000..c852b0aa018
--- /dev/null
+++ b/tests/wpt/tests/svg/crashtests/chrome-bug-1474157.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<svg>
+  <foreignObject id="target">
+    <div style="position: sticky; top: 0;"></div>
+  </foreignObject>
+</svg>
+<script>
+document.body.offsetTop;
+document.getElementById('target').style.overflow = 'visible';
+</script>
diff --git a/tests/wpt/tests/svg/interact/scripted/svg-root-border-radius.html b/tests/wpt/tests/svg/interact/scripted/svg-root-border-radius.html
new file mode 100644
index 00000000000..87d8d233be9
--- /dev/null
+++ b/tests/wpt/tests/svg/interact/scripted/svg-root-border-radius.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<title>SVG root with border-radius hit test</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+html, body {
+  padding: 0;
+  margin: 0;
+}
+svg {
+  border-radius: 50%;
+  background-color: blue;
+}
+</style>
+<svg width="200" height="200"></svg>
+<script>
+  test(t => {
+    const svgRoot = document.querySelector('svg');
+    const body = document.body;
+    assert_equals(document.elementFromPoint(10, 10), body, 'outside top-left');
+    assert_equals(document.elementFromPoint(190, 10), body, 'outside top-right');
+    assert_equals(document.elementFromPoint(10, 190), body, 'outside bottom-left');
+    assert_equals(document.elementFromPoint(190, 190), body, 'outside bottom-right');
+    assert_equals(document.elementFromPoint(100, 100), svgRoot, 'inside');
+  });
+</script>
diff --git a/tests/wpt/tests/svg/layout/svg-use-symbol-width-2-print.html b/tests/wpt/tests/svg/layout/svg-use-symbol-width-2-print.html
new file mode 100644
index 00000000000..ec08fd98b4d
--- /dev/null
+++ b/tests/wpt/tests/svg/layout/svg-use-symbol-width-2-print.html
@@ -0,0 +1,16 @@
+<!doctype html>
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1853727">
+<link rel="match" href="svg-use-symbol-width-print-ref.html">
+<style>
+ body { margin: 0 }
+</style>
+<!-- Should see a blue square inside the top left quarter of a purple square -->
+<svg width=200 height=200 viewbox="0 0 200 200">
+  <defs>
+    <symbol id="r" viewBox="0 0 200 200">
+      <rect fill="blue" style="width:100px;height:100px" />
+    </symbol>
+  </defs>
+  <rect fill="purple" style="width:100px;height:100px" />
+  <use href="#r" width="100" height="100" x="0" y="0" />
+</svg>
diff --git a/tests/wpt/tests/svg/painting/color-interpolation-001.svg b/tests/wpt/tests/svg/painting/color-interpolation-001.svg
new file mode 100644
index 00000000000..78f0cd4084f
--- /dev/null
+++ b/tests/wpt/tests/svg/painting/color-interpolation-001.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:h="http://www.w3.org/1999/xhtml">
+  <title>'color-interpolation: linearRGB' applies somewhat correctly</title>
+  <h:link rel="help" href="https://svgwg.org/svg2-draft/painting.html#ColorInterpolation"/>
+  <h:link rel="match" href="../struct/reftests/reference/green-100x100.svg"/>
+
+  <rect width="100" height="100" fill="green" color-interpolation="linearRGB"/>
+</svg>
diff --git a/tests/wpt/tests/svg/struct/reftests/svg-getIntersectionList-001.svg b/tests/wpt/tests/svg/struct/reftests/svg-getIntersectionList-001.svg
new file mode 100644
index 00000000000..20958dd76b8
--- /dev/null
+++ b/tests/wpt/tests/svg/struct/reftests/svg-getIntersectionList-001.svg
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="500" height="500"
+     xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink"
+     xmlns:h="http://www.w3.org/1999/xhtml">
+  <!-- getIntersectionList causes transforms to be recalculated in SVG -->
+  <h:link rel="help" href="https://bugs.webkit.org/show_bug.cgi?id=77179"/>
+  <h:link rel="match" href="reference/green-100x100.svg"/>
+  <script>
+    onload = function() {
+      const root = document.documentElement;
+      root.appendChild(document.createElementNS("http://www.w3.org/2000/svg", "text"));
+      root.getIntersectionList(root.createSVGRect(), null);
+    }
+  </script>
+  <!-- This test passes if there is a green non-rotated square visible on the top-left corner of the page. -->
+  <g transform="translate(100, 100) rotate(135)">
+    <rect width="100" height="100" fill="green" transform="rotate(45)" />
+  </g>
+</svg>
+
diff --git a/tests/wpt/tests/svg/struct/scripted/svg-checkIntersection-001.svg b/tests/wpt/tests/svg/struct/scripted/svg-checkIntersection-001.svg
new file mode 100644
index 00000000000..059cdef2a6b
--- /dev/null
+++ b/tests/wpt/tests/svg/struct/scripted/svg-checkIntersection-001.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:h="http://www.w3.org/1999/xhtml">
+  <h:script src="/resources/testharness.js"/>
+  <h:script src="/resources/testharnessreport.js"/>
+  <script>
+    const test = async_test('checkIntersection() / checkEnclosure() with null ref. element');
+    window.onload = test.step_func_done(() => {
+      const root = document.documentElement;
+      assert_throws_js(TypeError, () => root.checkIntersection(null, root.createSVGRect()));
+      assert_throws_js(TypeError, () => root.checkEnclosure(null, root.createSVGRect()));
+    });
+  </script>
+  <!-- This test passes if it does not crash. -->
+  <text>PASS</text>
+</svg>
diff --git a/tests/wpt/tests/svg/struct/scripted/svg-getIntersectionList.svg b/tests/wpt/tests/svg/struct/scripted/svg-getIntersectionList-001.svg
similarity index 100%
rename from tests/wpt/tests/svg/struct/scripted/svg-getIntersectionList.svg
rename to tests/wpt/tests/svg/struct/scripted/svg-getIntersectionList-001.svg
diff --git a/tests/wpt/tests/svg/struct/scripted/svg-getIntersectionList-002.svg b/tests/wpt/tests/svg/struct/scripted/svg-getIntersectionList-002.svg
new file mode 100644
index 00000000000..c2c1f8e425a
--- /dev/null
+++ b/tests/wpt/tests/svg/struct/scripted/svg-getIntersectionList-002.svg
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="root" xmlns="http://www.w3.org/2000/svg" xmlns:h="http://www.w3.org/1999/xhtml">
+  <h:script src="/resources/testharness.js"/>
+  <h:script src="/resources/testharnessreport.js"/>
+  <script>
+    const test = async_test('getIntersectionList() on clipped element');
+    window.onload = test.step_func_done(() => {
+      const testSVG = document.getElementById('root');
+      const r = testSVG.createSVGRect();
+      r.x = 0;
+      r.y = 0;
+      r.width = 100;
+      r.height = 100;
+
+      assert_equals(testSVG.getIntersectionList(r, testSVG).length, 1);
+    });
+  </script>
+  <rect x="0" y="0" width="200" height="200"/>
+  <clipPath id="MyClip">
+    <rect y="100" width="200" height="100"/>
+  </clipPath>
+  <rect x="0" y="0" width="200" height="200" clip-path="url(#MyClip)" fill="green"/>
+</svg>
diff --git a/tests/wpt/tests/svg/struct/scripted/svg-getIntersectionList-003.svg b/tests/wpt/tests/svg/struct/scripted/svg-getIntersectionList-003.svg
new file mode 100644
index 00000000000..b08ea71b360
--- /dev/null
+++ b/tests/wpt/tests/svg/struct/scripted/svg-getIntersectionList-003.svg
@@ -0,0 +1,26 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:h="http://www.w3.org/1999/xhtml"
+     id="askedForIntersection">
+<h:script src="/resources/testharness.js"/>
+<h:script src="/resources/testharnessreport.js"/>
+<style>
+.c1:nth-last-of-type(1n) { }
+</style>
+<script>
+    const test = async_test('getIntersectionList() crash test');
+    window.onload = test.step_func_done(() => {
+      docElement = document.documentElement;
+      textarea = document.createElementNS("http://www.w3.org/1999/xhtml", "textarea");
+      textarea.setAttribute("class", "c1");
+      docElement.appendChild(textarea);
+      object = document.createElementNS("http://www.w3.org/1999/xhtml", "object");
+      object.setAttribute("usemap", "#DivLogo-map");
+      iframe = document.createElementNS("http://www.w3.org/1999/xhtml", "iframe");
+      docElement.appendChild(iframe);
+      var svg = document.getElementById('askedForIntersection');
+      var rect = svg.createSVGRect();
+      svg.getIntersectionList(rect, svg);
+    });
+</script>
+<rect style='content: counters(c, ".", decimal)'></rect>
+<text x="10" y="50">PASS (didn't crash)</text>
+</svg>
diff --git a/tests/wpt/tests/svg/struct/scripted/svg-getIntersectionList-004.svg b/tests/wpt/tests/svg/struct/scripted/svg-getIntersectionList-004.svg
new file mode 100644
index 00000000000..c029a3b0702
--- /dev/null
+++ b/tests/wpt/tests/svg/struct/scripted/svg-getIntersectionList-004.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:h="http://www.w3.org/1999/xhtml">
+  <h:script src="/resources/testharness.js"/>
+  <h:script src="/resources/testharnessreport.js"/>
+  <script>
+    const test = async_test('getIntersectionList() with nested &lt;svg&gt;');
+    window.onload = test.step_func_done(() => {
+      const testSVG = document.getElementById('askedForIntersection');
+      const r = testSVG.createSVGRect();
+      r.x = 0;
+      r.y = 0;
+      r.width = 100;
+      r.height = 100;
+
+      assert_equals(testSVG.getIntersectionList(r, testSVG).length, 2);
+    });
+  </script>
+  <rect x="0" y="0" width="100" height="100" id="r1"/>
+    <svg id="askedForIntersection">
+      <rect x="0" y="0" width="100" height="100" id="r2"/>
+    <svg id="nestedSVG">
+      <rect x="0" y="0" width="100" height="100" id="r3"/>
+    </svg>
+  </svg>
+</svg>
diff --git a/tests/wpt/tests/svg/types/scripted/SVGGraphicsElement-clone.svg b/tests/wpt/tests/svg/types/scripted/SVGGraphicsElement-clone.svg
new file mode 100644
index 00000000000..2ef0e074809
--- /dev/null
+++ b/tests/wpt/tests/svg/types/scripted/SVGGraphicsElement-clone.svg
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:h="http://www.w3.org/1999/xhtml">
+  <title>cloning a SVGGraphicsElement</title>
+  <metadata>
+    <h:link rel="help" href="https://svgwg.org/svg2-draft/types.html#InterfaceSVGGraphicsElement"/>
+  </metadata>
+  <h:script src="/resources/testharness.js"/>
+  <h:script src="/resources/testharnessreport.js"/>
+
+  <rect id="r" x="10">
+    <set id="set" begin="indefinite" attributeName="x" to="20" dur="15ms" fill="freeze"/>
+  </rect>
+
+  <script><![CDATA[
+    let el = document.getElementById("r");
+    let set = document.getElementById("set");
+
+    test(function() {
+      let clone = el.cloneNode();
+      assert_equals(clone.x.animVal.value, clone.x.baseVal.value);
+    }, 'check animVal equals baseVal by default');
+
+    async_test(t => {
+      set.beginElement();
+      set.addEventListener("beginEvent", t.step_func_done(function () {
+        assert_approx_equals(el.x.animVal.value, 20, 0.001);
+        let clone = el.cloneNode();
+        assert_approx_equals(clone.x.animVal.value, 10, 0.001);
+      }));
+    }, 'check clone does not copy the animated value');
+  ]]></script>
+</svg>
diff --git a/tests/wpt/tests/svg/types/scripted/SVGLength-cap.html b/tests/wpt/tests/svg/types/scripted/SVGLength-cap.html
new file mode 100644
index 00000000000..1eb308b0b8e
--- /dev/null
+++ b/tests/wpt/tests/svg/types/scripted/SVGLength-cap.html
@@ -0,0 +1,23 @@
+<!DOCTYPE HTML>
+<title>SVGLength with 'cap' unit</title>
+<link rel="help" href="https://www.w3.org/TR/SVG/types.html#InterfaceSVGLength">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="cap_ref" style="font-family:initial; font-size:20px; width:10cap"></div>
+<svg>
+  <text id="cap_test" x="10cap" style="font-family:initial; font-size:20px"></text>
+</svg>
+<script>
+  let ref_width = cap_ref.offsetWidth;
+  let cap_length = cap_test.x.baseVal[0];
+
+  test(() => {
+    assert_equals(cap_length.unitType, SVGLength.SVG_LENGTHTYPE_UNKNOWN);
+    assert_approx_equals(cap_length.value, ref_width, 0.5);
+  }, "cap unit in SVGLength");
+
+  test(() => {
+    cap_length.value = ref_width * 2;
+    assert_approx_equals(cap_length.valueInSpecifiedUnits, 20, 0.1);
+  }, "Convert back to cap from new user unit value");
+</script>
diff --git a/tests/wpt/tests/svg/types/scripted/SVGLength-ch.html b/tests/wpt/tests/svg/types/scripted/SVGLength-ch.html
new file mode 100644
index 00000000000..fcacbd2e228
--- /dev/null
+++ b/tests/wpt/tests/svg/types/scripted/SVGLength-ch.html
@@ -0,0 +1,43 @@
+<!DOCTYPE HTML>
+<title>SVGLength with 'ch' unit</title>
+<link rel="help" href="https://www.w3.org/TR/SVG/types.html#InterfaceSVGLength">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+#ch_ref, text {
+  font-family:initial;
+  font-size:20px;
+  text-orientation: upright;
+}
+</style>
+<div id="ch_ref" style="width:10ch;"></div>
+<svg>
+  <text id="ch_test" x="10ch"/>
+</svg>
+<script>
+  let ch_ref = document.getElementById("ch_ref");
+  let ref_width = ch_ref.offsetWidth;
+  let ch_test = document.getElementById("ch_test");
+  let ch_length = ch_test.x.baseVal[0];
+
+  test(() => {
+    assert_equals(ch_length.unitType, SVGLength.SVG_LENGTHTYPE_UNKNOWN);
+    assert_approx_equals(ch_length.value, ref_width, 0.4);
+  }, "ch unit in SVGLength");
+
+  test(() => {
+    ch_length.value = ref_width * 4;
+    assert_approx_equals(ch_length.valueInSpecifiedUnits, 40, 0.3);
+    ch_length.value = ref_width;
+    assert_approx_equals(ch_length.value, ref_width, 0.3);
+  }, "Convert back to ch from new user unit value");
+
+  test(() => {
+    ch_test.setAttribute("style", "writing-mode: vertical-rl;");
+    ch_ref.style.writingMode = "vertical-rl";
+    assert_approx_equals(ch_length.value, ch_ref.offsetWidth, 0.4);
+    ch_test.removeAttribute("style");
+    ch_ref.style.writingMode = "";
+  }, "upright vertical ch unit in SVGLength");
+
+</script>
diff --git a/tests/wpt/tests/svg/types/scripted/SVGLength-rem.html b/tests/wpt/tests/svg/types/scripted/SVGLength-rem.html
new file mode 100644
index 00000000000..c89f937cf37
--- /dev/null
+++ b/tests/wpt/tests/svg/types/scripted/SVGLength-rem.html
@@ -0,0 +1,30 @@
+<!DOCTYPE HTML>
+<title>SVGLength with 'rem' unit</title>
+<link rel="help" href="https://www.w3.org/TR/SVG/types.html#InterfaceSVGLength">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+  :root {
+     /* default is 16px in all desktop browsers */
+     /* the math for 100px is: 16px * 0.25 = 4px/rem -> 100px / 4px/rem = 25rem = 100px */
+    font-size: 25%;
+  }
+</style>
+<div id="rem_ref" style="width:25rem"></div>
+<svg>
+  <rect id="rect" x="25rem"/>
+</svg>
+<script>
+  let ref_width = document.getElementById("rem_ref").offsetWidth;
+  let rem_length = document.getElementById("rect").x.baseVal;
+
+  test(() => {
+    assert_equals(rem_length.unitType, SVGLength.SVG_LENGTHTYPE_UNKNOWN);
+    assert_equals(rem_length.value, 100);
+  }, "rem unit in SVGLength");
+
+  test(() => {
+    rem_length.value = ref_width * 2;
+    assert_equals(rem_length.valueInSpecifiedUnits, 50);
+  }, "Convert back to rem from new user unit value");
+</script>
diff --git a/tests/wpt/tests/svg/types/scripted/SVGLength-viewport.html b/tests/wpt/tests/svg/types/scripted/SVGLength-viewport.html
new file mode 100644
index 00000000000..2a29c0ba549
--- /dev/null
+++ b/tests/wpt/tests/svg/types/scripted/SVGLength-viewport.html
@@ -0,0 +1,35 @@
+<!DOCTYPE HTML>
+<title>SVGLength with 'viewport' units</title>
+<link rel="help" href="https://www.w3.org/TR/SVG/types.html#InterfaceSVGLength">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="ref"></div>
+<svg>
+  <rect id="rect"/>
+</svg>
+<script>
+  const units = ['vw', 'vh', 'vmin', 'vmax'];
+
+  for (const unit of units) {
+
+    const ref = document.getElementById("ref");
+    ref.style.width=`10${unit}`;
+    const rect = document.getElementById("rect");
+    rect.setAttribute("x", `10${unit}`);
+
+    const ref_width = ref.offsetWidth;
+    let length = rect.x.baseVal;
+
+    test(() => {
+      assert_equals(length.unitType, SVGLength.SVG_LENGTHTYPE_UNKNOWN);
+      assert_approx_equals(length.value, ref_width, 0.5);
+    }, `${unit} unit in SVGLength`);
+
+    test(() => {
+      const old_value = length.value
+      length.value = ref_width * 2;
+      assert_approx_equals(length.valueInSpecifiedUnits, 20, 0.2);
+      length.value = old_value;
+    }, `Convert back to ${unit} from new user unit value`);
+  }
+</script>
diff --git a/tests/wpt/tests/tools/certs/cacert.key b/tests/wpt/tests/tools/certs/cacert.key
index 2bfd999b64a..28424d9211c 100644
--- a/tests/wpt/tests/tools/certs/cacert.key
+++ b/tests/wpt/tests/tools/certs/cacert.key
@@ -1,30 +1,30 @@
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIesNOadYpVBkCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECH8qbBfjkDSHBIIEyIsJK4OoIxiW
-sjNIuMr4mv0JNr5C2fPCodKQjm+iBFOAoWmkQ/tXATJdTkchmwRfG1ydaRwFLg0c
-u9YH01LD09JjGhOuCOvC2EuPMDEUN1zJTimZhk/HeEO0SIlHyq4L+ApYPtEQwQeZ
-sM8qWXyvSpjsoZJV29lwVmzOiO/9xhebvHLOMZKEugjuqDTuchHfX1guTuTIIg6T
-uj9CcmuUYPm6R8teZXkw9eSh+x8ztvn7q0SC/vcpGpyLqyu61MlbW5E33pKqMwiv
-urH87GyxkOZUrO/qhJkgy8SpT6aOQDTS5rnjCSGYpXpTXzdhZFuNtN5nkO6H3qQL
-Pk98EwTGxhH+eaKWqOd3rSGUJYGnqlV+YcK2R80ua6bhj0KoMNyLq9Ga/8eYaCVE
-VQjwBFzAr3NLx/kP2YYXEN34uOQyeuRnghAI0iToLhs7cL/+CVu6g9EEkCfREZ1a
-ipgdfraU4nbswSauc1NiaUX5l5myT/X19gwpxlVqQwG/UgExdI9VGqPDc+t9qSch
-FH2a0r/Ll98IPXHOdnlaPsTvI33V6cFfZwFdUnpH5ESSINQi5tjFH5iyIK9xDr5V
-S3Rm5d3CWaTabJx+hADilGzT77pruHji77Xug0blpbiA0Lp58G++U3cBwiOI5odO
-h/G7jaNE2Owrfla6p1fpWhfZhHUiQDoE6sBHuPA3t1gP8oQTLmSEY/0Kr7UZUGZk
-AHIyVymXFIhpn6spCnBzDgSrsQlFvJuQalbOQIfuCZ/5Gp6+IrJRSawzxzZaVvG0
-PYrB3cQ4w2fMJrtmHBHThebNOlXIXsgAyOr8lpzlrdhHfSJWPwaN+KftyMno9PFR
-J3K4Oay1SHJx7GfnZ7naD53YzekxxEfLFEFYg89Z+EMo2gDVX+v+tLqeQyX0/egz
-jk+EBQHBSaS+sZiw31+kebzZenbrvog9BhMFD0hhiSpA1zGOHND+zY5itxSWXUk7
-fm6FAKOGgQ7lJG0hCHUDoMPMQpXkp/txhcf7gV5WpO4WaCi3Scoo2EFqty/cBibK
-t0HU1yHqU6rAhab1QIsI2PtVL/Qfwx9dsTNKuOACRs9gA+RGZYncDnVv6nLLlUTd
-ARps6JK6dGL4owzkyXKjK7L7Gw7SrChfNHgYlsJ6ktLvlRPVYpHPH5VeLWgyYR4n
-uQiVgHfqGygd8abZEI3kFL+qI8HNIuXaGtRs9kZMfybUZJV9s5sS2XAw7bFlujqq
-XpC1EJZtZtwkKIWDtiFS7E/Q+uWzxLWUP5qF2io3Rs5gUhRB+ep4nqiSsdNu/Ijb
-tPNhpIwnLsFCriaIAMsQ/4hGbCBCCuZmY6917FIwEtZDTAb04ro2NYOhP7LvpiiH
-PRsFNom5aRyhEx/xXOO933rBuhNi7U5EbyDwviaUi7ETij6QGTXd/iI04Er29QDw
-hFemoi/gkW3j3/YMQE7ylbUoWgcEet1BJPeAGBTJ3JpAXdXBLfU7wLnJkhWUv8iS
-ZVn9Gub8Pu2vRqp9REU0jKJqW9F/1zZKi30BfWCs0yy5o2IfNEjlUQwokYb2nHDF
-ITy5LdUd2JqvpbBrPGgc6mTLfr7SpBY3+EA7RwDUFteNXPjnjr4T2rGiYykbsSr/
-a/aqz8EPgvjZOHDxcCBRiw==
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIlEW03rkHr0YCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECMnvBPzVShbWBIIEyBthE6OWkj8F
+nK4JOaxJeH3h0R6ocmQ3u2H4kPWu34zpGCMdXYJ3N1w2JotViAQQWrVpy0Y4ixr1
+FE0Y1GX/4YYBm+/PMmxPZTKfVIHIHvTCDryOUIhpLp/3tio/NIhvUNYLDHug5wyP
+HCgt4HDNEEV9mlB35delYcHHDl/DDTr5LdtAX1Svxets0cTEZ3XqTVmfN1Y2OBAG
+gPw3fyDqgKD/hq5y2CjonY6vxyMSmTrm3SJhKTwtelKeRLmfLDBoHXHLaoamd8nd
+hGvIGeINwV1Y6z2c+NNJ9ZwKMD2k+Qmt6CfGJKqw+T852ESFyPSqlwQfrlV8Yy69
+gA/POlxF7BHI970QMvZBuMBQgLtbNorvJTEqXBqbM7jlLZxVfZE76X7hkvWT298y
+GAHWI/Y/Qct+PpaBr0yxSN0NHZE0be13gOqSUivshqwf73r6CFnOQbmx3003OqR1
+nltppjrAd+dyJMxek0ouubMPDsG6CgBUgEKUjuAE6zhKwq7m4pHjsWasbT+3Eoly
+o895bTdFbI/t62Xx4NOPrir7KOi1bo6X8LPrjKhJKsYuFdrT8+EgZhUUy6fjdKpx
+lKmvHX8nIoKrM+rdfxNLHMOTHpEsxLiE+WcCcgc9xjPm7d0KTKpacemlKSOL77NN
+Fc0oTP0kANFDz4SFgkUhflP2t8jbyoors1uH4KrkNo2vAxD9DQCdlqgC80zv9+Tq
+ynIHHAbNKwX8gsnKSvKcyuTrw4fA/0r1+1D25kIuameQ0i6fUAVPeVBsQN+2StkC
+N4h3yGpLeIA0UAS+aIjR1h1e/NWvPWvPAhEbWsyuwlxaRSGsTKKLD5WkPw5nQrir
+W1LqfrkEQgo1g+CDl70YU1sPsI3jRBk0kGn0uDTo6SCYPOPmClWESchB/1Plk0e0
+Yr90/258niPcLsNV2lSdnHky0pqGmColPMqCWQvl0fjWpy9WSrFLAFAmo4Pqsdt7
+fZh3vNTpD/EGJQdYhQfyKmSnR0124jAMmu6wQf1jf7cZO7JV7lz2YIdS1V1zuG0X
+CS83EoJlI+OgDsbEtGFkC8sSYtyT+bzc4WLcByWuvZ0HBB0ATfLyzQIEQkRzIVTT
+C3eYgv+LyZi/l7TBLEBNOYH/2jPRghDhwA2F2xtc/81O3C078OP2F+rj8JUk7rX2
+Yaqvpg9bvHvkCu2F2xSG8IFVVzvtR1j0w0tJtjoYSc26R4bJtf1upfuIVyoRogwh
+qvCZfWpIq6wCShdgkHXFCWTlThPCEnATdPBRoCtQ/OoonZtJMJsnMoA3wEqu+Qf7
+DMwffby/ylccNdRtjN8TsUkI2uVeuJa+g4l4uT3h2GSXxNmJuy3+pKm4CllaQp+k
+rAQBigpnNj7Jt1n5OZwiKlwx+yQykhuFt3Y9SiXxlMQWwEYBDB/sziaRFQahQQti
+KveWzLr+Z6kIIvYd8Ay9TOAsdUN2GOeVQXHfaurb+1g3ZJBWxrQNlRF4irdDmsPp
+qNwKVGnMOfkis2mGSmSyBMdbwJYC64V0sTHRC9t/rn33eK0zI9cL5FY9ay1cokLX
+nkZpZKjguQ2yzzq34udLiCQGElcQnCUAMgTe7Vdb81ziPlmR5soTcshirM4+vaN4
+uaG/s+sespCfuB15hdLpAg==
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/tests/wpt/tests/tools/certs/cacert.pem b/tests/wpt/tests/tools/certs/cacert.pem
index f698a351d65..4905177a33f 100644
--- a/tests/wpt/tests/tools/certs/cacert.pem
+++ b/tests/wpt/tests/tools/certs/cacert.pem
@@ -1,53 +1,53 @@
 -----BEGIN CERTIFICATE-----
-MIIW5zCCFc+gAwIBAgIDBmgJMA0GCSqGSIb3DQEBCwUAMB0xGzAZBgNVBAMMEndl
-Yi1wbGF0Zm9ybS10ZXN0czAeFw0yMzA4MTIwMDQ1MzZaFw0yNDA4MTEwMDQ1MzZa
+MIIW5zCCFc+gAwIBAgIDCcbkMA0GCSqGSIb3DQEBCwUAMB0xGzAZBgNVBAMMEndl
+Yi1wbGF0Zm9ybS10ZXN0czAeFw0yMzA5MTIwMDQ3MTlaFw0yNDA5MTEwMDQ3MTla
 MB0xGzAZBgNVBAMMEndlYi1wbGF0Zm9ybS10ZXN0czCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAM3mSDwW7plqJ78BOxRgptVkADl0EM2SvRTKGYDoBHLX
-grogviXHsAud4MzZdHa0WuQ7sWTyANLl7sinORE5yG+UWCU7p7DsLuAbn4X5gfDv
-AiQJ+4eZP3/GYS4czjSkX/1Gg7+nxIhKI0hRZdIzv2/etGm+1cBNxiQSf5GcyQrF
-y4iWNcQqBkBXKZalfF68n8uB77s+IlwEzJE+3Q1BXjOG6C3KcoBM6QVKS6iSQVsh
-0bFc/M6eqPn1r87LTIP35PewE8AgA/n9lDcV6ITFB/p8AypJFsY/v0BHP8t8Ua3y
-1/lg5/vXvC1ARIiDsJWirRfywRLTCX2cCIsUSIaqdM8CAwEAAaOCFC4wghQqMAwG
-A1UdEwQFMAMBAf8wHQYDVR0OBBYEFBPyid267eESVzsJ+HDXeY4gCT1wMEcGA1Ud
-IwRAMD6AFBPyid267eESVzsJ+HDXeY4gCT1woSGkHzAdMRswGQYDVQQDDBJ3ZWIt
-cGxhdGZvcm0tdGVzdHOCAwZoCTALBgNVHQ8EBAMCAgQwggoFBgNVHR4Eggn8MIIJ
+BQADggEPADCCAQoCggEBAOKsSaJFosHayLqBysXW9/V44WPagXl1guuUrD0eJJy6
+FnzpUyn3MKB6epxRyMcQuRCct4GC8HBaUpYM9D5uG2aIYdr47P6C5lJJ90503yjy
+OciIPnljxLcoMOpG6HqEiMlBBUsNZSOXx4MgrPrrG/prN9mJIoQYy6iJn4xfh4OE
+cx+O1ZmbFgWsMyrEQ+g98J/bz4bM66hHRKlEu7mJNYoAPsLvAPQVSJGwSlBfLm4p
+LE3Lg70wsXHuY/+xNZ7dbRTnvh3dOoqcbiXzMvAILJTHLSbCQB+gXxGBSyWxWrkO
+bIXxr68K5GDbSNI0GIyN/fRfUGKCOKRclaqsfBbym7kCAwEAAaOCFC4wghQqMAwG
+A1UdEwQFMAMBAf8wHQYDVR0OBBYEFC/OVhUnYgYooLOcpHVY9g2HWSDYMEcGA1Ud
+IwRAMD6AFC/OVhUnYgYooLOcpHVY9g2HWSDYoSGkHzAdMRswGQYDVQQDDBJ3ZWIt
+cGxhdGZvcm0tdGVzdHOCAwnG5DALBgNVHQ8EBAMCAgQwggoFBgNVHR4Eggn8MIIJ
 +KCCCfQwE4IRd2ViLXBsYXRmb3JtLnRlc3QwF4IVd3d3LndlYi1wbGF0Zm9ybS50
-ZXN0MBeCFW5vdC13ZWItcGxhdGZvcm0udGVzdDAYghZ3d3cyLndlYi1wbGF0Zm9y
-bS50ZXN0MBiCFnd3dzEud2ViLXBsYXRmb3JtLnRlc3QwG4IZd3d3Lnd3dy53ZWIt
-cGxhdGZvcm0udGVzdDAbghl3d3cubm90LXdlYi1wbGF0Zm9ybS50ZXN0MByCGnd3
-dzIud3d3LndlYi1wbGF0Zm9ybS50ZXN0MByCGnd3dzEud3d3LndlYi1wbGF0Zm9y
-bS50ZXN0MByCGnd3dzEubm90LXdlYi1wbGF0Zm9ybS50ZXN0MByCGnd3dy53d3cx
-LndlYi1wbGF0Zm9ybS50ZXN0MByCGnd3dy53d3cyLndlYi1wbGF0Zm9ybS50ZXN0
-MByCGnd3dzIubm90LXdlYi1wbGF0Zm9ybS50ZXN0MB2CG3d3dzIud3d3MS53ZWIt
-cGxhdGZvcm0udGVzdDAdght3d3cxLnd3dzIud2ViLXBsYXRmb3JtLnRlc3QwHYIb
-d3d3MS53d3cxLndlYi1wbGF0Zm9ybS50ZXN0MB2CG3d3dzIud3d3Mi53ZWItcGxh
+ZXN0MBeCFW5vdC13ZWItcGxhdGZvcm0udGVzdDAYghZ3d3cxLndlYi1wbGF0Zm9y
+bS50ZXN0MBiCFnd3dzIud2ViLXBsYXRmb3JtLnRlc3QwG4IZd3d3Lm5vdC13ZWIt
+cGxhdGZvcm0udGVzdDAbghl3d3cud3d3LndlYi1wbGF0Zm9ybS50ZXN0MByCGnd3
+dy53d3cyLndlYi1wbGF0Zm9ybS50ZXN0MByCGnd3dzIud3d3LndlYi1wbGF0Zm9y
+bS50ZXN0MByCGnd3dy53d3cxLndlYi1wbGF0Zm9ybS50ZXN0MByCGnd3dzIubm90
+LXdlYi1wbGF0Zm9ybS50ZXN0MByCGnd3dzEud3d3LndlYi1wbGF0Zm9ybS50ZXN0
+MByCGnd3dzEubm90LXdlYi1wbGF0Zm9ybS50ZXN0MB2CG3d3dzIud3d3Mi53ZWIt
+cGxhdGZvcm0udGVzdDAdght3d3cxLnd3dzEud2ViLXBsYXRmb3JtLnRlc3QwHYIb
+d3d3MS53d3cyLndlYi1wbGF0Zm9ybS50ZXN0MB2CG3d3dzIud3d3MS53ZWItcGxh
 dGZvcm0udGVzdDAfgh13d3cud3d3Lm5vdC13ZWItcGxhdGZvcm0udGVzdDAggh53
-d3cyLnd3dy5ub3Qtd2ViLXBsYXRmb3JtLnRlc3QwIIIeeG4tLWx2ZS02bGFkLndl
+d3cxLnd3dy5ub3Qtd2ViLXBsYXRmb3JtLnRlc3QwIIIed3d3Lnd3dzEubm90LXdl
 Yi1wbGF0Zm9ybS50ZXN0MCCCHnd3dy53d3cyLm5vdC13ZWItcGxhdGZvcm0udGVz
-dDAggh53d3cud3d3MS5ub3Qtd2ViLXBsYXRmb3JtLnRlc3QwIIIed3d3MS53d3cu
-bm90LXdlYi1wbGF0Zm9ybS50ZXN0MCGCH3d3dzEud3d3MS5ub3Qtd2ViLXBsYXRm
+dDAggh54bi0tbHZlLTZsYWQud2ViLXBsYXRmb3JtLnRlc3QwIIIed3d3Mi53d3cu
+bm90LXdlYi1wbGF0Zm9ybS50ZXN0MCGCH3d3dzEud3d3Mi5ub3Qtd2ViLXBsYXRm
 b3JtLnRlc3QwIYIfd3d3Mi53d3cyLm5vdC13ZWItcGxhdGZvcm0udGVzdDAhgh93
-d3cxLnd3dzIubm90LXdlYi1wbGF0Zm9ybS50ZXN0MCGCH3d3dzIud3d3MS5ub3Qt
-d2ViLXBsYXRmb3JtLnRlc3QwJIIieG4tLWx2ZS02bGFkLnd3dy53ZWItcGxhdGZv
-cm0udGVzdDAkgiJ4bi0tbHZlLTZsYWQubm90LXdlYi1wbGF0Zm9ybS50ZXN0MCSC
-Ind3dy54bi0tbHZlLTZsYWQud2ViLXBsYXRmb3JtLnRlc3QwJYIjeG4tLWx2ZS02
-bGFkLnd3dzIud2ViLXBsYXRmb3JtLnRlc3QwJYIjd3d3MS54bi0tbHZlLTZsYWQu
-d2ViLXBsYXRmb3JtLnRlc3QwJYIjeG4tLWx2ZS02bGFkLnd3dzEud2ViLXBsYXRm
-b3JtLnRlc3QwJYIjd3d3Mi54bi0tbHZlLTZsYWQud2ViLXBsYXRmb3JtLnRlc3Qw
+d3cyLnd3dzEubm90LXdlYi1wbGF0Zm9ybS50ZXN0MCGCH3d3dzEud3d3MS5ub3Qt
+d2ViLXBsYXRmb3JtLnRlc3QwJIIid3d3LnhuLS1sdmUtNmxhZC53ZWItcGxhdGZv
+cm0udGVzdDAkgiJ4bi0tbHZlLTZsYWQud3d3LndlYi1wbGF0Zm9ybS50ZXN0MCSC
+InhuLS1sdmUtNmxhZC5ub3Qtd2ViLXBsYXRmb3JtLnRlc3QwJYIjd3d3Mi54bi0t
+bHZlLTZsYWQud2ViLXBsYXRmb3JtLnRlc3QwJYIjeG4tLWx2ZS02bGFkLnd3dzIu
+d2ViLXBsYXRmb3JtLnRlc3QwJYIjd3d3MS54bi0tbHZlLTZsYWQud2ViLXBsYXRm
+b3JtLnRlc3QwJYIjeG4tLWx2ZS02bGFkLnd3dzEud2ViLXBsYXRmb3JtLnRlc3Qw
 KIImeG4tLWx2ZS02bGFkLnd3dy5ub3Qtd2ViLXBsYXRmb3JtLnRlc3QwKIImd3d3
-LnhuLS1sdmUtNmxhZC5ub3Qtd2ViLXBsYXRmb3JtLnRlc3QwKYIneG4tLWx2ZS02
-bGFkLnd3dzEubm90LXdlYi1wbGF0Zm9ybS50ZXN0MCmCJ3huLS1sdmUtNmxhZC53
-d3cyLm5vdC13ZWItcGxhdGZvcm0udGVzdDApgid3d3cxLnhuLS1sdmUtNmxhZC5u
-b3Qtd2ViLXBsYXRmb3JtLnRlc3QwKYInd3d3Mi54bi0tbHZlLTZsYWQubm90LXdl
+LnhuLS1sdmUtNmxhZC5ub3Qtd2ViLXBsYXRmb3JtLnRlc3QwKYInd3d3Mi54bi0t
+bHZlLTZsYWQubm90LXdlYi1wbGF0Zm9ybS50ZXN0MCmCJ3d3dzEueG4tLWx2ZS02
+bGFkLm5vdC13ZWItcGxhdGZvcm0udGVzdDApgid4bi0tbHZlLTZsYWQud3d3MS5u
+b3Qtd2ViLXBsYXRmb3JtLnRlc3QwKYIneG4tLWx2ZS02bGFkLnd3dzIubm90LXdl
 Yi1wbGF0Zm9ybS50ZXN0MCuCKXhuLS1uOGo2ZHM1M2x3d2tycWh2MjhhLndlYi1w
 bGF0Zm9ybS50ZXN0MC2CK3huLS1sdmUtNmxhZC54bi0tbHZlLTZsYWQud2ViLXBs
-YXRmb3JtLnRlc3QwL4IteG4tLW44ajZkczUzbHd3a3JxaHYyOGEubm90LXdlYi1w
-bGF0Zm9ybS50ZXN0MC+CLXd3dy54bi0tbjhqNmRzNTNsd3drcnFodjI4YS53ZWIt
-cGxhdGZvcm0udGVzdDAvgi14bi0tbjhqNmRzNTNsd3drcnFodjI4YS53d3cud2Vi
+YXRmb3JtLnRlc3QwL4IteG4tLW44ajZkczUzbHd3a3JxaHYyOGEud3d3LndlYi1w
+bGF0Zm9ybS50ZXN0MC+CLXhuLS1uOGo2ZHM1M2x3d2tycWh2MjhhLm5vdC13ZWIt
+cGxhdGZvcm0udGVzdDAvgi13d3cueG4tLW44ajZkczUzbHd3a3JxaHYyOGEud2Vi
 LXBsYXRmb3JtLnRlc3QwMIIueG4tLW44ajZkczUzbHd3a3JxaHYyOGEud3d3Mi53
 ZWItcGxhdGZvcm0udGVzdDAwgi54bi0tbjhqNmRzNTNsd3drcnFodjI4YS53d3cx
-LndlYi1wbGF0Zm9ybS50ZXN0MDCCLnd3dzEueG4tLW44ajZkczUzbHd3a3JxaHYy
-OGEud2ViLXBsYXRmb3JtLnRlc3QwMIIud3d3Mi54bi0tbjhqNmRzNTNsd3drcnFo
+LndlYi1wbGF0Zm9ybS50ZXN0MDCCLnd3dzIueG4tLW44ajZkczUzbHd3a3JxaHYy
+OGEud2ViLXBsYXRmb3JtLnRlc3QwMIIud3d3MS54bi0tbjhqNmRzNTNsd3drcnFo
 djI4YS53ZWItcGxhdGZvcm0udGVzdDAxgi94bi0tbHZlLTZsYWQueG4tLWx2ZS02
 bGFkLm5vdC13ZWItcGxhdGZvcm0udGVzdDAzgjF4bi0tbjhqNmRzNTNsd3drcnFo
 djI4YS53d3cubm90LXdlYi1wbGF0Zm9ybS50ZXN0MDOCMXd3dy54bi0tbjhqNmRz
@@ -58,48 +58,48 @@ NIIyeG4tLW44ajZkczUzbHd3a3JxaHYyOGEud3d3MS5ub3Qtd2ViLXBsYXRmb3Jt
 LnRlc3QwNIIyd3d3Mi54bi0tbjhqNmRzNTNsd3drcnFodjI4YS5ub3Qtd2ViLXBs
 YXRmb3JtLnRlc3QwOII2eG4tLW44ajZkczUzbHd3a3JxaHYyOGEueG4tLWx2ZS02
 bGFkLndlYi1wbGF0Zm9ybS50ZXN0MDiCNnhuLS1sdmUtNmxhZC54bi0tbjhqNmRz
-NTNsd3drcnFodjI4YS53ZWItcGxhdGZvcm0udGVzdDA8gjp4bi0tbjhqNmRzNTNs
-d3drcnFodjI4YS54bi0tbHZlLTZsYWQubm90LXdlYi1wbGF0Zm9ybS50ZXN0MDyC
-OnhuLS1sdmUtNmxhZC54bi0tbjhqNmRzNTNsd3drcnFodjI4YS5ub3Qtd2ViLXBs
+NTNsd3drcnFodjI4YS53ZWItcGxhdGZvcm0udGVzdDA8gjp4bi0tbHZlLTZsYWQu
+eG4tLW44ajZkczUzbHd3a3JxaHYyOGEubm90LXdlYi1wbGF0Zm9ybS50ZXN0MDyC
+OnhuLS1uOGo2ZHM1M2x3d2tycWh2MjhhLnhuLS1sdmUtNmxhZC5ub3Qtd2ViLXBs
 YXRmb3JtLnRlc3QwQ4JBeG4tLW44ajZkczUzbHd3a3JxaHYyOGEueG4tLW44ajZk
 czUzbHd3a3JxaHYyOGEud2ViLXBsYXRmb3JtLnRlc3QwR4JFeG4tLW44ajZkczUz
 bHd3a3JxaHYyOGEueG4tLW44ajZkczUzbHd3a3JxaHYyOGEubm90LXdlYi1wbGF0
 Zm9ybS50ZXN0MBMGA1UdJQQMMAoGCCsGAQUFBwMBMIIJhQYDVR0RBIIJfDCCCXiC
 EXdlYi1wbGF0Zm9ybS50ZXN0ghV3d3cud2ViLXBsYXRmb3JtLnRlc3SCFW5vdC13
-ZWItcGxhdGZvcm0udGVzdIIWd3d3Mi53ZWItcGxhdGZvcm0udGVzdIIWd3d3MS53
-ZWItcGxhdGZvcm0udGVzdIIZd3d3Lnd3dy53ZWItcGxhdGZvcm0udGVzdIIZd3d3
-Lm5vdC13ZWItcGxhdGZvcm0udGVzdIIad3d3Mi53d3cud2ViLXBsYXRmb3JtLnRl
-c3SCGnd3dzEud3d3LndlYi1wbGF0Zm9ybS50ZXN0ghp3d3cxLm5vdC13ZWItcGxh
-dGZvcm0udGVzdIIad3d3Lnd3dzEud2ViLXBsYXRmb3JtLnRlc3SCGnd3dy53d3cy
-LndlYi1wbGF0Zm9ybS50ZXN0ghp3d3cyLm5vdC13ZWItcGxhdGZvcm0udGVzdIIb
-d3d3Mi53d3cxLndlYi1wbGF0Zm9ybS50ZXN0ght3d3cxLnd3dzIud2ViLXBsYXRm
-b3JtLnRlc3SCG3d3dzEud3d3MS53ZWItcGxhdGZvcm0udGVzdIIbd3d3Mi53d3cy
+ZWItcGxhdGZvcm0udGVzdIIWd3d3MS53ZWItcGxhdGZvcm0udGVzdIIWd3d3Mi53
+ZWItcGxhdGZvcm0udGVzdIIZd3d3Lm5vdC13ZWItcGxhdGZvcm0udGVzdIIZd3d3
+Lnd3dy53ZWItcGxhdGZvcm0udGVzdIIad3d3Lnd3dzIud2ViLXBsYXRmb3JtLnRl
+c3SCGnd3dzIud3d3LndlYi1wbGF0Zm9ybS50ZXN0ghp3d3cud3d3MS53ZWItcGxh
+dGZvcm0udGVzdIIad3d3Mi5ub3Qtd2ViLXBsYXRmb3JtLnRlc3SCGnd3dzEud3d3
+LndlYi1wbGF0Zm9ybS50ZXN0ghp3d3cxLm5vdC13ZWItcGxhdGZvcm0udGVzdIIb
+d3d3Mi53d3cyLndlYi1wbGF0Zm9ybS50ZXN0ght3d3cxLnd3dzEud2ViLXBsYXRm
+b3JtLnRlc3SCG3d3dzEud3d3Mi53ZWItcGxhdGZvcm0udGVzdIIbd3d3Mi53d3cx
 LndlYi1wbGF0Zm9ybS50ZXN0gh13d3cud3d3Lm5vdC13ZWItcGxhdGZvcm0udGVz
-dIIed3d3Mi53d3cubm90LXdlYi1wbGF0Zm9ybS50ZXN0gh54bi0tbHZlLTZsYWQu
+dIIed3d3MS53d3cubm90LXdlYi1wbGF0Zm9ybS50ZXN0gh53d3cud3d3MS5ub3Qt
 d2ViLXBsYXRmb3JtLnRlc3SCHnd3dy53d3cyLm5vdC13ZWItcGxhdGZvcm0udGVz
-dIIed3d3Lnd3dzEubm90LXdlYi1wbGF0Zm9ybS50ZXN0gh53d3cxLnd3dy5ub3Qt
-d2ViLXBsYXRmb3JtLnRlc3SCH3d3dzEud3d3MS5ub3Qtd2ViLXBsYXRmb3JtLnRl
-c3SCH3d3dzIud3d3Mi5ub3Qtd2ViLXBsYXRmb3JtLnRlc3SCH3d3dzEud3d3Mi5u
-b3Qtd2ViLXBsYXRmb3JtLnRlc3SCH3d3dzIud3d3MS5ub3Qtd2ViLXBsYXRmb3Jt
-LnRlc3SCInhuLS1sdmUtNmxhZC53d3cud2ViLXBsYXRmb3JtLnRlc3SCInhuLS1s
-dmUtNmxhZC5ub3Qtd2ViLXBsYXRmb3JtLnRlc3SCInd3dy54bi0tbHZlLTZsYWQu
-d2ViLXBsYXRmb3JtLnRlc3SCI3huLS1sdmUtNmxhZC53d3cyLndlYi1wbGF0Zm9y
-bS50ZXN0giN3d3cxLnhuLS1sdmUtNmxhZC53ZWItcGxhdGZvcm0udGVzdIIjeG4t
-LWx2ZS02bGFkLnd3dzEud2ViLXBsYXRmb3JtLnRlc3SCI3d3dzIueG4tLWx2ZS02
-bGFkLndlYi1wbGF0Zm9ybS50ZXN0giZ4bi0tbHZlLTZsYWQud3d3Lm5vdC13ZWIt
+dIIeeG4tLWx2ZS02bGFkLndlYi1wbGF0Zm9ybS50ZXN0gh53d3cyLnd3dy5ub3Qt
+d2ViLXBsYXRmb3JtLnRlc3SCH3d3dzEud3d3Mi5ub3Qtd2ViLXBsYXRmb3JtLnRl
+c3SCH3d3dzIud3d3Mi5ub3Qtd2ViLXBsYXRmb3JtLnRlc3SCH3d3dzIud3d3MS5u
+b3Qtd2ViLXBsYXRmb3JtLnRlc3SCH3d3dzEud3d3MS5ub3Qtd2ViLXBsYXRmb3Jt
+LnRlc3SCInd3dy54bi0tbHZlLTZsYWQud2ViLXBsYXRmb3JtLnRlc3SCInhuLS1s
+dmUtNmxhZC53d3cud2ViLXBsYXRmb3JtLnRlc3SCInhuLS1sdmUtNmxhZC5ub3Qt
+d2ViLXBsYXRmb3JtLnRlc3SCI3d3dzIueG4tLWx2ZS02bGFkLndlYi1wbGF0Zm9y
+bS50ZXN0giN4bi0tbHZlLTZsYWQud3d3Mi53ZWItcGxhdGZvcm0udGVzdIIjd3d3
+MS54bi0tbHZlLTZsYWQud2ViLXBsYXRmb3JtLnRlc3SCI3huLS1sdmUtNmxhZC53
+d3cxLndlYi1wbGF0Zm9ybS50ZXN0giZ4bi0tbHZlLTZsYWQud3d3Lm5vdC13ZWIt
 cGxhdGZvcm0udGVzdIImd3d3LnhuLS1sdmUtNmxhZC5ub3Qtd2ViLXBsYXRmb3Jt
-LnRlc3SCJ3huLS1sdmUtNmxhZC53d3cxLm5vdC13ZWItcGxhdGZvcm0udGVzdIIn
-eG4tLWx2ZS02bGFkLnd3dzIubm90LXdlYi1wbGF0Zm9ybS50ZXN0gid3d3cxLnhu
-LS1sdmUtNmxhZC5ub3Qtd2ViLXBsYXRmb3JtLnRlc3SCJ3d3dzIueG4tLWx2ZS02
-bGFkLm5vdC13ZWItcGxhdGZvcm0udGVzdIIpeG4tLW44ajZkczUzbHd3a3JxaHYy
+LnRlc3SCJ3d3dzIueG4tLWx2ZS02bGFkLm5vdC13ZWItcGxhdGZvcm0udGVzdIIn
+d3d3MS54bi0tbHZlLTZsYWQubm90LXdlYi1wbGF0Zm9ybS50ZXN0gid4bi0tbHZl
+LTZsYWQud3d3MS5ub3Qtd2ViLXBsYXRmb3JtLnRlc3SCJ3huLS1sdmUtNmxhZC53
+d3cyLm5vdC13ZWItcGxhdGZvcm0udGVzdIIpeG4tLW44ajZkczUzbHd3a3JxaHYy
 OGEud2ViLXBsYXRmb3JtLnRlc3SCK3huLS1sdmUtNmxhZC54bi0tbHZlLTZsYWQu
-d2ViLXBsYXRmb3JtLnRlc3SCLXhuLS1uOGo2ZHM1M2x3d2tycWh2MjhhLm5vdC13
-ZWItcGxhdGZvcm0udGVzdIItd3d3LnhuLS1uOGo2ZHM1M2x3d2tycWh2MjhhLndl
-Yi1wbGF0Zm9ybS50ZXN0gi14bi0tbjhqNmRzNTNsd3drcnFodjI4YS53d3cud2Vi
+d2ViLXBsYXRmb3JtLnRlc3SCLXhuLS1uOGo2ZHM1M2x3d2tycWh2MjhhLnd3dy53
+ZWItcGxhdGZvcm0udGVzdIIteG4tLW44ajZkczUzbHd3a3JxaHYyOGEubm90LXdl
+Yi1wbGF0Zm9ybS50ZXN0gi13d3cueG4tLW44ajZkczUzbHd3a3JxaHYyOGEud2Vi
 LXBsYXRmb3JtLnRlc3SCLnhuLS1uOGo2ZHM1M2x3d2tycWh2MjhhLnd3dzIud2Vi
 LXBsYXRmb3JtLnRlc3SCLnhuLS1uOGo2ZHM1M2x3d2tycWh2MjhhLnd3dzEud2Vi
-LXBsYXRmb3JtLnRlc3SCLnd3dzEueG4tLW44ajZkczUzbHd3a3JxaHYyOGEud2Vi
 LXBsYXRmb3JtLnRlc3SCLnd3dzIueG4tLW44ajZkczUzbHd3a3JxaHYyOGEud2Vi
+LXBsYXRmb3JtLnRlc3SCLnd3dzEueG4tLW44ajZkczUzbHd3a3JxaHYyOGEud2Vi
 LXBsYXRmb3JtLnRlc3SCL3huLS1sdmUtNmxhZC54bi0tbHZlLTZsYWQubm90LXdl
 Yi1wbGF0Zm9ybS50ZXN0gjF4bi0tbjhqNmRzNTNsd3drcnFodjI4YS53d3cubm90
 LXdlYi1wbGF0Zm9ybS50ZXN0gjF3d3cueG4tLW44ajZkczUzbHd3a3JxaHYyOGEu
@@ -110,16 +110,16 @@ cWh2MjhhLnd3dzEubm90LXdlYi1wbGF0Zm9ybS50ZXN0gjJ3d3cyLnhuLS1uOGo2
 ZHM1M2x3d2tycWh2MjhhLm5vdC13ZWItcGxhdGZvcm0udGVzdII2eG4tLW44ajZk
 czUzbHd3a3JxaHYyOGEueG4tLWx2ZS02bGFkLndlYi1wbGF0Zm9ybS50ZXN0gjZ4
 bi0tbHZlLTZsYWQueG4tLW44ajZkczUzbHd3a3JxaHYyOGEud2ViLXBsYXRmb3Jt
-LnRlc3SCOnhuLS1uOGo2ZHM1M2x3d2tycWh2MjhhLnhuLS1sdmUtNmxhZC5ub3Qt
-d2ViLXBsYXRmb3JtLnRlc3SCOnhuLS1sdmUtNmxhZC54bi0tbjhqNmRzNTNsd3dr
-cnFodjI4YS5ub3Qtd2ViLXBsYXRmb3JtLnRlc3SCQXhuLS1uOGo2ZHM1M2x3d2ty
+LnRlc3SCOnhuLS1sdmUtNmxhZC54bi0tbjhqNmRzNTNsd3drcnFodjI4YS5ub3Qt
+d2ViLXBsYXRmb3JtLnRlc3SCOnhuLS1uOGo2ZHM1M2x3d2tycWh2MjhhLnhuLS1s
+dmUtNmxhZC5ub3Qtd2ViLXBsYXRmb3JtLnRlc3SCQXhuLS1uOGo2ZHM1M2x3d2ty
 cWh2MjhhLnhuLS1uOGo2ZHM1M2x3d2tycWh2MjhhLndlYi1wbGF0Zm9ybS50ZXN0
 gkV4bi0tbjhqNmRzNTNsd3drcnFodjI4YS54bi0tbjhqNmRzNTNsd3drcnFodjI4
-YS5ub3Qtd2ViLXBsYXRmb3JtLnRlc3QwDQYJKoZIhvcNAQELBQADggEBADRLq9/7
-cf51ebjreSdMGetCUq2IRBsM4zVSq0TFEV0r4wSjL8snqRK98iyw/KHBwGS6XJhy
-OeIPAfkogUUliyvgj7Xy2n0CzbyLlCH8e1lqJYER9DtGVtXa6+K2dMzlWCh6kHz+
-i6axsgF4cQoPgirR3XAxM8VyJ+0GWynJ5piFhLKVG0oEOZywBofmicemAfb1R62u
-fAYLSqzizfYXBkvVSISEf4UjzK7O3P31F3IXhHhyIfZ9aZn0EyUvBauuMWeUMKQB
-G4M2A74WpWFOGBKhCCmmR5q6lZt+mAVQMdBAOXpTkOPByWilzitXruh3tLDkS3B6
-vGgUAnQOM955NiY=
+YS5ub3Qtd2ViLXBsYXRmb3JtLnRlc3QwDQYJKoZIhvcNAQELBQADggEBABgmlNYL
+FvectFPZIiLdS2t3K73eIDfyK2Ay1gILuzSggrB1GNL6X4AmWeoX962KV/lnKPTt
+2SfzV4ej3A4tJNql+vFUHtYV1GfXbDDjRLYff1b/GiF3QbJy7bZmzt9gxTE9/Rf1
+uj7M9VbnfQ9svyr7j5O5C9SQ811ejTGeGQ8oD1i3ymRnOm8hnQf0PnHcsJFfvaiV
+R5bqtARM7ONxSoCI1oJvq/iXUgEUiwDWfGZCJslBY9M0AwEX9XL9tRwGjwzUzDp3
+U3kyG0pCEcBYBz3RxUlKHft6MWBGEs8rDZiEJtLj4CUyfcWOn3YPdA7uZ9UgZ6D1
+XHPWabPan/e6Hzo=
 -----END CERTIFICATE-----
diff --git a/tests/wpt/tests/tools/certs/web-platform.test.key b/tests/wpt/tests/tools/certs/web-platform.test.key
index ae07ef896c1..16c60a9d5b1 100644
--- a/tests/wpt/tests/tools/certs/web-platform.test.key
+++ b/tests/wpt/tests/tools/certs/web-platform.test.key
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCo+KBRak1wDwph
-yImIneMMr/QDWXuBxIQlvlDVczGR3/p73qcT3UNBe+bKDNFcOujJ/S8oRdDswnPA
-Fw8zBgmq9+7md5KSawX6ehLPaubPgOrdvZ4h7Fyzg0C0X3Erjq6ZZdqsKBlDKO2s
-rxvB36+FfgsZNqeYnwhUwUKGQihPbZehdM0elcYpT9fLQSU/wXkVSuitOTevUQMF
-aX/mvEhHgYcPUywf3zzqEaJbl4swet4JmcfNZYpiaLozwWJA64BDBEzt6pjssQMx
-FAdKoU6BEfDUvIphXAwmX5DIb6ZolR8To/abPIEgmMhkmRpMhHs37+TRxOWacBbN
-1VSu43lrAgMBAAECggEBAJcckrN87/gRW2WLpIQLP2yvRvhf5DZvewcOJthdhq1A
-s5Bn1N/M90Lu/b0grXNgM6PAy5WmqmuykzXs6WjmM2s1A/AUa36KO/R/i6b3oadd
-Ua4wz+TirxzTeuBUoq8jkT4aeu+PhNgtGDFhAN/nnd8yk9ZerI+vWhICK+5J6Cbv
-FbPFF9uL/OKxNQPD/f1ScDKOdcvNwcYkZIRbTYiO/WaQqhQ+N3EG1eR6QHA8Xj29
-FZxgbH0GZysZ9D2/u3nTZ9u+n7D2rGmjPOJ6nRWsju6fQJZP7RFlfLu1C2MLlpdN
-ewEVriSRfJqYEx9tWAMUi6X5bEkz1zeu8HLMP1LvDNECgYEA0QF1fnludQckpuMY
-itX4ALyG5rE4deSWy4g544B6/N1xx4kQfL1iE7Fyfqv75YliexoY4XBiGh06bDaH
-gtaLn/NhD0GgBfBozTuXBNemFk4e6rChSBHHVenQ0WUcPusQ8J4WFSyfLbZ81Yj3
-8+kpNdHOwyoItNeYVKvbTdi6f+cCgYEAzva/h4d/G+Lnf9IvE9D/Xx0ZDp11VAK7
-N+5mzbsIaGa93ZJDFpvzgidZuuzZvQmpyVaBkZgq8wdNCizV9z1ffkPi0mZ5Ulk9
-hBelqt9U97K3jgJrWcljpI8aMOQEGmKQ/Jfh8GC3uFQ9oEXPXUOVEnVwPa04eLpc
-GFRBof6+md0CgYBZcGNkLPi8scLYe8QL3YaUYhjkbaA4qwpwrKoBFgELZoQDHD9m
-8fAfd0cEt/pCfqka/s744gvJGwreNfOFZOQ5HYBCdBXTlM50TPTSSKo1T1bhnZZW
-7ey8ciM/CCKvNg54uV2/z+mKOVZwVn2s7fEJq+/sCnfRU5VHXoepZ35frwKBgHAN
-4pcjgmt7x7FKAFkvUASUQYvLLsokjG708c4zlJLKBcRgO1iTaR0v5wIw2JbkE3xC
-DPbiN2bLridzLQmmvfwkDzuxZcBzNr48+2JvdpaBuaX2o17CjeN740dTPPF4Kl3I
-cfjutKnlWlRbV7F8NMsAsJuEHM4owFIf1EU8IsA1AoGAMN2S5kcmdMXGTrKk1EU0
-eFaFvVnXkqSFcZ+jAzeIutG9HpywpOhcIki5KveLSu6Cq4k4Y3RjnTbzfm+jlFoq
-0Q95PMTLdrHA3+EPR1GZHG0N08C/SyNpKiSuOYfSWjc1+qDZ1K6PSoRseCjkL45c
-ByqDG0VTRllPB/tjcyEinrk=
+MIIEwAIBADANBgkqhkiG9w0BAQEFAASCBKowggSmAgEAAoIBAQC1nEdkHngqBiPE
+jhia+mVcB77pqyB4XuSIcwRayIAnbTX8WO1AwA04wXxfyJbzkTgms1tw9Cjtg4Nx
+20QDOfLfFuQL/yrknlY/Pc93XWvC5OlbXR9b1IlWe2oQlqQtn9N6yf1mc8TlM9V9
+B7kzCjG5HBMUQHRWnBptRkJ0kn8OrfjCwo+6+2VpWg+qNuOWih/VdJjwQsV3ADwu
+R6AtIg/+84qF8CJl11GO0bmZjObcYjKhBOVRXPzMpBQ0tzUa4uR9uMYIJzeVo1tB
+8tNon5sEhbxfnxHJ4hpVfc1iNYetrlX+P4i0aIKmLVdqVwG48CKEQr/9vFLOAxX+
+tDVSNUzNAgMBAAECggEBAI9YGsFbi10gG3s47RLmMLrDIl0tRSO9QoSww+8j8oMs
+IEBdsGY7MDRsA89WdE8rgDaLutEc5nESLN3hQ32Ib7rGRplxflmU4F5qWybMBhJ+
+u/HxPp8s0noAT2dof43DaRix9eC33+FJWGinf/ZZRYXmMuj5NtplvDYkDrAUMVVT
+h2ndzlfv5u9fGZnXT/7qke03OZW3lGnI6BDw8dKgr/Lt0yF2oHUt3wbg29lHOh2N
+i/MUIxhYM/RnjZYHveKph3fapVN63ZVBi6xCZzLEPTFrZUtMZ0HpyNxNrCE6ZQrl
+dH8qH72ksvtTpUnIcoehAbjuaedBtzGEcaeXUGFoLcECgYEA2u6onDUmsiv/prZX
+sHUtHaTJf09M0RASaSIKZvVVl03wsL2uHqF8PU2QaOh1G85u+D+vNlBqA4lKAxsD
+W7Cv4qOJxGlVYeYYNhuPMXaWbnGFeSd8ijP44WUSDsCdmx99mwV1rMYXirypCgiq
+5Cg8TYQ/Ze2A5Z5hFltpuWVNzuMCgYEA1Fv0TGrWhuaJy+M9JErNmmvaLjtIknIH
+J2iaA0bAgINBDxODVN8gx4CufuJ8+QlRziIlWeYhE6Xg077GCsYYMW9GiaqyPDpG
+9q4efQU4hqgt/1Nx29hXO+sBCvgwFWNM1+4bBwwlfl2RIH9MUmFVUeb9jrE71IEi
+Vtai+MEnFI8CgYEAvwWJfHIrxz34nB9xN3el272SSlCIt8kMJ0saRGc/PPs2TR/T
+Msq3uk1Y+RAKTi66SERYvk0/ksJRH5CMR45MiLUkWYmGhBrdeShmskPEUa0fRmyb
+j4J1X0Rukwyg915sm7wRxqQ4mkauPyD86oHoy8HeBzNJSg/8qiMshiTL1P0CgYEA
+iMn+sGa1b0n7AvmKPeFtVQYaEWOgmKyYzRrE8k1V3LIvay2vkDD2JWxPem4cADKv
+ni9Cjgj9z3EvRFYDrZbyqI08C5uHmeIUKfv4qaF+Ssb0ch5nHizZ7D+xeUZreqtv
+KTw37q81S5Or0xoMqJgH5Gz9cTfbCURxQSya589LhCMCgYEAr5rWX0j32ZKMldtA
+yKWuNrEiX66Ab09hquP8Ew6atKDxdgp6vxNcnKKGFkMidg5gv8NAht08EWh/Yyuf
+VcigxrpqNkLJaqjntXCeurGUkcsLr8eZc0Cp+LJYsiOxg/TEnR0TlGraM4GftwP9
+Na3VJtUm8mO3hM+O5p7sTwNOmuI=
 -----END PRIVATE KEY-----
diff --git a/tests/wpt/tests/tools/certs/web-platform.test.pem b/tests/wpt/tests/tools/certs/web-platform.test.pem
index 6f843553160..5140687f3c0 100644
--- a/tests/wpt/tests/tools/certs/web-platform.test.pem
+++ b/tests/wpt/tests/tools/certs/web-platform.test.pem
@@ -1,113 +1,113 @@
 Certificate:
     Data:
         Version: 3 (0x2)
-        Serial Number: 419850 (0x6680a)
+        Serial Number: 640741 (0x9c6e5)
         Signature Algorithm: sha256WithRSAEncryption
         Issuer: CN=web-platform-tests
         Validity
-            Not Before: Aug 12 00:45:36 2023 GMT
-            Not After : Aug 11 00:45:36 2024 GMT
+            Not Before: Sep 12 00:47:19 2023 GMT
+            Not After : Sep 11 00:47:19 2024 GMT
         Subject: CN=web-platform.test
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
                 RSA Public-Key: (2048 bit)
                 Modulus:
-                    00:a8:f8:a0:51:6a:4d:70:0f:0a:61:c8:89:88:9d:
-                    e3:0c:af:f4:03:59:7b:81:c4:84:25:be:50:d5:73:
-                    31:91:df:fa:7b:de:a7:13:dd:43:41:7b:e6:ca:0c:
-                    d1:5c:3a:e8:c9:fd:2f:28:45:d0:ec:c2:73:c0:17:
-                    0f:33:06:09:aa:f7:ee:e6:77:92:92:6b:05:fa:7a:
-                    12:cf:6a:e6:cf:80:ea:dd:bd:9e:21:ec:5c:b3:83:
-                    40:b4:5f:71:2b:8e:ae:99:65:da:ac:28:19:43:28:
-                    ed:ac:af:1b:c1:df:af:85:7e:0b:19:36:a7:98:9f:
-                    08:54:c1:42:86:42:28:4f:6d:97:a1:74:cd:1e:95:
-                    c6:29:4f:d7:cb:41:25:3f:c1:79:15:4a:e8:ad:39:
-                    37:af:51:03:05:69:7f:e6:bc:48:47:81:87:0f:53:
-                    2c:1f:df:3c:ea:11:a2:5b:97:8b:30:7a:de:09:99:
-                    c7:cd:65:8a:62:68:ba:33:c1:62:40:eb:80:43:04:
-                    4c:ed:ea:98:ec:b1:03:31:14:07:4a:a1:4e:81:11:
-                    f0:d4:bc:8a:61:5c:0c:26:5f:90:c8:6f:a6:68:95:
-                    1f:13:a3:f6:9b:3c:81:20:98:c8:64:99:1a:4c:84:
-                    7b:37:ef:e4:d1:c4:e5:9a:70:16:cd:d5:54:ae:e3:
-                    79:6b
+                    00:b5:9c:47:64:1e:78:2a:06:23:c4:8e:18:9a:fa:
+                    65:5c:07:be:e9:ab:20:78:5e:e4:88:73:04:5a:c8:
+                    80:27:6d:35:fc:58:ed:40:c0:0d:38:c1:7c:5f:c8:
+                    96:f3:91:38:26:b3:5b:70:f4:28:ed:83:83:71:db:
+                    44:03:39:f2:df:16:e4:0b:ff:2a:e4:9e:56:3f:3d:
+                    cf:77:5d:6b:c2:e4:e9:5b:5d:1f:5b:d4:89:56:7b:
+                    6a:10:96:a4:2d:9f:d3:7a:c9:fd:66:73:c4:e5:33:
+                    d5:7d:07:b9:33:0a:31:b9:1c:13:14:40:74:56:9c:
+                    1a:6d:46:42:74:92:7f:0e:ad:f8:c2:c2:8f:ba:fb:
+                    65:69:5a:0f:aa:36:e3:96:8a:1f:d5:74:98:f0:42:
+                    c5:77:00:3c:2e:47:a0:2d:22:0f:fe:f3:8a:85:f0:
+                    22:65:d7:51:8e:d1:b9:99:8c:e6:dc:62:32:a1:04:
+                    e5:51:5c:fc:cc:a4:14:34:b7:35:1a:e2:e4:7d:b8:
+                    c6:08:27:37:95:a3:5b:41:f2:d3:68:9f:9b:04:85:
+                    bc:5f:9f:11:c9:e2:1a:55:7d:cd:62:35:87:ad:ae:
+                    55:fe:3f:88:b4:68:82:a6:2d:57:6a:57:01:b8:f0:
+                    22:84:42:bf:fd:bc:52:ce:03:15:fe:b4:35:52:35:
+                    4c:cd
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Basic Constraints: 
                 CA:FALSE
             X509v3 Subject Key Identifier: 
-                3F:99:A2:8E:CA:F2:40:25:E7:B8:79:FA:B2:6D:09:FF:51:B9:A5:8F
+                8C:6B:B4:12:01:78:DC:2B:78:9F:58:EC:38:00:49:12:7A:CB:FE:AA
             X509v3 Authority Key Identifier: 
-                keyid:13:F2:89:DD:BA:ED:E1:12:57:3B:09:F8:70:D7:79:8E:20:09:3D:70
+                keyid:2F:CE:56:15:27:62:06:28:A0:B3:9C:A4:75:58:F6:0D:87:59:20:D8
 
             X509v3 Key Usage: 
                 Digital Signature, Non Repudiation, Key Encipherment
             X509v3 Extended Key Usage: 
                 TLS Web Server Authentication
             X509v3 Subject Alternative Name: 
-                DNS:web-platform.test, DNS:www.web-platform.test, DNS:not-web-platform.test, DNS:www2.web-platform.test, DNS:www1.web-platform.test, DNS:www.www.web-platform.test, DNS:www.not-web-platform.test, DNS:www2.www.web-platform.test, DNS:www1.www.web-platform.test, DNS:www1.not-web-platform.test, DNS:www.www1.web-platform.test, DNS:www.www2.web-platform.test, DNS:www2.not-web-platform.test, DNS:www2.www1.web-platform.test, DNS:www1.www2.web-platform.test, DNS:www1.www1.web-platform.test, DNS:www2.www2.web-platform.test, DNS:www.www.not-web-platform.test, DNS:www2.www.not-web-platform.test, DNS:xn--lve-6lad.web-platform.test, DNS:www.www2.not-web-platform.test, DNS:www.www1.not-web-platform.test, DNS:www1.www.not-web-platform.test, DNS:www1.www1.not-web-platform.test, DNS:www2.www2.not-web-platform.test, DNS:www1.www2.not-web-platform.test, DNS:www2.www1.not-web-platform.test, DNS:xn--lve-6lad.www.web-platform.test, DNS:xn--lve-6lad.not-web-platform.test, DNS:www.xn--lve-6lad.web-platform.test, DNS:xn--lve-6lad.www2.web-platform.test, DNS:www1.xn--lve-6lad.web-platform.test, DNS:xn--lve-6lad.www1.web-platform.test, DNS:www2.xn--lve-6lad.web-platform.test, DNS:xn--lve-6lad.www.not-web-platform.test, DNS:www.xn--lve-6lad.not-web-platform.test, DNS:xn--lve-6lad.www1.not-web-platform.test, DNS:xn--lve-6lad.www2.not-web-platform.test, DNS:www1.xn--lve-6lad.not-web-platform.test, DNS:www2.xn--lve-6lad.not-web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.web-platform.test, DNS:xn--lve-6lad.xn--lve-6lad.web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.not-web-platform.test, DNS:www.xn--n8j6ds53lwwkrqhv28a.web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.www.web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.www2.web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.www1.web-platform.test, DNS:www1.xn--n8j6ds53lwwkrqhv28a.web-platform.test, DNS:www2.xn--n8j6ds53lwwkrqhv28a.web-platform.test, DNS:xn--lve-6lad.xn--lve-6lad.not-web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.www.not-web-platform.test, DNS:www.xn--n8j6ds53lwwkrqhv28a.not-web-platform.test, DNS:www1.xn--n8j6ds53lwwkrqhv28a.not-web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.www2.not-web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.www1.not-web-platform.test, DNS:www2.xn--n8j6ds53lwwkrqhv28a.not-web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.xn--lve-6lad.web-platform.test, DNS:xn--lve-6lad.xn--n8j6ds53lwwkrqhv28a.web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.xn--lve-6lad.not-web-platform.test, DNS:xn--lve-6lad.xn--n8j6ds53lwwkrqhv28a.not-web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.xn--n8j6ds53lwwkrqhv28a.web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.xn--n8j6ds53lwwkrqhv28a.not-web-platform.test
+                DNS:web-platform.test, DNS:www.web-platform.test, DNS:not-web-platform.test, DNS:www1.web-platform.test, DNS:www2.web-platform.test, DNS:www.not-web-platform.test, DNS:www.www.web-platform.test, DNS:www.www2.web-platform.test, DNS:www2.www.web-platform.test, DNS:www.www1.web-platform.test, DNS:www2.not-web-platform.test, DNS:www1.www.web-platform.test, DNS:www1.not-web-platform.test, DNS:www2.www2.web-platform.test, DNS:www1.www1.web-platform.test, DNS:www1.www2.web-platform.test, DNS:www2.www1.web-platform.test, DNS:www.www.not-web-platform.test, DNS:www1.www.not-web-platform.test, DNS:www.www1.not-web-platform.test, DNS:www.www2.not-web-platform.test, DNS:xn--lve-6lad.web-platform.test, DNS:www2.www.not-web-platform.test, DNS:www1.www2.not-web-platform.test, DNS:www2.www2.not-web-platform.test, DNS:www2.www1.not-web-platform.test, DNS:www1.www1.not-web-platform.test, DNS:www.xn--lve-6lad.web-platform.test, DNS:xn--lve-6lad.www.web-platform.test, DNS:xn--lve-6lad.not-web-platform.test, DNS:www2.xn--lve-6lad.web-platform.test, DNS:xn--lve-6lad.www2.web-platform.test, DNS:www1.xn--lve-6lad.web-platform.test, DNS:xn--lve-6lad.www1.web-platform.test, DNS:xn--lve-6lad.www.not-web-platform.test, DNS:www.xn--lve-6lad.not-web-platform.test, DNS:www2.xn--lve-6lad.not-web-platform.test, DNS:www1.xn--lve-6lad.not-web-platform.test, DNS:xn--lve-6lad.www1.not-web-platform.test, DNS:xn--lve-6lad.www2.not-web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.web-platform.test, DNS:xn--lve-6lad.xn--lve-6lad.web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.www.web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.not-web-platform.test, DNS:www.xn--n8j6ds53lwwkrqhv28a.web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.www2.web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.www1.web-platform.test, DNS:www2.xn--n8j6ds53lwwkrqhv28a.web-platform.test, DNS:www1.xn--n8j6ds53lwwkrqhv28a.web-platform.test, DNS:xn--lve-6lad.xn--lve-6lad.not-web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.www.not-web-platform.test, DNS:www.xn--n8j6ds53lwwkrqhv28a.not-web-platform.test, DNS:www1.xn--n8j6ds53lwwkrqhv28a.not-web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.www2.not-web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.www1.not-web-platform.test, DNS:www2.xn--n8j6ds53lwwkrqhv28a.not-web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.xn--lve-6lad.web-platform.test, DNS:xn--lve-6lad.xn--n8j6ds53lwwkrqhv28a.web-platform.test, DNS:xn--lve-6lad.xn--n8j6ds53lwwkrqhv28a.not-web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.xn--lve-6lad.not-web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.xn--n8j6ds53lwwkrqhv28a.web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.xn--n8j6ds53lwwkrqhv28a.not-web-platform.test
     Signature Algorithm: sha256WithRSAEncryption
-         5f:75:75:27:16:7c:d4:f8:7d:8d:09:54:98:3d:92:8f:a4:2f:
-         e4:69:cc:ae:a8:af:88:e9:d2:53:29:35:78:f8:38:a0:f9:7a:
-         19:65:01:ad:b4:83:2f:c5:4f:5e:a3:08:5a:fb:52:f1:a7:79:
-         8d:cc:18:42:4d:df:1f:e1:8a:8e:c3:75:ec:cc:66:40:1f:c5:
-         15:be:03:79:d2:7e:93:80:ef:75:5c:7f:71:eb:c5:45:0f:08:
-         82:5f:ca:ba:7b:56:98:b4:64:ff:54:43:9c:99:cb:31:5c:21:
-         9e:88:37:2e:41:59:e4:59:1a:0f:6d:05:58:84:e4:b9:c7:ed:
-         6c:f7:b3:75:bf:18:31:00:d6:9a:cf:60:07:74:cb:81:ec:d8:
-         a3:91:96:77:36:04:aa:93:2f:4d:28:6f:20:94:43:57:0c:83:
-         b5:26:e5:68:c0:2b:b9:20:49:34:10:bf:71:6d:78:ef:35:a0:
-         bf:df:1c:d7:29:ec:af:d8:ac:9b:f0:14:80:1b:03:dc:9c:d6:
-         25:29:ff:86:31:b5:55:c0:7b:6d:a7:73:02:74:06:ea:83:64:
-         f6:7f:3b:83:9b:08:36:cc:77:58:75:e5:4c:73:e5:bf:0e:fb:
-         f1:65:83:e9:a9:2b:db:71:93:61:a5:ce:46:aa:c8:34:01:e9:
-         a8:20:1d:09
+         89:74:5b:31:67:f5:72:96:7a:32:f5:b4:9e:d3:09:39:a5:a6:
+         8b:a6:51:8c:42:83:77:5a:b3:9f:92:a3:61:80:d8:3a:3c:98:
+         96:35:eb:bf:db:74:4e:a4:35:f1:af:cd:e0:19:ee:b1:b5:ea:
+         ff:ef:96:56:7f:68:70:1a:74:24:e7:66:1a:52:f2:66:48:6a:
+         15:f4:c1:a4:5e:09:ea:41:17:fc:71:1b:a6:63:2d:f6:ee:89:
+         83:96:0c:e4:61:e0:6e:c2:cd:cb:77:c2:e5:68:5d:c3:37:d2:
+         77:18:c9:1c:ee:95:3c:41:17:1e:bd:02:d9:85:e3:d4:18:d3:
+         47:0b:98:ed:c5:2e:ad:a9:24:16:5e:b4:42:66:c1:78:ce:1f:
+         01:39:d3:75:cd:78:cc:da:a0:58:e2:df:b7:38:8a:c2:66:46:
+         1c:9b:cb:15:10:b4:0c:b6:ef:c7:c3:18:bd:84:ec:6b:ef:9a:
+         86:35:96:f1:ba:53:ce:96:bf:12:bf:e1:ac:13:49:8c:87:0b:
+         c6:b8:b0:84:f1:ea:0c:4e:04:3f:51:4a:56:88:34:7d:f9:9b:
+         e3:dc:4b:fe:57:b3:ed:3d:4e:06:bc:0f:e7:bf:bf:bd:c6:43:
+         dc:47:aa:a0:34:df:7b:66:84:c2:32:54:16:f7:56:ee:68:7c:
+         cd:44:99:d9
 -----BEGIN CERTIFICATE-----
-MIIMsjCCC5qgAwIBAgIDBmgKMA0GCSqGSIb3DQEBCwUAMB0xGzAZBgNVBAMMEndl
-Yi1wbGF0Zm9ybS10ZXN0czAeFw0yMzA4MTIwMDQ1MzZaFw0yNDA4MTEwMDQ1MzZa
+MIIMsjCCC5qgAwIBAgIDCcblMA0GCSqGSIb3DQEBCwUAMB0xGzAZBgNVBAMMEndl
+Yi1wbGF0Zm9ybS10ZXN0czAeFw0yMzA5MTIwMDQ3MTlaFw0yNDA5MTEwMDQ3MTla
 MBwxGjAYBgNVBAMMEXdlYi1wbGF0Zm9ybS50ZXN0MIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAqPigUWpNcA8KYciJiJ3jDK/0A1l7gcSEJb5Q1XMxkd/6
-e96nE91DQXvmygzRXDroyf0vKEXQ7MJzwBcPMwYJqvfu5neSkmsF+noSz2rmz4Dq
-3b2eIexcs4NAtF9xK46umWXarCgZQyjtrK8bwd+vhX4LGTanmJ8IVMFChkIoT22X
-oXTNHpXGKU/Xy0ElP8F5FUrorTk3r1EDBWl/5rxIR4GHD1MsH9886hGiW5eLMHre
-CZnHzWWKYmi6M8FiQOuAQwRM7eqY7LEDMRQHSqFOgRHw1LyKYVwMJl+QyG+maJUf
-E6P2mzyBIJjIZJkaTIR7N+/k0cTlmnAWzdVUruN5awIDAQABo4IJ+jCCCfYwCQYD
-VR0TBAIwADAdBgNVHQ4EFgQUP5mijsryQCXnuHn6sm0J/1G5pY8wHwYDVR0jBBgw
-FoAUE/KJ3brt4RJXOwn4cNd5jiAJPXAwCwYDVR0PBAQDAgXgMBMGA1UdJQQMMAoG
+AAOCAQ8AMIIBCgKCAQEAtZxHZB54KgYjxI4YmvplXAe+6asgeF7kiHMEWsiAJ201
+/FjtQMANOMF8X8iW85E4JrNbcPQo7YODcdtEAzny3xbkC/8q5J5WPz3Pd11rwuTp
+W10fW9SJVntqEJakLZ/Tesn9ZnPE5TPVfQe5MwoxuRwTFEB0VpwabUZCdJJ/Dq34
+wsKPuvtlaVoPqjbjloof1XSY8ELFdwA8LkegLSIP/vOKhfAiZddRjtG5mYzm3GIy
+oQTlUVz8zKQUNLc1GuLkfbjGCCc3laNbQfLTaJ+bBIW8X58RyeIaVX3NYjWHra5V
+/j+ItGiCpi1XalcBuPAihEK//bxSzgMV/rQ1UjVMzQIDAQABo4IJ+jCCCfYwCQYD
+VR0TBAIwADAdBgNVHQ4EFgQUjGu0EgF43Ct4n1jsOABJEnrL/qowHwYDVR0jBBgw
+FoAUL85WFSdiBiigs5ykdVj2DYdZINgwCwYDVR0PBAQDAgXgMBMGA1UdJQQMMAoG
 CCsGAQUFBwMBMIIJhQYDVR0RBIIJfDCCCXiCEXdlYi1wbGF0Zm9ybS50ZXN0ghV3
 d3cud2ViLXBsYXRmb3JtLnRlc3SCFW5vdC13ZWItcGxhdGZvcm0udGVzdIIWd3d3
-Mi53ZWItcGxhdGZvcm0udGVzdIIWd3d3MS53ZWItcGxhdGZvcm0udGVzdIIZd3d3
-Lnd3dy53ZWItcGxhdGZvcm0udGVzdIIZd3d3Lm5vdC13ZWItcGxhdGZvcm0udGVz
-dIIad3d3Mi53d3cud2ViLXBsYXRmb3JtLnRlc3SCGnd3dzEud3d3LndlYi1wbGF0
-Zm9ybS50ZXN0ghp3d3cxLm5vdC13ZWItcGxhdGZvcm0udGVzdIIad3d3Lnd3dzEu
-d2ViLXBsYXRmb3JtLnRlc3SCGnd3dy53d3cyLndlYi1wbGF0Zm9ybS50ZXN0ghp3
-d3cyLm5vdC13ZWItcGxhdGZvcm0udGVzdIIbd3d3Mi53d3cxLndlYi1wbGF0Zm9y
-bS50ZXN0ght3d3cxLnd3dzIud2ViLXBsYXRmb3JtLnRlc3SCG3d3dzEud3d3MS53
-ZWItcGxhdGZvcm0udGVzdIIbd3d3Mi53d3cyLndlYi1wbGF0Zm9ybS50ZXN0gh13
-d3cud3d3Lm5vdC13ZWItcGxhdGZvcm0udGVzdIIed3d3Mi53d3cubm90LXdlYi1w
-bGF0Zm9ybS50ZXN0gh54bi0tbHZlLTZsYWQud2ViLXBsYXRmb3JtLnRlc3SCHnd3
-dy53d3cyLm5vdC13ZWItcGxhdGZvcm0udGVzdIIed3d3Lnd3dzEubm90LXdlYi1w
-bGF0Zm9ybS50ZXN0gh53d3cxLnd3dy5ub3Qtd2ViLXBsYXRmb3JtLnRlc3SCH3d3
-dzEud3d3MS5ub3Qtd2ViLXBsYXRmb3JtLnRlc3SCH3d3dzIud3d3Mi5ub3Qtd2Vi
-LXBsYXRmb3JtLnRlc3SCH3d3dzEud3d3Mi5ub3Qtd2ViLXBsYXRmb3JtLnRlc3SC
-H3d3dzIud3d3MS5ub3Qtd2ViLXBsYXRmb3JtLnRlc3SCInhuLS1sdmUtNmxhZC53
-d3cud2ViLXBsYXRmb3JtLnRlc3SCInhuLS1sdmUtNmxhZC5ub3Qtd2ViLXBsYXRm
-b3JtLnRlc3SCInd3dy54bi0tbHZlLTZsYWQud2ViLXBsYXRmb3JtLnRlc3SCI3hu
-LS1sdmUtNmxhZC53d3cyLndlYi1wbGF0Zm9ybS50ZXN0giN3d3cxLnhuLS1sdmUt
-NmxhZC53ZWItcGxhdGZvcm0udGVzdIIjeG4tLWx2ZS02bGFkLnd3dzEud2ViLXBs
-YXRmb3JtLnRlc3SCI3d3dzIueG4tLWx2ZS02bGFkLndlYi1wbGF0Zm9ybS50ZXN0
+MS53ZWItcGxhdGZvcm0udGVzdIIWd3d3Mi53ZWItcGxhdGZvcm0udGVzdIIZd3d3
+Lm5vdC13ZWItcGxhdGZvcm0udGVzdIIZd3d3Lnd3dy53ZWItcGxhdGZvcm0udGVz
+dIIad3d3Lnd3dzIud2ViLXBsYXRmb3JtLnRlc3SCGnd3dzIud3d3LndlYi1wbGF0
+Zm9ybS50ZXN0ghp3d3cud3d3MS53ZWItcGxhdGZvcm0udGVzdIIad3d3Mi5ub3Qt
+d2ViLXBsYXRmb3JtLnRlc3SCGnd3dzEud3d3LndlYi1wbGF0Zm9ybS50ZXN0ghp3
+d3cxLm5vdC13ZWItcGxhdGZvcm0udGVzdIIbd3d3Mi53d3cyLndlYi1wbGF0Zm9y
+bS50ZXN0ght3d3cxLnd3dzEud2ViLXBsYXRmb3JtLnRlc3SCG3d3dzEud3d3Mi53
+ZWItcGxhdGZvcm0udGVzdIIbd3d3Mi53d3cxLndlYi1wbGF0Zm9ybS50ZXN0gh13
+d3cud3d3Lm5vdC13ZWItcGxhdGZvcm0udGVzdIIed3d3MS53d3cubm90LXdlYi1w
+bGF0Zm9ybS50ZXN0gh53d3cud3d3MS5ub3Qtd2ViLXBsYXRmb3JtLnRlc3SCHnd3
+dy53d3cyLm5vdC13ZWItcGxhdGZvcm0udGVzdIIeeG4tLWx2ZS02bGFkLndlYi1w
+bGF0Zm9ybS50ZXN0gh53d3cyLnd3dy5ub3Qtd2ViLXBsYXRmb3JtLnRlc3SCH3d3
+dzEud3d3Mi5ub3Qtd2ViLXBsYXRmb3JtLnRlc3SCH3d3dzIud3d3Mi5ub3Qtd2Vi
+LXBsYXRmb3JtLnRlc3SCH3d3dzIud3d3MS5ub3Qtd2ViLXBsYXRmb3JtLnRlc3SC
+H3d3dzEud3d3MS5ub3Qtd2ViLXBsYXRmb3JtLnRlc3SCInd3dy54bi0tbHZlLTZs
+YWQud2ViLXBsYXRmb3JtLnRlc3SCInhuLS1sdmUtNmxhZC53d3cud2ViLXBsYXRm
+b3JtLnRlc3SCInhuLS1sdmUtNmxhZC5ub3Qtd2ViLXBsYXRmb3JtLnRlc3SCI3d3
+dzIueG4tLWx2ZS02bGFkLndlYi1wbGF0Zm9ybS50ZXN0giN4bi0tbHZlLTZsYWQu
+d3d3Mi53ZWItcGxhdGZvcm0udGVzdIIjd3d3MS54bi0tbHZlLTZsYWQud2ViLXBs
+YXRmb3JtLnRlc3SCI3huLS1sdmUtNmxhZC53d3cxLndlYi1wbGF0Zm9ybS50ZXN0
 giZ4bi0tbHZlLTZsYWQud3d3Lm5vdC13ZWItcGxhdGZvcm0udGVzdIImd3d3Lnhu
-LS1sdmUtNmxhZC5ub3Qtd2ViLXBsYXRmb3JtLnRlc3SCJ3huLS1sdmUtNmxhZC53
-d3cxLm5vdC13ZWItcGxhdGZvcm0udGVzdIIneG4tLWx2ZS02bGFkLnd3dzIubm90
-LXdlYi1wbGF0Zm9ybS50ZXN0gid3d3cxLnhuLS1sdmUtNmxhZC5ub3Qtd2ViLXBs
-YXRmb3JtLnRlc3SCJ3d3dzIueG4tLWx2ZS02bGFkLm5vdC13ZWItcGxhdGZvcm0u
+LS1sdmUtNmxhZC5ub3Qtd2ViLXBsYXRmb3JtLnRlc3SCJ3d3dzIueG4tLWx2ZS02
+bGFkLm5vdC13ZWItcGxhdGZvcm0udGVzdIInd3d3MS54bi0tbHZlLTZsYWQubm90
+LXdlYi1wbGF0Zm9ybS50ZXN0gid4bi0tbHZlLTZsYWQud3d3MS5ub3Qtd2ViLXBs
+YXRmb3JtLnRlc3SCJ3huLS1sdmUtNmxhZC53d3cyLm5vdC13ZWItcGxhdGZvcm0u
 dGVzdIIpeG4tLW44ajZkczUzbHd3a3JxaHYyOGEud2ViLXBsYXRmb3JtLnRlc3SC
 K3huLS1sdmUtNmxhZC54bi0tbHZlLTZsYWQud2ViLXBsYXRmb3JtLnRlc3SCLXhu
-LS1uOGo2ZHM1M2x3d2tycWh2MjhhLm5vdC13ZWItcGxhdGZvcm0udGVzdIItd3d3
-LnhuLS1uOGo2ZHM1M2x3d2tycWh2MjhhLndlYi1wbGF0Zm9ybS50ZXN0gi14bi0t
-bjhqNmRzNTNsd3drcnFodjI4YS53d3cud2ViLXBsYXRmb3JtLnRlc3SCLnhuLS1u
+LS1uOGo2ZHM1M2x3d2tycWh2MjhhLnd3dy53ZWItcGxhdGZvcm0udGVzdIIteG4t
+LW44ajZkczUzbHd3a3JxaHYyOGEubm90LXdlYi1wbGF0Zm9ybS50ZXN0gi13d3cu
+eG4tLW44ajZkczUzbHd3a3JxaHYyOGEud2ViLXBsYXRmb3JtLnRlc3SCLnhuLS1u
 OGo2ZHM1M2x3d2tycWh2MjhhLnd3dzIud2ViLXBsYXRmb3JtLnRlc3SCLnhuLS1u
-OGo2ZHM1M2x3d2tycWh2MjhhLnd3dzEud2ViLXBsYXRmb3JtLnRlc3SCLnd3dzEu
-eG4tLW44ajZkczUzbHd3a3JxaHYyOGEud2ViLXBsYXRmb3JtLnRlc3SCLnd3dzIu
+OGo2ZHM1M2x3d2tycWh2MjhhLnd3dzEud2ViLXBsYXRmb3JtLnRlc3SCLnd3dzIu
+eG4tLW44ajZkczUzbHd3a3JxaHYyOGEud2ViLXBsYXRmb3JtLnRlc3SCLnd3dzEu
 eG4tLW44ajZkczUzbHd3a3JxaHYyOGEud2ViLXBsYXRmb3JtLnRlc3SCL3huLS1s
 dmUtNmxhZC54bi0tbHZlLTZsYWQubm90LXdlYi1wbGF0Zm9ybS50ZXN0gjF4bi0t
 bjhqNmRzNTNsd3drcnFodjI4YS53d3cubm90LXdlYi1wbGF0Zm9ybS50ZXN0gjF3
@@ -118,16 +118,16 @@ b3JtLnRlc3SCMnhuLS1uOGo2ZHM1M2x3d2tycWh2MjhhLnd3dzEubm90LXdlYi1w
 bGF0Zm9ybS50ZXN0gjJ3d3cyLnhuLS1uOGo2ZHM1M2x3d2tycWh2MjhhLm5vdC13
 ZWItcGxhdGZvcm0udGVzdII2eG4tLW44ajZkczUzbHd3a3JxaHYyOGEueG4tLWx2
 ZS02bGFkLndlYi1wbGF0Zm9ybS50ZXN0gjZ4bi0tbHZlLTZsYWQueG4tLW44ajZk
-czUzbHd3a3JxaHYyOGEud2ViLXBsYXRmb3JtLnRlc3SCOnhuLS1uOGo2ZHM1M2x3
-d2tycWh2MjhhLnhuLS1sdmUtNmxhZC5ub3Qtd2ViLXBsYXRmb3JtLnRlc3SCOnhu
-LS1sdmUtNmxhZC54bi0tbjhqNmRzNTNsd3drcnFodjI4YS5ub3Qtd2ViLXBsYXRm
+czUzbHd3a3JxaHYyOGEud2ViLXBsYXRmb3JtLnRlc3SCOnhuLS1sdmUtNmxhZC54
+bi0tbjhqNmRzNTNsd3drcnFodjI4YS5ub3Qtd2ViLXBsYXRmb3JtLnRlc3SCOnhu
+LS1uOGo2ZHM1M2x3d2tycWh2MjhhLnhuLS1sdmUtNmxhZC5ub3Qtd2ViLXBsYXRm
 b3JtLnRlc3SCQXhuLS1uOGo2ZHM1M2x3d2tycWh2MjhhLnhuLS1uOGo2ZHM1M2x3
 d2tycWh2MjhhLndlYi1wbGF0Zm9ybS50ZXN0gkV4bi0tbjhqNmRzNTNsd3drcnFo
 djI4YS54bi0tbjhqNmRzNTNsd3drcnFodjI4YS5ub3Qtd2ViLXBsYXRmb3JtLnRl
-c3QwDQYJKoZIhvcNAQELBQADggEBAF91dScWfNT4fY0JVJg9ko+kL+RpzK6or4jp
-0lMpNXj4OKD5ehllAa20gy/FT16jCFr7UvGneY3MGEJN3x/hio7DdezMZkAfxRW+
-A3nSfpOA73Vcf3HrxUUPCIJfyrp7Vpi0ZP9UQ5yZyzFcIZ6INy5BWeRZGg9tBViE
-5LnH7Wz3s3W/GDEA1prPYAd0y4Hs2KORlnc2BKqTL00obyCUQ1cMg7Um5WjAK7kg
-STQQv3FteO81oL/fHNcp7K/YrJvwFIAbA9yc1iUp/4YxtVXAe22ncwJ0BuqDZPZ/
-O4ObCDbMd1h15Uxz5b8O+/Flg+mpK9txk2GlzkaqyDQB6aggHQk=
+c3QwDQYJKoZIhvcNAQELBQADggEBAIl0WzFn9XKWejL1tJ7TCTmlpoumUYxCg3da
+s5+So2GA2Do8mJY167/bdE6kNfGvzeAZ7rG16v/vllZ/aHAadCTnZhpS8mZIahX0
+waReCepBF/xxG6ZjLfbuiYOWDORh4G7Czct3wuVoXcM30ncYyRzulTxBFx69AtmF
+49QY00cLmO3FLq2pJBZetEJmwXjOHwE503XNeMzaoFji37c4isJmRhybyxUQtAy2
+78fDGL2E7GvvmoY1lvG6U86WvxK/4awTSYyHC8a4sITx6gxOBD9RSlaINH35m+Pc
+S/5Xs+09Tga8D+e/v73GQ9xHqqA033tmhMIyVBb3Vu5ofM1Emdk=
 -----END CERTIFICATE-----
diff --git a/tests/wpt/tests/tools/ci/azure/affected_tests.yml b/tests/wpt/tests/tools/ci/azure/affected_tests.yml
index 6d3d32acc82..566021d2496 100644
--- a/tests/wpt/tests/tools/ci/azure/affected_tests.yml
+++ b/tests/wpt/tests/tools/ci/azure/affected_tests.yml
@@ -10,9 +10,6 @@ steps:
       set -eux -o pipefail
       git checkout ${{ parameters.checkoutCommit }}
     displayName: 'Checkout ${{ parameters.checkoutCommit }}'
-- template: pip_install.yml
-  parameters:
-    packages: virtualenv
 - template: install_certs.yml
 - template: color_profile.yml
 - template: install_safari.yml
diff --git a/tests/wpt/tests/tools/ci/azure/sysdiagnose.yml b/tests/wpt/tests/tools/ci/azure/sysdiagnose.yml
index 97646f69149..76bee7dbb82 100644
--- a/tests/wpt/tests/tools/ci/azure/sysdiagnose.yml
+++ b/tests/wpt/tests/tools/ci/azure/sysdiagnose.yml
@@ -1,13 +1,12 @@
 steps:
 - script: |
     mkdir -p /Users/runner/sysdiagnose
-    # No UI, and no time sensitive, generated, or archived logs
-    sudo sysdiagnose -ub -PGR -f /Users/runner/sysdiagnose -A sysdiagnose_$(System.JobPositionInPhase)
+    sudo sysdiagnose -ub -f /Users/runner/sysdiagnose -A sysdiagnose_$(System.PhaseName)-attempt-$(System.JobAttempt)-chunk-$(System.JobPositionInPhase)
   displayName: 'Collect sysdiagnose'
-  condition: and(succeeded(), eq(variables['Agent.OS'], 'Darwin'))
+  condition: and(succeededOrFailed(), eq(variables['Agent.OS'], 'Darwin'))
 - task: PublishBuildArtifacts@1
   displayName: 'Publish sysdiagnose'
   inputs:
     pathtoPublish: /Users/runner/sysdiagnose/
     artifactName: sysdiagnose
-  condition: and(succeeded(), eq(variables['Agent.OS'], 'Darwin'))
+  condition: and(succeededOrFailed(), eq(variables['Agent.OS'], 'Darwin'))
diff --git a/tests/wpt/tests/tools/ci/requirements_tc.txt b/tests/wpt/tests/tools/ci/requirements_tc.txt
index 0506dbb0086..2ee8c065dba 100644
--- a/tests/wpt/tests/tools/ci/requirements_tc.txt
+++ b/tests/wpt/tests/tools/ci/requirements_tc.txt
@@ -1,4 +1,4 @@
-pygithub==1.59.1
+pygithub==2.1.1
 pyyaml==6.0.1
 requests==2.31.0
-taskcluster==54.4.2
+taskcluster==55.3.2
diff --git a/tests/wpt/tests/tools/ci/tc/decision.py b/tests/wpt/tests/tools/ci/tc/decision.py
index 0a6d03ab6cd..6e3bd8619d7 100644
--- a/tests/wpt/tests/tools/ci/tc/decision.py
+++ b/tests/wpt/tests/tools/ci/tc/decision.py
@@ -290,6 +290,7 @@ def get_artifact_data(artifact, task_id_map):
 def build_task_graph(event, all_tasks, tasks):
     task_id_map = OrderedDict()
     taskgroup_id = os.environ.get("TASK_ID", taskcluster.slugId())
+    sink_task_depends_on = []
 
     def add_task(task_name, task):
         depends_on_ids = []
@@ -309,6 +310,11 @@ def build_task_graph(event, all_tasks, tasks):
                                             env_extra=env_extra)
         task_id_map[task_name] = (task_id, task_data)
 
+        # The string conversion here is because if we use variables they are
+        # converted to a string, so it's easier to use a string always
+        if str(task.get("required", "True")) != "False" and task_name != "sink-task":
+            sink_task_depends_on.append(task_id)
+
     for task_name, task in tasks.items():
         if task_name == "sink-task":
             # sink-task will be created below at the end of the ordered dict,
@@ -324,10 +330,9 @@ def build_task_graph(event, all_tasks, tasks):
     sink_task = tasks.get("sink-task")
     if sink_task:
         logger.info("Scheduling sink-task")
-        depends_on_ids = [x[0] for x in task_id_map.values()]
-        sink_task["command"] += " {}".format(" ".join(depends_on_ids))
+        sink_task["command"] += " {}".format(" ".join(sink_task_depends_on))
         task_id_map["sink-task"] = create_tc_task(
-            event, sink_task, taskgroup_id, depends_on_ids)
+            event, sink_task, taskgroup_id, sink_task_depends_on)
     else:
         logger.info("sink-task is not scheduled")
 
diff --git a/tests/wpt/tests/tools/ci/tc/tasks/test.yml b/tests/wpt/tests/tools/ci/tc/tasks/test.yml
index 4e1abf950b5..d774272eca5 100644
--- a/tests/wpt/tests/tools/ci/tc/tasks/test.yml
+++ b/tests/wpt/tests/tools/ci/tc/tasks/test.yml
@@ -305,11 +305,13 @@ tasks:
             channel: nightly
             stability-exclude-users:
               - moz-wptsync-bot
+            required: true
         - vars:
             browser: chrome
             channel: dev
             stability-exclude-users:
               - chromium-wpt-export-bot
+            required: false
       do:
         - wpt-${vars.browser}-${vars.channel}-stability:
             use:
@@ -334,6 +336,7 @@ tasks:
               --verify-repeat-restart=10
               --github-checks-text-file="/home/test/artifacts/checkrun.md"
             exclude-users: ${vars.stability-exclude-users}
+            required: ${vars.required}
 
         - wpt-${vars.browser}-${vars.channel}-results:
             use:
diff --git a/tests/wpt/tests/tools/ci/tc/tests/test_valid.py b/tests/wpt/tests/tools/ci/tc/tests/test_valid.py
index f7e3d019128..8c4715ad6ec 100644
--- a/tests/wpt/tests/tools/ci/tc/tests/test_valid.py
+++ b/tests/wpt/tests/tools/ci/tc/tests/test_valid.py
@@ -61,6 +61,27 @@ def test_exclude_users(event_path, expected):
         assert set(tasks) == expected
 
 
+def test_sink_task_depends():
+    """Verify that sink task only depends on required tasks"""
+    from tools.ci.tc.decision import decide
+    files_changed = {"layout-instability/clip-negative-bottom-margin.html",
+                     "layout-instability/composited-element-movement.html"}
+    with open(data_path("pr_event_tests_affected.json"), encoding="utf8") as f:
+        event = json.load(f)
+        with mock.patch("tools.ci.tc.decision.get_fetch_rev", return_value=(None, None, None)):
+            with mock.patch("tools.wpt.testfiles.repo_files_changed",
+                            return_value=files_changed):
+                # Ensure we don't exclude the Chrome jobs
+                event["pull_request"]["user"]["login"] = "test"
+                task_id_map = decide(event)
+
+        sink_task = task_id_map["sink-task"][1]
+
+        assert set(sink_task["dependencies"]) == (
+            set(task_id for (task_name, (task_id, _)) in task_id_map.items()
+                if task_name not in {"sink-task", "wpt-chrome-dev-stability"}))
+
+
 def test_verify_payload():
     """Verify that the decision task produces tasks with a valid payload"""
     from tools.ci.tc.decision import decide
diff --git a/tests/wpt/tests/tools/lint/lint.py b/tests/wpt/tests/tools/lint/lint.py
index 00d76144ea8..c50282ed3a9 100644
--- a/tests/wpt/tests/tools/lint/lint.py
+++ b/tests/wpt/tests/tools/lint/lint.py
@@ -26,6 +26,7 @@ from .. import localpaths
 from ..ci.tc.github_checks_output import get_gh_checks_outputter, GitHubChecksOutputter
 from ..gitignore.gitignore import PathFilter
 from ..wpt import testfiles
+from ..manifest.mputil import max_parallelism
 from ..manifest.vcs import walk
 
 from ..manifest.sourcefile import SourceFile, js_meta_re, python_meta_re, space_chars, get_any_variants
@@ -351,7 +352,8 @@ regexps = [item() for item in  # type: ignore
             rules.SpecialPowersRegexp,
             rules.AssertThrowsRegexp,
             rules.PromiseRejectsRegexp,
-            rules.AssertPreconditionRegexp]]
+            rules.AssertPreconditionRegexp,
+            rules.HTMLInvalidSyntaxRegexp]]
 
 
 def check_regexp_line(repo_root: Text, path: Text, f: IO[bytes]) -> List[rules.Error]:
@@ -431,6 +433,18 @@ def check_parsed(repo_root: Text, path: Text, f: IO[bytes]) -> List[rules.Error]
         if timeout_value != "long":
             errors.append(rules.InvalidTimeout.error(path, (timeout_value,)))
 
+    if source_file.content_is_ref_node or source_file.content_is_testharness:
+        for element in source_file.variant_nodes:
+            if "content" not in element.attrib:
+                errors.append(rules.VariantMissing.error(path))
+            else:
+                variant = element.attrib["content"]
+                if (variant == "" or
+                    variant[0] not in ("?", "#") or
+                    len(variant) == 1 or
+                    (variant[0] == "?" and variant[1] == "#")):
+                    errors.append(rules.MalformedVariant.error(path, (path,)))
+
     required_elements: List[Text] = []
 
     testharnessreport_nodes: List[ElementTree.Element] = []
@@ -448,17 +462,6 @@ def check_parsed(repo_root: Text, path: Text, f: IO[bytes]) -> List[rules.Error]
             if len(testharnessreport_nodes) > 1:
                 errors.append(rules.MultipleTestharnessReport.error(path))
 
-        for element in source_file.variant_nodes:
-            if "content" not in element.attrib:
-                errors.append(rules.VariantMissing.error(path))
-            else:
-                variant = element.attrib["content"]
-                if (variant == "" or
-                    variant[0] not in ("?", "#") or
-                    len(variant) == 1 or
-                    (variant[0] == "?" and variant[1] == "#")):
-                    errors.append(rules.MalformedVariant.error(path, (path,)))
-
         required_elements.extend(key for key, value in {"testharness": True,
                                                         "testharnessreport": len(testharnessreport_nodes) > 0,
                                                         "timeout": len(source_file.timeout_nodes) > 0}.items()
@@ -877,12 +880,7 @@ def lint(repo_root: Text,
     last = None
 
     if jobs == 0:
-        jobs = multiprocessing.cpu_count()
-        if sys.platform == 'win32':
-            # Using too many child processes in Python 3 hits either hangs or a
-            # ValueError exception, and, has diminishing returns. Clamp to 56 to
-            # give margin for error.
-            jobs = min(jobs, 56)
+        jobs = max_parallelism()
 
     with open(os.path.join(repo_root, "lint.ignore")) as f:
         ignorelist, skipped_files = parse_ignorelist(f)
diff --git a/tests/wpt/tests/tools/lint/rules.py b/tests/wpt/tests/tools/lint/rules.py
index 580ef8009cd..06c4f579e67 100644
--- a/tests/wpt/tests/tools/lint/rules.py
+++ b/tests/wpt/tests/tools/lint/rules.py
@@ -502,3 +502,15 @@ class AssertPreconditionRegexp(Regexp):
     file_extensions = [".html", ".htm", ".js", ".xht", ".xhtml", ".svg"]
     description = "Test-file line has an `assert_precondition(...)` call"
     to_fix = """Replace with `assert_implements` or `assert_implements_optional`"""
+
+
+class HTMLInvalidSyntaxRegexp(Regexp):
+    pattern = (br"<(a|abbr|article|audio|b|bdi|bdo|blockquote|body|button|canvas|caption|cite|code|colgroup|data|datalist|dd|del|details|"
+               br"dfn|dialog|div|dl|dt|em|fieldset|figcaption|figure|footer|form|h[1-6]|head|header|html|i|iframe|ins|kbd|label|legend|li|"
+               br"main|map|mark|menu|meter|nav|noscript|object|ol|optgroup|option|output|p|picture|pre|progress|q|rp|rt|ruby|s|samp|script|"
+               br"search|section|select|slot|small|span|strong|style|sub|summary|sup|table|tbody|td|template|textarea|tfoot|th|thead|time|"
+               br"title|tr|u|ul|var|video)(\s+[^>]+)?\s*/>")
+    name = "HTML INVALID SYNTAX"
+    file_extensions = [".html", ".htm"]
+    description = "Test-file line has a non-void HTML tag with /> syntax"
+    to_fix = """Replace with start tag and end tag"""
diff --git a/tests/wpt/tests/tools/lint/tests/test_file_lints.py b/tests/wpt/tests/tools/lint/tests/test_file_lints.py
index 62a380e1a40..96eaf9b84cd 100644
--- a/tests/wpt/tests/tools/lint/tests/test_file_lints.py
+++ b/tests/wpt/tests/tools/lint/tests/test_file_lints.py
@@ -233,6 +233,16 @@ def test_no_missing_deps():
             assert errors == []
 
 
+def test_html_invalid_syntax():
+    error_map = check_with_files(b"<!doctype html><div/>")
+
+    for (filename, (errors, kind)) in error_map.items():
+        check_errors(errors)
+
+        if kind == "web-lax":
+            assert errors == [("HTML INVALID SYNTAX", "Test-file line has a non-void HTML tag with /> syntax", filename, 1)]
+
+
 def test_meta_timeout():
     code = b"""
 <html xmlns="http://www.w3.org/1999/xhtml">
diff --git a/tests/wpt/tests/tools/manifest/manifest.py b/tests/wpt/tests/tools/manifest/manifest.py
index 0b00c71ac51..959978f5283 100644
--- a/tests/wpt/tests/tools/manifest/manifest.py
+++ b/tests/wpt/tests/tools/manifest/manifest.py
@@ -1,9 +1,8 @@
 import os
-import sys
 from atomicwrites import atomic_write
 from copy import deepcopy
 from logging import Logger
-from multiprocessing import Pool, cpu_count
+from multiprocessing import Pool
 from typing import (Any, Callable, Container, Dict, IO, Iterator, Iterable, Optional, Set, Text, Tuple, Type,
                     Union)
 
@@ -21,11 +20,11 @@ from .item import (ConformanceCheckerTest,
                    VisualTest,
                    WebDriverSpecTest)
 from .log import get_logger
+from .mputil import max_parallelism
 from .sourcefile import SourceFile
 from .typedata import TypeData
 
 
-
 CURRENT_VERSION: int = 8
 
 
@@ -206,24 +205,16 @@ class Manifest:
         # 25 items was derived experimentally (2020-01) to be approximately the
         # point at which it is quicker to create a Pool and parallelize update.
         pool = None
-        if parallel and len(to_update) > 25 and cpu_count() > 1:
-            # On Python 3 on Windows, using >= MAXIMUM_WAIT_OBJECTS processes
-            # causes a crash in the multiprocessing module. Whilst this enum
-            # can technically have any value, it is usually 64. For safety,
-            # restrict manifest regeneration to 48 processes on Windows.
-            #
-            # See https://bugs.python.org/issue26903 and https://bugs.python.org/issue40263
-            processes = cpu_count()
-            if sys.platform == "win32" and processes > 48:
-                processes = 48
+        processes = max_parallelism()
+        if parallel and len(to_update) > 25 and processes > 1:
             pool = Pool(processes)
 
             # chunksize set > 1 when more than 10000 tests, because
             # chunking is a net-gain once we get to very large numbers
             # of items (again, experimentally, 2020-01)
             chunksize = max(1, len(to_update) // 10000)
-            logger.debug("Doing a multiprocessed update. CPU count: %s, "
-                "processes: %s, chunksize: %s" % (cpu_count(), processes, chunksize))
+            logger.debug("Doing a multiprocessed update. "
+                "Processes: %s, chunksize: %s" % (processes, chunksize))
             results: Iterator[Optional[Tuple[Tuple[Text, ...],
                                     Text,
                                     Set[ManifestItem], Text]]] = pool.imap_unordered(
diff --git a/tests/wpt/tests/tools/manifest/mputil.py b/tests/wpt/tests/tools/manifest/mputil.py
new file mode 100644
index 00000000000..fc9d5ac94cd
--- /dev/null
+++ b/tests/wpt/tests/tools/manifest/mputil.py
@@ -0,0 +1,14 @@
+import multiprocessing
+import sys
+
+def max_parallelism() -> int:
+    cpu_count = multiprocessing.cpu_count()
+    if sys.platform == 'win32':
+        # On Python 3 on Windows, using >= MAXIMUM_WAIT_OBJECTS processes
+        # causes a crash in the multiprocessing module. Whilst this enum
+        # can technically have any value, it is usually 64. For safety,
+        # restrict manifest regeneration to 56 processes on Windows.
+        #
+        # See https://bugs.python.org/issue26903 and https://bugs.python.org/issue40263
+        cpu_count = min(cpu_count, 56)
+    return cpu_count
diff --git a/tests/wpt/tests/tools/requirements_pytest.txt b/tests/wpt/tests/tools/requirements_pytest.txt
index 2ca04f876e4..93ec70d7e61 100644
--- a/tests/wpt/tests/tools/requirements_pytest.txt
+++ b/tests/wpt/tests/tools/requirements_pytest.txt
@@ -1,3 +1,3 @@
-pytest==7.3.2
+pytest==7.4.2
 pytest-cov==4.1.0
 hypothesis==6.78.2
diff --git a/tests/wpt/tests/tools/requirements_tests.txt b/tests/wpt/tests/tools/requirements_tests.txt
index a0885683ef8..0a4007dd8f3 100644
--- a/tests/wpt/tests/tools/requirements_tests.txt
+++ b/tests/wpt/tests/tools/requirements_tests.txt
@@ -2,5 +2,5 @@ httpx[http2]==0.24.1
 json-e==4.5.3
 jsonschema==4.17.3
 pyyaml==6.0.1
-taskcluster==54.4.2
+taskcluster==55.3.2
 mozterm==1.0.0
diff --git a/tests/wpt/tests/tools/serve/serve.py b/tests/wpt/tests/tools/serve/serve.py
index 1725399faca..6ef5bd89180 100644
--- a/tests/wpt/tests/tools/serve/serve.py
+++ b/tests/wpt/tests/tools/serve/serve.py
@@ -423,7 +423,7 @@ class ShadowRealmHandler(HtmlWrapperHandler):
 <script>
 (async function() {
   const r = new ShadowRealm();
-
+  r.evaluate("globalThis.self = globalThis; undefined;");
   await new Promise(r.evaluate(`
     (resolve, reject) => {
       (async () => {
diff --git a/tests/wpt/tests/tools/third_party/websockets/.appveyor.yml b/tests/wpt/tests/tools/third_party/websockets/.appveyor.yml
deleted file mode 100644
index 7954ee4be78..00000000000
--- a/tests/wpt/tests/tools/third_party/websockets/.appveyor.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-branches:
-  only:
-    - master
-
-skip_branch_with_pr: true
-
-environment:
-# websockets only works on Python >= 3.6.
-  CIBW_SKIP: cp27-* cp33-* cp34-* cp35-*
-  CIBW_TEST_COMMAND: python -W default -m unittest
-  WEBSOCKETS_TESTS_TIMEOUT_FACTOR: 100
-
-install:
-# Ensure python is Python 3.
-  - set PATH=C:\Python37;%PATH%
-  - cmd: python -m pip install --upgrade cibuildwheel
-# Create file '.cibuildwheel' so that extension build is not optional (c.f. setup.py).
-  - cmd: touch .cibuildwheel
-
-build_script:
-  - cmd: python -m cibuildwheel --output-dir wheelhouse
-# Upload to PyPI on tags
-  - ps: >-
-      if ($env:APPVEYOR_REPO_TAG -eq "true") {
-        Invoke-Expression "python -m pip install twine"
-        Invoke-Expression "python -m twine upload --skip-existing wheelhouse/*.whl"
-      }
diff --git a/tests/wpt/tests/tools/third_party/websockets/.circleci/config.yml b/tests/wpt/tests/tools/third_party/websockets/.circleci/config.yml
deleted file mode 100644
index 0877c161ad4..00000000000
--- a/tests/wpt/tests/tools/third_party/websockets/.circleci/config.yml
+++ /dev/null
@@ -1,55 +0,0 @@
-version: 2
-
-jobs:
-  main:
-    docker:
-      - image: circleci/python:3.7
-    steps:
-      # Remove IPv6 entry for localhost in Circle CI containers because it doesn't work anyway.
-      - run: sudo cp /etc/hosts /tmp; sudo sed -i '/::1/d' /tmp/hosts; sudo cp /tmp/hosts /etc
-      - checkout
-      - run: sudo pip install tox codecov
-      - run: tox -e coverage,black,flake8,isort,mypy
-      - run: codecov
-  py36:
-    docker:
-      - image: circleci/python:3.6
-    steps:
-      # Remove IPv6 entry for localhost in Circle CI containers because it doesn't work anyway.
-      - run: sudo cp /etc/hosts /tmp; sudo sed -i '/::1/d' /tmp/hosts; sudo cp /tmp/hosts /etc
-      - checkout
-      - run: sudo pip install tox
-      - run: tox -e py36
-  py37:
-    docker:
-      - image: circleci/python:3.7
-    steps:
-      # Remove IPv6 entry for localhost in Circle CI containers because it doesn't work anyway.
-      - run: sudo cp /etc/hosts /tmp; sudo sed -i '/::1/d' /tmp/hosts; sudo cp /tmp/hosts /etc
-      - checkout
-      - run: sudo pip install tox
-      - run: tox -e py37
-  py38:
-    docker:
-      - image: circleci/python:3.8.0rc1
-    steps:
-      # Remove IPv6 entry for localhost in Circle CI containers because it doesn't work anyway.
-      - run: sudo cp /etc/hosts /tmp; sudo sed -i '/::1/d' /tmp/hosts; sudo cp /tmp/hosts /etc
-      - checkout
-      - run: sudo pip install tox
-      - run: tox -e py38
-
-workflows:
-  version: 2
-  build:
-    jobs:
-      - main
-      - py36:
-          requires:
-            - main
-      - py37:
-          requires:
-            - main
-      - py38:
-          requires:
-            - main
diff --git a/tests/wpt/tests/tools/third_party/websockets/.github/FUNDING.yml b/tests/wpt/tests/tools/third_party/websockets/.github/FUNDING.yml
deleted file mode 100644
index 7ae223b3d89..00000000000
--- a/tests/wpt/tests/tools/third_party/websockets/.github/FUNDING.yml
+++ /dev/null
@@ -1 +0,0 @@
-tidelift: "pypi/websockets"
diff --git a/tests/wpt/tests/tools/third_party/websockets/.gitignore b/tests/wpt/tests/tools/third_party/websockets/.gitignore
deleted file mode 100644
index ef0d16520c0..00000000000
--- a/tests/wpt/tests/tools/third_party/websockets/.gitignore
+++ /dev/null
@@ -1,12 +0,0 @@
-*.pyc
-*.so
-.coverage
-.mypy_cache
-.tox
-build/
-compliance/reports/
-dist/
-docs/_build/
-htmlcov/
-MANIFEST
-websockets.egg-info/
diff --git a/tests/wpt/tests/tools/third_party/websockets/.readthedocs.yml b/tests/wpt/tests/tools/third_party/websockets/.readthedocs.yml
deleted file mode 100644
index 109affab457..00000000000
--- a/tests/wpt/tests/tools/third_party/websockets/.readthedocs.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-build:
-  image: latest
-
-python:
-  version: 3.7
-
-requirements_file: docs/requirements.txt
diff --git a/tests/wpt/tests/tools/third_party/websockets/.travis.yml b/tests/wpt/tests/tools/third_party/websockets/.travis.yml
deleted file mode 100644
index 0306937597a..00000000000
--- a/tests/wpt/tests/tools/third_party/websockets/.travis.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-env:
-  global:
-  # websockets only works on Python >= 3.6.
-    - CIBW_SKIP="cp27-* cp33-* cp34-* cp35-*"
-    - CIBW_TEST_COMMAND="python3 -W default -m unittest"
-    - WEBSOCKETS_TESTS_TIMEOUT_FACTOR=100
-
-matrix:
-  include:
-    - language: python
-      dist: xenial    # required for Python 3.7 (travis-ci/travis-ci#9069)
-      sudo: required
-      python: "3.7"
-      services:
-        - docker
-    - os: osx
-      osx_image: xcode8.3
-
-install:
-# Python 3 is needed to run cibuildwheel for websockets.
-  - if [ "${TRAVIS_OS_NAME:-}" == "osx" ]; then
-      brew update;
-      brew upgrade python;
-    fi
-# Install cibuildwheel using pip3 to make sure Python 3 is used.
-  - pip3 install --upgrade cibuildwheel
-# Create file '.cibuildwheel' so that extension build is not optional (c.f. setup.py).
-  - touch .cibuildwheel
-
-script:
-  - cibuildwheel --output-dir wheelhouse
-# Upload to PyPI on tags
-  - if [ "${TRAVIS_TAG:-}" != "" ]; then
-      pip3 install twine;
-      python3 -m twine upload --skip-existing wheelhouse/*;
-    fi
diff --git a/tests/wpt/tests/tools/third_party/websockets/CODE_OF_CONDUCT.md b/tests/wpt/tests/tools/third_party/websockets/CODE_OF_CONDUCT.md
deleted file mode 100644
index 80f80d51b11..00000000000
--- a/tests/wpt/tests/tools/third_party/websockets/CODE_OF_CONDUCT.md
+++ /dev/null
@@ -1,46 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at aymeric DOT augustin AT fractalideas DOT com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
-
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/
diff --git a/tests/wpt/tests/tools/third_party/websockets/LICENSE b/tests/wpt/tests/tools/third_party/websockets/LICENSE
index b2962adba2b..119b29ef35b 100644
--- a/tests/wpt/tests/tools/third_party/websockets/LICENSE
+++ b/tests/wpt/tests/tools/third_party/websockets/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2013-2019 Aymeric Augustin and contributors.
+Copyright (c) 2013-2021 Aymeric Augustin and contributors.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/tests/wpt/tests/tools/third_party/websockets/Makefile b/tests/wpt/tests/tools/third_party/websockets/Makefile
deleted file mode 100644
index d9e16fefe37..00000000000
--- a/tests/wpt/tests/tools/third_party/websockets/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-.PHONY: default style test coverage build clean
-
-export PYTHONASYNCIODEBUG=1
-export PYTHONPATH=src
-
-default: coverage style
-
-style:
-	isort --recursive src tests
-	black src tests
-	flake8 src tests
-	mypy --strict src
-
-test:
-	python -W default -m unittest
-
-coverage:
-	python -m coverage erase
-	python -W default -m coverage run -m unittest
-	python -m coverage html
-	python -m coverage report --show-missing --fail-under=100
-
-build:
-	python setup.py build_ext --inplace
-
-clean:
-	find . -name '*.pyc' -o -name '*.so' -delete
-	find . -name __pycache__ -delete
-	rm -rf .coverage build compliance/reports dist docs/_build htmlcov MANIFEST src/websockets.egg-info
diff --git a/tests/wpt/tests/tools/third_party/websockets/PKG-INFO b/tests/wpt/tests/tools/third_party/websockets/PKG-INFO
new file mode 100644
index 00000000000..3b042a3f9f8
--- /dev/null
+++ b/tests/wpt/tests/tools/third_party/websockets/PKG-INFO
@@ -0,0 +1,174 @@
+Metadata-Version: 2.1
+Name: websockets
+Version: 10.3
+Summary: An implementation of the WebSocket Protocol (RFC 6455 & 7692)
+Home-page: https://github.com/aaugustin/websockets
+Author: Aymeric Augustin
+Author-email: aymeric.augustin@m4x.org
+License: BSD
+Project-URL: Changelog, https://websockets.readthedocs.io/en/stable/project/changelog.html
+Project-URL: Documentation, https://websockets.readthedocs.io/
+Project-URL: Funding, https://tidelift.com/subscription/pkg/pypi-websockets?utm_source=pypi-websockets&utm_medium=referral&utm_campaign=readme
+Project-URL: Tracker, https://github.com/aaugustin/websockets/issues
+Platform: UNKNOWN
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Web Environment
+Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved :: BSD License
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Requires-Python: >=3.7
+License-File: LICENSE
+
+.. image:: logo/horizontal.svg
+   :width: 480px
+   :alt: websockets
+
+|licence| |version| |pyversions| |wheel| |tests| |docs|
+
+.. |licence| image:: https://img.shields.io/pypi/l/websockets.svg
+    :target: https://pypi.python.org/pypi/websockets
+
+.. |version| image:: https://img.shields.io/pypi/v/websockets.svg
+    :target: https://pypi.python.org/pypi/websockets
+
+.. |pyversions| image:: https://img.shields.io/pypi/pyversions/websockets.svg
+    :target: https://pypi.python.org/pypi/websockets
+
+.. |wheel| image:: https://img.shields.io/pypi/wheel/websockets.svg
+    :target: https://pypi.python.org/pypi/websockets
+
+.. |tests| image:: https://img.shields.io/github/checks-status/aaugustin/websockets/main
+   :target: https://github.com/aaugustin/websockets/actions/workflows/tests.yml
+
+.. |docs| image:: https://img.shields.io/readthedocs/websockets.svg
+   :target: https://websockets.readthedocs.io/
+
+What is ``websockets``?
+-----------------------
+
+websockets is a library for building WebSocket_ servers and clients in Python
+with a focus on correctness, simplicity, robustness, and performance.
+
+.. _WebSocket: https://developer.mozilla.org/en-US/docs/Web/API/WebSockets_API
+
+Built on top of ``asyncio``, Python's standard asynchronous I/O framework, it
+provides an elegant coroutine-based API.
+
+`Documentation is available on Read the Docs. <https://websockets.readthedocs.io/>`_
+
+Here's how a client sends and receives messages:
+
+.. copy-pasted because GitHub doesn't support the include directive
+
+.. code:: python
+
+    #!/usr/bin/env python
+
+    import asyncio
+    from websockets import connect
+
+    async def hello(uri):
+        async with connect(uri) as websocket:
+            await websocket.send("Hello world!")
+            await websocket.recv()
+
+    asyncio.run(hello("ws://localhost:8765"))
+
+And here's an echo server:
+
+.. code:: python
+
+    #!/usr/bin/env python
+
+    import asyncio
+    from websockets import serve
+
+    async def echo(websocket):
+        async for message in websocket:
+            await websocket.send(message)
+
+    async def main():
+        async with serve(echo, "localhost", 8765):
+            await asyncio.Future()  # run forever
+
+    asyncio.run(main())
+
+Does that look good?
+
+`Get started with the tutorial! <https://websockets.readthedocs.io/en/stable/intro/index.html>`_
+
+Why should I use ``websockets``?
+--------------------------------
+
+The development of ``websockets`` is shaped by four principles:
+
+1. **Correctness**: ``websockets`` is heavily tested for compliance
+   with :rfc:`6455`. Continuous integration fails under 100% branch
+   coverage.
+
+2. **Simplicity**: all you need to understand is ``msg = await ws.recv()`` and
+   ``await ws.send(msg)``. ``websockets`` takes care of managing connections
+   so you can focus on your application.
+
+3. **Robustness**: ``websockets`` is built for production. For example, it was
+   the only library to `handle backpressure correctly`_ before the issue
+   became widely known in the Python community.
+
+4. **Performance**: memory usage is optimized and configurable. A C extension
+   accelerates expensive operations. It's pre-compiled for Linux, macOS and
+   Windows and packaged in the wheel format for each system and Python version.
+
+Documentation is a first class concern in the project. Head over to `Read the
+Docs`_ and see for yourself.
+
+.. _Read the Docs: https://websockets.readthedocs.io/
+.. _handle backpressure correctly: https://vorpus.org/blog/some-thoughts-on-asynchronous-api-design-in-a-post-asyncawait-world/#websocket-servers
+
+Why shouldn't I use ``websockets``?
+-----------------------------------
+
+* If you prefer callbacks over coroutines: ``websockets`` was created to
+  provide the best coroutine-based API to manage WebSocket connections in
+  Python. Pick another library for a callback-based API.
+
+* If you're looking for a mixed HTTP / WebSocket library: ``websockets`` aims
+  at being an excellent implementation of :rfc:`6455`: The WebSocket Protocol
+  and :rfc:`7692`: Compression Extensions for WebSocket. Its support for HTTP
+  is minimal — just enough for a HTTP health check.
+
+  If you want to do both in the same server, look at HTTP frameworks that
+  build on top of ``websockets`` to support WebSocket connections, like
+  Sanic_.
+
+.. _Sanic: https://sanicframework.org/en/
+
+What else?
+----------
+
+Bug reports, patches and suggestions are welcome!
+
+To report a security vulnerability, please use the `Tidelift security
+contact`_. Tidelift will coordinate the fix and disclosure.
+
+.. _Tidelift security contact: https://tidelift.com/security
+
+For anything else, please open an issue_ or send a `pull request`_.
+
+.. _issue: https://github.com/aaugustin/websockets/issues/new
+.. _pull request: https://github.com/aaugustin/websockets/compare/
+
+Participants must uphold the `Contributor Covenant code of conduct`_.
+
+.. _Contributor Covenant code of conduct: https://github.com/aaugustin/websockets/blob/main/CODE_OF_CONDUCT.md
+
+``websockets`` is released under the `BSD license`_.
+
+.. _BSD license: https://github.com/aaugustin/websockets/blob/main/LICENSE
+
+
diff --git a/tests/wpt/tests/tools/third_party/websockets/README.rst b/tests/wpt/tests/tools/third_party/websockets/README.rst
index 1e15ba1981f..2b9a445ea5c 100644
--- a/tests/wpt/tests/tools/third_party/websockets/README.rst
+++ b/tests/wpt/tests/tools/third_party/websockets/README.rst
@@ -2,37 +2,33 @@
    :width: 480px
    :alt: websockets
 
-|rtd| |pypi-v| |pypi-pyversions| |pypi-l| |pypi-wheel| |circleci| |codecov|
+|licence| |version| |pyversions| |wheel| |tests| |docs|
 
-.. |rtd| image:: https://readthedocs.org/projects/websockets/badge/?version=latest
+.. |licence| image:: https://img.shields.io/pypi/l/websockets.svg
+    :target: https://pypi.python.org/pypi/websockets
+
+.. |version| image:: https://img.shields.io/pypi/v/websockets.svg
+    :target: https://pypi.python.org/pypi/websockets
+
+.. |pyversions| image:: https://img.shields.io/pypi/pyversions/websockets.svg
+    :target: https://pypi.python.org/pypi/websockets
+
+.. |wheel| image:: https://img.shields.io/pypi/wheel/websockets.svg
+    :target: https://pypi.python.org/pypi/websockets
+
+.. |tests| image:: https://img.shields.io/github/checks-status/aaugustin/websockets/main
+   :target: https://github.com/aaugustin/websockets/actions/workflows/tests.yml
+
+.. |docs| image:: https://img.shields.io/readthedocs/websockets.svg
    :target: https://websockets.readthedocs.io/
 
-.. |pypi-v| image:: https://img.shields.io/pypi/v/websockets.svg
-    :target: https://pypi.python.org/pypi/websockets
-
-.. |pypi-pyversions| image:: https://img.shields.io/pypi/pyversions/websockets.svg
-    :target: https://pypi.python.org/pypi/websockets
-
-.. |pypi-l| image:: https://img.shields.io/pypi/l/websockets.svg
-    :target: https://pypi.python.org/pypi/websockets
-
-.. |pypi-wheel| image:: https://img.shields.io/pypi/wheel/websockets.svg
-    :target: https://pypi.python.org/pypi/websockets
-
-.. |circleci| image:: https://img.shields.io/circleci/project/github/aaugustin/websockets.svg
-   :target: https://circleci.com/gh/aaugustin/websockets
-
-.. |codecov| image:: https://codecov.io/gh/aaugustin/websockets/branch/master/graph/badge.svg
-    :target: https://codecov.io/gh/aaugustin/websockets
-
 What is ``websockets``?
 -----------------------
 
-``websockets`` is a library for building WebSocket servers_ and clients_ in
-Python with a focus on correctness and simplicity.
+websockets is a library for building WebSocket_ servers and clients in Python
+with a focus on correctness, simplicity, robustness, and performance.
 
-.. _servers: https://github.com/aaugustin/websockets/blob/master/example/server.py
-.. _clients: https://github.com/aaugustin/websockets/blob/master/example/client.py
+.. _WebSocket: https://developer.mozilla.org/en-US/docs/Web/API/WebSockets_API
 
 Built on top of ``asyncio``, Python's standard asynchronous I/O framework, it
 provides an elegant coroutine-based API.
@@ -48,15 +44,14 @@ Here's how a client sends and receives messages:
     #!/usr/bin/env python
 
     import asyncio
-    import websockets
+    from websockets import connect
 
     async def hello(uri):
-        async with websockets.connect(uri) as websocket:
+        async with connect(uri) as websocket:
             await websocket.send("Hello world!")
             await websocket.recv()
 
-    asyncio.get_event_loop().run_until_complete(
-        hello('ws://localhost:8765'))
+    asyncio.run(hello("ws://localhost:8765"))
 
 And here's an echo server:
 
@@ -65,24 +60,26 @@ And here's an echo server:
     #!/usr/bin/env python
 
     import asyncio
-    import websockets
+    from websockets import serve
 
-    async def echo(websocket, path):
+    async def echo(websocket):
         async for message in websocket:
             await websocket.send(message)
 
-    asyncio.get_event_loop().run_until_complete(
-        websockets.serve(echo, 'localhost', 8765))
-    asyncio.get_event_loop().run_forever()
+    async def main():
+        async with serve(echo, "localhost", 8765):
+            await asyncio.Future()  # run forever
+
+    asyncio.run(main())
 
 Does that look good?
 
-`Get started with the tutorial! <https://websockets.readthedocs.io/en/stable/intro.html>`_
+`Get started with the tutorial! <https://websockets.readthedocs.io/en/stable/intro/index.html>`_
 
 .. raw:: html
 
     <hr>
-    <img align="left" height="150" width="150" src="https://raw.githubusercontent.com/aaugustin/websockets/master/logo/tidelift.png">
+    <img align="left" height="150" width="150" src="https://raw.githubusercontent.com/aaugustin/websockets/main/logo/tidelift.png">
     <h3 align="center"><i>websockets for enterprise</i></h3>
     <p align="center"><i>Available as part of the Tidelift Subscription</i></p>
     <p align="center"><i>The maintainers of websockets and thousands of other packages are working with Tidelift to deliver commercial support and maintenance for the open source dependencies you use to build your applications. Save time, reduce risk, and improve code health, while paying the maintainers of the exact dependencies you use. <a href="https://tidelift.com/subscription/pkg/pypi-websockets?utm_source=pypi-websockets&utm_medium=referral&utm_campaign=readme">Learn more.</a></i></p>
@@ -94,19 +91,19 @@ Why should I use ``websockets``?
 
 The development of ``websockets`` is shaped by four principles:
 
-1. **Simplicity**: all you need to understand is ``msg = await ws.recv()`` and
-   ``await ws.send(msg)``; ``websockets`` takes care of managing connections
+1. **Correctness**: ``websockets`` is heavily tested for compliance
+   with :rfc:`6455`. Continuous integration fails under 100% branch
+   coverage.
+
+2. **Simplicity**: all you need to understand is ``msg = await ws.recv()`` and
+   ``await ws.send(msg)``. ``websockets`` takes care of managing connections
    so you can focus on your application.
 
-2. **Robustness**: ``websockets`` is built for production; for example it was
+3. **Robustness**: ``websockets`` is built for production. For example, it was
    the only library to `handle backpressure correctly`_ before the issue
    became widely known in the Python community.
 
-3. **Quality**: ``websockets`` is heavily tested. Continuous integration fails
-   under 100% branch coverage. Also it passes the industry-standard `Autobahn
-   Testsuite`_.
-
-4. **Performance**: memory use is configurable. An extension written in C
+4. **Performance**: memory usage is optimized and configurable. A C extension
    accelerates expensive operations. It's pre-compiled for Linux, macOS and
    Windows and packaged in the wheel format for each system and Python version.
 
@@ -115,7 +112,6 @@ Docs`_ and see for yourself.
 
 .. _Read the Docs: https://websockets.readthedocs.io/
 .. _handle backpressure correctly: https://vorpus.org/blog/some-thoughts-on-asynchronous-api-design-in-a-post-asyncawait-world/#websocket-servers
-.. _Autobahn Testsuite: https://github.com/aaugustin/websockets/blob/master/compliance/README.rst
 
 Why shouldn't I use ``websockets``?
 -----------------------------------
@@ -123,12 +119,17 @@ Why shouldn't I use ``websockets``?
 * If you prefer callbacks over coroutines: ``websockets`` was created to
   provide the best coroutine-based API to manage WebSocket connections in
   Python. Pick another library for a callback-based API.
+
 * If you're looking for a mixed HTTP / WebSocket library: ``websockets`` aims
   at being an excellent implementation of :rfc:`6455`: The WebSocket Protocol
   and :rfc:`7692`: Compression Extensions for WebSocket. Its support for HTTP
   is minimal — just enough for a HTTP health check.
-* If you want to use Python 2: ``websockets`` builds upon ``asyncio`` which
-  only works on Python 3. ``websockets`` requires Python ≥ 3.6.1.
+
+  If you want to do both in the same server, look at HTTP frameworks that
+  build on top of ``websockets`` to support WebSocket connections, like
+  Sanic_.
+
+.. _Sanic: https://sanicframework.org/en/
 
 What else?
 ----------
@@ -147,8 +148,8 @@ For anything else, please open an issue_ or send a `pull request`_.
 
 Participants must uphold the `Contributor Covenant code of conduct`_.
 
-.. _Contributor Covenant code of conduct: https://github.com/aaugustin/websockets/blob/master/CODE_OF_CONDUCT.md
+.. _Contributor Covenant code of conduct: https://github.com/aaugustin/websockets/blob/main/CODE_OF_CONDUCT.md
 
 ``websockets`` is released under the `BSD license`_.
 
-.. _BSD license: https://github.com/aaugustin/websockets/blob/master/LICENSE
+.. _BSD license: https://github.com/aaugustin/websockets/blob/main/LICENSE
diff --git a/tests/wpt/tests/tools/third_party/websockets/compliance/README.rst b/tests/wpt/tests/tools/third_party/websockets/compliance/README.rst
deleted file mode 100644
index 8570f9176d5..00000000000
--- a/tests/wpt/tests/tools/third_party/websockets/compliance/README.rst
+++ /dev/null
@@ -1,50 +0,0 @@
-Autobahn Testsuite
-==================
-
-General information and installation instructions are available at
-https://github.com/crossbario/autobahn-testsuite.
-
-To improve performance, you should compile the C extension first::
-
-    $ python setup.py build_ext --inplace
-
-Running the test suite
-----------------------
-
-All commands below must be run from the directory containing this file.
-
-To test the server::
-
-    $ PYTHONPATH=.. python test_server.py
-    $ wstest -m fuzzingclient
-
-To test the client::
-
-    $ wstest -m fuzzingserver
-    $ PYTHONPATH=.. python test_client.py
-
-Run the first command in a shell. Run the second command in another shell.
-It should take about ten minutes to complete — wstest is the bottleneck.
-Then kill the first one with Ctrl-C.
-
-The test client or server shouldn't display any exceptions. The results are
-stored in reports/clients/index.html.
-
-Note that the Autobahn software only supports Python 2, while ``websockets``
-only supports Python 3; you need two different environments.
-
-Conformance notes
------------------
-
-Some test cases are more strict than the RFC. Given the implementation of the
-library and the test echo client or server, ``websockets`` gets a "Non-Strict"
-in these cases.
-
-In 3.2, 3.3, 4.1.3, 4.1.4, 4.2.3, 4.2.4, and 5.15 ``websockets`` notices the
-protocol error and closes the connection before it has had a chance to echo
-the previous frame.
-
-In 6.4.3 and 6.4.4, even though it uses an incremental decoder, ``websockets``
-doesn't notice the invalid utf-8 fast enough to get a "Strict" pass. These
-tests are more strict than the RFC.
-
diff --git a/tests/wpt/tests/tools/third_party/websockets/compliance/fuzzingclient.json b/tests/wpt/tests/tools/third_party/websockets/compliance/fuzzingclient.json
deleted file mode 100644
index 202ff49a03a..00000000000
--- a/tests/wpt/tests/tools/third_party/websockets/compliance/fuzzingclient.json
+++ /dev/null
@@ -1,11 +0,0 @@
-
-{
-   "options": {"failByDrop": false},
-   "outdir": "./reports/servers",
-
-   "servers": [{"agent": "websockets", "url": "ws://localhost:8642", "options": {"version": 18}}],
-
-   "cases": ["*"],
-   "exclude-cases": [],
-   "exclude-agent-cases": {}
-}
diff --git a/tests/wpt/tests/tools/third_party/websockets/compliance/fuzzingserver.json b/tests/wpt/tests/tools/third_party/websockets/compliance/fuzzingserver.json
deleted file mode 100644
index 1bdb42723ef..00000000000
--- a/tests/wpt/tests/tools/third_party/websockets/compliance/fuzzingserver.json
+++ /dev/null
@@ -1,12 +0,0 @@
-
-{
-   "url": "ws://localhost:8642",
-
-   "options": {"failByDrop": false},
-   "outdir": "./reports/clients",
-   "webport": 8080,
-
-   "cases": ["*"],
-   "exclude-cases": [],
-   "exclude-agent-cases": {}
-}
diff --git a/tests/wpt/tests/tools/third_party/websockets/compliance/test_client.py b/tests/wpt/tests/tools/third_party/websockets/compliance/test_client.py
deleted file mode 100644
index 5fd0f4b4fb3..00000000000
--- a/tests/wpt/tests/tools/third_party/websockets/compliance/test_client.py
+++ /dev/null
@@ -1,49 +0,0 @@
-import json
-import logging
-import urllib.parse
-
-import asyncio
-import websockets
-
-
-logging.basicConfig(level=logging.WARNING)
-
-# Uncomment this line to make only websockets more verbose.
-# logging.getLogger('websockets').setLevel(logging.DEBUG)
-
-
-SERVER = "ws://127.0.0.1:8642"
-AGENT = "websockets"
-
-
-async def get_case_count(server):
-    uri = f"{server}/getCaseCount"
-    async with websockets.connect(uri) as ws:
-        msg = ws.recv()
-    return json.loads(msg)
-
-
-async def run_case(server, case, agent):
-    uri = f"{server}/runCase?case={case}&agent={agent}"
-    async with websockets.connect(uri, max_size=2 ** 25, max_queue=1) as ws:
-        async for msg in ws:
-            await ws.send(msg)
-
-
-async def update_reports(server, agent):
-    uri = f"{server}/updateReports?agent={agent}"
-    async with websockets.connect(uri):
-        pass
-
-
-async def run_tests(server, agent):
-    cases = await get_case_count(server)
-    for case in range(1, cases + 1):
-        print(f"Running test case {case} out of {cases}", end="\r")
-        await run_case(server, case, agent)
-    print(f"Ran {cases} test cases               ")
-    await update_reports(server, agent)
-
-
-main = run_tests(SERVER, urllib.parse.quote(AGENT))
-asyncio.get_event_loop().run_until_complete(main)
diff --git a/tests/wpt/tests/tools/third_party/websockets/compliance/test_server.py b/tests/wpt/tests/tools/third_party/websockets/compliance/test_server.py
deleted file mode 100644
index 8020f68d35f..00000000000
--- a/tests/wpt/tests/tools/third_party/websockets/compliance/test_server.py
+++ /dev/null
@@ -1,27 +0,0 @@
-import logging
-
-import asyncio
-import websockets
-
-
-logging.basicConfig(level=logging.WARNING)
-
-# Uncomment this line to make only websockets more verbose.
-# logging.getLogger('websockets').setLevel(logging.DEBUG)
-
-
-HOST, PORT = "127.0.0.1", 8642
-
-
-async def echo(ws, path):
-    async for msg in ws:
-        await ws.send(msg)
-
-
-start_server = websockets.serve(echo, HOST, PORT, max_size=2 ** 25, max_queue=1)
-
-try:
-    asyncio.get_event_loop().run_until_complete(start_server)
-    asyncio.get_event_loop().run_forever()
-except KeyboardInterrupt:
-    pass
diff --git a/tests/wpt/tests/tools/third_party/websockets/docs/Makefile b/tests/wpt/tests/tools/third_party/websockets/docs/Makefile
deleted file mode 100644
index bb25aa49d08..00000000000
--- a/tests/wpt/tests/tools/third_party/websockets/docs/Makefile
+++ /dev/null
@@ -1,160 +0,0 @@
-# Makefile for Sphinx documentation
-#
-
-# You can set these variables from the command line.
-SPHINXOPTS    =
-SPHINXBUILD   = sphinx-build
-PAPER         =
-BUILDDIR      = _build
-
-# Internal variables.
-PAPEROPT_a4     = -D latex_paper_size=a4
-PAPEROPT_letter = -D latex_paper_size=letter
-ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
-# the i18n builder cannot share the environment and doctrees with the others
-I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
-
-.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext
-
-help:
-	@echo "Please use \`make <target>' where <target> is one of"
-	@echo "  html       to make standalone HTML files"
-	@echo "  dirhtml    to make HTML files named index.html in directories"
-	@echo "  singlehtml to make a single large HTML file"
-	@echo "  pickle     to make pickle files"
-	@echo "  json       to make JSON files"
-	@echo "  htmlhelp   to make HTML files and a HTML help project"
-	@echo "  qthelp     to make HTML files and a qthelp project"
-	@echo "  devhelp    to make HTML files and a Devhelp project"
-	@echo "  epub       to make an epub"
-	@echo "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
-	@echo "  latexpdf   to make LaTeX files and run them through pdflatex"
-	@echo "  text       to make text files"
-	@echo "  man        to make manual pages"
-	@echo "  texinfo    to make Texinfo files"
-	@echo "  info       to make Texinfo files and run them through makeinfo"
-	@echo "  gettext    to make PO message catalogs"
-	@echo "  changes    to make an overview of all changed/added/deprecated items"
-	@echo "  linkcheck  to check all external links for integrity"
-	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
-	@echo "  spelling   to check for typos in documentation"
-
-clean:
-	-rm -rf $(BUILDDIR)/*
-
-html:
-	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
-	@echo
-	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
-
-dirhtml:
-	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
-	@echo
-	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
-
-singlehtml:
-	$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
-	@echo
-	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
-
-pickle:
-	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
-	@echo
-	@echo "Build finished; now you can process the pickle files."
-
-json:
-	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
-	@echo
-	@echo "Build finished; now you can process the JSON files."
-
-htmlhelp:
-	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
-	@echo
-	@echo "Build finished; now you can run HTML Help Workshop with the" \
-	      ".hhp project file in $(BUILDDIR)/htmlhelp."
-
-qthelp:
-	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
-	@echo
-	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
-	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
-	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/websockets.qhcp"
-	@echo "To view the help file:"
-	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/websockets.qhc"
-
-devhelp:
-	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
-	@echo
-	@echo "Build finished."
-	@echo "To view the help file:"
-	@echo "# mkdir -p $$HOME/.local/share/devhelp/websockets"
-	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/websockets"
-	@echo "# devhelp"
-
-epub:
-	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
-	@echo
-	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
-
-latex:
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	@echo
-	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
-	@echo "Run \`make' in that directory to run these through (pdf)latex" \
-	      "(use \`make latexpdf' here to do that automatically)."
-
-latexpdf:
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	@echo "Running LaTeX files through pdflatex..."
-	$(MAKE) -C $(BUILDDIR)/latex all-pdf
-	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
-
-text:
-	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
-	@echo
-	@echo "Build finished. The text files are in $(BUILDDIR)/text."
-
-man:
-	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
-	@echo
-	@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
-
-texinfo:
-	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
-	@echo
-	@echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
-	@echo "Run \`make' in that directory to run these through makeinfo" \
-	      "(use \`make info' here to do that automatically)."
-
-info:
-	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
-	@echo "Running Texinfo files through makeinfo..."
-	make -C $(BUILDDIR)/texinfo info
-	@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
-
-gettext:
-	$(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
-	@echo
-	@echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."
-
-changes:
-	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
-	@echo
-	@echo "The overview file is in $(BUILDDIR)/changes."
-
-linkcheck:
-	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
-	@echo
-	@echo "Link check complete; look for any errors in the above output " \
-	      "or in $(BUILDDIR)/linkcheck/output.txt."
-
-doctest:
-	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
-	@echo "Testing of doctests in the sources finished, look at the " \
-	      "results in $(BUILDDIR)/doctest/output.txt."
-
-spelling:
-	$(SPHINXBUILD) -b spelling $(ALLSPHINXOPTS) $(BUILDDIR)/spelling
-	@echo
-	@echo "Check finished. Wrong words can be found in " \
-		"$(BUILDDIR)/spelling/output.txt."
diff --git a/tests/wpt/tests/tools/third_party/websockets/docs/_static/tidelift.png b/tests/wpt/tests/tools/third_party/websockets/docs/_static/tidelift.png
deleted file mode 100644
index 317dc4d9852..00000000000
Binary files a/tests/wpt/tests/tools/third_party/websockets/docs/_static/tidelift.png and /dev/null differ
diff --git a/tests/wpt/tests/tools/third_party/websockets/docs/_static/websockets.svg b/tests/wpt/tests/tools/third_party/websockets/docs/_static/websockets.svg
deleted file mode 100644
index b07fb223873..00000000000
--- a/tests/wpt/tests/tools/third_party/websockets/docs/_static/websockets.svg
+++ /dev/null
@@ -1,31 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="480" height="320" viewBox="0 0 480 320">
-  <linearGradient id="w" x1="0.2333" y1="0" x2="0.5889" y2="0.5333">
-    <stop offset="0%" stop-color="#ffe873" />
-    <stop offset="100%" stop-color="#ffd43b" />
-  </linearGradient>
-  <linearGradient id="s" x1="0.2333" y1="0" x2="0.5889" y2="0.5333">
-    <stop offset="0%" stop-color="#5a9fd4" />
-    <stop offset="100%" stop-color="#306998" />
-  </linearGradient>
-  <g>
-    <path fill="url(#w)" d="m 263.40708,146.81618 c -0.43704,0.0747 -0.88656,0.12978 -1.35572,0.14933 -2.45813,0.0764 -4.25357,-0.58665 -5.82335,-2.15107 l -8.89246,-8.85942 -11.23464,-11.19805 -36.04076,-35.919454 c -3.43568,-3.42217 -7.33248,-5.347474 -11.58962,-5.723468 -2.22981,-0.198219 -4.47388,0.03111 -6.64036,0.675545 -3.24213,0.944875 -6.13552,2.664848 -8.59366,5.116366 -3.83437,3.819499 -5.86349,8.414979 -5.87598,13.287801 -0.0607,4.95281 1.95153,9.60074 5.8082,13.44424 l 55.62289,55.43648 c 1.82219,1.84175 2.65971,3.79549 2.63384,6.14568 l 0.004,0.208 c 0.0527,2.43196 -0.75991,4.34571 -2.6267,6.20612 -1.78028,1.77598 -3.8094,2.65241 -6.30945,2.75552 -2.45814,0.0764 -4.25446,-0.58844 -5.82514,-2.15286 L 160.50255,128.2618 c -5.21417,-5.19459 -11.7029,-6.98745 -18.22998,-5.04881 -3.2457,0.9431 -6.13553,2.66307 -8.59545,5.11459 -3.83437,3.82127 -5.86527,8.41676 -5.87597,13.28957 -0.0562,4.95281 1.95152,9.60252 5.80641,13.4478 l 58.10689,57.90577 c 8.31984,8.29143 19.34042,11.9376 32.74331,10.83806 12.57967,-1.02043 23.02317,-5.5848 31.03441,-13.57313 7.51265,-7.4861 11.96423,-16.35175 13.28695,-26.42537 10.47206,-1.68264 19.29494,-6.04524 26.27512,-13.00158 4.01364,-3.99994 7.14963,-8.3972 9.40531,-13.16157 -14.15569,-0.39911 -28.23645,-4.00972 -41.05247,-10.83095 z" />
-    <path fill="url(#s)" d="m 308.76038,138.11854 c 0.10259,-12.84514 -4.43017,-23.98541 -13.50635,-33.1346 L 259.37292,69.225372 c -0.24349,-0.240885 -0.46469,-0.487992 -0.68678,-0.744877 -1.48416,-1.739529 -2.18788,-3.583056 -2.21018,-5.807022 -0.0259,-2.470184 0.84911,-4.508375 2.7605,-6.407902 1.91406,-1.909304 3.8531,-2.737735 6.36564,-2.684403 2.53662,0.024 4.62728,0.943097 6.57257,2.881734 l 60.59178,60.384848 12.11408,-12.06914 c 1.12203,-0.90755 1.95777,-1.76887 2.87823,-2.93418 5.91879,-7.515442 5.26947,-18.272611 -1.51003,-25.028952 L 299.00456,29.727312 c -9.19393,-9.157192 -20.36703,-13.776677 -33.16789,-13.7269 -12.94266,-0.05067 -24.14163,4.548375 -33.28739,13.662901 -9.02892,8.996307 -13.64015,19.93925 -13.7008,32.487501 l -0.004,0.14222 c -0.002,0.167998 -0.005,0.336884 -0.005,0.506659 -0.091,12.232701 4.10729,22.95787 12.48154,31.881285 0.40226,0.43022 0.80274,0.85777 1.22283,1.27821 l 35.75088,35.626122 c 1.88909,1.88174 2.71769,3.79638 2.69361,6.20968 l 0.003,0.20977 c 0.0527,2.43197 -0.76081,4.34571 -2.6276,6.20791 -1.44759,1.43909 -3.06286,2.27818 -4.9564,2.60262 12.81601,6.82123 26.89677,10.43184 41.05246,10.83362 2.80598,-5.92525 4.2509,-12.41848 4.29906,-19.43526 z" />
-    <path fill="#ffffff" d="m 327.48093,85.181572 c 2.84701,-2.838179 7.46359,-2.836401 10.30883,0 2.84433,2.834623 2.84612,7.435446 -0.002,10.270956 -2.84345,2.83818 -7.46271,2.83818 -10.30704,0 -2.84524,-2.83551 -2.84791,-7.435444 0,-10.270956 z" />
-  </g>
-  <g>
-    <g fill="#ffd43b">
-      <path d="m 25.719398,284.91839 c 0,2.59075 0.912299,4.79875 2.736898,6.62269 1.824599,1.82657 4.033255,2.73821 6.625313,2.73821 2.591402,0 4.800058,-0.91164 6.624002,-2.73821 1.825254,-1.82394 2.738209,-4.03194 2.738209,-6.62269 v -21.77984 c 0,-1.32126 0.475811,-2.45901 1.42809,-3.40998 0.952278,-0.95359 2.089375,-1.43006 3.411947,-1.43006 h 0.0793 c 1.348132,0 2.471467,0.47647 3.371969,1.43006 0.952278,0.95097 1.428745,2.08938 1.428745,3.40998 v 21.77984 c 0,2.59075 0.912299,4.79875 2.738209,6.62269 1.823944,1.82657 4.031289,2.73821 6.624002,2.73821 2.618274,0 4.839382,-0.91164 6.663981,-2.73821 1.825254,-1.82394 2.738209,-4.03194 2.738209,-6.62269 v -21.77984 c 0,-1.32126 0.475156,-2.45901 1.42809,-3.40998 0.897881,-0.95359 2.022526,-1.43006 3.371969,-1.43006 h 0.07865 c 1.323228,0 2.460325,0.47647 3.411948,1.43006 0.926062,0.95097 1.388766,2.08938 1.388766,3.40998 v 21.77984 c 0,5.26211 -1.865233,9.75807 -5.593077,13.48657 -3.729156,3.7285 -8.22577,5.59373 -13.487876,5.59373 -6.294998,0 -11.028207,-2.08807 -14.202904,-6.26747 -3.199602,4.1794 -7.94723,6.26747 -14.240916,6.26747 -5.262763,0 -9.759377,-1.86523 -13.487876,-5.59373 C 17.866544,294.67646 16,290.18115 16,284.91839 v -21.77984 c 0,-1.32126 0.476467,-2.45901 1.428745,-3.40998 0.951623,-0.95359 2.075612,-1.43006 3.371969,-1.43006 h 0.11928 c 1.295702,0 2.419036,0.47647 3.372625,1.43006 0.950967,0.95097 1.427434,2.08938 1.427434,3.40998 v 21.77984 z" />
-      <path d="m 132.94801,271.6291 c 0.31786,0.66063 0.47712,1.33371 0.47712,2.02252 0,0.55577 -0.10551,1.11089 -0.3172,1.66665 -0.45026,1.24262 -1.29636,2.14181 -2.53898,2.69692 -3.70293,1.66665 -8.56853,3.8622 -14.59875,6.58599 -7.48453,3.38442 -11.87497,5.38139 -13.17067,5.9909 2.00942,2.53832 5.14414,3.80715 9.40219,3.80715 2.82931,0 5.39515,-0.83234 7.69556,-2.499 2.24798,-1.63977 3.82222,-3.75537 4.72141,-6.34808 0.76746,-2.16868 2.30107,-3.25269 4.60148,-3.25269 1.63912,0 2.94859,0.68881 3.92708,2.06185 0.6082,0.84742 0.9123,1.7335 0.9123,2.65891 0,0.55577 -0.10552,1.12399 -0.31655,1.70532 -1.56048,4.52348 -4.29869,8.17334 -8.21135,10.95087 -3.96706,2.88108 -8.41059,4.32293 -13.32993,4.32293 -6.29434,0 -11.67639,-2.23356 -16.145474,-6.70395 -4.469743,-4.46975 -6.704615,-9.85114 -6.704615,-16.14679 0,-6.29434 2.234872,-11.67507 6.704615,-16.14678 4.468434,-4.46843 9.851134,-6.70396 16.145474,-6.70396 4.54773,0 8.70027,1.24392 12.45629,3.7285 3.72785,2.43607 6.49162,5.63437 8.29,9.60274 z m -20.74695,-3.5332 c -3.64985,0 -6.7577,1.28391 -9.32289,3.84909 -2.53897,2.5665 -3.808452,5.67435 -3.808452,9.32289 v 0.27789 l 22.175692,-9.95731 c -1.95633,-2.32597 -4.97177,-3.49256 -9.04435,-3.49256 z" />
-      <path d="m 146.11999,242.03442 c 1.2957,0 2.41904,0.46336 3.37197,1.38876 0.95228,0.95097 1.42874,2.08938 1.42874,3.4113 v 15.4311 c 2.98792,-2.64318 7.36525,-3.96707 13.13004,-3.96707 6.29434,0 11.67638,2.23488 16.14613,6.70396 4.46908,4.47106 6.70461,9.85245 6.70461,16.14679 0,6.29499 -2.23553,11.67638 -6.70461,16.14678 -4.46909,4.4704 -9.85113,6.70396 -16.14613,6.70396 -6.295,0 -11.66262,-2.22111 -16.10549,-6.66529 -4.4704,-4.41469 -6.71838,-9.77052 -6.7446,-16.06617 v -34.43341 c 0,-1.32257 0.47647,-2.46032 1.42875,-3.41129 0.95162,-0.92541 2.07561,-1.38877 3.37197,-1.38877 h 0.11862 z m 17.93009,26.06148 c -3.64919,0 -6.75704,1.28391 -9.32288,3.84909 -2.53767,2.5665 -3.80781,5.67435 -3.80781,9.32289 0,3.62364 1.27014,6.71772 3.80781,9.28291 2.56584,2.56519 5.67303,3.84778 9.32288,3.84778 3.62364,0 6.71773,-1.28259 9.28357,-3.84778 2.56387,-2.56519 3.84712,-5.65927 3.84712,-9.28291 0,-3.64788 -1.28325,-6.75639 -3.84712,-9.32289 -2.56584,-2.56518 -5.65927,-3.84909 -9.28357,-3.84909 z" />
-    </g>
-    <g fill="#306998">
-      <path d="m 205.94246,268.01922 c -1.16397,0 -2.14247,0.39586 -2.93548,1.18888 -0.79368,0.82054 -1.19019,1.79838 -1.19019,2.93548 0,1.58735 0.76681,2.77753 2.30172,3.56989 0.52825,0.29165 2.7369,0.95228 6.62466,1.98386 3.14717,0.89985 5.48691,2.07627 7.02051,3.53057 2.19621,2.09003 3.29267,5.06549 3.29267,8.92704 0,3.80714 -1.34879,7.0736 -4.04571,9.79739 -2.72444,2.69823 -5.9909,4.04636 -9.7987,4.04636 h -10.35381 c -1.29701,0 -2.41969,-0.47516 -3.37262,-1.42875 -0.95228,-0.89853 -1.42875,-2.02252 -1.42875,-3.37065 v -0.0806 c 0,-1.32126 0.47647,-2.45901 1.42875,-3.41129 0.95227,-0.95228 2.07561,-1.42874 3.37262,-1.42874 h 10.75032 c 1.16331,0 2.14246,-0.39586 2.93548,-1.18888 0.79368,-0.79367 1.19019,-1.77151 1.19019,-2.93548 0,-1.45561 -0.7537,-2.55339 -2.26044,-3.29201 -0.3965,-0.18678 -2.61892,-0.84742 -6.66529,-1.98386 -3.14782,-0.9254 -5.48887,-2.14377 -7.02247,-3.65051 -2.19555,-2.1418 -3.29202,-5.17035 -3.29202,-9.08432 0,-3.80846 1.34945,-7.06049 4.04702,-9.75807 2.72314,-2.72379 5.99024,-4.087 9.79805,-4.087 h 7.2997 c 1.32192,0 2.45967,0.47647 3.41195,1.43006 0.95162,0.95097 1.42809,2.08938 1.42809,3.40998 v 0.0793 c 0,1.34945 -0.47647,2.47409 -1.42809,3.37263 -0.95228,0.95097 -2.09003,1.42874 -3.41195,1.42874 z" />
-      <path d="m 249.06434,258.29851 c 6.29434,0 11.67573,2.23488 16.14612,6.70396 4.46909,4.47106 6.70396,9.85245 6.70396,16.14679 0,6.29499 -2.23487,11.67638 -6.70396,16.14678 -4.46974,4.46974 -9.85178,6.70396 -16.14612,6.70396 -6.29435,0 -11.67639,-2.23356 -16.14548,-6.70396 -4.46974,-4.46974 -6.70461,-9.85113 -6.70461,-16.14678 0,-6.29434 2.23487,-11.67508 6.70461,-16.14679 4.46909,-4.46908 9.85113,-6.70396 16.14548,-6.70396 z m 0,9.79739 c -3.64986,0 -6.7577,1.28391 -9.32289,3.84909 -2.53963,2.5665 -3.80911,5.67435 -3.80911,9.32289 0,3.62364 1.26948,6.71772 3.80911,9.28291 2.56519,2.56519 5.67238,3.84778 9.32289,3.84778 3.62298,0 6.71706,-1.28259 9.28291,-3.84778 2.56518,-2.56519 3.84778,-5.65927 3.84778,-9.28291 0,-3.64788 -1.2826,-6.75639 -3.84778,-9.32289 -2.56585,-2.56518 -5.65928,-3.84909 -9.28291,-3.84909 z" />
-      <path d="m 307.22146,259.37007 c 2.24864,0.71438 3.37263,2.24798 3.37263,4.60148 v 0.19989 c 0,1.6116 -0.64884,2.89419 -1.94454,3.84778 -0.89919,0.63376 -1.82525,0.95097 -2.77622,0.95097 -0.50334,0 -1.01913,-0.0793 -1.54737,-0.23791 -1.29636,-0.42272 -2.63204,-0.63638 -4.00638,-0.63638 -3.64986,0 -6.75836,1.28391 -9.32289,3.84909 -2.53963,2.5665 -3.80846,5.67435 -3.80846,9.32289 0,3.62364 1.26883,6.71772 3.80846,9.28291 2.56453,2.56519 5.67238,3.84778 9.32289,3.84778 1.375,0 2.71068,-0.21103 4.00638,-0.63507 0.50203,-0.1586 1.00471,-0.2379 1.50739,-0.2379 0.97718,0 1.91767,0.31851 2.81686,0.95358 1.2957,0.95097 1.94453,2.24798 1.94453,3.88776 0,2.32728 -1.12464,3.86089 -3.37262,4.60148 -2.22111,0.6875 -4.52152,1.03027 -6.90189,1.03027 -6.29434,0 -11.67638,-2.23356 -16.14678,-6.70396 -4.46843,-4.46974 -6.70396,-9.85113 -6.70396,-16.14678 0,-6.29435 2.23487,-11.67508 6.70396,-16.14679 4.46974,-4.46843 9.85178,-6.70396 16.14678,-6.70396 2.37906,0.001 4.68012,0.35981 6.90123,1.07287 z" />
-      <path d="m 322.25671,242.03442 c 1.29504,0 2.41903,0.46336 3.37262,1.38876 0.95163,0.95097 1.42809,2.08938 1.42809,3.4113 v 27.49154 h 1.50739 c 3.38508,0 6.33301,-1.12399 8.84708,-3.37263 2.45901,-2.24798 3.86023,-5.0242 4.20431,-8.33063 0.15861,-1.24261 0.68816,-2.26174 1.58735,-3.0541 0.89854,-0.84611 1.96944,-1.27015 3.21271,-1.27015 h 0.11863 c 1.40252,0 2.5796,0.53021 3.53122,1.58735 0.84676,0.92541 1.26949,1.99697 1.26949,3.21271 0,0.15861 -0.0138,0.33163 -0.0393,0.51579 -0.63507,6.63842 -3.17405,11.61019 -7.61692,14.91531 2.32663,1.43006 4.46909,3.84909 6.42739,7.26039 2.03563,3.51746 3.05476,7.31412 3.05476,11.38473 v 2.02515 c 0,1.34813 -0.47712,2.47147 -1.42809,3.37066 -0.95359,0.95359 -2.07692,1.42874 -3.37263,1.42874 h -0.11928 c -1.29635,0 -2.41969,-0.47515 -3.37196,-1.42874 -0.95228,-0.89854 -1.42809,-2.02253 -1.42809,-3.37066 v -2.02515 c -0.0275,-3.59414 -1.31012,-6.67708 -3.84844,-9.24358 -2.56584,-2.53832 -5.66058,-3.80715 -9.28291,-3.80715 h -3.25269 v 15.07523 c 0,1.34813 -0.47646,2.47146 -1.42809,3.37065 -0.95293,0.95359 -2.07758,1.42875 -3.37262,1.42875 h -0.12059 c -1.2957,0 -2.41838,-0.47516 -3.37132,-1.42875 -0.95162,-0.89853 -1.42809,-2.02252 -1.42809,-3.37065 v -52.36547 c 0,-1.32257 0.47647,-2.46032 1.42809,-3.41129 0.95228,-0.92541 2.07562,-1.38877 3.37132,-1.38877 h 0.12059 z" />
-      <path d="m 402.31164,271.6291 c 0.31721,0.66063 0.47581,1.33371 0.47581,2.02252 0,0.55577 -0.10617,1.11089 -0.31655,1.66665 -0.45025,1.24262 -1.29635,2.14181 -2.53897,2.69692 -3.70294,1.66665 -8.56919,3.8622 -14.59876,6.58599 -7.48452,3.38442 -11.87496,5.38139 -13.17067,5.9909 2.00877,2.53832 5.14349,3.80715 9.40219,3.80715 2.82866,0 5.3945,-0.83234 7.69622,-2.499 2.24732,-1.63977 3.82091,-3.75537 4.7201,-6.34808 0.76681,-2.16868 2.30172,-3.25269 4.60148,-3.25269 1.63978,0 2.94924,0.68881 3.92839,2.06185 0.60689,0.84742 0.91165,1.7335 0.91165,2.65891 0,0.55577 -0.10552,1.12399 -0.31721,1.70532 -1.56048,4.52348 -4.29738,8.17334 -8.21135,10.95087 -3.96706,2.88108 -8.40994,4.32293 -13.32928,4.32293 -6.29434,0 -11.67638,-2.23356 -16.14547,-6.70395 -4.46974,-4.46975 -6.70461,-9.85114 -6.70461,-16.14679 0,-6.29434 2.23487,-11.67507 6.70461,-16.14678 4.46843,-4.46843 9.85113,-6.70396 16.14547,-6.70396 4.54774,0 8.70093,1.24392 12.4563,3.7285 3.7285,2.43607 6.49161,5.63437 8.29065,9.60274 z m -20.7476,-3.5332 c -3.6492,0 -6.7577,1.28391 -9.32289,3.84909 -2.53897,2.5665 -3.80846,5.67435 -3.80846,9.32289 v 0.27789 l 22.1757,-9.95731 c -1.95699,-2.32597 -4.97177,-3.49256 -9.04435,-3.49256 z" />
-      <path d="m 415.48166,242.03442 c 1.2957,0 2.41969,0.46336 3.37262,1.38876 0.95162,0.95097 1.42809,2.08938 1.42809,3.4113 v 11.46403 h 5.95092 c 1.2957,0 2.41903,0.47647 3.37262,1.43006 0.95163,0.95097 1.42678,2.08938 1.42678,3.40998 v 0.0793 c 0,1.34945 -0.47515,2.47409 -1.42678,3.37263 -0.95293,0.95097 -2.07692,1.42874 -3.37262,1.42874 h -5.95092 v 23.52252 c 0,0.76811 0.26347,1.41695 0.79367,1.94453 0.5289,0.53021 1.19019,0.79368 1.98321,0.79368 h 3.17404 c 1.2957,0 2.41903,0.47646 3.37262,1.42874 0.95163,0.95228 1.42678,2.09003 1.42678,3.41129 v 0.0806 c 0,1.34813 -0.47515,2.47146 -1.42678,3.37065 C 428.65298,303.52484 427.52899,304 426.23329,304 h -3.17404 c -3.43817,0 -6.38675,-1.21574 -8.84642,-3.6492 -2.43411,-2.45901 -3.6492,-5.39515 -3.6492,-8.80775 v -44.70726 c 0,-1.32258 0.47581,-2.46033 1.42809,-3.4113 0.95228,-0.9254 2.07627,-1.38876 3.37197,-1.38876 h 0.11797 z" />
-      <path d="m 448.88545,268.01922 c -1.16397,0 -2.14246,0.39586 -2.93548,1.18888 -0.79368,0.82054 -1.19019,1.79838 -1.19019,2.93548 0,1.58735 0.76681,2.77753 2.30042,3.56989 0.5302,0.29165 2.7382,0.95228 6.62596,1.98386 3.14652,0.89985 5.48691,2.07627 7.02117,3.53057 2.19489,2.09003 3.29267,5.06549 3.29267,8.92704 0,3.80714 -1.34945,7.0736 -4.04637,9.79739 -2.72379,2.69823 -5.99089,4.04636 -9.79869,4.04636 h -10.35382 c -1.29635,0 -2.41969,-0.47516 -3.37262,-1.42875 -0.95228,-0.89853 -1.42744,-2.02252 -1.42744,-3.37065 v -0.0806 c 0,-1.32126 0.47516,-2.45901 1.42744,-3.41129 0.95228,-0.95228 2.07627,-1.42874 3.37262,-1.42874 h 10.75032 c 1.16332,0 2.14312,-0.39586 2.93549,-1.18888 0.79367,-0.79367 1.19018,-1.77151 1.19018,-2.93548 0,-1.45561 -0.7537,-2.55339 -2.26043,-3.29201 -0.39782,-0.18678 -2.61893,-0.84742 -6.66529,-1.98386 -3.14783,-0.9254 -5.48887,-2.14377 -7.02248,-3.65051 -2.19555,-2.1418 -3.29201,-5.17035 -3.29201,-9.08432 0,-3.80846 1.34944,-7.06049 4.04701,-9.75807 2.72314,-2.72379 5.99025,-4.087 9.7987,-4.087 h 7.29906 c 1.32322,0 2.45967,0.47647 3.41129,1.43006 0.95228,0.95097 1.42809,2.08938 1.42809,3.40998 v 0.0793 c 0,1.34945 -0.47581,2.47409 -1.42809,3.37263 -0.95162,0.95097 -2.08872,1.42874 -3.41129,1.42874 z" />
-    </g>
-  </g>
-</svg>
diff --git a/tests/wpt/tests/tools/third_party/websockets/docs/api.rst b/tests/wpt/tests/tools/third_party/websockets/docs/api.rst
deleted file mode 100644
index d265a91c2cd..00000000000
--- a/tests/wpt/tests/tools/third_party/websockets/docs/api.rst
+++ /dev/null
@@ -1,152 +0,0 @@
-API
-===
-
-Design
-------
-
-``websockets`` provides complete client and server implementations, as shown
-in the :doc:`getting started guide <intro>`. These functions are built on top
-of low-level APIs reflecting the two phases of the WebSocket protocol:
-
-1. An opening handshake, in the form of an HTTP Upgrade request;
-
-2. Data transfer, as framed messages, ending with a closing handshake.
-
-The first phase is designed to integrate with existing HTTP software.
-``websockets`` provides a minimal implementation to build, parse and validate
-HTTP requests and responses.
-
-The second phase is the core of the WebSocket protocol. ``websockets``
-provides a complete implementation on top of ``asyncio`` with a simple API.
-
-For convenience, public APIs can be imported directly from the
-:mod:`websockets` package, unless noted otherwise. Anything that isn't listed
-in this document is a private API.
-
-High-level
-----------
-
-Server
-......
-
-.. automodule:: websockets.server
-
-    .. autofunction:: serve(ws_handler, host=None, port=None, *, create_protocol=None, ping_interval=20, ping_timeout=20, close_timeout=10, max_size=2 ** 20, max_queue=2 ** 5, read_limit=2 ** 16, write_limit=2 ** 16, loop=None, compression='deflate', origins=None, extensions=None, subprotocols=None, extra_headers=None, process_request=None, select_subprotocol=None, **kwds)
-        :async:
-
-    .. autofunction:: unix_serve(ws_handler, path, *, create_protocol=None, ping_interval=20, ping_timeout=20, close_timeout=10, max_size=2 ** 20, max_queue=2 ** 5, read_limit=2 ** 16, write_limit=2 ** 16, loop=None, compression='deflate', origins=None, extensions=None, subprotocols=None, extra_headers=None, process_request=None, select_subprotocol=None, **kwds)
-        :async:
-
-
-    .. autoclass:: WebSocketServer
-
-        .. automethod:: close
-        .. automethod:: wait_closed
-        .. autoattribute:: sockets
-
-    .. autoclass:: WebSocketServerProtocol(ws_handler, ws_server, *, ping_interval=20, ping_timeout=20, close_timeout=10, max_size=2 ** 20, max_queue=2 ** 5, read_limit=2 ** 16, write_limit=2 ** 16, loop=None, origins=None, extensions=None, subprotocols=None, extra_headers=None, process_request=None, select_subprotocol=None)
-
-        .. automethod:: handshake
-        .. automethod:: process_request
-        .. automethod:: select_subprotocol
-
-Client
-......
-
-.. automodule:: websockets.client
-
-    .. autofunction:: connect(uri, *, create_protocol=None, ping_interval=20, ping_timeout=20, close_timeout=10, max_size=2 ** 20, max_queue=2 ** 5, read_limit=2 ** 16, write_limit=2 ** 16, loop=None, compression='deflate', origin=None, extensions=None, subprotocols=None, extra_headers=None, **kwds)
-        :async:
-
-    .. autofunction:: unix_connect(path, uri="ws://localhost/", *, create_protocol=None, ping_interval=20, ping_timeout=20, close_timeout=10, max_size=2 ** 20, max_queue=2 ** 5, read_limit=2 ** 16, write_limit=2 ** 16, loop=None, compression='deflate', origin=None, extensions=None, subprotocols=None, extra_headers=None, **kwds)
-        :async:
-
-    .. autoclass:: WebSocketClientProtocol(*, ping_interval=20, ping_timeout=20, close_timeout=10, max_size=2 ** 20, max_queue=2 ** 5, read_limit=2 ** 16, write_limit=2 ** 16, loop=None, origin=None, extensions=None, subprotocols=None, extra_headers=None)
-
-        .. automethod:: handshake
-
-Shared
-......
-
-.. automodule:: websockets.protocol
-
-    .. autoclass:: WebSocketCommonProtocol(*, ping_interval=20, ping_timeout=20, close_timeout=10, max_size=2 ** 20, max_queue=2 ** 5, read_limit=2 ** 16, write_limit=2 ** 16, loop=None)
-
-        .. automethod:: close
-        .. automethod:: wait_closed
-
-        .. automethod:: recv
-        .. automethod:: send
-
-        .. automethod:: ping
-        .. automethod:: pong
-
-        .. autoattribute:: local_address
-        .. autoattribute:: remote_address
-
-        .. autoattribute:: open
-        .. autoattribute:: closed
-
-Types
-.....
-
-.. automodule:: websockets.typing
-
-    .. autodata:: Data
-
-
-Per-Message Deflate Extension
-.............................
-
-.. automodule:: websockets.extensions.permessage_deflate
-
-    .. autoclass:: ServerPerMessageDeflateFactory
-
-    .. autoclass:: ClientPerMessageDeflateFactory
-
-HTTP Basic Auth
-...............
-
-.. automodule:: websockets.auth
-
-    .. autofunction:: basic_auth_protocol_factory
-
-    .. autoclass:: BasicAuthWebSocketServerProtocol
-
-        .. automethod:: process_request
-
-Exceptions
-..........
-
-.. automodule:: websockets.exceptions
-    :members:
-
-Low-level
----------
-
-Opening handshake
-.................
-
-.. automodule:: websockets.handshake
-    :members:
-
-Data transfer
-.............
-
-.. automodule:: websockets.framing
-    :members:
-
-URI parser
-..........
-
-.. automodule:: websockets.uri
-    :members:
-
-Utilities
-.........
-
-.. automodule:: websockets.headers
-    :members:
-
-.. automodule:: websockets.http
-    :members:
diff --git a/tests/wpt/tests/tools/third_party/websockets/docs/changelog.rst b/tests/wpt/tests/tools/third_party/websockets/docs/changelog.rst
deleted file mode 100644
index 04f18a7657d..00000000000
--- a/tests/wpt/tests/tools/third_party/websockets/docs/changelog.rst
+++ /dev/null
@@ -1,563 +0,0 @@
-Changelog
----------
-
-.. currentmodule:: websockets
-
-8.2
-...
-
-*In development*
-
-8.1
-...
-
-* Added compatibility with Python 3.8.
-
-8.0.2
-.....
-
-* Restored the ability to pass a socket with the ``sock`` parameter of
-  :func:`~server.serve`.
-
-* Removed an incorrect assertion when a connection drops.
-
-8.0.1
-.....
-
-* Restored the ability to import ``WebSocketProtocolError`` from
-  ``websockets``.
-
-8.0
-...
-
-.. warning::
-
-    **Version 8.0 drops compatibility with Python 3.4 and 3.5.**
-
-.. note::
-
-    **Version 8.0 expects** ``process_request`` **to be a coroutine.**
-
-    Previously, it could be a function or a coroutine.
-
-    If you're passing a ``process_request`` argument to :func:`~server.serve`
-    or :class:`~server.WebSocketServerProtocol`, or if you're overriding
-    :meth:`~protocol.WebSocketServerProtocol.process_request` in a subclass,
-    define it with ``async def`` instead of ``def``.
-
-    For backwards compatibility, functions are still mostly supported, but
-    mixing functions and coroutines won't work in some inheritance scenarios.
-
-.. note::
-
-    **Version 8.0 changes the behavior of the** ``max_queue`` **parameter.**
-
-    If you were setting ``max_queue=0`` to make the queue of incoming messages
-    unbounded, change it to ``max_queue=None``.
-
-.. note::
-
-    **Version 8.0 deprecates the** ``host`` **,** ``port`` **, and** ``secure``
-    **attributes of** :class:`~protocol.WebSocketCommonProtocol`.
-
-    Use :attr:`~protocol.WebSocketCommonProtocol.local_address` in servers and
-    :attr:`~protocol.WebSocketCommonProtocol.remote_address` in clients
-    instead of ``host`` and ``port``.
-
-.. note::
-
-    **Version 8.0 renames the** ``WebSocketProtocolError`` **exception**
-    to :exc:`ProtocolError` **.**
-
-    A ``WebSocketProtocolError`` alias provides backwards compatibility.
-
-.. note::
-
-    **Version 8.0 adds the reason phrase to the return type of the low-level
-    API** :func:`~http.read_response` **.**
-
-Also:
-
-* :meth:`~protocol.WebSocketCommonProtocol.send`,
-  :meth:`~protocol.WebSocketCommonProtocol.ping`, and
-  :meth:`~protocol.WebSocketCommonProtocol.pong` support bytes-like types
-  :class:`bytearray` and :class:`memoryview` in addition to :class:`bytes`.
-
-* Added :exc:`~exceptions.ConnectionClosedOK` and
-  :exc:`~exceptions.ConnectionClosedError` subclasses of
-  :exc:`~exceptions.ConnectionClosed` to tell apart normal connection
-  termination from errors.
-
-* Added :func:`~auth.basic_auth_protocol_factory` to enforce HTTP Basic Auth
-  on the server side.
-
-* :func:`~client.connect` handles redirects from the server during the
-  handshake.
-
-* :func:`~client.connect` supports overriding ``host`` and ``port``.
-
-* Added :func:`~client.unix_connect` for connecting to Unix sockets.
-
-* Improved support for sending fragmented messages by accepting asynchronous
-  iterators in :meth:`~protocol.WebSocketCommonProtocol.send`.
-
-* Prevented spurious log messages about :exc:`~exceptions.ConnectionClosed`
-  exceptions in keepalive ping task. If you were using ``ping_timeout=None``
-  as a workaround, you can remove it.
-
-* Changed :meth:`WebSocketServer.close() <server.WebSocketServer.close>` to
-  perform a proper closing handshake instead of failing the connection.
-
-* Avoided a crash when a ``extra_headers`` callable returns ``None``.
-
-* Improved error messages when HTTP parsing fails.
-
-* Enabled readline in the interactive client.
-
-* Added type hints (:pep:`484`).
-
-* Added a FAQ to the documentation.
-
-* Added documentation for extensions.
-
-* Documented how to optimize memory usage.
-
-* Improved API documentation.
-
-7.0
-...
-
-.. warning::
-
-    **Version 7.0 renames the** ``timeout`` **argument of**
-    :func:`~server.serve()` **and** :func:`~client.connect` **to**
-    ``close_timeout`` **.**
-
-    This prevents confusion with ``ping_timeout``.
-
-    For backwards compatibility, ``timeout`` is still supported.
-
-.. warning::
-
-    **Version 7.0 changes how a server terminates connections when it's
-    closed with** :meth:`~server.WebSocketServer.close` **.**
-
-    Previously, connections handlers were canceled. Now, connections are
-    closed with close code 1001 (going away). From the perspective of the
-    connection handler, this is the same as if the remote endpoint was
-    disconnecting. This removes the need to prepare for
-    :exc:`~asyncio.CancelledError` in connection handlers.
-
-    You can restore the previous behavior by adding the following line at the
-    beginning of connection handlers::
-
-        def handler(websocket, path):
-            closed = asyncio.ensure_future(websocket.wait_closed())
-            closed.add_done_callback(lambda task: task.cancel())
-
-.. note::
-
-    **Version 7.0 changes how a** :meth:`~protocol.WebSocketCommonProtocol.ping`
-    **that hasn't received a pong yet behaves when the connection is closed.**
-
-    The ping — as in ``ping = await websocket.ping()`` — used to be canceled
-    when the connection is closed, so that ``await ping`` raised
-    :exc:`~asyncio.CancelledError`. Now ``await ping`` raises
-    :exc:`~exceptions.ConnectionClosed` like other public APIs.
-
-.. note::
-
-    **Version 7.0 raises a** :exc:`RuntimeError` **exception if two coroutines
-    call** :meth:`~protocol.WebSocketCommonProtocol.recv` **concurrently.**
-
-    Concurrent calls lead to non-deterministic behavior because there are no
-    guarantees about which coroutine will receive which message.
-
-Also:
-
-* ``websockets`` sends Ping frames at regular intervals and closes the
-  connection if it doesn't receive a matching Pong frame. See
-  :class:`~protocol.WebSocketCommonProtocol` for details.
-
-* Added ``process_request`` and ``select_subprotocol`` arguments to
-  :func:`~server.serve` and :class:`~server.WebSocketServerProtocol` to
-  customize :meth:`~server.WebSocketServerProtocol.process_request` and
-  :meth:`~server.WebSocketServerProtocol.select_subprotocol` without
-  subclassing :class:`~server.WebSocketServerProtocol`.
-
-* Added support for sending fragmented messages.
-
-* Added the :meth:`~protocol.WebSocketCommonProtocol.wait_closed` method to
-  protocols.
-
-* Added an interactive client: ``python -m websockets <uri>``.
-
-* Changed the ``origins`` argument to represent the lack of an origin with
-  ``None`` rather than ``''``.
-
-* Fixed a data loss bug in :meth:`~protocol.WebSocketCommonProtocol.recv`:
-  canceling it at the wrong time could result in messages being dropped.
-
-* Improved handling of multiple HTTP headers with the same name.
-
-* Improved error messages when a required HTTP header is missing.
-
-6.0
-...
-
-.. warning::
-
-    **Version 6.0 introduces the** :class:`~http.Headers` **class for managing
-    HTTP headers and changes several public APIs:**
-
-    * :meth:`~server.WebSocketServerProtocol.process_request` now receives a
-      :class:`~http.Headers` instead of a :class:`~http.client.HTTPMessage` in
-      the ``request_headers`` argument.
-
-    * The :attr:`~protocol.WebSocketCommonProtocol.request_headers` and
-      :attr:`~protocol.WebSocketCommonProtocol.response_headers` attributes of
-      :class:`~protocol.WebSocketCommonProtocol` are :class:`~http.Headers`
-      instead of :class:`~http.client.HTTPMessage`.
-
-    * The :attr:`~protocol.WebSocketCommonProtocol.raw_request_headers` and
-      :attr:`~protocol.WebSocketCommonProtocol.raw_response_headers`
-      attributes of :class:`~protocol.WebSocketCommonProtocol` are removed.
-      Use :meth:`~http.Headers.raw_items` instead.
-
-    * Functions defined in the :mod:`~handshake` module now receive
-      :class:`~http.Headers` in argument instead of ``get_header`` or
-      ``set_header`` functions. This affects libraries that rely on
-      low-level APIs.
-
-    * Functions defined in the :mod:`~http` module now return HTTP headers as
-      :class:`~http.Headers` instead of lists of ``(name, value)`` pairs.
-
-    Since :class:`~http.Headers` and :class:`~http.client.HTTPMessage` provide
-    similar APIs, this change won't affect most of the code dealing with HTTP
-    headers.
-
-
-Also:
-
-* Added compatibility with Python 3.7.
-
-5.0.1
-.....
-
-* Fixed a regression in the 5.0 release that broke some invocations of
-  :func:`~server.serve()` and :func:`~client.connect`.
-
-5.0
-...
-
-.. note::
-
-    **Version 5.0 fixes a security issue introduced in version 4.0.**
-
-    Version 4.0 was vulnerable to denial of service by memory exhaustion
-    because it didn't enforce ``max_size`` when decompressing compressed
-    messages (`CVE-2018-1000518`_).
-
-    .. _CVE-2018-1000518: https://nvd.nist.gov/vuln/detail/CVE-2018-1000518
-
-.. note::
-
-    **Version 5.0 adds a** ``user_info`` **field to the return value of**
-    :func:`~uri.parse_uri` **and** :class:`~uri.WebSocketURI` **.**
-
-    If you're unpacking :class:`~exceptions.WebSocketURI` into four variables,
-    adjust your code to account for that fifth field.
-
-Also:
-
-* :func:`~client.connect` performs HTTP Basic Auth when the URI contains
-  credentials.
-
-* Iterating on incoming messages no longer raises an exception when the
-  connection terminates with close code 1001 (going away).
-
-* A plain HTTP request now receives a 426 Upgrade Required response and
-  doesn't log a stack trace.
-
-* :func:`~server.unix_serve` can be used as an asynchronous context manager on
-  Python ≥ 3.5.1.
-
-* Added the :attr:`~protocol.WebSocketCommonProtocol.closed` property to
-  protocols.
-
-* If a :meth:`~protocol.WebSocketCommonProtocol.ping` doesn't receive a pong,
-  it's canceled when the connection is closed.
-
-* Reported the cause of :exc:`~exceptions.ConnectionClosed` exceptions.
-
-* Added new examples in the documentation.
-
-* Updated documentation with new features from Python 3.6.
-
-* Improved several other sections of the documentation.
-
-* Fixed missing close code, which caused :exc:`TypeError` on connection close.
-
-* Fixed a race condition in the closing handshake that raised
-  :exc:`~exceptions.InvalidState`.
-
-* Stopped logging stack traces when the TCP connection dies prematurely.
-
-* Prevented writing to a closing TCP connection during unclean shutdowns.
-
-* Made connection termination more robust to network congestion.
-
-* Prevented processing of incoming frames after failing the connection.
-
-4.0.1
-.....
-
-* Fixed issues with the packaging of the 4.0 release.
-
-4.0
-...
-
-.. warning::
-
-    **Version 4.0 enables compression with the permessage-deflate extension.**
-
-    In August 2017, Firefox and Chrome support it, but not Safari and IE.
-
-    Compression should improve performance but it increases RAM and CPU use.
-
-    If you want to disable compression, add ``compression=None`` when calling
-    :func:`~server.serve()` or :func:`~client.connect`.
-
-.. warning::
-
-    **Version 4.0 drops compatibility with Python 3.3.**
-
-.. note::
-
-    **Version 4.0 removes the** ``state_name`` **attribute of protocols.**
-
-    Use ``protocol.state.name`` instead of ``protocol.state_name``.
-
-Also:
-
-* :class:`~protocol.WebSocketCommonProtocol` instances can be used as
-  asynchronous iterators on Python ≥ 3.6. They yield incoming messages.
-
-* Added :func:`~server.unix_serve` for listening on Unix sockets.
-
-* Added the :attr:`~server.WebSocketServer.sockets` attribute to the return
-  value of :func:`~server.serve`.
-
-* Reorganized and extended documentation.
-
-* Aborted connections if they don't close within the configured ``timeout``.
-
-* Rewrote connection termination to increase robustness in edge cases.
-
-* Stopped leaking pending tasks when :meth:`~asyncio.Task.cancel` is called on
-  a connection while it's being closed.
-
-* Reduced verbosity of "Failing the WebSocket connection" logs.
-
-* Allowed ``extra_headers`` to override ``Server`` and ``User-Agent`` headers.
-
-3.4
-...
-
-* Renamed :func:`~server.serve()` and :func:`~client.connect`'s ``klass``
-  argument to ``create_protocol`` to reflect that it can also be a callable.
-  For backwards compatibility, ``klass`` is still supported.
-
-* :func:`~server.serve` can be used as an asynchronous context manager on
-  Python ≥ 3.5.1.
-
-* Added support for customizing handling of incoming connections with
-  :meth:`~server.WebSocketServerProtocol.process_request`.
-
-* Made read and write buffer sizes configurable.
-
-* Rewrote HTTP handling for simplicity and performance.
-
-* Added an optional C extension to speed up low-level operations.
-
-* An invalid response status code during :func:`~client.connect` now raises
-  :class:`~exceptions.InvalidStatusCode` with a ``code`` attribute.
-
-* Providing a ``sock`` argument to :func:`~client.connect` no longer
-  crashes.
-
-3.3
-...
-
-* Ensured compatibility with Python 3.6.
-
-* Reduced noise in logs caused by connection resets.
-
-* Avoided crashing on concurrent writes on slow connections.
-
-3.2
-...
-
-* Added ``timeout``, ``max_size``, and ``max_queue`` arguments to
-  :func:`~client.connect()` and :func:`~server.serve`.
-
-* Made server shutdown more robust.
-
-3.1
-...
-
-* Avoided a warning when closing a connection before the opening handshake.
-
-* Added flow control for incoming data.
-
-3.0
-...
-
-.. warning::
-
-    **Version 3.0 introduces a backwards-incompatible change in the**
-    :meth:`~protocol.WebSocketCommonProtocol.recv` **API.**
-
-    **If you're upgrading from 2.x or earlier, please read this carefully.**
-
-    :meth:`~protocol.WebSocketCommonProtocol.recv` used to return ``None``
-    when the connection was closed. This required checking the return value of
-    every call::
-
-        message = await websocket.recv()
-        if message is None:
-            return
-
-    Now it raises a :exc:`~exceptions.ConnectionClosed` exception instead.
-    This is more Pythonic. The previous code can be simplified to::
-
-        message = await websocket.recv()
-
-    When implementing a server, which is the more popular use case, there's no
-    strong reason to handle such exceptions. Let them bubble up, terminate the
-    handler coroutine, and the server will simply ignore them.
-
-    In order to avoid stranding projects built upon an earlier version, the
-    previous behavior can be restored by passing ``legacy_recv=True`` to
-    :func:`~server.serve`, :func:`~client.connect`,
-    :class:`~server.WebSocketServerProtocol`, or
-    :class:`~client.WebSocketClientProtocol`. ``legacy_recv`` isn't documented
-    in their signatures but isn't scheduled for deprecation either.
-
-Also:
-
-* :func:`~client.connect` can be used as an asynchronous context manager on
-  Python ≥ 3.5.1.
-
-* Updated documentation with ``await`` and ``async`` syntax from Python 3.5.
-
-* :meth:`~protocol.WebSocketCommonProtocol.ping` and
-  :meth:`~protocol.WebSocketCommonProtocol.pong` support data passed as
-  :class:`str` in addition to :class:`bytes`.
-
-* Worked around an asyncio bug affecting connection termination under load.
-
-* Made ``state_name`` attribute on protocols a public API.
-
-* Improved documentation.
-
-2.7
-...
-
-* Added compatibility with Python 3.5.
-
-* Refreshed documentation.
-
-2.6
-...
-
-* Added ``local_address`` and ``remote_address`` attributes on protocols.
-
-* Closed open connections with code 1001 when a server shuts down.
-
-* Avoided TCP fragmentation of small frames.
-
-2.5
-...
-
-* Improved documentation.
-
-* Provided access to handshake request and response HTTP headers.
-
-* Allowed customizing handshake request and response HTTP headers.
-
-* Supported running on a non-default event loop.
-
-* Returned a 403 status code instead of 400 when the request Origin isn't
-  allowed.
-
-* Canceling :meth:`~protocol.WebSocketCommonProtocol.recv` no longer drops
-  the next message.
-
-* Clarified that the closing handshake can be initiated by the client.
-
-* Set the close code and reason more consistently.
-
-* Strengthened connection termination by simplifying the implementation.
-
-* Improved tests, added tox configuration, and enforced 100% branch coverage.
-
-2.4
-...
-
-* Added support for subprotocols.
-
-* Supported non-default event loop.
-
-* Added ``loop`` argument to :func:`~client.connect` and
-  :func:`~server.serve`.
-
-2.3
-...
-
-* Improved compliance of close codes.
-
-2.2
-...
-
-* Added support for limiting message size.
-
-2.1
-...
-
-* Added ``host``, ``port`` and ``secure`` attributes on protocols.
-
-* Added support for providing and checking Origin_.
-
-.. _Origin: https://tools.ietf.org/html/rfc6455#section-10.2
-
-2.0
-...
-
-.. warning::
-
-    **Version 2.0 introduces a backwards-incompatible change in the**
-    :meth:`~protocol.WebSocketCommonProtocol.send`,
-    :meth:`~protocol.WebSocketCommonProtocol.ping`, and
-    :meth:`~protocol.WebSocketCommonProtocol.pong` **APIs.**
-
-    **If you're upgrading from 1.x or earlier, please read this carefully.**
-
-    These APIs used to be functions. Now they're coroutines.
-
-    Instead of::
-
-        websocket.send(message)
-
-    you must now write::
-
-        await websocket.send(message)
-
-Also:
-
-* Added flow control for outgoing data.
-
-1.0
-...
-
-* Initial public release.
diff --git a/tests/wpt/tests/tools/third_party/websockets/docs/cheatsheet.rst b/tests/wpt/tests/tools/third_party/websockets/docs/cheatsheet.rst
deleted file mode 100644
index f897326a6ba..00000000000
--- a/tests/wpt/tests/tools/third_party/websockets/docs/cheatsheet.rst
+++ /dev/null
@@ -1,109 +0,0 @@
-Cheat sheet
-===========
-
-.. currentmodule:: websockets
-
-Server
-------
-
-* Write a coroutine that handles a single connection. It receives a WebSocket
-  protocol instance and the URI path in argument.
-
-  * Call :meth:`~protocol.WebSocketCommonProtocol.recv` and
-    :meth:`~protocol.WebSocketCommonProtocol.send` to receive and send
-    messages at any time.
-
-  * When :meth:`~protocol.WebSocketCommonProtocol.recv` or
-    :meth:`~protocol.WebSocketCommonProtocol.send` raises
-    :exc:`~exceptions.ConnectionClosed`, clean up and exit. If you started
-    other :class:`asyncio.Task`, terminate them before exiting.
-
-  * If you aren't awaiting :meth:`~protocol.WebSocketCommonProtocol.recv`,
-    consider awaiting :meth:`~protocol.WebSocketCommonProtocol.wait_closed`
-    to detect quickly when the connection is closed.
-
-  * You may :meth:`~protocol.WebSocketCommonProtocol.ping` or
-    :meth:`~protocol.WebSocketCommonProtocol.pong` if you wish but it isn't
-    needed in general.
-
-* Create a server with :func:`~server.serve` which is similar to asyncio's
-  :meth:`~asyncio.AbstractEventLoop.create_server`. You can also use it as an
-  asynchronous context manager.
-
-  * The server takes care of establishing connections, then lets the handler
-    execute the application logic, and finally closes the connection after the
-    handler exits normally or with an exception.
-
-  * For advanced customization, you may subclass
-    :class:`~server.WebSocketServerProtocol` and pass either this subclass or
-    a factory function as the ``create_protocol`` argument.
-
-Client
-------
-
-* Create a client with :func:`~client.connect` which is similar to asyncio's
-  :meth:`~asyncio.BaseEventLoop.create_connection`. You can also use it as an
-  asynchronous context manager.
-
-  * For advanced customization, you may subclass
-    :class:`~server.WebSocketClientProtocol` and pass either this subclass or
-    a factory function as the ``create_protocol`` argument.
-
-* Call :meth:`~protocol.WebSocketCommonProtocol.recv` and
-  :meth:`~protocol.WebSocketCommonProtocol.send` to receive and send messages
-  at any time.
-
-* You may :meth:`~protocol.WebSocketCommonProtocol.ping` or
-  :meth:`~protocol.WebSocketCommonProtocol.pong` if you wish but it isn't
-  needed in general.
-
-* If you aren't using :func:`~client.connect` as a context manager, call
-  :meth:`~protocol.WebSocketCommonProtocol.close` to terminate the connection.
-
-.. _debugging:
-
-Debugging
----------
-
-If you don't understand what ``websockets`` is doing, enable logging::
-
-    import logging
-    logger = logging.getLogger('websockets')
-    logger.setLevel(logging.INFO)
-    logger.addHandler(logging.StreamHandler())
-
-The logs contain:
-
-* Exceptions in the connection handler at the ``ERROR`` level
-* Exceptions in the opening or closing handshake at the ``INFO`` level
-* All frames at the ``DEBUG`` level — this can be very verbose
-
-If you're new to ``asyncio``, you will certainly encounter issues that are
-related to asynchronous programming in general rather than to ``websockets``
-in particular. Fortunately Python's official documentation provides advice to
-`develop with asyncio`_. Check it out: it's invaluable!
-
-.. _develop with asyncio: https://docs.python.org/3/library/asyncio-dev.html
-
-Passing additional arguments to the connection handler
-------------------------------------------------------
-
-When writing a server, if you need to pass additional arguments to the
-connection handler, you can bind them with :func:`functools.partial`::
-
-    import asyncio
-    import functools
-    import websockets
-
-    async def handler(websocket, path, extra_argument):
-        ...
-
-    bound_handler = functools.partial(handler, extra_argument='spam')
-    start_server = websockets.serve(bound_handler, '127.0.0.1', 8765)
-
-    asyncio.get_event_loop().run_until_complete(start_server)
-    asyncio.get_event_loop().run_forever()
-
-Another way to achieve this result is to define the ``handler`` coroutine in
-a scope where the ``extra_argument`` variable exists instead of injecting it
-through an argument.
diff --git a/tests/wpt/tests/tools/third_party/websockets/docs/conf.py b/tests/wpt/tests/tools/third_party/websockets/docs/conf.py
deleted file mode 100644
index 064c657bf16..00000000000
--- a/tests/wpt/tests/tools/third_party/websockets/docs/conf.py
+++ /dev/null
@@ -1,272 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# websockets documentation build configuration file, created by
-# sphinx-quickstart on Sun Mar 31 20:48:44 2013.
-#
-# This file is execfile()d with the current directory set to its containing dir.
-#
-# Note that not all possible configuration values are present in this
-# autogenerated file.
-#
-# All configuration values have a default; values that are commented out
-# serve to show the default.
-
-import sys, os, datetime
-
-# If extensions (or modules to document with autodoc) are in another directory,
-# add these directories to sys.path here. If the directory is relative to the
-# documentation root, use os.path.abspath to make it absolute, like shown here.
-sys.path.insert(0, os.path.join(os.path.abspath('..'), 'src'))
-
-# -- General configuration -----------------------------------------------------
-
-# If your documentation needs a minimal Sphinx version, state it here.
-#needs_sphinx = '1.0'
-
-# Add any Sphinx extension module names here, as strings. They can be extensions
-# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = [
-    'sphinx.ext.autodoc',
-    'sphinx.ext.intersphinx',
-    'sphinx.ext.viewcode',
-    'sphinx_autodoc_typehints',
-    'sphinxcontrib_trio',
-  ]
-
-# Spelling check needs an additional module that is not installed by default.
-# Add it only if spelling check is requested so docs can be generated without it.
-if 'spelling' in sys.argv:
-    extensions.append('sphinxcontrib.spelling')
-
-# Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
-
-# The suffix of source filenames.
-source_suffix = '.rst'
-
-# The encoding of source files.
-#source_encoding = 'utf-8-sig'
-
-# The master toctree document.
-master_doc = 'index'
-
-# General information about the project.
-project = 'websockets'
-copyright = f'2013-{datetime.date.today().year}, Aymeric Augustin and contributors'
-
-# The version info for the project you're documenting, acts as replacement for
-# |version| and |release|, also used in various other places throughout the
-# built documents.
-#
-# The short X.Y version.
-version = '8.1'
-# The full version, including alpha/beta/rc tags.
-release = '8.1'
-
-# The language for content autogenerated by Sphinx. Refer to documentation
-# for a list of supported languages.
-#language = None
-
-# There are two options for replacing |today|: either, you set today to some
-# non-false value, then it is used:
-#today = ''
-# Else, today_fmt is used as the format for a strftime call.
-#today_fmt = '%B %d, %Y'
-
-# List of patterns, relative to source directory, that match files and
-# directories to ignore when looking for source files.
-exclude_patterns = ['_build']
-
-# The reST default role (used for this markup: `text`) to use for all documents.
-#default_role = None
-
-# If true, '()' will be appended to :func: etc. cross-reference text.
-#add_function_parentheses = True
-
-# If true, the current module name will be prepended to all description
-# unit titles (such as .. function::).
-#add_module_names = True
-
-# If true, sectionauthor and moduleauthor directives will be shown in the
-# output. They are ignored by default.
-#show_authors = False
-
-# The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
-
-# A list of ignored prefixes for module index sorting.
-#modindex_common_prefix = []
-
-
-# -- Options for HTML output ---------------------------------------------------
-
-# The theme to use for HTML and HTML Help pages.  See the documentation for
-# a list of builtin themes.
-html_theme = 'alabaster'
-
-# Theme options are theme-specific and customize the look and feel of a theme
-# further.  For a list of options available for each theme, see the
-# documentation.
-html_theme_options = {
-    'logo': 'websockets.svg',
-    'description': 'A library for building WebSocket servers and clients in Python with a focus on correctness and simplicity.',
-    'github_button': True,
-    'github_user': 'aaugustin',
-    'github_repo': 'websockets',
-    'tidelift_url': 'https://tidelift.com/subscription/pkg/pypi-websockets?utm_source=pypi-websockets&utm_medium=referral&utm_campaign=docs',
-}
-
-# Add any paths that contain custom themes here, relative to this directory.
-#html_theme_path = []
-
-# The name for this set of Sphinx documents.  If None, it defaults to
-# "<project> v<release> documentation".
-#html_title = None
-
-# A shorter title for the navigation bar.  Default is the same as html_title.
-#html_short_title = None
-
-# The name of an image file (relative to this directory) to place at the top
-# of the sidebar.
-#html_logo = None
-
-# The name of an image file (within the static path) to use as favicon of the
-# docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
-# pixels large.
-#html_favicon = None
-
-# Add any paths that contain custom static files (such as style sheets) here,
-# relative to this directory. They are copied after the builtin static files,
-# so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
-
-# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
-# using the given strftime format.
-#html_last_updated_fmt = '%b %d, %Y'
-
-# If true, SmartyPants will be used to convert quotes and dashes to
-# typographically correct entities.
-#html_use_smartypants = True
-
-# Custom sidebar templates, maps document names to template names.
-html_sidebars = {
-    '**': [
-        'about.html',
-        'searchbox.html',
-        'navigation.html',
-        'relations.html',
-        'donate.html',
-    ]
-}
-
-# Additional templates that should be rendered to pages, maps page names to
-# template names.
-#html_additional_pages = {}
-
-# If false, no module index is generated.
-#html_domain_indices = True
-
-# If false, no index is generated.
-#html_use_index = True
-
-# If true, the index is split into individual pages for each letter.
-#html_split_index = False
-
-# If true, links to the reST sources are added to the pages.
-#html_show_sourcelink = True
-
-# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
-#html_show_sphinx = True
-
-# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
-#html_show_copyright = True
-
-# If true, an OpenSearch description file will be output, and all pages will
-# contain a <link> tag referring to it.  The value of this option must be the
-# base URL from which the finished HTML is served.
-#html_use_opensearch = ''
-
-# This is the file name suffix for HTML files (e.g. ".xhtml").
-#html_file_suffix = None
-
-# Output file base name for HTML help builder.
-htmlhelp_basename = 'websocketsdoc'
-
-
-# -- Options for LaTeX output --------------------------------------------------
-
-latex_elements = {
-# The paper size ('letterpaper' or 'a4paper').
-#'papersize': 'letterpaper',
-
-# The font size ('10pt', '11pt' or '12pt').
-#'pointsize': '10pt',
-
-# Additional stuff for the LaTeX preamble.
-#'preamble': '',
-}
-
-# Grouping the document tree into LaTeX files. List of tuples
-# (source start file, target name, title, author, documentclass [howto/manual]).
-latex_documents = [
-  ('index', 'websockets.tex', 'websockets Documentation',
-   'Aymeric Augustin', 'manual'),
-]
-
-# The name of an image file (relative to this directory) to place at the top of
-# the title page.
-#latex_logo = None
-
-# For "manual" documents, if this is true, then toplevel headings are parts,
-# not chapters.
-#latex_use_parts = False
-
-# If true, show page references after internal links.
-#latex_show_pagerefs = False
-
-# If true, show URL addresses after external links.
-#latex_show_urls = False
-
-# Documents to append as an appendix to all manuals.
-#latex_appendices = []
-
-# If false, no module index is generated.
-#latex_domain_indices = True
-
-
-# -- Options for manual page output --------------------------------------------
-
-# One entry per manual page. List of tuples
-# (source start file, name, description, authors, manual section).
-man_pages = [
-    ('index', 'websockets', 'websockets Documentation',
-     ['Aymeric Augustin'], 1)
-]
-
-# If true, show URL addresses after external links.
-#man_show_urls = False
-
-
-# -- Options for Texinfo output ------------------------------------------------
-
-# Grouping the document tree into Texinfo files. List of tuples
-# (source start file, target name, title, author,
-#  dir menu entry, description, category)
-texinfo_documents = [
-  ('index', 'websockets', 'websockets Documentation',
-   'Aymeric Augustin', 'websockets', 'One line description of project.',
-   'Miscellaneous'),
-]
-
-# Documents to append as an appendix to all manuals.
-#texinfo_appendices = []
-
-# If false, no module index is generated.
-#texinfo_domain_indices = True
-
-# How to display URL addresses: 'footnote', 'no', or 'inline'.
-#texinfo_show_urls = 'footnote'
-
-
-# Example configuration for intersphinx: refer to the Python standard library.
-intersphinx_mapping = {'https://docs.python.org/3/': None}
diff --git a/tests/wpt/tests/tools/third_party/websockets/docs/contributing.rst b/tests/wpt/tests/tools/third_party/websockets/docs/contributing.rst
deleted file mode 100644
index 40f1dbb54ae..00000000000
--- a/tests/wpt/tests/tools/third_party/websockets/docs/contributing.rst
+++ /dev/null
@@ -1,61 +0,0 @@
-Contributing
-============
-
-Thanks for taking the time to contribute to websockets!
-
-Code of Conduct
----------------
-
-This project and everyone participating in it is governed by the `Code of
-Conduct`_. By participating, you are expected to uphold this code. Please
-report inappropriate behavior to aymeric DOT augustin AT fractalideas DOT com.
-
-.. _Code of Conduct: https://github.com/aaugustin/websockets/blob/master/CODE_OF_CONDUCT.md
-
-*(If I'm the person with the inappropriate behavior, please accept my
-apologies. I know I can mess up. I can't expect you to tell me, but if you
-choose to do so, I'll do my best to handle criticism constructively.
--- Aymeric)*
-
-Contributions
--------------
-
-Bug reports, patches and suggestions are welcome!
-
-Please open an issue_ or send a `pull request`_.
-
-Feedback about the documentation is especially valuable — the authors of
-``websockets`` feel more confident about writing code than writing docs :-)
-
-If you're wondering why things are done in a certain way, the :doc:`design
-document <design>` provides lots of details about the internals of websockets.
-
-.. _issue: https://github.com/aaugustin/websockets/issues/new
-.. _pull request: https://github.com/aaugustin/websockets/compare/
-
-Questions
----------
-
-GitHub issues aren't a good medium for handling questions. There are better
-places to ask questions, for example Stack Overflow.
-
-If you want to ask a question anyway, please make sure that:
-
-- it's a question about ``websockets`` and not about :mod:`asyncio`;
-- it isn't answered by the documentation;
-- it wasn't asked already.
-
-A good question can be written as a suggestion to improve the documentation.
-
-Bitcoin users
--------------
-
-websockets appears to be quite popular for interfacing with Bitcoin or other
-cryptocurrency trackers. I'm strongly opposed to Bitcoin's carbon footprint.
-
-Please stop heating the planet where my children are supposed to live, thanks.
-
-Since ``websockets`` is released under an open-source license, you can use it
-for any purpose you like. However, I won't spend any of my time to help.
-
-I will summarily close issues related to Bitcoin or cryptocurrency in any way.
diff --git a/tests/wpt/tests/tools/third_party/websockets/docs/deployment.rst b/tests/wpt/tests/tools/third_party/websockets/docs/deployment.rst
deleted file mode 100644
index 5b05afff143..00000000000
--- a/tests/wpt/tests/tools/third_party/websockets/docs/deployment.rst
+++ /dev/null
@@ -1,162 +0,0 @@
-Deployment
-==========
-
-.. currentmodule:: websockets
-
-Application server
-------------------
-
-The author of ``websockets`` isn't aware of best practices for deploying
-network services based on :mod:`asyncio`, let alone application servers.
-
-You can run a script similar to the :ref:`server example <server-example>`,
-inside a supervisor if you deem that useful.
-
-You can also add a wrapper to daemonize the process. Third-party libraries
-provide solutions for that.
-
-If you can share knowledge on this topic, please file an issue_. Thanks!
-
-.. _issue: https://github.com/aaugustin/websockets/issues/new
-
-Graceful shutdown
------------------
-
-You may want to close connections gracefully when shutting down the server,
-perhaps after executing some cleanup logic. There are two ways to achieve this
-with the object returned by :func:`~server.serve`:
-
-- using it as a asynchronous context manager, or
-- calling its ``close()`` method, then waiting for its ``wait_closed()``
-  method to complete.
-
-On Unix systems, shutdown is usually triggered by sending a signal.
-
-Here's a full example for handling SIGTERM on Unix:
-
-.. literalinclude:: ../example/shutdown.py
-    :emphasize-lines: 13,17-19
-
-This example is easily adapted to handle other signals. If you override the
-default handler for SIGINT, which raises :exc:`KeyboardInterrupt`, be aware
-that you won't be able to interrupt a program with Ctrl-C anymore when it's
-stuck in a loop.
-
-It's more difficult to achieve the same effect on Windows. Some third-party
-projects try to help with this problem.
-
-If your server doesn't run in the main thread, look at
-:func:`~asyncio.AbstractEventLoop.call_soon_threadsafe`.
-
-Memory usage
-------------
-
-.. _memory-usage:
-
-In most cases, memory usage of a WebSocket server is proportional to the
-number of open connections. When a server handles thousands of connections,
-memory usage can become a bottleneck.
-
-Memory usage of a single connection is the sum of:
-
-1. the baseline amount of memory ``websockets`` requires for each connection,
-2. the amount of data held in buffers before the application processes it,
-3. any additional memory allocated by the application itself.
-
-Baseline
-........
-
-Compression settings are the main factor affecting the baseline amount of
-memory used by each connection.
-
-By default ``websockets`` maximizes compression rate at the expense of memory
-usage. If memory usage is an issue, lowering compression settings can help:
-
-- Context Takeover is necessary to get good performance for almost all
-  applications. It should remain enabled.
-- Window Bits is a trade-off between memory usage and compression rate.
-  It defaults to 15 and can be lowered. The default value isn't optimal
-  for small, repetitive messages which are typical of WebSocket servers.
-- Memory Level is a trade-off between memory usage and compression speed.
-  It defaults to 8 and can be lowered. A lower memory level can actually
-  increase speed thanks to memory locality, even if the CPU does more work!
-
-See this :ref:`example <per-message-deflate-configuration-example>` for how to
-configure compression settings.
-
-Here's how various compression settings affect memory usage of a single
-connection on a 64-bit system, as well a benchmark_ of compressed size and
-compression time for a corpus of small JSON documents.
-
-+-------------+-------------+--------------+--------------+------------------+------------------+
-| Compression | Window Bits | Memory Level | Memory usage | Size vs. default | Time vs. default |
-+=============+=============+==============+==============+==================+==================+
-| *default*   | 15          | 8            | 325 KiB      | +0%              | +0%              +
-+-------------+-------------+--------------+--------------+------------------+------------------+
-|             | 14          | 7            | 181 KiB      | +1.5%            | -5.3%            |
-+-------------+-------------+--------------+--------------+------------------+------------------+
-|             | 13          | 6            | 110 KiB      | +2.8%            | -7.5%            |
-+-------------+-------------+--------------+--------------+------------------+------------------+
-|             | 12          | 5            | 73 KiB       | +4.4%            | -18.9%           |
-+-------------+-------------+--------------+--------------+------------------+------------------+
-|             | 11          | 4            | 55 KiB       | +8.5%            | -18.8%           |
-+-------------+-------------+--------------+--------------+------------------+------------------+
-| *disabled*  | N/A         | N/A          | 22 KiB       | N/A              | N/A              |
-+-------------+-------------+--------------+--------------+------------------+------------------+
-
-*Don't assume this example is representative! Compressed size and compression
-time depend heavily on the kind of messages exchanged by the application!*
-
-You can run the same benchmark for your application by creating a list of
-typical messages and passing it to the ``_benchmark`` function_.
-
-.. _benchmark: https://gist.github.com/aaugustin/fbea09ce8b5b30c4e56458eb081fe599
-.. _function: https://gist.github.com/aaugustin/fbea09ce8b5b30c4e56458eb081fe599#file-compression-py-L48-L144
-
-This `blog post by Ilya Grigorik`_ provides more details about how compression
-settings affect memory usage and how to optimize them.
-
-.. _blog post by Ilya Grigorik: https://www.igvita.com/2013/11/27/configuring-and-optimizing-websocket-compression/
-
-This `experiment by Peter Thorson`_ suggests Window Bits = 11, Memory Level =
-4 as a sweet spot for optimizing memory usage.
-
-.. _experiment by Peter Thorson: https://www.ietf.org/mail-archive/web/hybi/current/msg10222.html
-
-Buffers
-.......
-
-Under normal circumstances, buffers are almost always empty.
-
-Under high load, if a server receives more messages than it can process,
-bufferbloat can result in excessive memory use.
-
-By default ``websockets`` has generous limits. It is strongly recommended to
-adapt them to your application. When you call :func:`~server.serve`:
-
-- Set ``max_size`` (default: 1 MiB, UTF-8 encoded) to the maximum size of
-  messages your application generates.
-- Set ``max_queue`` (default: 32) to the maximum number of messages your
-  application expects to receive faster than it can process them. The queue
-  provides burst tolerance without slowing down the TCP connection.
-
-Furthermore, you can lower ``read_limit`` and ``write_limit`` (default:
-64 KiB) to reduce the size of buffers for incoming and outgoing data.
-
-The design document provides :ref:`more details about buffers<buffers>`.
-
-Port sharing
-------------
-
-The WebSocket protocol is an extension of HTTP/1.1. It can be tempting to
-serve both HTTP and WebSocket on the same port.
-
-The author of ``websockets`` doesn't think that's a good idea, due to the
-widely different operational characteristics of HTTP and WebSocket.
-
-``websockets`` provide minimal support for responding to HTTP requests with
-the :meth:`~server.WebSocketServerProtocol.process_request` hook. Typical
-use cases include health checks. Here's an example:
-
-.. literalinclude:: ../example/health_check_server.py
-    :emphasize-lines: 9-11,17-19
diff --git a/tests/wpt/tests/tools/third_party/websockets/docs/design.rst b/tests/wpt/tests/tools/third_party/websockets/docs/design.rst
deleted file mode 100644
index 74279b87f6e..00000000000
--- a/tests/wpt/tests/tools/third_party/websockets/docs/design.rst
+++ /dev/null
@@ -1,571 +0,0 @@
-Design
-======
-
-.. currentmodule:: websockets
-
-This document describes the design of ``websockets``. It assumes familiarity
-with the specification of the WebSocket protocol in :rfc:`6455`.
-
-It's primarily intended at maintainers. It may also be useful for users who
-wish to understand what happens under the hood.
-
-.. warning::
-
-    Internals described in this document may change at any time.
-
-    Backwards compatibility is only guaranteed for `public APIs <api>`_.
-
-
-Lifecycle
----------
-
-State
-.....
-
-WebSocket connections go through a trivial state machine:
-
-- ``CONNECTING``: initial state,
-- ``OPEN``: when the opening handshake is complete,
-- ``CLOSING``: when the closing handshake is started,
-- ``CLOSED``: when the TCP connection is closed.
-
-Transitions happen in the following places:
-
-- ``CONNECTING -> OPEN``: in
-  :meth:`~protocol.WebSocketCommonProtocol.connection_open` which runs when
-  the :ref:`opening handshake <opening-handshake>` completes and the WebSocket
-  connection is established — not to be confused with
-  :meth:`~asyncio.Protocol.connection_made` which runs when the TCP connection
-  is established;
-- ``OPEN -> CLOSING``: in
-  :meth:`~protocol.WebSocketCommonProtocol.write_frame` immediately before
-  sending a close frame; since receiving a close frame triggers sending a
-  close frame, this does the right thing regardless of which side started the
-  :ref:`closing handshake <closing-handshake>`; also in
-  :meth:`~protocol.WebSocketCommonProtocol.fail_connection` which duplicates
-  a few lines of code from ``write_close_frame()`` and ``write_frame()``;
-- ``* -> CLOSED``: in
-  :meth:`~protocol.WebSocketCommonProtocol.connection_lost` which is always
-  called exactly once when the TCP connection is closed.
-
-Coroutines
-..........
-
-The following diagram shows which coroutines are running at each stage of the
-connection lifecycle on the client side.
-
-.. image:: lifecycle.svg
-   :target: _images/lifecycle.svg
-
-The lifecycle is identical on the server side, except inversion of control
-makes the equivalent of :meth:`~client.connect` implicit.
-
-Coroutines shown in green are called by the application. Multiple coroutines
-may interact with the WebSocket connection concurrently.
-
-Coroutines shown in gray manage the connection. When the opening handshake
-succeeds, :meth:`~protocol.WebSocketCommonProtocol.connection_open` starts
-two tasks:
-
-- :attr:`~protocol.WebSocketCommonProtocol.transfer_data_task` runs
-  :meth:`~protocol.WebSocketCommonProtocol.transfer_data` which handles
-  incoming data and lets :meth:`~protocol.WebSocketCommonProtocol.recv`
-  consume it. It may be canceled to terminate the connection. It never exits
-  with an exception other than :exc:`~asyncio.CancelledError`. See :ref:`data
-  transfer <data-transfer>` below.
-
-- :attr:`~protocol.WebSocketCommonProtocol.keepalive_ping_task` runs
-  :meth:`~protocol.WebSocketCommonProtocol.keepalive_ping` which sends Ping
-  frames at regular intervals and ensures that corresponding Pong frames are
-  received. It is canceled when the connection terminates. It never exits
-  with an exception other than :exc:`~asyncio.CancelledError`.
-
-- :attr:`~protocol.WebSocketCommonProtocol.close_connection_task` runs
-  :meth:`~protocol.WebSocketCommonProtocol.close_connection` which waits for
-  the data transfer to terminate, then takes care of closing the TCP
-  connection. It must not be canceled. It never exits with an exception. See
-  :ref:`connection termination <connection-termination>` below.
-
-Besides, :meth:`~protocol.WebSocketCommonProtocol.fail_connection` starts
-the same :attr:`~protocol.WebSocketCommonProtocol.close_connection_task` when
-the opening handshake fails, in order to close the TCP connection.
-
-Splitting the responsibilities between two tasks makes it easier to guarantee
-that ``websockets`` can terminate connections:
-
-- within a fixed timeout,
-- without leaking pending tasks,
-- without leaking open TCP connections,
-
-regardless of whether the connection terminates normally or abnormally.
-
-:attr:`~protocol.WebSocketCommonProtocol.transfer_data_task` completes when no
-more data will be received on the connection. Under normal circumstances, it
-exits after exchanging close frames.
-
-:attr:`~protocol.WebSocketCommonProtocol.close_connection_task` completes when
-the TCP connection is closed.
-
-
-.. _opening-handshake:
-
-Opening handshake
------------------
-
-``websockets`` performs the opening handshake when establishing a WebSocket
-connection. On the client side, :meth:`~client.connect` executes it before
-returning the protocol to the caller. On the server side, it's executed before
-passing the protocol to the ``ws_handler`` coroutine handling the connection.
-
-While the opening handshake is asymmetrical — the client sends an HTTP Upgrade
-request and the server replies with an HTTP Switching Protocols response —
-``websockets`` aims at keeping the implementation of both sides consistent
-with one another.
-
-On the client side, :meth:`~client.WebSocketClientProtocol.handshake`:
-
-- builds a HTTP request based on the ``uri`` and parameters passed to
-  :meth:`~client.connect`;
-- writes the HTTP request to the network;
-- reads a HTTP response from the network;
-- checks the HTTP response, validates ``extensions`` and ``subprotocol``, and
-  configures the protocol accordingly;
-- moves to the ``OPEN`` state.
-
-On the server side, :meth:`~server.WebSocketServerProtocol.handshake`:
-
-- reads a HTTP request from the network;
-- calls :meth:`~server.WebSocketServerProtocol.process_request` which may
-  abort the WebSocket handshake and return a HTTP response instead; this
-  hook only makes sense on the server side;
-- checks the HTTP request, negotiates ``extensions`` and ``subprotocol``, and
-  configures the protocol accordingly;
-- builds a HTTP response based on the above and parameters passed to
-  :meth:`~server.serve`;
-- writes the HTTP response to the network;
-- moves to the ``OPEN`` state;
-- returns the ``path`` part of the ``uri``.
-
-The most significant asymmetry between the two sides of the opening handshake
-lies in the negotiation of extensions and, to a lesser extent, of the
-subprotocol. The server knows everything about both sides and decides what the
-parameters should be for the connection. The client merely applies them.
-
-If anything goes wrong during the opening handshake, ``websockets``
-:ref:`fails the connection <connection-failure>`.
-
-
-.. _data-transfer:
-
-Data transfer
--------------
-
-Symmetry
-........
-
-Once the opening handshake has completed, the WebSocket protocol enters the
-data transfer phase. This part is almost symmetrical. There are only two
-differences between a server and a client:
-
-- `client-to-server masking`_: the client masks outgoing frames; the server
-  unmasks incoming frames;
-- `closing the TCP connection`_: the server closes the connection immediately;
-  the client waits for the server to do it.
-
-.. _client-to-server masking: https://tools.ietf.org/html/rfc6455#section-5.3
-.. _closing the TCP connection: https://tools.ietf.org/html/rfc6455#section-5.5.1
-
-These differences are so minor that all the logic for `data framing`_, for
-`sending and receiving data`_ and for `closing the connection`_ is implemented
-in the same class, :class:`~protocol.WebSocketCommonProtocol`.
-
-.. _data framing: https://tools.ietf.org/html/rfc6455#section-5
-.. _sending and receiving data: https://tools.ietf.org/html/rfc6455#section-6
-.. _closing the connection: https://tools.ietf.org/html/rfc6455#section-7
-
-The :attr:`~protocol.WebSocketCommonProtocol.is_client` attribute tells which
-side a protocol instance is managing. This attribute is defined on the
-:attr:`~server.WebSocketServerProtocol` and
-:attr:`~client.WebSocketClientProtocol` classes.
-
-Data flow
-.........
-
-The following diagram shows how data flows between an application built on top
-of ``websockets`` and a remote endpoint. It applies regardless of which side
-is the server or the client.
-
-.. image:: protocol.svg
-   :target: _images/protocol.svg
-
-Public methods are shown in green, private methods in yellow, and buffers in
-orange. Methods related to connection termination are omitted; connection
-termination is discussed in another section below.
-
-Receiving data
-..............
-
-The left side of the diagram shows how ``websockets`` receives data.
-
-Incoming data is written to a :class:`~asyncio.StreamReader` in order to
-implement flow control and provide backpressure on the TCP connection.
-
-:attr:`~protocol.WebSocketCommonProtocol.transfer_data_task`, which is started
-when the WebSocket connection is established, processes this data.
-
-When it receives data frames, it reassembles fragments and puts the resulting
-messages in the :attr:`~protocol.WebSocketCommonProtocol.messages` queue.
-
-When it encounters a control frame:
-
-- if it's a close frame, it starts the closing handshake;
-- if it's a ping frame, it answers with a pong frame;
-- if it's a pong frame, it acknowledges the corresponding ping (unless it's an
-  unsolicited pong).
-
-Running this process in a task guarantees that control frames are processed
-promptly. Without such a task, ``websockets`` would depend on the application
-to drive the connection by having exactly one coroutine awaiting
-:meth:`~protocol.WebSocketCommonProtocol.recv` at any time. While this
-happens naturally in many use cases, it cannot be relied upon.
-
-Then :meth:`~protocol.WebSocketCommonProtocol.recv` fetches the next message
-from the :attr:`~protocol.WebSocketCommonProtocol.messages` queue, with some
-complexity added for handling backpressure and termination correctly.
-
-Sending data
-............
-
-The right side of the diagram shows how ``websockets`` sends data.
-
-:meth:`~protocol.WebSocketCommonProtocol.send` writes one or several data
-frames containing the message. While sending a fragmented message, concurrent
-calls to :meth:`~protocol.WebSocketCommonProtocol.send` are put on hold until
-all fragments are sent. This makes concurrent calls safe.
-
-:meth:`~protocol.WebSocketCommonProtocol.ping` writes a ping frame and
-yields a :class:`~asyncio.Future` which will be completed when a matching pong
-frame is received.
-
-:meth:`~protocol.WebSocketCommonProtocol.pong` writes a pong frame.
-
-:meth:`~protocol.WebSocketCommonProtocol.close` writes a close frame and
-waits for the TCP connection to terminate.
-
-Outgoing data is written to a :class:`~asyncio.StreamWriter` in order to
-implement flow control and provide backpressure from the TCP connection.
-
-.. _closing-handshake:
-
-Closing handshake
-.................
-
-When the other side of the connection initiates the closing handshake,
-:meth:`~protocol.WebSocketCommonProtocol.read_message` receives a close
-frame while in the ``OPEN`` state. It moves to the ``CLOSING`` state, sends a
-close frame, and returns ``None``, causing
-:attr:`~protocol.WebSocketCommonProtocol.transfer_data_task` to terminate.
-
-When this side of the connection initiates the closing handshake with
-:meth:`~protocol.WebSocketCommonProtocol.close`, it moves to the ``CLOSING``
-state and sends a close frame. When the other side sends a close frame,
-:meth:`~protocol.WebSocketCommonProtocol.read_message` receives it in the
-``CLOSING`` state and returns ``None``, also causing
-:attr:`~protocol.WebSocketCommonProtocol.transfer_data_task` to terminate.
-
-If the other side doesn't send a close frame within the connection's close
-timeout, ``websockets`` :ref:`fails the connection <connection-failure>`.
-
-The closing handshake can take up to ``2 * close_timeout``: one
-``close_timeout`` to write a close frame and one ``close_timeout`` to receive
-a close frame.
-
-Then ``websockets`` terminates the TCP connection.
-
-
-.. _connection-termination:
-
-Connection termination
-----------------------
-
-:attr:`~protocol.WebSocketCommonProtocol.close_connection_task`, which is
-started when the WebSocket connection is established, is responsible for
-eventually closing the TCP connection.
-
-First :attr:`~protocol.WebSocketCommonProtocol.close_connection_task` waits
-for :attr:`~protocol.WebSocketCommonProtocol.transfer_data_task` to terminate,
-which may happen as a result of:
-
-- a successful closing handshake: as explained above, this exits the infinite
-  loop in :attr:`~protocol.WebSocketCommonProtocol.transfer_data_task`;
-- a timeout while waiting for the closing handshake to complete: this cancels
-  :attr:`~protocol.WebSocketCommonProtocol.transfer_data_task`;
-- a protocol error, including connection errors: depending on the exception,
-  :attr:`~protocol.WebSocketCommonProtocol.transfer_data_task` :ref:`fails the
-  connection <connection-failure>` with a suitable code and exits.
-
-:attr:`~protocol.WebSocketCommonProtocol.close_connection_task` is separate
-from :attr:`~protocol.WebSocketCommonProtocol.transfer_data_task` to make it
-easier to implement the timeout on the closing handshake. Canceling
-:attr:`~protocol.WebSocketCommonProtocol.transfer_data_task` creates no risk
-of canceling :attr:`~protocol.WebSocketCommonProtocol.close_connection_task`
-and failing to close the TCP connection, thus leaking resources.
-
-Then :attr:`~protocol.WebSocketCommonProtocol.close_connection_task` cancels
-:attr:`~protocol.WebSocketCommonProtocol.keepalive_ping`. This task has no
-protocol compliance responsibilities. Terminating it to avoid leaking it is
-the only concern.
-
-Terminating the TCP connection can take up to ``2 * close_timeout`` on the
-server side and ``3 * close_timeout`` on the client side. Clients start by
-waiting for the server to close the connection, hence the extra
-``close_timeout``. Then both sides go through the following steps until the
-TCP connection is lost: half-closing the connection (only for non-TLS
-connections), closing the connection, aborting the connection. At this point
-the connection drops regardless of what happens on the network.
-
-
-.. _connection-failure:
-
-Connection failure
-------------------
-
-If the opening handshake doesn't complete successfully, ``websockets`` fails
-the connection by closing the TCP connection.
-
-Once the opening handshake has completed, ``websockets`` fails the connection
-by canceling :attr:`~protocol.WebSocketCommonProtocol.transfer_data_task` and
-sending a close frame if appropriate.
-
-:attr:`~protocol.WebSocketCommonProtocol.transfer_data_task` exits, unblocking
-:attr:`~protocol.WebSocketCommonProtocol.close_connection_task`, which closes
-the TCP connection.
-
-
-.. _server-shutdown:
-
-Server shutdown
----------------
-
-:class:`~websockets.server.WebSocketServer` closes asynchronously like
-:class:`asyncio.Server`. The shutdown happen in two steps:
-
-1. Stop listening and accepting new connections;
-2. Close established connections with close code 1001 (going away) or, if
-   the opening handshake is still in progress, with HTTP status code 503
-   (Service Unavailable).
-
-The first call to :class:`~websockets.server.WebSocketServer.close` starts a
-task that performs this sequence. Further calls are ignored. This is the
-easiest way to make :class:`~websockets.server.WebSocketServer.close` and
-:class:`~websockets.server.WebSocketServer.wait_closed` idempotent.
-
-
-.. _cancellation:
-
-Cancellation
-------------
-
-User code
-.........
-
-``websockets`` provides a WebSocket application server. It manages connections
-and passes them to user-provided connection handlers. This is an *inversion of
-control* scenario: library code calls user code.
-
-If a connection drops, the corresponding handler should terminate. If the
-server shuts down, all connection handlers must terminate. Canceling
-connection handlers would terminate them.
-
-However, using cancellation for this purpose would require all connection
-handlers to handle it properly. For example, if a connection handler starts
-some tasks, it should catch :exc:`~asyncio.CancelledError`, terminate or
-cancel these tasks, and then re-raise the exception.
-
-Cancellation is tricky in :mod:`asyncio` applications, especially when it
-interacts with finalization logic. In the example above, what if a handler
-gets interrupted with :exc:`~asyncio.CancelledError` while it's finalizing
-the tasks it started, after detecting that the connection dropped?
-
-``websockets`` considers that cancellation may only be triggered by the caller
-of a coroutine when it doesn't care about the results of that coroutine
-anymore. (Source: `Guido van Rossum <https://groups.google.com/forum/#!msg
-/python-tulip/LZQe38CR3bg/7qZ1p_q5yycJ>`_). Since connection handlers run
-arbitrary user code, ``websockets`` has no way of deciding whether that code
-is still doing something worth caring about.
-
-For these reasons, ``websockets`` never cancels connection handlers. Instead
-it expects them to detect when the connection is closed, execute finalization
-logic if needed, and exit.
-
-Conversely, cancellation isn't a concern for WebSocket clients because they
-don't involve inversion of control.
-
-Library
-.......
-
-Most :doc:`public APIs <api>` of ``websockets`` are coroutines. They may be
-canceled, for example if the user starts a task that calls these coroutines
-and cancels the task later. ``websockets`` must handle this situation.
-
-Cancellation during the opening handshake is handled like any other exception:
-the TCP connection is closed and the exception is re-raised. This can only
-happen on the client side. On the server side, the opening handshake is
-managed by ``websockets`` and nothing results in a cancellation.
-
-Once the WebSocket connection is established, internal tasks
-:attr:`~protocol.WebSocketCommonProtocol.transfer_data_task` and
-:attr:`~protocol.WebSocketCommonProtocol.close_connection_task` mustn't get
-accidentally canceled if a coroutine that awaits them is canceled. In other
-words, they must be shielded from cancellation.
-
-:meth:`~protocol.WebSocketCommonProtocol.recv` waits for the next message in
-the queue or for :attr:`~protocol.WebSocketCommonProtocol.transfer_data_task`
-to terminate, whichever comes first. It relies on :func:`~asyncio.wait` for
-waiting on two futures in parallel. As a consequence, even though it's waiting
-on a :class:`~asyncio.Future` signaling the next message and on
-:attr:`~protocol.WebSocketCommonProtocol.transfer_data_task`, it doesn't
-propagate cancellation to them.
-
-:meth:`~protocol.WebSocketCommonProtocol.ensure_open` is called by
-:meth:`~protocol.WebSocketCommonProtocol.send`,
-:meth:`~protocol.WebSocketCommonProtocol.ping`, and
-:meth:`~protocol.WebSocketCommonProtocol.pong`. When the connection state is
-``CLOSING``, it waits for
-:attr:`~protocol.WebSocketCommonProtocol.transfer_data_task` but shields it to
-prevent cancellation.
-
-:meth:`~protocol.WebSocketCommonProtocol.close` waits for the data transfer
-task to terminate with :func:`~asyncio.wait_for`. If it's canceled or if the
-timeout elapses, :attr:`~protocol.WebSocketCommonProtocol.transfer_data_task`
-is canceled, which is correct at this point.
-:meth:`~protocol.WebSocketCommonProtocol.close` then waits for
-:attr:`~protocol.WebSocketCommonProtocol.close_connection_task` but shields it
-to prevent cancellation.
-
-:meth:`~protocol.WebSocketCommonProtocol.close` and
-:func:`~protocol.WebSocketCommonProtocol.fail_connection` are the only
-places where :attr:`~protocol.WebSocketCommonProtocol.transfer_data_task` may
-be canceled.
-
-:attr:`~protocol.WebSocketCommonProtocol.close_connnection_task` starts by
-waiting for :attr:`~protocol.WebSocketCommonProtocol.transfer_data_task`. It
-catches :exc:`~asyncio.CancelledError` to prevent a cancellation of
-:attr:`~protocol.WebSocketCommonProtocol.transfer_data_task` from propagating
-to :attr:`~protocol.WebSocketCommonProtocol.close_connnection_task`.
-
-.. _backpressure:
-
-Backpressure
-------------
-
-.. note::
-
-    This section discusses backpressure from the perspective of a server but
-    the concept applies to clients symmetrically.
-
-With a naive implementation, if a server receives inputs faster than it can
-process them, or if it generates outputs faster than it can send them, data
-accumulates in buffers, eventually causing the server to run out of memory and
-crash.
-
-The solution to this problem is backpressure. Any part of the server that
-receives inputs faster than it can process them and send the outputs
-must propagate that information back to the previous part in the chain.
-
-``websockets`` is designed to make it easy to get backpressure right.
-
-For incoming data, ``websockets`` builds upon :class:`~asyncio.StreamReader`
-which propagates backpressure to its own buffer and to the TCP stream. Frames
-are parsed from the input stream and added to a bounded queue. If the queue
-fills up, parsing halts until the application reads a frame.
-
-For outgoing data, ``websockets`` builds upon :class:`~asyncio.StreamWriter`
-which implements flow control. If the output buffers grow too large, it waits
-until they're drained. That's why all APIs that write frames are asynchronous.
-
-Of course, it's still possible for an application to create its own unbounded
-buffers and break the backpressure. Be careful with queues.
-
-
-.. _buffers:
-
-Buffers
--------
-
-.. note::
-
-    This section discusses buffers from the perspective of a server but it
-    applies to clients as well.
-
-An asynchronous systems works best when its buffers are almost always empty.
-
-For example, if a client sends data too fast for a server, the queue of
-incoming messages will be constantly full. The server will always be 32
-messages (by default) behind the client. This consumes memory and increases
-latency for no good reason. The problem is called bufferbloat.
-
-If buffers are almost always full and that problem cannot be solved by adding
-capacity — typically because the system is bottlenecked by the output and
-constantly regulated by backpressure — reducing the size of buffers minimizes
-negative consequences.
-
-By default ``websockets`` has rather high limits. You can decrease them
-according to your application's characteristics.
-
-Bufferbloat can happen at every level in the stack where there is a buffer.
-For each connection, the receiving side contains these buffers:
-
-- OS buffers: tuning them is an advanced optimization.
-- :class:`~asyncio.StreamReader` bytes buffer: the default limit is 64 KiB.
-  You can set another limit by passing a ``read_limit`` keyword argument to
-  :func:`~client.connect()` or :func:`~server.serve`.
-- Incoming messages :class:`~collections.deque`: its size depends both on
-  the size and the number of messages it contains. By default the maximum
-  UTF-8 encoded size is 1 MiB and the maximum number is 32. In the worst case,
-  after UTF-8 decoding, a single message could take up to 4 MiB of memory and
-  the overall memory consumption could reach 128 MiB. You should adjust these
-  limits by setting the ``max_size`` and ``max_queue`` keyword arguments of
-  :func:`~client.connect()` or :func:`~server.serve` according to your
-  application's requirements.
-
-For each connection, the sending side contains these buffers:
-
-- :class:`~asyncio.StreamWriter` bytes buffer: the default size is 64 KiB.
-  You can set another limit by passing a ``write_limit`` keyword argument to
-  :func:`~client.connect()` or :func:`~server.serve`.
-- OS buffers: tuning them is an advanced optimization.
-
-Concurrency
------------
-
-Awaiting any combination of :meth:`~protocol.WebSocketCommonProtocol.recv`,
-:meth:`~protocol.WebSocketCommonProtocol.send`,
-:meth:`~protocol.WebSocketCommonProtocol.close`
-:meth:`~protocol.WebSocketCommonProtocol.ping`, or
-:meth:`~protocol.WebSocketCommonProtocol.pong` concurrently is safe, including
-multiple calls to the same method, with one exception and one limitation.
-
-* **Only one coroutine can receive messages at a time.** This constraint
-  avoids non-deterministic behavior (and simplifies the implementation). If a
-  coroutine is awaiting :meth:`~protocol.WebSocketCommonProtocol.recv`,
-  awaiting it again in another coroutine raises :exc:`RuntimeError`.
-
-* **Sending a fragmented message forces serialization.** Indeed, the WebSocket
-  protocol doesn't support multiplexing messages. If a coroutine is awaiting
-  :meth:`~protocol.WebSocketCommonProtocol.send` to send a fragmented message,
-  awaiting it again in another coroutine waits until the first call completes.
-  This will be transparent in many cases. It may be a concern if the
-  fragmented message is generated slowly by an asynchronous iterator.
-
-Receiving frames is independent from sending frames. This isolates
-:meth:`~protocol.WebSocketCommonProtocol.recv`, which receives frames, from
-the other methods, which send frames.
-
-While the connection is open, each frame is sent with a single write. Combined
-with the concurrency model of :mod:`asyncio`, this enforces serialization. The
-only other requirement is to prevent interleaving other data frames in the
-middle of a fragmented message.
-
-After the connection is closed, sending a frame raises
-:exc:`~websockets.exceptions.ConnectionClosed`, which is safe.
diff --git a/tests/wpt/tests/tools/third_party/websockets/docs/extensions.rst b/tests/wpt/tests/tools/third_party/websockets/docs/extensions.rst
deleted file mode 100644
index 4000340906a..00000000000
--- a/tests/wpt/tests/tools/third_party/websockets/docs/extensions.rst
+++ /dev/null
@@ -1,87 +0,0 @@
-Extensions
-==========
-
-.. currentmodule:: websockets
-
-The WebSocket protocol supports extensions_.
-
-At the time of writing, there's only one `registered extension`_, WebSocket
-Per-Message Deflate, specified in :rfc:`7692`.
-
-.. _extensions: https://tools.ietf.org/html/rfc6455#section-9
-.. _registered extension: https://www.iana.org/assignments/websocket/websocket.xhtml#extension-name
-
-Per-Message Deflate
--------------------
-
-:func:`~server.serve()` and :func:`~client.connect` enable the Per-Message
-Deflate extension by default. You can disable this with ``compression=None``.
-
-You can also configure the Per-Message Deflate extension explicitly if you
-want to customize its parameters.
-
-.. _per-message-deflate-configuration-example:
-
-Here's an example on the server side::
-
-    import websockets
-    from websockets.extensions import permessage_deflate
-
-    websockets.serve(
-        ...,
-        extensions=[
-            permessage_deflate.ServerPerMessageDeflateFactory(
-                server_max_window_bits=11,
-                client_max_window_bits=11,
-                compress_settings={'memLevel': 4},
-            ),
-        ],
-    )
-
-Here's an example on the client side::
-
-    import websockets
-    from websockets.extensions import permessage_deflate
-
-    websockets.connect(
-        ...,
-        extensions=[
-            permessage_deflate.ClientPerMessageDeflateFactory(
-                server_max_window_bits=11,
-                client_max_window_bits=11,
-                compress_settings={'memLevel': 4},
-            ),
-        ],
-    )
-
-Refer to the API documentation of
-:class:`~extensions.permessage_deflate.ServerPerMessageDeflateFactory` and
-:class:`~extensions.permessage_deflate.ClientPerMessageDeflateFactory` for
-details.
-
-Writing an extension
---------------------
-
-During the opening handshake, WebSocket clients and servers negotiate which
-extensions will be used with which parameters. Then each frame is processed by
-extensions before it's sent and after it's received.
-
-As a consequence writing an extension requires implementing several classes:
-
-1. Extension Factory: it negotiates parameters and instantiates the extension.
-   Clients and servers require separate extension factories with distinct APIs.
-
-2. Extension: it decodes incoming frames and encodes outgoing frames. If the
-   extension is symmetrical, clients and servers can use the same class.
-
-``websockets`` provides abstract base classes for extension factories and
-extensions.
-
-.. autoclass:: websockets.extensions.base.ServerExtensionFactory
-    :members:
-
-.. autoclass:: websockets.extensions.base.ClientExtensionFactory
-    :members:
-
-.. autoclass:: websockets.extensions.base.Extension
-    :members:
diff --git a/tests/wpt/tests/tools/third_party/websockets/docs/faq.rst b/tests/wpt/tests/tools/third_party/websockets/docs/faq.rst
deleted file mode 100644
index cea3f535839..00000000000
--- a/tests/wpt/tests/tools/third_party/websockets/docs/faq.rst
+++ /dev/null
@@ -1,261 +0,0 @@
-FAQ
-===
-
-.. currentmodule:: websockets
-
-.. note::
-
-    Many questions asked in :mod:`websockets`' issue tracker are actually
-    about :mod:`asyncio`. Python's documentation about `developing with
-    asyncio`_ is a good complement.
-
-    .. _developing with asyncio: https://docs.python.org/3/library/asyncio-dev.html
-
-Server side
------------
-
-Why does the server close the connection after processing one message?
-......................................................................
-
-Your connection handler exits after processing one message. Write a loop to
-process multiple messages.
-
-For example, if your handler looks like this::
-
-    async def handler(websocket, path):
-        print(websocket.recv())
-
-change it like this::
-
-    async def handler(websocket, path):
-        async for message in websocket:
-            print(message)
-
-*Don't feel bad if this happens to you — it's the most common question in
-websockets' issue tracker :-)*
-
-Why can only one client connect at a time?
-..........................................
-
-Your connection handler blocks the event loop. Look for blocking calls.
-Any call that may take some time must be asynchronous.
-
-For example, if you have::
-
-    async def handler(websocket, path):
-        time.sleep(1)
-
-change it to::
-
-    async def handler(websocket, path):
-        await asyncio.sleep(1)
-
-This is part of learning asyncio. It isn't specific to websockets.
-
-See also Python's documentation about `running blocking code`_.
-
-.. _running blocking code: https://docs.python.org/3/library/asyncio-dev.html#running-blocking-code
-
-How do I get access HTTP headers, for example cookies?
-......................................................
-
-To access HTTP headers during the WebSocket handshake, you can override
-:attr:`~server.WebSocketServerProtocol.process_request`::
-
-    async def process_request(self, path, request_headers):
-        cookies = request_header["Cookie"]
-
-See
-
-Once the connection is established, they're available in
-:attr:`~protocol.WebSocketServerProtocol.request_headers`::
-
-    async def handler(websocket, path):
-        cookies = websocket.request_headers["Cookie"]
-
-How do I get the IP address of the client connecting to my server?
-..................................................................
-
-It's available in :attr:`~protocol.WebSocketCommonProtocol.remote_address`::
-
-    async def handler(websocket, path):
-        remote_ip = websocket.remote_address[0]
-
-How do I set which IP addresses my server listens to?
-.....................................................
-
-Look at the ``host`` argument of :meth:`~asyncio.loop.create_server`.
-
-:func:`serve` accepts the same arguments as
-:meth:`~asyncio.loop.create_server`.
-
-How do I close a connection properly?
-.....................................
-
-websockets takes care of closing the connection when the handler exits.
-
-How do I run a HTTP server and WebSocket server on the same port?
-.................................................................
-
-This isn't supported.
-
-Providing a HTTP server is out of scope for websockets. It only aims at
-providing a WebSocket server.
-
-There's limited support for returning HTTP responses with the
-:attr:`~server.WebSocketServerProtocol.process_request` hook.
-If you need more, pick a HTTP server and run it separately.
-
-Client side
------------
-
-How do I close a connection properly?
-.....................................
-
-The easiest is to use :func:`connect` as a context manager::
-
-    async with connect(...) as websocket:
-        ...
-
-How do I reconnect automatically when the connection drops?
-...........................................................
-
-See `issue 414`_.
-
-.. _issue 414: https://github.com/aaugustin/websockets/issues/414
-
-How do I disable TLS/SSL certificate verification?
-..................................................
-
-Look at the ``ssl`` argument of :meth:`~asyncio.loop.create_connection`.
-
-:func:`connect` accepts the same arguments as
-:meth:`~asyncio.loop.create_connection`.
-
-Both sides
-----------
-
-How do I do two things in parallel? How do I integrate with another coroutine?
-..............................................................................
-
-You must start two tasks, which the event loop will run concurrently. You can
-achieve this with :func:`asyncio.gather` or :func:`asyncio.wait`.
-
-This is also part of learning asyncio and not specific to websockets.
-
-Keep track of the tasks and make sure they terminate or you cancel them when
-the connection terminates.
-
-How do I create channels or topics?
-...................................
-
-websockets doesn't have built-in publish / subscribe for these use cases.
-
-Depending on the scale of your service, a simple in-memory implementation may
-do the job or you may need an external publish / subscribe component.
-
-What does ``ConnectionClosedError: code = 1006`` mean?
-......................................................
-
-If you're seeing this traceback in the logs of a server:
-
-.. code-block:: pytb
-
-    Error in connection handler
-    Traceback (most recent call last):
-      ...
-    asyncio.streams.IncompleteReadError: 0 bytes read on a total of 2 expected bytes
-
-    The above exception was the direct cause of the following exception:
-
-    Traceback (most recent call last):
-      ...
-    websockets.exceptions.ConnectionClosedError: code = 1006 (connection closed abnormally [internal]), no reason
-
-or if a client crashes with this traceback:
-
-.. code-block:: pytb
-
-    Traceback (most recent call last):
-      ...
-    ConnectionResetError: [Errno 54] Connection reset by peer
-
-    The above exception was the direct cause of the following exception:
-
-    Traceback (most recent call last):
-      ...
-    websockets.exceptions.ConnectionClosedError: code = 1006 (connection closed abnormally [internal]), no reason
-
-it means that the TCP connection was lost. As a consequence, the WebSocket
-connection was closed without receiving a close frame, which is abnormal.
-
-You can catch and handle :exc:`~exceptions.ConnectionClosed` to prevent it
-from being logged.
-
-There are several reasons why long-lived connections may be lost:
-
-* End-user devices tend to lose network connectivity often and unpredictably
-  because they can move out of wireless network coverage, get unplugged from
-  a wired network, enter airplane mode, be put to sleep, etc.
-* HTTP load balancers or proxies that aren't configured for long-lived
-  connections may terminate connections after a short amount of time, usually
-  30 seconds.
-
-If you're facing a reproducible issue, :ref:`enable debug logs <debugging>` to
-see when and how connections are closed.
-
-Are there ``onopen``, ``onmessage``, ``onerror``, and ``onclose`` callbacks?
-............................................................................
-
-No, there aren't.
-
-websockets provides high-level, coroutine-based APIs. Compared to callbacks,
-coroutines make it easier to manage control flow in concurrent code.
-
-If you prefer callback-based APIs, you should use another library.
-
-Can I use ``websockets`` synchronously, without ``async`` / ``await``?
-......................................................................
-
-You can convert every asynchronous call to a synchronous call by wrapping it
-in ``asyncio.get_event_loop().run_until_complete(...)``.
-
-If this turns out to be impractical, you should use another library.
-
-Miscellaneous
--------------
-
-How do I set a timeout on ``recv()``?
-.....................................
-
-Use :func:`~asyncio.wait_for`::
-
-    await asyncio.wait_for(websocket.recv(), timeout=10)
-
-This technique works for most APIs, except for asynchronous context managers.
-See `issue 574`_.
-
-.. _issue 574: https://github.com/aaugustin/websockets/issues/574
-
-How do I keep idle connections open?
-....................................
-
-websockets sends pings at 20 seconds intervals to keep the connection open.
-
-In closes the connection if it doesn't get a pong within 20 seconds.
-
-You can adjust this behavior with ``ping_interval`` and ``ping_timeout``.
-
-How do I respond to pings?
-..........................
-
-websockets takes care of responding to pings with pongs.
-
-Is there a Python 2 version?
-............................
-
-No, there isn't.
-
-websockets builds upon asyncio which requires Python 3.
-
-
diff --git a/tests/wpt/tests/tools/third_party/websockets/docs/index.rst b/tests/wpt/tests/tools/third_party/websockets/docs/index.rst
deleted file mode 100644
index 1b2f85f0a4f..00000000000
--- a/tests/wpt/tests/tools/third_party/websockets/docs/index.rst
+++ /dev/null
@@ -1,99 +0,0 @@
-websockets
-==========
-
-|pypi-v| |pypi-pyversions| |pypi-l| |pypi-wheel| |circleci| |codecov|
-
-.. |pypi-v| image:: https://img.shields.io/pypi/v/websockets.svg
-    :target: https://pypi.python.org/pypi/websockets
-
-.. |pypi-pyversions| image:: https://img.shields.io/pypi/pyversions/websockets.svg
-    :target: https://pypi.python.org/pypi/websockets
-
-.. |pypi-l| image:: https://img.shields.io/pypi/l/websockets.svg
-    :target: https://pypi.python.org/pypi/websockets
-
-.. |pypi-wheel| image:: https://img.shields.io/pypi/wheel/websockets.svg
-    :target: https://pypi.python.org/pypi/websockets
-
-.. |circleci| image:: https://img.shields.io/circleci/project/github/aaugustin/websockets.svg
-   :target: https://circleci.com/gh/aaugustin/websockets
-
-.. |codecov| image:: https://codecov.io/gh/aaugustin/websockets/branch/master/graph/badge.svg
-    :target: https://codecov.io/gh/aaugustin/websockets
-
-``websockets`` is a library for building WebSocket servers_ and clients_ in
-Python with a focus on correctness and simplicity.
-
-.. _servers: https://github.com/aaugustin/websockets/blob/master/example/server.py
-.. _clients: https://github.com/aaugustin/websockets/blob/master/example/client.py
-
-Built on top of :mod:`asyncio`, Python's standard asynchronous I/O framework,
-it provides an elegant coroutine-based API.
-
-Here's how a client sends and receives messages:
-
-.. literalinclude:: ../example/hello.py
-
-And here's an echo server:
-
-.. literalinclude:: ../example/echo.py
-
-Do you like it? Let's dive in!
-
-Tutorials
----------
-
-If you're new to ``websockets``, this is the place to start.
-
-.. toctree::
-   :maxdepth: 2
-
-   intro
-   faq
-
-How-to guides
--------------
-
-These guides will help you build and deploy a ``websockets`` application.
-
-.. toctree::
-   :maxdepth: 2
-
-   cheatsheet
-   deployment
-   extensions
-
-Reference
----------
-
-Find all the details you could ask for, and then some.
-
-.. toctree::
-   :maxdepth: 2
-
-   api
-
-Discussions
------------
-
-Get a deeper understanding of how ``websockets`` is built and why.
-
-.. toctree::
-   :maxdepth: 2
-
-   design
-   limitations
-   security
-
-Project
--------
-
-This is about websockets-the-project rather than websockets-the-software.
-
-.. toctree::
-   :maxdepth: 2
-
-   changelog
-   contributing
-   license
-   For enterprise <tidelift>
diff --git a/tests/wpt/tests/tools/third_party/websockets/docs/intro.rst b/tests/wpt/tests/tools/third_party/websockets/docs/intro.rst
deleted file mode 100644
index 8be700239f3..00000000000
--- a/tests/wpt/tests/tools/third_party/websockets/docs/intro.rst
+++ /dev/null
@@ -1,209 +0,0 @@
-Getting started
-===============
-
-.. currentmodule:: websockets
-
-Requirements
-------------
-
-``websockets`` requires Python ≥ 3.6.1.
-
-You should use the latest version of Python if possible. If you're using an
-older version, be aware that for each minor version (3.x), only the latest
-bugfix release (3.x.y) is officially supported.
-
-Installation
-------------
-
-Install ``websockets`` with::
-
-    pip install websockets
-
-Basic example
--------------
-
-.. _server-example:
-
-Here's a WebSocket server example.
-
-It reads a name from the client, sends a greeting, and closes the connection.
-
-.. literalinclude:: ../example/server.py
-    :emphasize-lines: 8,17
-
-.. _client-example:
-
-On the server side, ``websockets`` executes the handler coroutine ``hello``
-once for each WebSocket connection. It closes the connection when the handler
-coroutine returns.
-
-Here's a corresponding WebSocket client example.
-
-.. literalinclude:: ../example/client.py
-    :emphasize-lines: 8,10
-
-Using :func:`connect` as an asynchronous context manager ensures the
-connection is closed before exiting the ``hello`` coroutine.
-
-.. _secure-server-example:
-
-Secure example
---------------
-
-Secure WebSocket connections improve confidentiality and also reliability
-because they reduce the risk of interference by bad proxies.
-
-The WSS protocol is to WS what HTTPS is to HTTP: the connection is encrypted
-with Transport Layer Security (TLS) — which is often referred to as Secure
-Sockets Layer (SSL). WSS requires TLS certificates like HTTPS.
-
-Here's how to adapt the server example to provide secure connections. See the
-documentation of the :mod:`ssl` module for configuring the context securely.
-
-.. literalinclude:: ../example/secure_server.py
-    :emphasize-lines: 19,23-25
-
-Here's how to adapt the client.
-
-.. literalinclude:: ../example/secure_client.py
-    :emphasize-lines: 10,15-18
-
-This client needs a context because the server uses a self-signed certificate.
-
-A client connecting to a secure WebSocket server with a valid certificate
-(i.e. signed by a CA that your Python installation trusts) can simply pass
-``ssl=True`` to :func:`connect` instead of building a context.
-
-Browser-based example
----------------------
-
-Here's an example of how to run a WebSocket server and connect from a browser.
-
-Run this script in a console:
-
-.. literalinclude:: ../example/show_time.py
-
-Then open this HTML file in a browser.
-
-.. literalinclude:: ../example/show_time.html
-   :language: html
-
-Synchronization example
------------------------
-
-A WebSocket server can receive events from clients, process them to update the
-application state, and synchronize the resulting state across clients.
-
-Here's an example where any client can increment or decrement a counter.
-Updates are propagated to all connected clients.
-
-The concurrency model of :mod:`asyncio` guarantees that updates are
-serialized.
-
-Run this script in a console:
-
-.. literalinclude:: ../example/counter.py
-
-Then open this HTML file in several browsers.
-
-.. literalinclude:: ../example/counter.html
-   :language: html
-
-Common patterns
----------------
-
-You will usually want to process several messages during the lifetime of a
-connection. Therefore you must write a loop. Here are the basic patterns for
-building a WebSocket server.
-
-Consumer
-........
-
-For receiving messages and passing them to a ``consumer`` coroutine::
-
-    async def consumer_handler(websocket, path):
-        async for message in websocket:
-            await consumer(message)
-
-In this example, ``consumer`` represents your business logic for processing
-messages received on the WebSocket connection.
-
-Iteration terminates when the client disconnects.
-
-Producer
-........
-
-For getting messages from a ``producer`` coroutine and sending them::
-
-    async def producer_handler(websocket, path):
-        while True:
-            message = await producer()
-            await websocket.send(message)
-
-In this example, ``producer`` represents your business logic for generating
-messages to send on the WebSocket connection.
-
-:meth:`~protocol.WebSocketCommonProtocol.send` raises a
-:exc:`~exceptions.ConnectionClosed` exception when the client disconnects,
-which breaks out of the ``while True`` loop.
-
-Both
-....
-
-You can read and write messages on the same connection by combining the two
-patterns shown above and running the two tasks in parallel::
-
-    async def handler(websocket, path):
-        consumer_task = asyncio.ensure_future(
-            consumer_handler(websocket, path))
-        producer_task = asyncio.ensure_future(
-            producer_handler(websocket, path))
-        done, pending = await asyncio.wait(
-            [consumer_task, producer_task],
-            return_when=asyncio.FIRST_COMPLETED,
-        )
-        for task in pending:
-            task.cancel()
-
-Registration
-............
-
-As shown in the synchronization example above, if you need to maintain a list
-of currently connected clients, you must register them when they connect and
-unregister them when they disconnect.
-
-::
-
-    connected = set()
-
-    async def handler(websocket, path):
-        # Register.
-        connected.add(websocket)
-        try:
-            # Implement logic here.
-            await asyncio.wait([ws.send("Hello!") for ws in connected])
-            await asyncio.sleep(10)
-        finally:
-            # Unregister.
-            connected.remove(websocket)
-
-This simplistic example keeps track of connected clients in memory. This only
-works as long as you run a single process. In a practical application, the
-handler may subscribe to some channels on a message broker, for example.
-
-That's all!
------------
-
-The design of the ``websockets`` API was driven by simplicity.
-
-You don't have to worry about performing the opening or the closing handshake,
-answering pings, or any other behavior required by the specification.
-
-``websockets`` handles all this under the hood so you don't have to.
-
-One more thing...
------------------
-
-``websockets`` provides an interactive client::
-
-    $ python -m websockets wss://echo.websocket.org/
diff --git a/tests/wpt/tests/tools/third_party/websockets/docs/license.rst b/tests/wpt/tests/tools/third_party/websockets/docs/license.rst
deleted file mode 100644
index 842d3b07fc9..00000000000
--- a/tests/wpt/tests/tools/third_party/websockets/docs/license.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-License
--------
-
-.. literalinclude:: ../LICENSE
diff --git a/tests/wpt/tests/tools/third_party/websockets/docs/lifecycle.graffle b/tests/wpt/tests/tools/third_party/websockets/docs/lifecycle.graffle
deleted file mode 100644
index a8ab7ff09f5..00000000000
Binary files a/tests/wpt/tests/tools/third_party/websockets/docs/lifecycle.graffle and /dev/null differ
diff --git a/tests/wpt/tests/tools/third_party/websockets/docs/lifecycle.svg b/tests/wpt/tests/tools/third_party/websockets/docs/lifecycle.svg
deleted file mode 100644
index 0a9818d2930..00000000000
--- a/tests/wpt/tests/tools/third_party/websockets/docs/lifecycle.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xl="http://www.w3.org/1999/xlink" version="1.1" viewBox="-14.3464565 112.653543 624.6929 372.69291" width="624.6929pt" height="372.69291pt" xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata> Produced by OmniGraffle 6.6.2 <dc:date>2018-07-29 15:25:34 +0000</dc:date></metadata><defs><font-face font-family="Courier New" font-size="12" panose-1="2 7 6 9 2 2 5 2 4 4" units-per-em="1000" underline-position="-232.91016" underline-thickness="100.097656" slope="0" x-height="443.35938" cap-height="591.79688" ascent="832.51953" descent="-300.29297" font-weight="bold"><font-face-src><font-face-name name="CourierNewPS-BoldMT"/></font-face-src></font-face><font-face font-family="Courier New" font-size="12" panose-1="2 7 3 9 2 2 5 2 4 4" units-per-em="1000" underline-position="-232.91016" underline-thickness="41.015625" slope="0" x-height="422.85156" cap-height="571.28906" ascent="832.51953" descent="-300.29297" font-weight="500"><font-face-src><font-face-name name="CourierNewPSMT"/></font-face-src></font-face><marker orient="auto" overflow="visible" markerUnits="strokeWidth" id="StickArrow_Marker" viewBox="-1 -4 8 8" markerWidth="8" markerHeight="8" color="black"><g><path d="M 5.8666667 0 L 0 0 M 0 -2.2 L 5.8666667 0 L 0 2.2" fill="none" stroke="currentColor" stroke-width="1"/></g></marker><font-face font-family="Verdana" font-size="12" panose-1="2 11 6 4 3 5 4 4 2 4" units-per-em="1000" underline-position="-87.890625" underline-thickness="58.59375" slope="0" x-height="545.41016" cap-height="727.0508" ascent="1005.3711" descent="-209.96094" font-weight="500"><font-face-src><font-face-name name="Verdana"/></font-face-src></font-face></defs><g stroke="none" stroke-opacity="1" stroke-dasharray="none" fill="none" fill-opacity="1"><title>Canvas 1</title><g><title>Layer 1</title><text transform="translate(19.173228 148.90551)" fill="black"><tspan font-family="Courier New" font-size="12" font-weight="bold" x="1.5138254" y="10" textLength="72.01172">CONNECTING</tspan></text><text transform="translate(160.90551 148.90551)" fill="black"><tspan font-family="Courier New" font-size="12" font-weight="bold" x="23.117341" y="10" textLength="28.804688">OPEN</tspan></text><text transform="translate(359.3307 148.90551)" fill="black"><tspan font-family="Courier New" font-size="12" font-weight="bold" x="12.315583" y="10" textLength="50.408203">CLOSING</tspan></text><text transform="translate(501.063 148.90551)" fill="black"><tspan font-family="Courier New" font-size="12" font-weight="bold" x="15.916169" y="10" textLength="43.20703">CLOSED</tspan></text><line x1="198.4252" y1="170.07874" x2="198.4252" y2="453.5433" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" stroke-dasharray="1,3"/><line x1="396.8504" y1="170.07874" x2="396.8504" y2="453.5433" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" stroke-dasharray="1,3"/><line x1="538.58267" y1="170.07874" x2="538.58267" y2="453.5433" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" stroke-dasharray="1,3"/><line x1="56.692913" y1="170.07874" x2="56.692913" y2="453.5433" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" stroke-dasharray="1,3"/><path d="M 240.94488 240.94488 L 411.02362 240.94488 C 418.85128 240.94488 425.19685 247.29045 425.19685 255.11811 L 425.19685 255.11811 C 425.19685 262.94577 418.85128 269.29134 411.02362 269.29134 L 240.94488 269.29134 C 233.11722 269.29134 226.77165 262.94577 226.77165 255.11811 L 226.77165 255.11811 C 226.77165 247.29045 233.11722 240.94488 240.94488 240.94488 Z" fill="#dadada"/><path d="M 240.94488 240.94488 L 411.02362 240.94488 C 418.85128 240.94488 425.19685 247.29045 425.19685 255.11811 L 425.19685 255.11811 C 425.19685 262.94577 418.85128 269.29134 411.02362 269.29134 L 240.94488 269.29134 C 233.11722 269.29134 226.77165 262.94577 226.77165 255.11811 L 226.77165 255.11811 C 226.77165 247.29045 233.11722 240.94488 240.94488 240.94488 Z" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"/><text transform="translate(226.77165 248.11811)" fill="black"><tspan font-family="Courier New" font-size="12" font-weight="bold" x="52.40498" y="10" textLength="93.615234">transfer_data</tspan></text><path d="M 240.94488 354.3307 L 552.7559 354.3307 C 560.58356 354.3307 566.92913 360.67628 566.92913 368.50393 L 566.92913 368.50393 C 566.92913 376.3316 560.58356 382.67716 552.7559 382.67716 L 240.94488 382.67716 C 233.11722 382.67716 226.77165 376.3316 226.77165 368.50393 L 226.77165 368.50393 C 226.77165 360.67628 233.11722 354.3307 240.94488 354.3307 Z" fill="#dadada"/><path d="M 240.94488 354.3307 L 552.7559 354.3307 C 560.58356 354.3307 566.92913 360.67628 566.92913 368.50393 L 566.92913 368.50393 C 566.92913 376.3316 560.58356 382.67716 552.7559 382.67716 L 240.94488 382.67716 C 233.11722 382.67716 226.77165 376.3316 226.77165 368.50393 L 226.77165 368.50393 C 226.77165 360.67628 233.11722 354.3307 240.94488 354.3307 Z" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"/><text transform="translate(231.77165 361.50393)" fill="black"><tspan font-family="Courier New" font-size="12" font-weight="bold" x="107.469364" y="10" textLength="115.21875">close_connection</tspan></text><path d="M 99.2126 184.25197 L 155.90551 184.25197 C 163.73317 184.25197 170.07874 190.59754 170.07874 198.4252 L 170.07874 198.4252 C 170.07874 206.25285 163.73317 212.59842 155.90551 212.59842 L 99.2126 212.59842 C 91.38494 212.59842 85.03937 206.25285 85.03937 198.4252 L 85.03937 198.4252 C 85.03937 190.59754 91.38494 184.25197 99.2126 184.25197 Z" fill="#6f6"/><path d="M 99.2126 184.25197 L 155.90551 184.25197 C 163.73317 184.25197 170.07874 190.59754 170.07874 198.4252 L 170.07874 198.4252 C 170.07874 206.25285 163.73317 212.59842 155.90551 212.59842 L 99.2126 212.59842 C 91.38494 212.59842 85.03937 206.25285 85.03937 198.4252 L 85.03937 198.4252 C 85.03937 190.59754 91.38494 184.25197 99.2126 184.25197 Z" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"/><text transform="translate(90.03937 191.4252)" fill="black"><tspan font-family="Courier New" font-size="12" font-weight="bold" x="12.315583" y="10" textLength="50.408203">connect</tspan></text><path d="M 240.94488 184.25197 L 496.063 184.25197 C 503.89065 184.25197 510.23622 190.59754 510.23622 198.4252 L 510.23622 198.4252 C 510.23622 206.25285 503.89065 212.59842 496.063 212.59842 L 240.94488 212.59842 C 233.11722 212.59842 226.77165 206.25285 226.77165 198.4252 L 226.77165 198.4252 C 226.77165 190.59754 233.11722 184.25197 240.94488 184.25197 Z" fill="#6f6"/><path d="M 240.94488 184.25197 L 496.063 184.25197 C 503.89065 184.25197 510.23622 190.59754 510.23622 198.4252 L 510.23622 198.4252 C 510.23622 206.25285 503.89065 212.59842 496.063 212.59842 L 240.94488 212.59842 C 233.11722 212.59842 226.77165 206.25285 226.77165 198.4252 L 226.77165 198.4252 C 226.77165 190.59754 233.11722 184.25197 240.94488 184.25197 Z" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"/><text transform="translate(231.77165 191.4252)" fill="black"><tspan font-family="Courier New" font-size="12" font-weight="bold" x="17.912947" y="10" textLength="100.816406">recv / send / </tspan><tspan font-family="Courier New" font-size="12" font-weight="500" x="118.72935" y="10" textLength="93.615234">ping / pong /</tspan><tspan font-family="Courier New" font-size="12" font-weight="bold" x="212.34459" y="10" textLength="50.408203"> close </tspan></text><path d="M 170.07874 198.4252 L 183.97874 198.4252 L 198.4252 198.4252 L 198.4252 283.46457 L 198.4252 368.50393 L 212.87165 368.50393 L 215.37165 368.50393" marker-end="url(#StickArrow_Marker)" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"/><text transform="translate(75.86614 410.19685)" fill="black"><tspan font-family="Verdana" font-size="12" font-weight="500" x="27.760296" y="12" textLength="52.083984">opening </tspan><tspan font-family="Verdana" font-size="12" font-weight="500" x="19.164593" y="27" textLength="58.02539">handshak</tspan><tspan font-family="Verdana" font-size="12" font-weight="500" x="77.072796" y="27" textLength="7.1484375">e</tspan></text><text transform="translate(416.02362 410.19685)" fill="black"><tspan font-family="Verdana" font-size="12" font-weight="500" x="19.182171" y="12" textLength="65.021484">connection</tspan><tspan font-family="Verdana" font-size="12" font-weight="500" x="16.861858" y="27" textLength="69.66211">termination</tspan></text><text transform="translate(217.59842 410.19685)" fill="black"><tspan font-family="Verdana" font-size="12" font-weight="500" x="41.03058" y="12" textLength="40.6875">data tr</tspan><tspan font-family="Verdana" font-size="12" font-weight="500" x="81.507143" y="12" textLength="37.541016">ansfer</tspan><tspan font-family="Verdana" font-size="12" font-weight="500" x="18.211245" y="27" textLength="116.625">&amp; closing handshak</tspan><tspan font-family="Verdana" font-size="12" font-weight="500" x="134.71906" y="27" textLength="7.1484375">e</tspan></text><path d="M 425.19685 255.11811 L 439.09685 255.11811 L 453.5433 255.11811 L 453.5433 342.9307" marker-end="url(#StickArrow_Marker)" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"/><path d="M 240.94488 297.6378 L 411.02362 297.6378 C 418.85128 297.6378 425.19685 303.98336 425.19685 311.81102 L 425.19685 311.81102 C 425.19685 319.63868 418.85128 325.98425 411.02362 325.98425 L 240.94488 325.98425 C 233.11722 325.98425 226.77165 319.63868 226.77165 311.81102 L 226.77165 311.81102 C 226.77165 303.98336 233.11722 297.6378 240.94488 297.6378 Z" fill="#dadada"/><path d="M 240.94488 297.6378 L 411.02362 297.6378 C 418.85128 297.6378 425.19685 303.98336 425.19685 311.81102 L 425.19685 311.81102 C 425.19685 319.63868 418.85128 325.98425 411.02362 325.98425 L 240.94488 325.98425 C 233.11722 325.98425 226.77165 319.63868 226.77165 311.81102 L 226.77165 311.81102 C 226.77165 303.98336 233.11722 297.6378 240.94488 297.6378 Z" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"/><text transform="translate(226.77165 304.81102)" fill="black"><tspan font-family="Courier New" font-size="12" font-weight="bold" x="48.804395" y="10" textLength="100.816406">keepalive_ping</tspan></text><line x1="198.4252" y1="255.11811" x2="214.62165" y2="255.11811" marker-end="url(#StickArrow_Marker)" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"/><line x1="198.4252" y1="311.81102" x2="215.37165" y2="311.81102" marker-end="url(#StickArrow_Marker)" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"/></g></g></svg>
diff --git a/tests/wpt/tests/tools/third_party/websockets/docs/limitations.rst b/tests/wpt/tests/tools/third_party/websockets/docs/limitations.rst
deleted file mode 100644
index bd6d32b2f63..00000000000
--- a/tests/wpt/tests/tools/third_party/websockets/docs/limitations.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-Limitations
------------
-
-The client doesn't attempt to guarantee that there is no more than one
-connection to a given IP address in a CONNECTING state.
-
-The client doesn't support connecting through a proxy.
-
-There is no way to fragment outgoing messages. A message is always sent in a
-single frame.
diff --git a/tests/wpt/tests/tools/third_party/websockets/docs/protocol.graffle b/tests/wpt/tests/tools/third_party/websockets/docs/protocol.graffle
deleted file mode 100644
index df76f49607e..00000000000
Binary files a/tests/wpt/tests/tools/third_party/websockets/docs/protocol.graffle and /dev/null differ
diff --git a/tests/wpt/tests/tools/third_party/websockets/docs/protocol.svg b/tests/wpt/tests/tools/third_party/websockets/docs/protocol.svg
deleted file mode 100644
index 51bfd982be7..00000000000
--- a/tests/wpt/tests/tools/third_party/websockets/docs/protocol.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xl="http://www.w3.org/1999/xlink" version="1.1" viewBox="0 0 624.34646 822.34646" width="624.34646pt" height="822.34646pt" xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata> Produced by OmniGraffle 6.6.2 <dc:date>2019-07-07 08:38:24 +0000</dc:date></metadata><defs><font-face font-family="Verdana" font-size="12" panose-1="2 11 6 4 3 5 4 4 2 4" units-per-em="1000" underline-position="-87.890625" underline-thickness="58.59375" slope="0" x-height="545.41016" cap-height="727.0508" ascent="1005.3711" descent="-209.96094" font-weight="500"><font-face-src><font-face-name name="Verdana"/></font-face-src></font-face><font-face font-family="Courier New" font-size="12" panose-1="2 7 3 9 2 2 5 2 4 4" units-per-em="1000" underline-position="-232.91016" underline-thickness="41.015625" slope="0" x-height="422.85156" cap-height="571.28906" ascent="832.51953" descent="-300.29297" font-weight="500"><font-face-src><font-face-name name="CourierNewPSMT"/></font-face-src></font-face><font-face font-family="Courier New" font-size="12" panose-1="2 7 6 9 2 2 5 2 4 4" units-per-em="1000" underline-position="-232.91016" underline-thickness="100.097656" slope="0" x-height="443.35938" cap-height="591.79688" ascent="832.51953" descent="-300.29297" font-weight="bold"><font-face-src><font-face-name name="CourierNewPS-BoldMT"/></font-face-src></font-face><font-face font-family="Courier New" font-size="10" panose-1="2 7 3 9 2 2 5 2 4 4" units-per-em="1000" underline-position="-232.91016" underline-thickness="41.015625" slope="0" x-height="422.85156" cap-height="571.28906" ascent="832.51953" descent="-300.29297" font-weight="500"><font-face-src><font-face-name name="CourierNewPSMT"/></font-face-src></font-face><marker orient="auto" overflow="visible" markerUnits="strokeWidth" id="StickArrow_Marker" viewBox="-1 -4 8 8" markerWidth="8" markerHeight="8" color="black"><g><path d="M 5.8666667 0 L 0 0 M 0 -2.2 L 5.8666667 0 L 0 2.2" fill="none" stroke="currentColor" stroke-width="1"/></g></marker><radialGradient cx="0" cy="0" r="1" id="Gradient" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="white"/><stop offset="1" stop-color="#a5a5a5"/></radialGradient><radialGradient id="Obj_Gradient" xl:href="#Gradient" gradientTransform="translate(311.81102 708.6614) scale(145.75703)"/><marker orient="auto" overflow="visible" markerUnits="strokeWidth" id="StickArrow_Marker_2" viewBox="-1 -6 14 12" markerWidth="14" markerHeight="12" color="black"><g><path d="M 12 0 L 0 0 M 0 -4.5 L 12 0 L 0 4.5" fill="none" stroke="currentColor" stroke-width="1"/></g></marker><marker orient="auto" overflow="visible" markerUnits="strokeWidth" id="StickArrow_Marker_3" viewBox="-1 -4 8 8" markerWidth="8" markerHeight="8" color="black"><g><path d="M 5.9253333 0 L 0 0 M 0 -2.222 L 5.9253333 0 L 0 2.222" fill="none" stroke="currentColor" stroke-width="1"/></g></marker></defs><g stroke="none" stroke-opacity="1" stroke-dasharray="none" fill="none" fill-opacity="1"><title>Canvas 1</title><rect fill="white" width="1314" height="1698"/><g><title>Layer 1</title><rect x="28.346457" y="765.35433" width="566.92913" height="28.346457" fill="#6cf"/><rect x="28.346457" y="765.35433" width="566.92913" height="28.346457" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"/><text transform="translate(33.346457 772.02755)" fill="black"><tspan font-family="Verdana" font-size="12" font-weight="500" x="228.50753" y="12" textLength="99.91406">remote endpoint</tspan></text><rect x="28.346457" y="85.03937" width="566.92913" height="566.92913" fill="white"/><rect x="28.346457" y="85.03937" width="566.92913" height="566.92913" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"/><text transform="translate(33.346457 90.03937)" fill="black"><tspan font-family="Verdana" font-size="12" font-weight="500" x="243.79171" y="12" textLength="51.333984">websock</tspan><tspan font-family="Verdana" font-size="12" font-weight="500" x="295.00851" y="12" textLength="18.128906">ets</tspan><tspan font-family="Courier New" font-size="12" font-weight="500" x="195.65109" y="25" textLength="165.62695">WebSocketCommonProtocol</tspan></text><rect x="28.346457" y="28.346457" width="566.92913" height="28.346457" fill="#6f6"/><rect x="28.346457" y="28.346457" width="566.92913" height="28.346457" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"/><text transform="translate(33.346457 35.019685)" fill="black"><tspan font-family="Verdana" font-size="12" font-weight="500" x="230.0046" y="12" textLength="96.91992">application logic</tspan></text><path d="M 102.047243 586.77165 L 238.11023 586.77165 C 247.49858 586.77165 255.11811 596.93102 255.11811 609.4488 C 255.11811 621.9666 247.49858 632.12598 238.11023 632.12598 L 102.047243 632.12598 C 92.658897 632.12598 85.03937 621.9666 85.03937 609.4488 C 85.03937 596.93102 92.658897 586.77165 102.047243 586.77165" fill="#fc6"/><path d="M 102.047243 586.77165 L 238.11023 586.77165 C 247.49858 586.77165 255.11811 596.93102 255.11811 609.4488 C 255.11811 621.9666 247.49858 632.12598 238.11023 632.12598 L 102.047243 632.12598 C 92.658897 632.12598 85.03937 621.9666 85.03937 609.4488 C 85.03937 596.93102 92.658897 586.77165 102.047243 586.77165 M 238.11023 586.77165 C 228.72189 586.77165 221.10236 596.93102 221.10236 609.4488 C 221.10236 621.9666 228.72189 632.12598 238.11023 632.12598" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"/><text transform="translate(125.33071 596.9488)" fill="black"><tspan font-family="Courier New" font-size="12" font-weight="bold" x="14.896484" y="10" textLength="43.20703">reader</tspan><tspan font-family="Courier New" font-size="10" font-weight="500" x=".49414062" y="22" textLength="72.01172">StreamReader</tspan></text><path d="M 385.5118 586.77165 L 521.5748 586.77165 C 530.96315 586.77165 538.58267 596.93102 538.58267 609.4488 C 538.58267 621.9666 530.96315 632.12598 521.5748 632.12598 L 385.5118 632.12598 C 376.12346 632.12598 368.50393 621.9666 368.50393 609.4488 C 368.50393 596.93102 376.12346 586.77165 385.5118 586.77165" fill="#fc6"/><path d="M 385.5118 586.77165 L 521.5748 586.77165 C 530.96315 586.77165 538.58267 596.93102 538.58267 609.4488 C 538.58267 621.9666 530.96315 632.12598 521.5748 632.12598 L 385.5118 632.12598 C 376.12346 632.12598 368.50393 621.9666 368.50393 609.4488 C 368.50393 596.93102 376.12346 586.77165 385.5118 586.77165 M 521.5748 586.77165 C 512.18645 586.77165 504.56693 596.93102 504.56693 609.4488 C 504.56693 621.9666 512.18645 632.12598 521.5748 632.12598" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"/><text transform="translate(408.79527 596.9488)" fill="black"><tspan font-family="Courier New" font-size="12" font-weight="bold" x="14.896484" y="10" textLength="43.20703">writer</tspan><tspan font-family="Courier New" font-size="10" font-weight="500" x=".49414062" y="22" textLength="72.01172">StreamWriter</tspan></text><path d="M 481.88976 419.52756 L 481.88976 374.17323 C 481.88976 371.04378 469.19055 368.50393 453.5433 368.50393 C 437.89606 368.50393 425.19685 371.04378 425.19685 374.17323 L 425.19685 419.52756 C 425.19685 422.657 437.89606 425.19685 453.5433 425.19685 C 469.19055 425.19685 481.88976 422.657 481.88976 419.52756" fill="#fecc66"/><path d="M 481.88976 419.52756 L 481.88976 374.17323 C 481.88976 371.04378 469.19055 368.50393 453.5433 368.50393 C 437.89606 368.50393 425.19685 371.04378 425.19685 374.17323 L 425.19685 419.52756 C 425.19685 422.657 437.89606 425.19685 453.5433 425.19685 C 469.19055 425.19685 481.88976 422.657 481.88976 419.52756 M 481.88976 374.17323 C 481.88976 377.30267 469.19055 379.84252 453.5433 379.84252 C 437.89606 379.84252 425.19685 377.30267 425.19685 374.17323" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width=".75"/><text transform="translate(429.19685 387.18504)" fill="black"><tspan font-family="Courier New" font-size="12" font-weight="500" x="6.343527" y="10" textLength="36.00586">pings</tspan><tspan font-family="Courier New" font-size="10" font-weight="500" x="12.3445034" y="22" textLength="24.003906">dict</tspan></text><path d="M 85.039413 283.46457 L 255.11806 283.46457 C 270.7734 283.46457 283.46457 296.15573 283.46457 311.81107 L 283.46457 481.88972 C 283.46457 497.54506 270.7734 510.23622 255.11806 510.23622 L 85.039413 510.23622 C 69.384074 510.23622 56.692913 497.54506 56.692913 481.88972 L 56.692913 311.81107 C 56.692913 296.15573 69.384074 283.46457 85.039413 283.46457 Z" fill="#dadada"/><path d="M 85.039413 283.46457 L 255.11806 283.46457 C 270.7734 283.46457 283.46457 296.15573 283.46457 311.81107 L 283.46457 481.88972 C 283.46457 497.54506 270.7734 510.23622 255.11806 510.23622 L 85.039413 510.23622 C 69.384074 510.23622 56.692913 497.54506 56.692913 481.88972 L 56.692913 311.81107 C 56.692913 296.15573 69.384074 283.46457 85.039413 283.46457 Z" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"/><text transform="translate(61.692913 288.46457)" fill="black"><tspan font-family="Courier New" font-size="12" font-weight="bold" x="43.57528" y="10" textLength="129.62109">transfer_data_task</tspan><tspan font-family="Courier New" font-size="10" font-weight="500" x="96.383873" y="22" textLength="24.003906">Task</tspan></text><path d="M 297.6378 765.35433 L 297.6378 609.4488 L 255.11811 609.4488 L 269.01811 609.4488 L 266.51811 609.4488" marker-end="url(#StickArrow_Marker)" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"/><path d="M 368.50393 609.4488 L 354.60393 609.4488 L 325.98425 609.4488 L 325.98425 753.95433" marker-end="url(#StickArrow_Marker)" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"/><path d="M 207.03401 712.3154 C 161.22047 708.6614 179.48976 677.90097 252.5726 683.1496 C 259.35307 672.91835 344.33858 674.579 343.783 683.1496 C 397.0715 672.1877 465.17102 694.04553 419.49354 705.00744 C 474.30425 710.32206 418.80189 738.9565 373.8189 734.17322 C 370.2189 742.14584 289.80283 744.9358 282.74457 734.17322 C 237.20882 745.66715 142.25953 727.9946 207.03401 712.3154 Z" fill="url(#Obj_Gradient)"/><path d="M 207.03401 712.3154 C 161.22047 708.6614 179.48976 677.90097 252.5726 683.1496 C 259.35307 672.91835 344.33858 674.579 343.783 683.1496 C 397.0715 672.1877 465.17102 694.04553 419.49354 705.00744 C 474.30425 710.32206 418.80189 738.9565 373.8189 734.17322 C 370.2189 742.14584 289.80283 744.9358 282.74457 734.17322 C 237.20882 745.66715 142.25953 727.9946 207.03401 712.3154 Z" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"/><text transform="translate(217.59842 701.1614)" fill="black"><tspan font-family="Verdana" font-size="12" font-weight="500" x="69.81416" y="12" textLength="48.796875">network</tspan></text><rect x="85.03937" y="453.5433" width="170.07874" height="28.346457" fill="#ff6"/><rect x="85.03937" y="453.5433" width="170.07874" height="28.346457" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"/><text transform="translate(90.03937 460.71653)" fill="black"><tspan font-family="Courier New" font-size="12" font-weight="bold" x="44.03351" y="10" textLength="72.01172">read_frame</tspan></text><rect x="85.03937" y="396.8504" width="170.07874" height="28.346457" fill="#ff6"/><rect x="85.03937" y="396.8504" width="170.07874" height="28.346457" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"/><text transform="translate(90.03937 404.02362)" fill="black"><tspan font-family="Courier New" font-size="12" font-weight="bold" x="26.03058" y="10" textLength="108.01758">read_data_frame</tspan></text><rect x="85.03937" y="340.15748" width="170.07874" height="28.346457" fill="#ff6"/><rect x="85.03937" y="340.15748" width="170.07874" height="28.346457" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"/><text transform="translate(90.03937 347.3307)" fill="black"><tspan font-family="Courier New" font-size="12" font-weight="bold" x="36.832338" y="10" textLength="86.41406">read_message</tspan></text><text transform="translate(178.07874 490.563)" fill="black"><tspan font-family="Courier New" font-size="10" font-weight="500" x="0" y="8" textLength="30.004883">bytes</tspan></text><text transform="translate(178.07874 433.87008)" fill="black"><tspan font-family="Courier New" font-size="10" font-weight="500" x="0" y="8" textLength="36.00586">frames</tspan></text><text transform="translate(178.07874 371.67716)" fill="black"><tspan font-family="Courier New" font-size="10" font-weight="500" x="0" y="8" textLength="24.003906">data</tspan><tspan font-family="Courier New" font-size="10" font-weight="500" x="0" y="19" textLength="36.00586">frames</tspan></text><rect x="368.50393" y="510.23622" width="170.07874" height="28.346457" fill="#ff6"/><rect x="368.50393" y="510.23622" width="170.07874" height="28.346457" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"/><text transform="translate(373.50393 517.40945)" fill="black"><tspan font-family="Courier New" font-size="12" font-weight="bold" x="40.432924" y="10" textLength="79.21289">write_frame</tspan></text><path d="M 85.03937 609.4488 L 71.13937 609.4488 L 56.692913 609.4488 L 56.692913 595.2756 L 56.692913 566.92913 L 113.385826 566.92913 L 170.07874 566.92913 L 170.07874 495.78976 L 170.07874 494.03976" marker-end="url(#StickArrow_Marker)" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"/><path d="M 453.5433 539.33267 L 453.5433 552.48267 L 453.5433 566.92913 L 510.23622 566.92913 L 569.76378 566.92913 L 569.76378 595.2756 L 569.76378 609.4488 L 552.48267 609.4488 L 549.98267 609.4488" marker-end="url(#StickArrow_Marker)" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"/><line x1="170.07874" y1="453.5433" x2="170.07874" y2="437.34685" marker-end="url(#StickArrow_Marker)" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"/><line x1="170.07874" y1="396.8504" x2="170.07874" y2="380.65393" marker-end="url(#StickArrow_Marker)" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"/><path d="M 102.047243 204.09449 L 238.11023 204.09449 C 247.49858 204.09449 255.11811 214.25386 255.11811 226.77165 C 255.11811 239.28945 247.49858 249.44882 238.11023 249.44882 L 102.047243 249.44882 C 92.658897 249.44882 85.03937 239.28945 85.03937 226.77165 C 85.03937 214.25386 92.658897 204.09449 102.047243 204.09449" fill="#fc6"/><path d="M 102.047243 204.09449 L 238.11023 204.09449 C 247.49858 204.09449 255.11811 214.25386 255.11811 226.77165 C 255.11811 239.28945 247.49858 249.44882 238.11023 249.44882 L 102.047243 249.44882 C 92.658897 249.44882 85.03937 239.28945 85.03937 226.77165 C 85.03937 214.25386 92.658897 204.09449 102.047243 204.09449 M 238.11023 204.09449 C 228.72189 204.09449 221.10236 214.25386 221.10236 226.77165 C 221.10236 239.28945 228.72189 249.44882 238.11023 249.44882" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"/><text transform="translate(132.33071 214.27165)" fill="black"><tspan font-family="Courier New" font-size="12" font-weight="bold" x=".1953125" y="10" textLength="57.609375">messages</tspan><tspan font-family="Courier New" font-size="10" font-weight="500" x="13.997559" y="22" textLength="30.004883">deque</tspan></text><path d="M 255.11811 354.3307 L 269.01811 354.3307 L 297.6378 354.3307 L 297.6378 328.8189 L 297.6378 226.77165 L 269.01811 226.77165 L 266.51811 226.77165" marker-end="url(#StickArrow_Marker)" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"/><rect x="85.03937" y="141.73228" width="170.07874" height="28.346457" fill="#cf6"/><rect x="85.03937" y="141.73228" width="170.07874" height="28.346457" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"/><text transform="translate(90.03937 148.90551)" fill="black"><tspan font-family="Courier New" font-size="12" font-weight="bold" x="65.637026" y="10" textLength="28.804688">recv</tspan></text><path d="M 85.03937 226.77165 L 71.13937 226.77165 L 42.519685 226.77165 L 42.519685 209.76378 L 42.519685 155.90551 L 71.13937 155.90551 L 73.63937 155.90551" marker-end="url(#StickArrow_Marker)" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"/><line x1="170.07874" y1="141.73228" x2="170.07874" y2="68.092913" marker-end="url(#StickArrow_Marker)" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"/><line x1="453.5433" y1="56.692913" x2="453.5433" y2="130.33228" marker-end="url(#StickArrow_Marker)" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"/><line x1="467.71653" y1="56.692913" x2="467.71653" y2="187.8752" marker-end="url(#StickArrow_Marker_2)" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width=".75"/><line x1="481.88976" y1="56.692913" x2="481.88976" y2="244.56811" marker-end="url(#StickArrow_Marker_2)" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width=".75"/><line x1="496.063" y1="56.692913" x2="496.063" y2="300.32302" marker-end="url(#StickArrow_Marker_3)" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"/><rect x="368.50393" y="141.73228" width="170.07874" height="28.346457" fill="#cf6"/><rect x="368.50393" y="141.73228" width="170.07874" height="28.346457" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"/><text transform="translate(373.50393 148.90551)" fill="black"><tspan font-family="Courier New" font-size="12" font-weight="bold" x="65.637026" y="10" textLength="28.804688">send</tspan></text><rect x="368.50393" y="198.4252" width="170.07874" height="28.346457" fill="#cf6"/><rect x="368.50393" y="198.4252" width="170.07874" height="28.346457" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width=".75"/><text transform="translate(373.50393 205.59842)" fill="black"><tspan font-family="Courier New" font-size="12" font-weight="500" x="65.637026" y="10" textLength="28.804688">ping</tspan></text><rect x="368.50393" y="255.11811" width="170.07874" height="28.346457" fill="#cf6"/><rect x="368.50393" y="255.11811" width="170.07874" height="28.346457" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width=".75"/><text transform="translate(373.50393 262.29134)" fill="black"><tspan font-family="Courier New" font-size="12" font-weight="500" x="65.637026" y="10" textLength="28.804688">pong</tspan></text><rect x="368.50393" y="311.81102" width="170.07874" height="28.346457" fill="#cf6"/><rect x="368.50393" y="311.81102" width="170.07874" height="28.346457" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"/><text transform="translate(373.50393 318.98425)" fill="black"><tspan font-family="Courier New" font-size="12" font-weight="bold" x="62.03644" y="10" textLength="36.00586">close</tspan></text><path d="M 538.58267 155.90551 L 552.48267 155.90551 L 566.92913 155.90551 L 566.92913 481.88976 L 453.5433 481.88976 L 453.5433 496.33622 L 453.5433 498.08622" marker-end="url(#StickArrow_Marker)" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"/><line x1="538.58267" y1="212.59842" x2="566.92913" y2="212.59842" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width=".75"/><line x1="538.58267" y1="269.29134" x2="566.92913" y2="269.29134" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width=".75"/><line x1="538.58267" y1="325.98425" x2="566.92913" y2="325.98425" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"/><path d="M 255.86811 411.02362 L 262.61811 411.02362 L 340.15748 411.02362 L 340.15748 481.88976 L 453.5433 481.88976" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"/><text transform="translate(291.94527 399.02362)" fill="black"><tspan font-family="Courier New" font-size="10" font-weight="500" x="0" y="8" textLength="42.006836">control</tspan><tspan font-family="Courier New" font-size="10" font-weight="500" x="0" y="21" textLength="36.00586">frames</tspan></text><line x1="340.15748" y1="411.02362" x2="414.64685" y2="411.02362" marker-end="url(#StickArrow_Marker_2)" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width=".75"/><path d="M 368.50393 212.59842 L 361.75393 212.59842 L 340.15748 212.59842 L 340.15748 340.15748 L 340.15748 382.67716" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width=".75"/><text transform="translate(461.5433 547.2559)" fill="black"><tspan font-family="Courier New" font-size="10" font-weight="500" x="0" y="8" textLength="30.004883">bytes</tspan></text><text transform="translate(461.5433 490.563)" fill="black"><tspan font-family="Courier New" font-size="10" font-weight="500" x="0" y="8" textLength="36.00586">frames</tspan></text><line x1="340.15748" y1="382.67716" x2="414.64685" y2="382.67716" marker-end="url(#StickArrow_Marker_2)" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width=".75"/></g></g></svg>
diff --git a/tests/wpt/tests/tools/third_party/websockets/docs/requirements.txt b/tests/wpt/tests/tools/third_party/websockets/docs/requirements.txt
deleted file mode 100644
index 0eaf94fbe8f..00000000000
--- a/tests/wpt/tests/tools/third_party/websockets/docs/requirements.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-sphinx
-sphinx-autodoc-typehints
-sphinxcontrib-spelling
-sphinxcontrib-trio
diff --git a/tests/wpt/tests/tools/third_party/websockets/docs/security.rst b/tests/wpt/tests/tools/third_party/websockets/docs/security.rst
deleted file mode 100644
index e9acf0629c8..00000000000
--- a/tests/wpt/tests/tools/third_party/websockets/docs/security.rst
+++ /dev/null
@@ -1,39 +0,0 @@
-Security
-========
-
-Encryption
-----------
-
-For production use, a server should require encrypted connections.
-
-See this example of :ref:`encrypting connections with TLS
-<secure-server-example>`.
-
-Memory use
-----------
-
-.. warning::
-
-    An attacker who can open an arbitrary number of connections will be able
-    to perform a denial of service by memory exhaustion. If you're concerned
-    by denial of service attacks, you must reject suspicious connections
-    before they reach ``websockets``, typically in a reverse proxy.
-
-With the default settings, opening a connection uses 325 KiB of memory.
-
-Sending some highly compressed messages could use up to 128 MiB of memory
-with an amplification factor of 1000 between network traffic and memory use.
-
-Configuring a server to :ref:`optimize memory usage <memory-usage>` will
-improve security in addition to improving performance.
-
-Other limits
-------------
-
-``websockets`` implements additional limits on the amount of data it accepts
-in order to minimize exposure to security vulnerabilities.
-
-In the opening handshake, ``websockets`` limits the number of HTTP headers to
-256 and the size of an individual header to 4096 bytes. These limits are 10 to
-20 times larger than what's expected in standard use cases. They're hard-coded.
-If you need to change them, monkey-patch the constants in ``websockets.http``.
diff --git a/tests/wpt/tests/tools/third_party/websockets/docs/spelling_wordlist.txt b/tests/wpt/tests/tools/third_party/websockets/docs/spelling_wordlist.txt
deleted file mode 100644
index 1eacc491df7..00000000000
--- a/tests/wpt/tests/tools/third_party/websockets/docs/spelling_wordlist.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-attr
-augustin
-Auth
-awaitable
-aymeric
-backpressure
-Backpressure
-Bitcoin
-bufferbloat
-Bufferbloat
-bugfix
-bytestring
-bytestrings
-changelog
-cryptocurrency
-daemonize
-fractalideas
-iterable
-keepalive
-KiB
-lifecycle
-Lifecycle
-MiB
-nginx
-permessage
-pong
-pongs
-Pythonic
-serializers
-subclassing
-subprotocol
-subprotocols
-TLS
-Unparse
-uple
-username
-websocket
-WebSocket
-websockets
diff --git a/tests/wpt/tests/tools/third_party/websockets/docs/tidelift.rst b/tests/wpt/tests/tools/third_party/websockets/docs/tidelift.rst
deleted file mode 100644
index 43b457aafa8..00000000000
--- a/tests/wpt/tests/tools/third_party/websockets/docs/tidelift.rst
+++ /dev/null
@@ -1,112 +0,0 @@
-websockets for enterprise
-=========================
-
-Available as part of the Tidelift Subscription
-----------------------------------------------
-
-.. image:: _static/tidelift.png
-   :height: 150px
-   :width: 150px
-   :align: left
-
-Tidelift is working with the maintainers of websockets and thousands of other
-open source projects to deliver commercial support and maintenance for the
-open source dependencies you use to build your applications. Save time, reduce
-risk, and improve code health, while paying the maintainers of the exact
-dependencies you use.
-
-.. raw:: html
-
-   <style type="text/css">
-   .tidelift-links {
-       display: flex;
-       justify-content: center;
-   }
-   @media only screen and (max-width: 600px)  {
-       .tidelift-links {
-           flex-direction: column;
-       }
-   }
-   .tidelift-links a {
-       border: thin solid #f6914d;
-       border-radius: 0.25em;
-       font-family: Verdana, sans-serif;
-       font-size: 15px;
-       margin: 0.5em 2em;
-       padding: 0.5em 2em;
-       text-align: center;
-       text-decoration: none;
-       text-transform: uppercase;
-   }
-   .tidelift-links a.tidelift-links__learn-more {
-       background-color: white;
-       color: #f6914d;
-   }
-   .tidelift-links a.tidelift-links__request-a-demo {
-       background-color: #f6914d;
-       color: white;
-   }
-   </style>
-
-   <div class="tidelift-links">
-   <a class="tidelift-links__learn-more" href="https://tidelift.com/subscription/pkg/pypi-websockets?utm_source=pypi-websockets&utm_medium=referral&utm_campaign=enterprise">Learn more</a>
-   <a class="tidelift-links__request-a-demo" href="https://tidelift.com/subscription/request-a-demo?utm_source=pypi-websockets&utm_medium=referral&utm_campaign=enterprise">Request a demo</a>
-   </div>
-
-Enterprise-ready open source software—managed for you
------------------------------------------------------
-
-The Tidelift Subscription is a managed open source subscription for
-application dependencies covering millions of open source projects across
-JavaScript, Python, Java, PHP, Ruby, .NET, and more.
-
-Your subscription includes:
-
-* **Security updates**
-
-  * Tidelift’s security response team coordinates patches for new breaking
-    security vulnerabilities and alerts immediately through a private channel,
-    so your software supply chain is always secure.
-
-* **Licensing verification and indemnification**
-
-  * Tidelift verifies license information to enable easy policy enforcement
-    and adds intellectual property indemnification to cover creators and users
-    in case something goes wrong. You always have a 100% up-to-date bill of
-    materials for your dependencies to share with your legal team, customers,
-    or partners.
-
-* **Maintenance and code improvement**
-
-  * Tidelift ensures the software you rely on keeps working as long as you
-    need it to work. Your managed dependencies are actively maintained and we
-    recruit additional maintainers where required.
-
-* **Package selection and version guidance**
-
-  * We help you choose the best open source packages from the start—and then
-    guide you through updates to stay on the best releases as new issues
-    arise.
-
-* **Roadmap input**
-
-  * Take a seat at the table with the creators behind the software you use.
-    Tidelift’s participating maintainers earn more income as their software is
-    used by more subscribers, so they’re interested in knowing what you need.
-
-* **Tooling and cloud integration**
-
-  * Tidelift works with GitHub, GitLab, BitBucket, and more. We support every
-    cloud platform (and other deployment targets, too).
-
-The end result? All of the capabilities you expect from commercial-grade
-software, for the full breadth of open source you use. That means less time
-grappling with esoteric open source trivia, and more time building your own
-applications—and your business.
-
-.. raw:: html
-
-   <div class="tidelift-links">
-   <a class="tidelift-links__learn-more" href="https://tidelift.com/subscription/pkg/pypi-websockets?utm_source=pypi-websockets&utm_medium=referral&utm_campaign=enterprise">Learn more</a>
-   <a class="tidelift-links__request-a-demo" href="https://tidelift.com/subscription/request-a-demo?utm_source=pypi-websockets&utm_medium=referral&utm_campaign=enterprise">Request a demo</a>
-   </div>
diff --git a/tests/wpt/tests/tools/third_party/websockets/example/basic_auth_client.py b/tests/wpt/tests/tools/third_party/websockets/example/basic_auth_client.py
deleted file mode 100755
index cc94dbe4b49..00000000000
--- a/tests/wpt/tests/tools/third_party/websockets/example/basic_auth_client.py
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env python
-
-# WS client example with HTTP Basic Authentication
-
-import asyncio
-import websockets
-
-async def hello():
-    uri = "ws://mary:p@ssw0rd@localhost:8765"
-    async with websockets.connect(uri) as websocket:
-        greeting = await websocket.recv()
-        print(greeting)
-
-asyncio.get_event_loop().run_until_complete(hello())
diff --git a/tests/wpt/tests/tools/third_party/websockets/example/basic_auth_server.py b/tests/wpt/tests/tools/third_party/websockets/example/basic_auth_server.py
deleted file mode 100755
index 6740d57989c..00000000000
--- a/tests/wpt/tests/tools/third_party/websockets/example/basic_auth_server.py
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env python
-
-# Server example with HTTP Basic Authentication over TLS
-
-import asyncio
-import websockets
-
-async def hello(websocket, path):
-    greeting = f"Hello {websocket.username}!"
-    await websocket.send(greeting)
-
-start_server = websockets.serve(
-    hello, "localhost", 8765,
-    create_protocol=websockets.basic_auth_protocol_factory(
-        realm="example", credentials=("mary", "p@ssw0rd")
-    ),
-)
-
-asyncio.get_event_loop().run_until_complete(start_server)
-asyncio.get_event_loop().run_forever()
diff --git a/tests/wpt/tests/tools/third_party/websockets/example/client.py b/tests/wpt/tests/tools/third_party/websockets/example/client.py
deleted file mode 100755
index 4f969c478ad..00000000000
--- a/tests/wpt/tests/tools/third_party/websockets/example/client.py
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env python
-
-# WS client example
-
-import asyncio
-import websockets
-
-async def hello():
-    uri = "ws://localhost:8765"
-    async with websockets.connect(uri) as websocket:
-        name = input("What's your name? ")
-
-        await websocket.send(name)
-        print(f"> {name}")
-
-        greeting = await websocket.recv()
-        print(f"< {greeting}")
-
-asyncio.get_event_loop().run_until_complete(hello())
diff --git a/tests/wpt/tests/tools/third_party/websockets/example/counter.html b/tests/wpt/tests/tools/third_party/websockets/example/counter.html
deleted file mode 100644
index 6310c4a16d9..00000000000
--- a/tests/wpt/tests/tools/third_party/websockets/example/counter.html
+++ /dev/null
@@ -1,80 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <title>WebSocket demo</title>
-        <style type="text/css">
-            body {
-                font-family: "Courier New", sans-serif;
-                text-align: center;
-            }
-            .buttons {
-                font-size: 4em;
-                display: flex;
-                justify-content: center;
-            }
-            .button, .value {
-                line-height: 1;
-                padding: 2rem;
-                margin: 2rem;
-                border: medium solid;
-                min-height: 1em;
-                min-width: 1em;
-            }
-            .button {
-                cursor: pointer;
-                user-select: none;
-            }
-            .minus {
-                color: red;
-            }
-            .plus {
-                color: green;
-            }
-            .value {
-                min-width: 2em;
-            }
-            .state {
-                font-size: 2em;
-            }
-        </style>
-    </head>
-    <body>
-        <div class="buttons">
-            <div class="minus button">-</div>
-            <div class="value">?</div>
-            <div class="plus button">+</div>
-        </div>
-        <div class="state">
-            <span class="users">?</span> online
-        </div>
-        <script>
-            var minus = document.querySelector('.minus'),
-                plus = document.querySelector('.plus'),
-                value = document.querySelector('.value'),
-                users = document.querySelector('.users'),
-                websocket = new WebSocket("ws://127.0.0.1:6789/");
-            minus.onclick = function (event) {
-                websocket.send(JSON.stringify({action: 'minus'}));
-            }
-            plus.onclick = function (event) {
-                websocket.send(JSON.stringify({action: 'plus'}));
-            }
-            websocket.onmessage = function (event) {
-                data = JSON.parse(event.data);
-                switch (data.type) {
-                    case 'state':
-                        value.textContent = data.value;
-                        break;
-                    case 'users':
-                        users.textContent = (
-                            data.count.toString() + " user" +
-                            (data.count == 1 ? "" : "s"));
-                        break;
-                    default:
-                        console.error(
-                            "unsupported event", data);
-                }
-            };
-        </script>
-    </body>
-</html>
diff --git a/tests/wpt/tests/tools/third_party/websockets/example/counter.py b/tests/wpt/tests/tools/third_party/websockets/example/counter.py
deleted file mode 100755
index dbbbe593580..00000000000
--- a/tests/wpt/tests/tools/third_party/websockets/example/counter.py
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/usr/bin/env python
-
-# WS server example that synchronizes state across clients
-
-import asyncio
-import json
-import logging
-import websockets
-
-logging.basicConfig()
-
-STATE = {"value": 0}
-
-USERS = set()
-
-
-def state_event():
-    return json.dumps({"type": "state", **STATE})
-
-
-def users_event():
-    return json.dumps({"type": "users", "count": len(USERS)})
-
-
-async def notify_state():
-    if USERS:  # asyncio.wait doesn't accept an empty list
-        message = state_event()
-        await asyncio.wait([user.send(message) for user in USERS])
-
-
-async def notify_users():
-    if USERS:  # asyncio.wait doesn't accept an empty list
-        message = users_event()
-        await asyncio.wait([user.send(message) for user in USERS])
-
-
-async def register(websocket):
-    USERS.add(websocket)
-    await notify_users()
-
-
-async def unregister(websocket):
-    USERS.remove(websocket)
-    await notify_users()
-
-
-async def counter(websocket, path):
-    # register(websocket) sends user_event() to websocket
-    await register(websocket)
-    try:
-        await websocket.send(state_event())
-        async for message in websocket:
-            data = json.loads(message)
-            if data["action"] == "minus":
-                STATE["value"] -= 1
-                await notify_state()
-            elif data["action"] == "plus":
-                STATE["value"] += 1
-                await notify_state()
-            else:
-                logging.error("unsupported event: {}", data)
-    finally:
-        await unregister(websocket)
-
-
-start_server = websockets.serve(counter, "localhost", 6789)
-
-asyncio.get_event_loop().run_until_complete(start_server)
-asyncio.get_event_loop().run_forever()
diff --git a/tests/wpt/tests/tools/third_party/websockets/example/echo.py b/tests/wpt/tests/tools/third_party/websockets/example/echo.py
deleted file mode 100755
index b7ca38d321f..00000000000
--- a/tests/wpt/tests/tools/third_party/websockets/example/echo.py
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env python
-
-import asyncio
-import websockets
-
-async def echo(websocket, path):
-    async for message in websocket:
-        await websocket.send(message)
-
-start_server = websockets.serve(echo, "localhost", 8765)
-
-asyncio.get_event_loop().run_until_complete(start_server)
-asyncio.get_event_loop().run_forever()
diff --git a/tests/wpt/tests/tools/third_party/websockets/example/health_check_server.py b/tests/wpt/tests/tools/third_party/websockets/example/health_check_server.py
deleted file mode 100755
index 417063fce7e..00000000000
--- a/tests/wpt/tests/tools/third_party/websockets/example/health_check_server.py
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env python
-
-# WS echo server with HTTP endpoint at /health/
-
-import asyncio
-import http
-import websockets
-
-async def health_check(path, request_headers):
-    if path == "/health/":
-        return http.HTTPStatus.OK, [], b"OK\n"
-
-async def echo(websocket, path):
-    async for message in websocket:
-        await websocket.send(message)
-
-start_server = websockets.serve(
-    echo, "localhost", 8765, process_request=health_check
-)
-
-asyncio.get_event_loop().run_until_complete(start_server)
-asyncio.get_event_loop().run_forever()
diff --git a/tests/wpt/tests/tools/third_party/websockets/example/hello.py b/tests/wpt/tests/tools/third_party/websockets/example/hello.py
deleted file mode 100755
index 6c9c839d827..00000000000
--- a/tests/wpt/tests/tools/third_party/websockets/example/hello.py
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env python
-
-import asyncio
-import websockets
-
-async def hello():
-    uri = "ws://localhost:8765"
-    async with websockets.connect(uri) as websocket:
-        await websocket.send("Hello world!")
-        await websocket.recv()
-
-asyncio.get_event_loop().run_until_complete(hello())
diff --git a/tests/wpt/tests/tools/third_party/websockets/example/localhost.pem b/tests/wpt/tests/tools/third_party/websockets/example/localhost.pem
deleted file mode 100644
index f9a30ba8f63..00000000000
--- a/tests/wpt/tests/tools/third_party/websockets/example/localhost.pem
+++ /dev/null
@@ -1,48 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDG8iDak4UBpurI
-TWjSfqJ0YVG/S56nhswehupCaIzu0xQ8wqPSs36h5t1jMexJPZfvwyvFjcV+hYpj
-LMM0wMJPx9oBQEe0bsmlC66e8aF0UpSQw1aVfYoxA9BejgEyrFNE7cRbQNYFEb/5
-3HfqZKdEQA2fgQSlZ0RTRmLrD+l72iO5o2xl5bttXpqYZB2XOkyO79j/xWdu9zFE
-sgZJ5ysWbqoRAGgnxjdYYr9DARd8bIE/hN3SW7mDt5v4LqCIhGn1VmrwtT3d5AuG
-QPz4YEbm0t6GOlmFjIMYH5Y7pALRVfoJKRj6DGNIR1JicL+wqLV66kcVnj8WKbla
-20i7fR7NAgMBAAECggEAG5yvgqbG5xvLqlFUIyMAWTbIqcxNEONcoUAIc38fUGZr
-gKNjKXNQOBha0dG0AdZSqCxmftzWdGEEfA9SaJf4YCpUz6ekTB60Tfv5GIZg6kwr
-4ou6ELWD4Jmu6fC7qdTRGdgGUMQG8F0uT/eRjS67KHXbbi/x/SMAEK7MO+PRfCbj
-+JGzS9Ym9mUweINPotgjHdDGwwd039VWYS+9A+QuNK27p3zq4hrWRb4wshSC8fKy
-oLoe4OQt81aowpX9k6mAU6N8vOmP8/EcQHYC+yFIIDZB2EmDP07R1LUEH3KJnzo7
-plCK1/kYPhX0a05cEdTpXdKa74AlvSRkS11sGqfUAQKBgQDj1SRv0AUGsHSA0LWx
-a0NT1ZLEXCG0uqgdgh0sTqIeirQsPROw3ky4lH5MbjkfReArFkhHu3M6KoywEPxE
-wanSRh/t1qcNjNNZUvFoUzAKVpb33RLkJppOTVEWPt+wtyDlfz1ZAXzMV66tACrx
-H2a3v0ZWUz6J+x/dESH5TTNL4QKBgQDfirmknp408pwBE+bulngKy0QvU09En8H0
-uvqr8q4jCXqJ1tXon4wsHg2yF4Fa37SCpSmvONIDwJvVWkkYLyBHKOns/fWCkW3n
-hIcYx0q2jgcoOLU0uoaM9ArRXhIxoWqV/KGkQzN+3xXC1/MxZ5OhyxBxfPCPIYIN
-YN3M1t/QbQKBgDImhsC+D30rdlmsl3IYZFed2ZKznQ/FTqBANd+8517FtWdPgnga
-VtUCitKUKKrDnNafLwXrMzAIkbNn6b/QyWrp2Lln2JnY9+TfpxgJx7de3BhvZ2sl
-PC4kQsccy+yAQxOBcKWY+Dmay251bP5qpRepWPhDlq6UwqzMyqev4KzBAoGAWDMi
-IEO9ZGK9DufNXCHeZ1PgKVQTmJ34JxmHQkTUVFqvEKfFaq1Y3ydUfAouLa7KSCnm
-ko42vuhGFB41bOdbMvh/o9RoBAZheNGfhDVN002ioUoOpSlbYU4A3q7hOtfXeCpf
-lLI3JT3cFi6ic8HMTDAU4tJLEA5GhATOPr4hPNkCgYB8jTYGcLvoeFaLEveg0kS2
-cz6ZXGLJx5m1AOQy5g9FwGaW+10lr8TF2k3AldwoiwX0R6sHAf/945aGU83ms5v9
-PB9/x66AYtSRUos9MwB4y1ur4g6FiXZUBgTJUqzz2nehPCyGjYhh49WucjszqcjX
-chS1bKZOY+1knWq8xj5Qyg==
------END PRIVATE KEY-----
------BEGIN CERTIFICATE-----
-MIIDTTCCAjWgAwIBAgIJAOjte6l+03jvMA0GCSqGSIb3DQEBCwUAMEwxCzAJBgNV
-BAYTAkZSMQ4wDAYDVQQHDAVQYXJpczEZMBcGA1UECgwQQXltZXJpYyBBdWd1c3Rp
-bjESMBAGA1UEAwwJbG9jYWxob3N0MCAXDTE4MDUwNTE2NTkyOVoYDzIwNjAwNTA0
-MTY1OTI5WjBMMQswCQYDVQQGEwJGUjEOMAwGA1UEBwwFUGFyaXMxGTAXBgNVBAoM
-EEF5bWVyaWMgQXVndXN0aW4xEjAQBgNVBAMMCWxvY2FsaG9zdDCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAMbyINqThQGm6shNaNJ+onRhUb9LnqeGzB6G
-6kJojO7TFDzCo9KzfqHm3WMx7Ek9l+/DK8WNxX6FimMswzTAwk/H2gFAR7RuyaUL
-rp7xoXRSlJDDVpV9ijED0F6OATKsU0TtxFtA1gURv/ncd+pkp0RADZ+BBKVnRFNG
-YusP6XvaI7mjbGXlu21emphkHZc6TI7v2P/FZ273MUSyBknnKxZuqhEAaCfGN1hi
-v0MBF3xsgT+E3dJbuYO3m/guoIiEafVWavC1Pd3kC4ZA/PhgRubS3oY6WYWMgxgf
-ljukAtFV+gkpGPoMY0hHUmJwv7CotXrqRxWePxYpuVrbSLt9Hs0CAwEAAaMwMC4w
-LAYDVR0RBCUwI4IJbG9jYWxob3N0hwR/AAABhxAAAAAAAAAAAAAAAAAAAAABMA0G
-CSqGSIb3DQEBCwUAA4IBAQC9TsTxTEvqHPUS6sfvF77eG0D6HLOONVN91J+L7LiX
-v3bFeS1xbUS6/wIxZi5EnAt/te5vaHk/5Q1UvznQP4j2gNoM6lH/DRkSARvRitVc
-H0qN4Xp2Yk1R9VEx4ZgArcyMpI+GhE4vJRx1LE/hsuAzw7BAdsTt9zicscNg2fxO
-3ao/eBcdaC6n9aFYdE6CADMpB1lCX2oWNVdj6IavQLu7VMc+WJ3RKncwC9th+5OP
-ISPvkVZWf25rR2STmvvb0qEm3CZjk4Xd7N+gxbKKUvzEgPjrLSWzKKJAWHjCLugI
-/kQqhpjWVlTbtKzWz5bViqCjSbrIPpU2MgG9AUV9y3iV
------END CERTIFICATE-----
diff --git a/tests/wpt/tests/tools/third_party/websockets/example/secure_client.py b/tests/wpt/tests/tools/third_party/websockets/example/secure_client.py
deleted file mode 100755
index 54971b9847e..00000000000
--- a/tests/wpt/tests/tools/third_party/websockets/example/secure_client.py
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/usr/bin/env python
-
-# WSS (WS over TLS) client example, with a self-signed certificate
-
-import asyncio
-import pathlib
-import ssl
-import websockets
-
-ssl_context = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
-localhost_pem = pathlib.Path(__file__).with_name("localhost.pem")
-ssl_context.load_verify_locations(localhost_pem)
-
-async def hello():
-    uri = "wss://localhost:8765"
-    async with websockets.connect(
-        uri, ssl=ssl_context
-    ) as websocket:
-        name = input("What's your name? ")
-
-        await websocket.send(name)
-        print(f"> {name}")
-
-        greeting = await websocket.recv()
-        print(f"< {greeting}")
-
-asyncio.get_event_loop().run_until_complete(hello())
diff --git a/tests/wpt/tests/tools/third_party/websockets/example/secure_server.py b/tests/wpt/tests/tools/third_party/websockets/example/secure_server.py
deleted file mode 100755
index 2a00bdb5042..00000000000
--- a/tests/wpt/tests/tools/third_party/websockets/example/secure_server.py
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/env python
-
-# WSS (WS over TLS) server example, with a self-signed certificate
-
-import asyncio
-import pathlib
-import ssl
-import websockets
-
-async def hello(websocket, path):
-    name = await websocket.recv()
-    print(f"< {name}")
-
-    greeting = f"Hello {name}!"
-
-    await websocket.send(greeting)
-    print(f"> {greeting}")
-
-ssl_context = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER)
-localhost_pem = pathlib.Path(__file__).with_name("localhost.pem")
-ssl_context.load_cert_chain(localhost_pem)
-
-start_server = websockets.serve(
-    hello, "localhost", 8765, ssl=ssl_context
-)
-
-asyncio.get_event_loop().run_until_complete(start_server)
-asyncio.get_event_loop().run_forever()
diff --git a/tests/wpt/tests/tools/third_party/websockets/example/server.py b/tests/wpt/tests/tools/third_party/websockets/example/server.py
deleted file mode 100755
index c8ab69971b2..00000000000
--- a/tests/wpt/tests/tools/third_party/websockets/example/server.py
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env python
-
-# WS server example
-
-import asyncio
-import websockets
-
-async def hello(websocket, path):
-    name = await websocket.recv()
-    print(f"< {name}")
-
-    greeting = f"Hello {name}!"
-
-    await websocket.send(greeting)
-    print(f"> {greeting}")
-
-start_server = websockets.serve(hello, "localhost", 8765)
-
-asyncio.get_event_loop().run_until_complete(start_server)
-asyncio.get_event_loop().run_forever()
diff --git a/tests/wpt/tests/tools/third_party/websockets/example/show_time.html b/tests/wpt/tests/tools/third_party/websockets/example/show_time.html
deleted file mode 100644
index 721f44264ef..00000000000
--- a/tests/wpt/tests/tools/third_party/websockets/example/show_time.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <title>WebSocket demo</title>
-    </head>
-    <body>
-        <script>
-            var ws = new WebSocket("ws://127.0.0.1:5678/"),
-                messages = document.createElement('ul');
-            ws.onmessage = function (event) {
-                var messages = document.getElementsByTagName('ul')[0],
-                    message = document.createElement('li'),
-                    content = document.createTextNode(event.data);
-                message.appendChild(content);
-                messages.appendChild(message);
-            };
-            document.body.appendChild(messages);
-        </script>
-    </body>
-</html>
diff --git a/tests/wpt/tests/tools/third_party/websockets/example/show_time.py b/tests/wpt/tests/tools/third_party/websockets/example/show_time.py
deleted file mode 100755
index e5d6ac9aa3b..00000000000
--- a/tests/wpt/tests/tools/third_party/websockets/example/show_time.py
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env python
-
-# WS server that sends messages at random intervals
-
-import asyncio
-import datetime
-import random
-import websockets
-
-async def time(websocket, path):
-    while True:
-        now = datetime.datetime.utcnow().isoformat() + "Z"
-        await websocket.send(now)
-        await asyncio.sleep(random.random() * 3)
-
-start_server = websockets.serve(time, "127.0.0.1", 5678)
-
-asyncio.get_event_loop().run_until_complete(start_server)
-asyncio.get_event_loop().run_forever()
diff --git a/tests/wpt/tests/tools/third_party/websockets/example/shutdown.py b/tests/wpt/tests/tools/third_party/websockets/example/shutdown.py
deleted file mode 100755
index 86846abe73e..00000000000
--- a/tests/wpt/tests/tools/third_party/websockets/example/shutdown.py
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env python
-
-import asyncio
-import signal
-import websockets
-
-async def echo(websocket, path):
-    async for message in websocket:
-        await websocket.send(message)
-
-async def echo_server(stop):
-    async with websockets.serve(echo, "localhost", 8765):
-        await stop
-
-loop = asyncio.get_event_loop()
-
-# The stop condition is set when receiving SIGTERM.
-stop = loop.create_future()
-loop.add_signal_handler(signal.SIGTERM, stop.set_result, None)
-
-# Run the server until the stop condition is met.
-loop.run_until_complete(echo_server(stop))
diff --git a/tests/wpt/tests/tools/third_party/websockets/example/unix_client.py b/tests/wpt/tests/tools/third_party/websockets/example/unix_client.py
deleted file mode 100755
index 577135b3dbf..00000000000
--- a/tests/wpt/tests/tools/third_party/websockets/example/unix_client.py
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env python
-
-# WS client example connecting to a Unix socket
-
-import asyncio
-import os.path
-import websockets
-
-async def hello():
-    socket_path = os.path.join(os.path.dirname(__file__), "socket")
-    async with websockets.unix_connect(socket_path) as websocket:
-        name = input("What's your name? ")
-        await websocket.send(name)
-        print(f"> {name}")
-
-        greeting = await websocket.recv()
-        print(f"< {greeting}")
-
-asyncio.get_event_loop().run_until_complete(hello())
diff --git a/tests/wpt/tests/tools/third_party/websockets/example/unix_server.py b/tests/wpt/tests/tools/third_party/websockets/example/unix_server.py
deleted file mode 100755
index a6ec0168a2b..00000000000
--- a/tests/wpt/tests/tools/third_party/websockets/example/unix_server.py
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env python
-
-# WS server example listening on a Unix socket
-
-import asyncio
-import os.path
-import websockets
-
-async def hello(websocket, path):
-    name = await websocket.recv()
-    print(f"< {name}")
-
-    greeting = f"Hello {name}!"
-
-    await websocket.send(greeting)
-    print(f"> {greeting}")
-
-socket_path = os.path.join(os.path.dirname(__file__), "socket")
-start_server = websockets.unix_serve(hello, socket_path)
-
-asyncio.get_event_loop().run_until_complete(start_server)
-asyncio.get_event_loop().run_forever()
diff --git a/tests/wpt/tests/tools/third_party/websockets/logo/horizontal.svg b/tests/wpt/tests/tools/third_party/websockets/logo/horizontal.svg
deleted file mode 100644
index ee872dc4786..00000000000
--- a/tests/wpt/tests/tools/third_party/websockets/logo/horizontal.svg
+++ /dev/null
@@ -1,31 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="1024" height="256" viewBox="0 0 1024 256">
-  <linearGradient id="w" x1="0" y1="0" x2="0.1667" y2="0.6667">
-    <stop offset="0%" stop-color="#ffe873" />
-    <stop offset="100%" stop-color="#ffd43b" />
-  </linearGradient>
-  <linearGradient id="s" x1="0" y1="0" x2="0.1667" y2="0.6667">
-    <stop offset="0%" stop-color="#5a9fd4" />
-    <stop offset="100%" stop-color="#306998" />
-  </linearGradient>
-<g>
-    <path fill="url(#w)" d="m 151.60708,154.81618 c -0.43704,0.0747 -0.88656,0.12978 -1.35572,0.14933 -2.45813,0.0764 -4.25357,-0.58665 -5.82335,-2.15107 l -8.89246,-8.85942 -11.23464,-11.19805 -36.040757,-35.919452 c -3.43568,-3.42217 -7.332485,-5.347474 -11.589626,-5.723468 -2.229803,-0.198219 -4.473877,0.03111 -6.640354,0.675545 -3.242133,0.944875 -6.135526,2.664848 -8.593662,5.116366 -3.834369,3.819499 -5.86349,8.414979 -5.875977,13.287799 -0.06065,4.95281 1.951523,9.60074 5.808192,13.44424 l 55.622894,55.43648 c 1.82219,1.84175 2.65971,3.79549 2.63384,6.14568 l 0.004,0.208 c 0.0527,2.43196 -0.75991,4.34571 -2.6267,6.20612 -1.78028,1.77598 -3.8094,2.65241 -6.30945,2.75552 -2.45814,0.0764 -4.25446,-0.58844 -5.82514,-2.15286 L 48.702551,136.2618 c -5.214172,-5.19459 -11.702899,-6.98745 -18.22998,-5.04881 -3.245701,0.9431 -6.135527,2.66307 -8.595446,5.11459 -3.83437,3.82127 -5.865275,8.41676 -5.875978,13.28957 -0.05619,4.95281 1.951524,9.60252 5.806409,13.4478 l 58.10689,57.90577 c 8.319842,8.29143 19.340421,11.9376 32.743314,10.83806 12.57967,-1.02043 23.02317,-5.5848 31.03441,-13.57313 7.51265,-7.4861 11.96423,-16.35175 13.28695,-26.42537 10.47206,-1.68264 19.29494,-6.04524 26.27512,-13.00158 4.01364,-3.99994 7.14963,-8.3972 9.40531,-13.16157 -14.15569,-0.39911 -28.23645,-4.00972 -41.05247,-10.83095 z" />
-    <path fill="url(#s)" d="m 196.96038,146.11854 c 0.10259,-12.84514 -4.43017,-23.98541 -13.50635,-33.1346 L 147.57292,77.225374 c -0.24349,-0.240885 -0.46469,-0.487992 -0.68678,-0.744877 -1.48416,-1.739529 -2.18788,-3.583056 -2.21018,-5.807022 -0.0259,-2.470184 0.84911,-4.508375 2.7605,-6.407902 1.91406,-1.909304 3.8531,-2.737735 6.36564,-2.684403 2.53662,0.024 4.62728,0.943097 6.57257,2.881734 l 60.59178,60.384846 12.11408,-12.06914 c 1.12203,-0.90755 1.95777,-1.76887 2.87823,-2.93418 5.91879,-7.51544 5.26947,-18.272609 -1.51003,-25.02895 L 187.20456,37.727314 c -9.19393,-9.157192 -20.36703,-13.776677 -33.16789,-13.7269 -12.94266,-0.05067 -24.14163,4.548375 -33.28739,13.662901 -9.02892,8.996307 -13.64015,19.93925 -13.7008,32.487501 l -0.004,0.14222 c -0.002,0.167998 -0.005,0.336884 -0.005,0.506659 -0.091,12.232701 4.10729,22.95787 12.48154,31.881285 0.40226,0.43022 0.80274,0.85777 1.22283,1.27821 l 35.75088,35.62612 c 1.88909,1.88174 2.71769,3.79638 2.69361,6.20968 l 0.003,0.20977 c 0.0527,2.43197 -0.76081,4.34571 -2.6276,6.20791 -1.44759,1.43909 -3.06286,2.27818 -4.9564,2.60262 12.81601,6.82123 26.89677,10.43184 41.05246,10.83362 2.80598,-5.92525 4.2509,-12.41848 4.29906,-19.43526 z" />
-    <path fill="#ffffff" d="m 215.68093,93.181574 c 2.84701,-2.838179 7.46359,-2.836401 10.30883,0 2.84433,2.834623 2.84612,7.435446 -0.002,10.270956 -2.84345,2.83818 -7.46271,2.83818 -10.30704,0 -2.84524,-2.83551 -2.84791,-7.435444 0,-10.270956 z" />
-  </g>
-  <g>
-    <g fill="#ffd43b">
-      <path d="m 271.62046,177.33313 c 0,4.1637 1.46619,7.71227 4.39858,10.64361 2.9324,2.93556 6.48202,4.40069 10.64783,4.40069 4.16475,0 7.71438,-1.46513 10.64572,-4.40069 2.93344,-2.93134 4.40069,-6.47991 4.40069,-10.64361 v -35.00332 c 0,-2.12345 0.7647,-3.95198 2.29514,-5.48032 1.53045,-1.53256 3.35793,-2.29831 5.48349,-2.29831 h 0.12745 c 2.16664,0 3.972,0.76575 5.41923,2.29831 1.53045,1.52834 2.2962,3.35793 2.2962,5.48032 v 35.00332 c 0,4.1637 1.4662,7.71227 4.40069,10.64361 2.93134,2.93556 6.47886,4.40069 10.64572,4.40069 4.20794,0 7.77758,-1.46513 10.70997,-4.40069 2.93345,-2.93134 4.40069,-6.47991 4.40069,-10.64361 v -35.00332 c 0,-2.12345 0.76365,-3.95198 2.29515,-5.48032 1.44302,-1.53256 3.25049,-2.29831 5.41924,-2.29831 h 0.1264 c 2.12661,0 3.95409,0.76575 5.48349,2.29831 1.48831,1.52834 2.23194,3.35793 2.23194,5.48032 v 35.00332 c 0,8.45696 -2.9977,15.68261 -8.98887,21.67484 -5.99329,5.99224 -13.21999,8.98993 -21.67695,8.98993 -10.11696,0 -17.7239,-3.35583 -22.82609,-10.07272 -5.14222,6.71689 -12.77234,10.07272 -22.88719,10.07272 -8.45801,0 -15.68471,-2.99769 -21.67695,-8.98993 C 258.9998,193.01574 256,185.79113 256,177.33313 v -35.00332 c 0,-2.12345 0.76575,-3.95198 2.29619,-5.48032 1.5294,-1.53256 3.33581,-2.29831 5.41924,-2.29831 h 0.1917 c 2.08238,0 3.88774,0.76575 5.42029,2.29831 1.52834,1.52834 2.29409,3.35793 2.29409,5.48032 v 35.00332 z" />
-      <path d="m 443.95216,155.97534 c 0.51085,1.06173 0.7668,2.14346 0.7668,3.25048 0,0.8932 -0.16957,1.78536 -0.50979,2.67854 -0.72363,1.99707 -2.08343,3.4422 -4.0805,4.33434 -5.95114,2.67854 -13.77085,6.20711 -23.46228,10.58463 -12.02871,5.43924 -19.08477,8.64866 -21.16715,9.62823 3.22943,4.07944 8.26737,6.11863 15.11067,6.11863 4.5471,0 8.67077,-1.33769 12.36786,-4.01625 3.61283,-2.63534 6.14286,-6.03541 7.58798,-10.20227 1.23342,-3.48538 3.69815,-5.22754 7.39524,-5.22754 2.6343,0 4.7388,1.10702 6.31138,3.31369 0.97746,1.36193 1.46619,2.78598 1.46619,4.27325 0,0.8932 -0.16958,1.80641 -0.50874,2.74069 -2.50791,7.26988 -6.90861,13.13573 -13.19681,17.59961 -6.37563,4.63031 -13.51702,6.94757 -21.4231,6.94757 -10.11591,0 -18.76563,-3.58965 -25.94809,-10.7742 -7.18351,-7.18353 -10.77527,-15.83219 -10.77527,-25.9502 0,-10.11591 3.59176,-18.76351 10.77527,-25.95019 7.18142,-7.1814 15.83218,-10.77422 25.94809,-10.77422 7.30885,0 13.98257,1.99916 20.01904,5.99223 5.99118,3.91512 10.43296,9.05524 13.32321,15.43298 z m -33.34331,-5.67836 c -5.86583,0 -10.86059,2.06343 -14.98322,6.18604 -4.08049,4.12473 -6.12073,9.11949 -6.12073,14.98322 v 0.44661 l 35.63951,-16.00282 c -3.1441,-3.73817 -7.99035,-5.61305 -14.53556,-5.61305 z" />
-      <path d="m 465.12141,108.41246 c 2.08238,0 3.88775,0.74469 5.41924,2.23194 1.53045,1.52834 2.29619,3.35793 2.29619,5.48244 v 24.79998 c 4.80202,-4.24796 11.83701,-6.37564 21.10185,-6.37564 10.11591,0 18.76561,3.59177 25.94914,10.77422 7.18245,7.18563 10.77527,15.83429 10.77527,25.9502 0,10.11695 -3.59282,18.76561 -10.77527,25.95018 C 512.70536,204.41035 504.05566,208 493.93869,208 c -10.11696,0 -18.74349,-3.56964 -25.88382,-10.71207 -7.18457,-7.09504 -10.7974,-15.70262 -10.83954,-25.82063 v -55.33941 c 0,-2.12556 0.76576,-3.95409 2.29621,-5.48243 1.52939,-1.48727 3.3358,-2.23196 5.41924,-2.23196 h 0.19063 z m 28.81622,41.88452 c -5.86477,0 -10.85953,2.06343 -14.9832,6.18604 -4.0784,4.12473 -6.11969,9.11949 -6.11969,14.98322 0,5.8237 2.04129,10.79633 6.11969,14.91896 4.12367,4.12263 9.11737,6.18393 14.9832,6.18393 5.82371,0 10.79635,-2.0613 14.92002,-6.18393 4.12051,-4.12263 6.18288,-9.09526 6.18288,-14.91896 0,-5.86267 -2.06237,-10.85849 -6.18288,-14.98322 -4.12367,-4.12261 -9.09525,-6.18604 -14.92002,-6.18604 z" />
-    </g>
-    <g fill="#306998">
-      <path d="m 561.26467,150.17375 c -1.87066,0 -3.44325,0.6362 -4.71773,1.9107 -1.27556,1.31872 -1.91281,2.89025 -1.91281,4.71773 0,2.5511 1.23237,4.46389 3.69919,5.73733 0.84898,0.46872 4.39859,1.53045 10.64678,3.18834 5.05795,1.44619 8.81825,3.33686 11.28296,5.67413 3.52963,3.35898 5.29179,8.14097 5.29179,14.34703 0,6.11862 -2.16769,11.36829 -6.50203,15.74581 -4.37857,4.33644 -9.62823,6.50308 -15.74791,6.50308 h -16.64005 c -2.08448,0 -3.88879,-0.76365 -5.42029,-2.29621 -1.53045,-1.44407 -2.2962,-3.25048 -2.2962,-5.41712 v -0.12953 c 0,-2.12345 0.76575,-3.95198 2.2962,-5.48243 1.53044,-1.53045 3.33581,-2.29619 5.42029,-2.29619 h 17.2773 c 1.8696,0 3.44324,-0.6362 4.71773,-1.9107 1.27556,-1.27554 1.91281,-2.84707 1.91281,-4.71774 0,-2.33937 -1.21131,-4.10366 -3.63285,-5.29073 -0.63723,-0.30018 -4.20898,-1.36192 -10.71208,-3.18834 -5.05899,-1.48725 -8.82139,-3.44535 -11.28611,-5.8669 -3.52856,-3.44217 -5.29075,-8.30949 -5.29075,-14.5998 0,-6.12073 2.16876,-11.34721 6.50414,-15.68261 4.37648,-4.37752 9.62718,-6.56839 15.74687,-6.56839 h 11.73166 c 2.12452,0 3.95304,0.76575 5.48349,2.29831 1.52939,1.52834 2.29515,3.35793 2.29515,5.48032 v 0.12745 c 0,2.16876 -0.76576,3.97622 -2.29515,5.4203 -1.53045,1.52834 -3.35897,2.29619 -5.48349,2.29619 z" />
-      <path d="m 630.5677,134.55118 c 10.1159,0 18.76456,3.59177 25.94912,10.77422 7.18246,7.18563 10.77422,15.83429 10.77422,25.9502 0,10.11695 -3.59176,18.76561 -10.77422,25.95018 C 649.33331,204.40929 640.6836,208 630.5677,208 c -10.11592,0 -18.76563,-3.58965 -25.9481,-10.77422 -7.18351,-7.18351 -10.77526,-15.83217 -10.77526,-25.95018 0,-10.11591 3.59175,-18.76352 10.77526,-25.9502 7.18247,-7.18245 15.83218,-10.77422 25.9481,-10.77422 z m 0,15.7458 c -5.86585,0 -10.86059,2.06343 -14.98322,6.18604 -4.08155,4.12473 -6.12178,9.11949 -6.12178,14.98322 0,5.8237 2.04023,10.79633 6.12178,14.91896 4.12263,4.12263 9.11632,6.18393 14.98322,6.18393 5.82264,0 10.79527,-2.0613 14.91896,-6.18393 4.12261,-4.12263 6.18393,-9.09526 6.18393,-14.91896 0,-5.86267 -2.06132,-10.85849 -6.18393,-14.98322 -4.12369,-4.12261 -9.09527,-6.18604 -14.91896,-6.18604 z" />
-      <path d="m 724.0345,136.27333 c 3.61388,1.14811 5.4203,3.61282 5.4203,7.39523 v 0.32125 c 0,2.59008 -1.04278,4.65138 -3.12516,6.18394 -1.44512,1.01854 -2.93343,1.52834 -4.46178,1.52834 -0.80894,0 -1.63789,-0.12745 -2.48684,-0.38235 -2.08344,-0.67938 -4.23007,-1.02276 -6.43883,-1.02276 -5.86585,0 -10.86165,2.06343 -14.98322,6.18604 -4.08154,4.12473 -6.12074,9.11949 -6.12074,14.98322 0,5.8237 2.0392,10.79633 6.12074,14.91896 4.12157,4.12263 9.11633,6.18393 14.98322,6.18393 2.20982,0 4.35645,-0.33915 6.43883,-1.02065 0.80683,-0.25489 1.61471,-0.38234 2.42259,-0.38234 1.57046,0 3.08197,0.5119 4.52709,1.53254 2.08238,1.52835 3.12514,3.61283 3.12514,6.24819 0,3.74027 -1.80746,6.205 -5.42028,7.39524 -3.56964,1.10491 -7.26673,1.65579 -11.09232,1.65579 -10.11591,0 -18.76562,-3.58965 -25.95019,-10.77423 -7.1814,-7.18351 -10.77422,-15.83217 -10.77422,-25.95018 0,-10.11592 3.59176,-18.76352 10.77422,-25.9502 7.18351,-7.1814 15.83322,-10.77422 25.95019,-10.77422 3.82348,0.002 7.52162,0.57827 11.09126,1.72426 z" />
-      <path d="m 748.19829,108.41246 c 2.08132,0 3.88773,0.74469 5.42029,2.23194 1.5294,1.52834 2.29514,3.35793 2.29514,5.48244 v 44.18284 h 2.42259 c 5.44031,0 10.17805,-1.80642 14.21852,-5.4203 3.95198,-3.61283 6.20394,-8.07461 6.75693,-13.38852 0.25491,-1.99705 1.10597,-3.63494 2.5511,-4.90837 1.44408,-1.35982 3.16517,-2.04131 5.16328,-2.04131 h 0.19066 c 2.25405,0 4.14578,0.85212 5.67517,2.55109 1.36087,1.48727 2.04026,3.20942 2.04026,5.16329 0,0.25491 -0.0222,0.53298 -0.0632,0.82895 -1.02064,10.66889 -5.10115,18.65923 -12.24147,23.97103 3.73922,2.29831 7.18246,6.18604 10.32973,11.66849 3.27155,5.65306 4.90944,11.75483 4.90944,18.29688 v 3.25471 c 0,2.16664 -0.7668,3.972 -2.29515,5.41713 -1.53255,1.53256 -3.33791,2.29619 -5.4203,2.29619 h -0.1917 c -2.08342,0 -3.88879,-0.76363 -5.41922,-2.29619 -1.53045,-1.44408 -2.29514,-3.25049 -2.29514,-5.41713 v -3.25471 c -0.0442,-5.77629 -2.10555,-10.73102 -6.185,-14.85575 -4.12367,-4.07944 -9.09736,-6.11863 -14.91896,-6.11863 h -5.22754 v 24.22804 c 0,2.16664 -0.76574,3.97199 -2.29514,5.41712 -1.5315,1.53256 -3.33897,2.29621 -5.42028,2.29621 h -0.19381 c -2.08237,0 -3.88668,-0.76365 -5.41819,-2.29621 -1.52939,-1.44407 -2.29515,-3.25048 -2.29515,-5.41712 v -84.15879 c 0,-2.12556 0.76576,-3.95408 2.29515,-5.48243 1.53045,-1.48727 3.33582,-2.23195 5.41819,-2.23195 h 0.19381 z" />
-      <path d="m 876.85801,155.97534 c 0.5098,1.06173 0.76469,2.14346 0.76469,3.25048 0,0.8932 -0.17063,1.78536 -0.50874,2.67854 -0.72362,1.99707 -2.08342,3.4422 -4.08049,4.33434 -5.95115,2.67854 -13.77191,6.20711 -23.46229,10.58463 -12.02869,5.43924 -19.08476,8.64866 -21.16715,9.62823 3.22838,4.07944 8.26632,6.11863 15.11066,6.11863 4.54606,0 8.66973,-1.33769 12.36893,-4.01625 3.61176,-2.63534 6.14075,-6.03541 7.58587,-10.20227 1.23238,-3.48538 3.6992,-5.22754 7.39524,-5.22754 2.63536,0 4.73985,1.10702 6.31348,3.31369 0.97536,1.36193 1.46515,2.78598 1.46515,4.27325 0,0.8932 -0.16958,1.80641 -0.5098,2.74069 -2.50791,7.26988 -6.9065,13.13573 -13.19681,17.59961 -6.37563,4.63031 -13.51598,6.94757 -21.42206,6.94757 -10.1159,0 -18.76561,-3.58965 -25.94808,-10.7742 -7.18351,-7.18353 -10.77526,-15.83219 -10.77526,-25.9502 0,-10.11591 3.59175,-18.76351 10.77526,-25.95019 7.18141,-7.1814 15.83218,-10.77422 25.94808,-10.77422 7.30887,0 13.98364,1.99916 20.01906,5.99223 5.99223,3.91512 10.43294,9.05524 13.32426,15.43298 z m -33.34436,-5.67836 c -5.86479,0 -10.86059,2.06343 -14.98322,6.18604 -4.08049,4.12473 -6.12074,9.11949 -6.12074,14.98322 v 0.44661 l 35.63952,-16.00282 c -3.14516,-3.73817 -7.99034,-5.61305 -14.53556,-5.61305 z" />
-      <path d="m 898.02411,108.41246 c 2.08238,0 3.88879,0.74469 5.42028,2.23194 1.52939,1.52834 2.29515,3.35793 2.29515,5.48244 v 18.42434 h 9.56398 c 2.08237,0 3.88772,0.76575 5.42028,2.29831 1.5294,1.52834 2.29304,3.35793 2.29304,5.48032 v 0.12745 c 0,2.16876 -0.76364,3.97621 -2.29304,5.4203 -1.5315,1.52834 -3.33791,2.29619 -5.42028,2.29619 h -9.56398 v 37.80405 c 0,1.23446 0.42343,2.27724 1.27554,3.12514 0.85002,0.85212 1.9128,1.27555 3.1873,1.27555 h 5.10114 c 2.08237,0 3.88772,0.76574 5.42028,2.29619 1.5294,1.53045 2.29304,3.35898 2.29304,5.48243 v 0.12954 c 0,2.16664 -0.76364,3.97199 -2.29304,5.41711 C 919.1923,207.23635 917.38589,208 915.30352,208 h -5.10114 c -5.52563,0 -10.26442,-1.95387 -14.21746,-5.86478 -3.91196,-3.95198 -5.86479,-8.67078 -5.86479,-14.15532 v -71.85095 c 0,-2.12558 0.7647,-3.9541 2.29515,-5.48245 1.53045,-1.48725 3.33686,-2.23193 5.41924,-2.23193 h 0.18959 z" />
-      <path d="m 951.70877,150.17375 c -1.87066,0 -3.44324,0.6362 -4.71773,1.9107 -1.27556,1.31872 -1.91281,2.89025 -1.91281,4.71773 0,2.5511 1.23238,4.46389 3.69711,5.73733 0.8521,0.46872 4.40067,1.53045 10.64886,3.18834 5.05691,1.44619 8.81825,3.33686 11.28402,5.67413 3.52751,3.35898 5.2918,8.14097 5.2918,14.34703 0,6.11862 -2.16876,11.36829 -6.5031,15.74581 -4.37752,4.33644 -9.62822,6.50308 -15.74789,6.50308 h -16.64007 c -2.08342,0 -3.88879,-0.76365 -5.42028,-2.29621 -1.53045,-1.44407 -2.2941,-3.25048 -2.2941,-5.41712 v -0.12953 c 0,-2.12345 0.76365,-3.95198 2.2941,-5.48243 1.53045,-1.53045 3.33686,-2.29619 5.42028,-2.29619 h 17.2773 c 1.86962,0 3.4443,-0.6362 4.71775,-1.9107 1.27554,-1.27554 1.91279,-2.84707 1.91279,-4.71774 0,-2.33937 -1.2113,-4.10366 -3.63283,-5.29073 -0.63936,-0.30018 -4.209,-1.36192 -10.71208,-3.18834 -5.05901,-1.48725 -8.8214,-3.44535 -11.28613,-5.8669 -3.52856,-3.44217 -5.29073,-8.30949 -5.29073,-14.5998 0,-6.12073 2.16875,-11.34721 6.50413,-15.68261 4.37647,-4.37752 9.62718,-6.56839 15.74791,-6.56839 h 11.73063 c 2.1266,0 3.95304,0.76575 5.48243,2.29831 1.53045,1.52834 2.29514,3.35793 2.29514,5.48032 v 0.12745 c 0,2.16876 -0.76469,3.97622 -2.29514,5.4203 -1.52939,1.52834 -3.35687,2.29619 -5.48243,2.29619 z" />
-    </g>
-  </g>
-</svg>
diff --git a/tests/wpt/tests/tools/third_party/websockets/logo/icon.svg b/tests/wpt/tests/tools/third_party/websockets/logo/icon.svg
deleted file mode 100644
index cb760940aa1..00000000000
--- a/tests/wpt/tests/tools/third_party/websockets/logo/icon.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewBox="0 0 256 256">
-  <linearGradient id="w" x1="0" y1="0" x2="0.6667" y2="0.6667">
-    <stop offset="0%" stop-color="#ffe873" />
-    <stop offset="100%" stop-color="#ffd43b" />
-  </linearGradient>
-  <linearGradient id="s" x1="0" y1="0" x2="0.6667" y2="0.6667">
-    <stop offset="0%" stop-color="#5a9fd4" />
-    <stop offset="100%" stop-color="#306998" />
-  </linearGradient>
-  <g>
-    <path fill="url(#w)" d="m 151.60708,154.81618 c -0.43704,0.0747 -0.88656,0.12978 -1.35572,0.14933 -2.45813,0.0764 -4.25357,-0.58665 -5.82335,-2.15107 l -8.89246,-8.85942 -11.23464,-11.19805 -36.040757,-35.919452 c -3.43568,-3.42217 -7.332485,-5.347474 -11.589626,-5.723468 -2.229803,-0.198219 -4.473877,0.03111 -6.640354,0.675545 -3.242133,0.944875 -6.135526,2.664848 -8.593662,5.116366 -3.834369,3.819499 -5.86349,8.414979 -5.875977,13.287799 -0.06065,4.95281 1.951523,9.60074 5.808192,13.44424 l 55.622894,55.43648 c 1.82219,1.84175 2.65971,3.79549 2.63384,6.14568 l 0.004,0.208 c 0.0527,2.43196 -0.75991,4.34571 -2.6267,6.20612 -1.78028,1.77598 -3.8094,2.65241 -6.30945,2.75552 -2.45814,0.0764 -4.25446,-0.58844 -5.82514,-2.15286 L 48.702551,136.2618 c -5.214172,-5.19459 -11.702899,-6.98745 -18.22998,-5.04881 -3.245701,0.9431 -6.135527,2.66307 -8.595446,5.11459 -3.83437,3.82127 -5.865275,8.41676 -5.875978,13.28957 -0.05619,4.95281 1.951524,9.60252 5.806409,13.4478 l 58.10689,57.90577 c 8.319842,8.29143 19.340421,11.9376 32.743314,10.83806 12.57967,-1.02043 23.02317,-5.5848 31.03441,-13.57313 7.51265,-7.4861 11.96423,-16.35175 13.28695,-26.42537 10.47206,-1.68264 19.29494,-6.04524 26.27512,-13.00158 4.01364,-3.99994 7.14963,-8.3972 9.40531,-13.16157 -14.15569,-0.39911 -28.23645,-4.00972 -41.05247,-10.83095 z" />
-    <path fill="url(#s)" d="m 196.96038,146.11854 c 0.10259,-12.84514 -4.43017,-23.98541 -13.50635,-33.1346 L 147.57292,77.225374 c -0.24349,-0.240885 -0.46469,-0.487992 -0.68678,-0.744877 -1.48416,-1.739529 -2.18788,-3.583056 -2.21018,-5.807022 -0.0259,-2.470184 0.84911,-4.508375 2.7605,-6.407902 1.91406,-1.909304 3.8531,-2.737735 6.36564,-2.684403 2.53662,0.024 4.62728,0.943097 6.57257,2.881734 l 60.59178,60.384846 12.11408,-12.06914 c 1.12203,-0.90755 1.95777,-1.76887 2.87823,-2.93418 5.91879,-7.51544 5.26947,-18.272609 -1.51003,-25.02895 L 187.20456,37.727314 c -9.19393,-9.157192 -20.36703,-13.776677 -33.16789,-13.7269 -12.94266,-0.05067 -24.14163,4.548375 -33.28739,13.662901 -9.02892,8.996307 -13.64015,19.93925 -13.7008,32.487501 l -0.004,0.14222 c -0.002,0.167998 -0.005,0.336884 -0.005,0.506659 -0.091,12.232701 4.10729,22.95787 12.48154,31.881285 0.40226,0.43022 0.80274,0.85777 1.22283,1.27821 l 35.75088,35.62612 c 1.88909,1.88174 2.71769,3.79638 2.69361,6.20968 l 0.003,0.20977 c 0.0527,2.43197 -0.76081,4.34571 -2.6276,6.20791 -1.44759,1.43909 -3.06286,2.27818 -4.9564,2.60262 12.81601,6.82123 26.89677,10.43184 41.05246,10.83362 2.80598,-5.92525 4.2509,-12.41848 4.29906,-19.43526 z" />
-    <path fill="#ffffff" d="m 215.68093,93.181574 c 2.84701,-2.838179 7.46359,-2.836401 10.30883,0 2.84433,2.834623 2.84612,7.435446 -0.002,10.270956 -2.84345,2.83818 -7.46271,2.83818 -10.30704,0 -2.84524,-2.83551 -2.84791,-7.435444 0,-10.270956 z" />
-  </g>
-</svg>
diff --git a/tests/wpt/tests/tools/third_party/websockets/logo/old.svg b/tests/wpt/tests/tools/third_party/websockets/logo/old.svg
deleted file mode 100644
index a073139e331..00000000000
--- a/tests/wpt/tests/tools/third_party/websockets/logo/old.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="360" height="120" viewBox="0 0 21 7">
-  <linearGradient id="w" x1="0" y1="0" x2="1" y2="1">
-    <stop offset="0%" stop-color="#5a9fd4" />
-    <stop offset="100%" stop-color="#306998" />
-  </linearGradient>
-  <linearGradient id="s" x1="0" y1="0" x2="1" y2="1">
-    <stop offset="0%" stop-color="#ffe873" />
-    <stop offset="100%" stop-color="#ffd43b" />
-  </linearGradient>
-  <polyline fill="none" stroke="url(#w)" stroke-linecap="round" stroke-linejoin="round"
-            points="1,1 1,5 5,5 5,1 5,5 9,5 9,1"/>
-  <polyline fill="none" stroke="url(#s)" stroke-linecap="round" stroke-linejoin="round"
-            points="19,1 11,1 11,3 19,3 19,5 11,5"/>
-</svg>
diff --git a/tests/wpt/tests/tools/third_party/websockets/logo/tidelift.png b/tests/wpt/tests/tools/third_party/websockets/logo/tidelift.png
deleted file mode 100644
index 317dc4d9852..00000000000
Binary files a/tests/wpt/tests/tools/third_party/websockets/logo/tidelift.png and /dev/null differ
diff --git a/tests/wpt/tests/tools/third_party/websockets/logo/vertical.svg b/tests/wpt/tests/tools/third_party/websockets/logo/vertical.svg
deleted file mode 100644
index b07fb223873..00000000000
--- a/tests/wpt/tests/tools/third_party/websockets/logo/vertical.svg
+++ /dev/null
@@ -1,31 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="480" height="320" viewBox="0 0 480 320">
-  <linearGradient id="w" x1="0.2333" y1="0" x2="0.5889" y2="0.5333">
-    <stop offset="0%" stop-color="#ffe873" />
-    <stop offset="100%" stop-color="#ffd43b" />
-  </linearGradient>
-  <linearGradient id="s" x1="0.2333" y1="0" x2="0.5889" y2="0.5333">
-    <stop offset="0%" stop-color="#5a9fd4" />
-    <stop offset="100%" stop-color="#306998" />
-  </linearGradient>
-  <g>
-    <path fill="url(#w)" d="m 263.40708,146.81618 c -0.43704,0.0747 -0.88656,0.12978 -1.35572,0.14933 -2.45813,0.0764 -4.25357,-0.58665 -5.82335,-2.15107 l -8.89246,-8.85942 -11.23464,-11.19805 -36.04076,-35.919454 c -3.43568,-3.42217 -7.33248,-5.347474 -11.58962,-5.723468 -2.22981,-0.198219 -4.47388,0.03111 -6.64036,0.675545 -3.24213,0.944875 -6.13552,2.664848 -8.59366,5.116366 -3.83437,3.819499 -5.86349,8.414979 -5.87598,13.287801 -0.0607,4.95281 1.95153,9.60074 5.8082,13.44424 l 55.62289,55.43648 c 1.82219,1.84175 2.65971,3.79549 2.63384,6.14568 l 0.004,0.208 c 0.0527,2.43196 -0.75991,4.34571 -2.6267,6.20612 -1.78028,1.77598 -3.8094,2.65241 -6.30945,2.75552 -2.45814,0.0764 -4.25446,-0.58844 -5.82514,-2.15286 L 160.50255,128.2618 c -5.21417,-5.19459 -11.7029,-6.98745 -18.22998,-5.04881 -3.2457,0.9431 -6.13553,2.66307 -8.59545,5.11459 -3.83437,3.82127 -5.86527,8.41676 -5.87597,13.28957 -0.0562,4.95281 1.95152,9.60252 5.80641,13.4478 l 58.10689,57.90577 c 8.31984,8.29143 19.34042,11.9376 32.74331,10.83806 12.57967,-1.02043 23.02317,-5.5848 31.03441,-13.57313 7.51265,-7.4861 11.96423,-16.35175 13.28695,-26.42537 10.47206,-1.68264 19.29494,-6.04524 26.27512,-13.00158 4.01364,-3.99994 7.14963,-8.3972 9.40531,-13.16157 -14.15569,-0.39911 -28.23645,-4.00972 -41.05247,-10.83095 z" />
-    <path fill="url(#s)" d="m 308.76038,138.11854 c 0.10259,-12.84514 -4.43017,-23.98541 -13.50635,-33.1346 L 259.37292,69.225372 c -0.24349,-0.240885 -0.46469,-0.487992 -0.68678,-0.744877 -1.48416,-1.739529 -2.18788,-3.583056 -2.21018,-5.807022 -0.0259,-2.470184 0.84911,-4.508375 2.7605,-6.407902 1.91406,-1.909304 3.8531,-2.737735 6.36564,-2.684403 2.53662,0.024 4.62728,0.943097 6.57257,2.881734 l 60.59178,60.384848 12.11408,-12.06914 c 1.12203,-0.90755 1.95777,-1.76887 2.87823,-2.93418 5.91879,-7.515442 5.26947,-18.272611 -1.51003,-25.028952 L 299.00456,29.727312 c -9.19393,-9.157192 -20.36703,-13.776677 -33.16789,-13.7269 -12.94266,-0.05067 -24.14163,4.548375 -33.28739,13.662901 -9.02892,8.996307 -13.64015,19.93925 -13.7008,32.487501 l -0.004,0.14222 c -0.002,0.167998 -0.005,0.336884 -0.005,0.506659 -0.091,12.232701 4.10729,22.95787 12.48154,31.881285 0.40226,0.43022 0.80274,0.85777 1.22283,1.27821 l 35.75088,35.626122 c 1.88909,1.88174 2.71769,3.79638 2.69361,6.20968 l 0.003,0.20977 c 0.0527,2.43197 -0.76081,4.34571 -2.6276,6.20791 -1.44759,1.43909 -3.06286,2.27818 -4.9564,2.60262 12.81601,6.82123 26.89677,10.43184 41.05246,10.83362 2.80598,-5.92525 4.2509,-12.41848 4.29906,-19.43526 z" />
-    <path fill="#ffffff" d="m 327.48093,85.181572 c 2.84701,-2.838179 7.46359,-2.836401 10.30883,0 2.84433,2.834623 2.84612,7.435446 -0.002,10.270956 -2.84345,2.83818 -7.46271,2.83818 -10.30704,0 -2.84524,-2.83551 -2.84791,-7.435444 0,-10.270956 z" />
-  </g>
-  <g>
-    <g fill="#ffd43b">
-      <path d="m 25.719398,284.91839 c 0,2.59075 0.912299,4.79875 2.736898,6.62269 1.824599,1.82657 4.033255,2.73821 6.625313,2.73821 2.591402,0 4.800058,-0.91164 6.624002,-2.73821 1.825254,-1.82394 2.738209,-4.03194 2.738209,-6.62269 v -21.77984 c 0,-1.32126 0.475811,-2.45901 1.42809,-3.40998 0.952278,-0.95359 2.089375,-1.43006 3.411947,-1.43006 h 0.0793 c 1.348132,0 2.471467,0.47647 3.371969,1.43006 0.952278,0.95097 1.428745,2.08938 1.428745,3.40998 v 21.77984 c 0,2.59075 0.912299,4.79875 2.738209,6.62269 1.823944,1.82657 4.031289,2.73821 6.624002,2.73821 2.618274,0 4.839382,-0.91164 6.663981,-2.73821 1.825254,-1.82394 2.738209,-4.03194 2.738209,-6.62269 v -21.77984 c 0,-1.32126 0.475156,-2.45901 1.42809,-3.40998 0.897881,-0.95359 2.022526,-1.43006 3.371969,-1.43006 h 0.07865 c 1.323228,0 2.460325,0.47647 3.411948,1.43006 0.926062,0.95097 1.388766,2.08938 1.388766,3.40998 v 21.77984 c 0,5.26211 -1.865233,9.75807 -5.593077,13.48657 -3.729156,3.7285 -8.22577,5.59373 -13.487876,5.59373 -6.294998,0 -11.028207,-2.08807 -14.202904,-6.26747 -3.199602,4.1794 -7.94723,6.26747 -14.240916,6.26747 -5.262763,0 -9.759377,-1.86523 -13.487876,-5.59373 C 17.866544,294.67646 16,290.18115 16,284.91839 v -21.77984 c 0,-1.32126 0.476467,-2.45901 1.428745,-3.40998 0.951623,-0.95359 2.075612,-1.43006 3.371969,-1.43006 h 0.11928 c 1.295702,0 2.419036,0.47647 3.372625,1.43006 0.950967,0.95097 1.427434,2.08938 1.427434,3.40998 v 21.77984 z" />
-      <path d="m 132.94801,271.6291 c 0.31786,0.66063 0.47712,1.33371 0.47712,2.02252 0,0.55577 -0.10551,1.11089 -0.3172,1.66665 -0.45026,1.24262 -1.29636,2.14181 -2.53898,2.69692 -3.70293,1.66665 -8.56853,3.8622 -14.59875,6.58599 -7.48453,3.38442 -11.87497,5.38139 -13.17067,5.9909 2.00942,2.53832 5.14414,3.80715 9.40219,3.80715 2.82931,0 5.39515,-0.83234 7.69556,-2.499 2.24798,-1.63977 3.82222,-3.75537 4.72141,-6.34808 0.76746,-2.16868 2.30107,-3.25269 4.60148,-3.25269 1.63912,0 2.94859,0.68881 3.92708,2.06185 0.6082,0.84742 0.9123,1.7335 0.9123,2.65891 0,0.55577 -0.10552,1.12399 -0.31655,1.70532 -1.56048,4.52348 -4.29869,8.17334 -8.21135,10.95087 -3.96706,2.88108 -8.41059,4.32293 -13.32993,4.32293 -6.29434,0 -11.67639,-2.23356 -16.145474,-6.70395 -4.469743,-4.46975 -6.704615,-9.85114 -6.704615,-16.14679 0,-6.29434 2.234872,-11.67507 6.704615,-16.14678 4.468434,-4.46843 9.851134,-6.70396 16.145474,-6.70396 4.54773,0 8.70027,1.24392 12.45629,3.7285 3.72785,2.43607 6.49162,5.63437 8.29,9.60274 z m -20.74695,-3.5332 c -3.64985,0 -6.7577,1.28391 -9.32289,3.84909 -2.53897,2.5665 -3.808452,5.67435 -3.808452,9.32289 v 0.27789 l 22.175692,-9.95731 c -1.95633,-2.32597 -4.97177,-3.49256 -9.04435,-3.49256 z" />
-      <path d="m 146.11999,242.03442 c 1.2957,0 2.41904,0.46336 3.37197,1.38876 0.95228,0.95097 1.42874,2.08938 1.42874,3.4113 v 15.4311 c 2.98792,-2.64318 7.36525,-3.96707 13.13004,-3.96707 6.29434,0 11.67638,2.23488 16.14613,6.70396 4.46908,4.47106 6.70461,9.85245 6.70461,16.14679 0,6.29499 -2.23553,11.67638 -6.70461,16.14678 -4.46909,4.4704 -9.85113,6.70396 -16.14613,6.70396 -6.295,0 -11.66262,-2.22111 -16.10549,-6.66529 -4.4704,-4.41469 -6.71838,-9.77052 -6.7446,-16.06617 v -34.43341 c 0,-1.32257 0.47647,-2.46032 1.42875,-3.41129 0.95162,-0.92541 2.07561,-1.38877 3.37197,-1.38877 h 0.11862 z m 17.93009,26.06148 c -3.64919,0 -6.75704,1.28391 -9.32288,3.84909 -2.53767,2.5665 -3.80781,5.67435 -3.80781,9.32289 0,3.62364 1.27014,6.71772 3.80781,9.28291 2.56584,2.56519 5.67303,3.84778 9.32288,3.84778 3.62364,0 6.71773,-1.28259 9.28357,-3.84778 2.56387,-2.56519 3.84712,-5.65927 3.84712,-9.28291 0,-3.64788 -1.28325,-6.75639 -3.84712,-9.32289 -2.56584,-2.56518 -5.65927,-3.84909 -9.28357,-3.84909 z" />
-    </g>
-    <g fill="#306998">
-      <path d="m 205.94246,268.01922 c -1.16397,0 -2.14247,0.39586 -2.93548,1.18888 -0.79368,0.82054 -1.19019,1.79838 -1.19019,2.93548 0,1.58735 0.76681,2.77753 2.30172,3.56989 0.52825,0.29165 2.7369,0.95228 6.62466,1.98386 3.14717,0.89985 5.48691,2.07627 7.02051,3.53057 2.19621,2.09003 3.29267,5.06549 3.29267,8.92704 0,3.80714 -1.34879,7.0736 -4.04571,9.79739 -2.72444,2.69823 -5.9909,4.04636 -9.7987,4.04636 h -10.35381 c -1.29701,0 -2.41969,-0.47516 -3.37262,-1.42875 -0.95228,-0.89853 -1.42875,-2.02252 -1.42875,-3.37065 v -0.0806 c 0,-1.32126 0.47647,-2.45901 1.42875,-3.41129 0.95227,-0.95228 2.07561,-1.42874 3.37262,-1.42874 h 10.75032 c 1.16331,0 2.14246,-0.39586 2.93548,-1.18888 0.79368,-0.79367 1.19019,-1.77151 1.19019,-2.93548 0,-1.45561 -0.7537,-2.55339 -2.26044,-3.29201 -0.3965,-0.18678 -2.61892,-0.84742 -6.66529,-1.98386 -3.14782,-0.9254 -5.48887,-2.14377 -7.02247,-3.65051 -2.19555,-2.1418 -3.29202,-5.17035 -3.29202,-9.08432 0,-3.80846 1.34945,-7.06049 4.04702,-9.75807 2.72314,-2.72379 5.99024,-4.087 9.79805,-4.087 h 7.2997 c 1.32192,0 2.45967,0.47647 3.41195,1.43006 0.95162,0.95097 1.42809,2.08938 1.42809,3.40998 v 0.0793 c 0,1.34945 -0.47647,2.47409 -1.42809,3.37263 -0.95228,0.95097 -2.09003,1.42874 -3.41195,1.42874 z" />
-      <path d="m 249.06434,258.29851 c 6.29434,0 11.67573,2.23488 16.14612,6.70396 4.46909,4.47106 6.70396,9.85245 6.70396,16.14679 0,6.29499 -2.23487,11.67638 -6.70396,16.14678 -4.46974,4.46974 -9.85178,6.70396 -16.14612,6.70396 -6.29435,0 -11.67639,-2.23356 -16.14548,-6.70396 -4.46974,-4.46974 -6.70461,-9.85113 -6.70461,-16.14678 0,-6.29434 2.23487,-11.67508 6.70461,-16.14679 4.46909,-4.46908 9.85113,-6.70396 16.14548,-6.70396 z m 0,9.79739 c -3.64986,0 -6.7577,1.28391 -9.32289,3.84909 -2.53963,2.5665 -3.80911,5.67435 -3.80911,9.32289 0,3.62364 1.26948,6.71772 3.80911,9.28291 2.56519,2.56519 5.67238,3.84778 9.32289,3.84778 3.62298,0 6.71706,-1.28259 9.28291,-3.84778 2.56518,-2.56519 3.84778,-5.65927 3.84778,-9.28291 0,-3.64788 -1.2826,-6.75639 -3.84778,-9.32289 -2.56585,-2.56518 -5.65928,-3.84909 -9.28291,-3.84909 z" />
-      <path d="m 307.22146,259.37007 c 2.24864,0.71438 3.37263,2.24798 3.37263,4.60148 v 0.19989 c 0,1.6116 -0.64884,2.89419 -1.94454,3.84778 -0.89919,0.63376 -1.82525,0.95097 -2.77622,0.95097 -0.50334,0 -1.01913,-0.0793 -1.54737,-0.23791 -1.29636,-0.42272 -2.63204,-0.63638 -4.00638,-0.63638 -3.64986,0 -6.75836,1.28391 -9.32289,3.84909 -2.53963,2.5665 -3.80846,5.67435 -3.80846,9.32289 0,3.62364 1.26883,6.71772 3.80846,9.28291 2.56453,2.56519 5.67238,3.84778 9.32289,3.84778 1.375,0 2.71068,-0.21103 4.00638,-0.63507 0.50203,-0.1586 1.00471,-0.2379 1.50739,-0.2379 0.97718,0 1.91767,0.31851 2.81686,0.95358 1.2957,0.95097 1.94453,2.24798 1.94453,3.88776 0,2.32728 -1.12464,3.86089 -3.37262,4.60148 -2.22111,0.6875 -4.52152,1.03027 -6.90189,1.03027 -6.29434,0 -11.67638,-2.23356 -16.14678,-6.70396 -4.46843,-4.46974 -6.70396,-9.85113 -6.70396,-16.14678 0,-6.29435 2.23487,-11.67508 6.70396,-16.14679 4.46974,-4.46843 9.85178,-6.70396 16.14678,-6.70396 2.37906,0.001 4.68012,0.35981 6.90123,1.07287 z" />
-      <path d="m 322.25671,242.03442 c 1.29504,0 2.41903,0.46336 3.37262,1.38876 0.95163,0.95097 1.42809,2.08938 1.42809,3.4113 v 27.49154 h 1.50739 c 3.38508,0 6.33301,-1.12399 8.84708,-3.37263 2.45901,-2.24798 3.86023,-5.0242 4.20431,-8.33063 0.15861,-1.24261 0.68816,-2.26174 1.58735,-3.0541 0.89854,-0.84611 1.96944,-1.27015 3.21271,-1.27015 h 0.11863 c 1.40252,0 2.5796,0.53021 3.53122,1.58735 0.84676,0.92541 1.26949,1.99697 1.26949,3.21271 0,0.15861 -0.0138,0.33163 -0.0393,0.51579 -0.63507,6.63842 -3.17405,11.61019 -7.61692,14.91531 2.32663,1.43006 4.46909,3.84909 6.42739,7.26039 2.03563,3.51746 3.05476,7.31412 3.05476,11.38473 v 2.02515 c 0,1.34813 -0.47712,2.47147 -1.42809,3.37066 -0.95359,0.95359 -2.07692,1.42874 -3.37263,1.42874 h -0.11928 c -1.29635,0 -2.41969,-0.47515 -3.37196,-1.42874 -0.95228,-0.89854 -1.42809,-2.02253 -1.42809,-3.37066 v -2.02515 c -0.0275,-3.59414 -1.31012,-6.67708 -3.84844,-9.24358 -2.56584,-2.53832 -5.66058,-3.80715 -9.28291,-3.80715 h -3.25269 v 15.07523 c 0,1.34813 -0.47646,2.47146 -1.42809,3.37065 -0.95293,0.95359 -2.07758,1.42875 -3.37262,1.42875 h -0.12059 c -1.2957,0 -2.41838,-0.47516 -3.37132,-1.42875 -0.95162,-0.89853 -1.42809,-2.02252 -1.42809,-3.37065 v -52.36547 c 0,-1.32257 0.47647,-2.46032 1.42809,-3.41129 0.95228,-0.92541 2.07562,-1.38877 3.37132,-1.38877 h 0.12059 z" />
-      <path d="m 402.31164,271.6291 c 0.31721,0.66063 0.47581,1.33371 0.47581,2.02252 0,0.55577 -0.10617,1.11089 -0.31655,1.66665 -0.45025,1.24262 -1.29635,2.14181 -2.53897,2.69692 -3.70294,1.66665 -8.56919,3.8622 -14.59876,6.58599 -7.48452,3.38442 -11.87496,5.38139 -13.17067,5.9909 2.00877,2.53832 5.14349,3.80715 9.40219,3.80715 2.82866,0 5.3945,-0.83234 7.69622,-2.499 2.24732,-1.63977 3.82091,-3.75537 4.7201,-6.34808 0.76681,-2.16868 2.30172,-3.25269 4.60148,-3.25269 1.63978,0 2.94924,0.68881 3.92839,2.06185 0.60689,0.84742 0.91165,1.7335 0.91165,2.65891 0,0.55577 -0.10552,1.12399 -0.31721,1.70532 -1.56048,4.52348 -4.29738,8.17334 -8.21135,10.95087 -3.96706,2.88108 -8.40994,4.32293 -13.32928,4.32293 -6.29434,0 -11.67638,-2.23356 -16.14547,-6.70395 -4.46974,-4.46975 -6.70461,-9.85114 -6.70461,-16.14679 0,-6.29434 2.23487,-11.67507 6.70461,-16.14678 4.46843,-4.46843 9.85113,-6.70396 16.14547,-6.70396 4.54774,0 8.70093,1.24392 12.4563,3.7285 3.7285,2.43607 6.49161,5.63437 8.29065,9.60274 z m -20.7476,-3.5332 c -3.6492,0 -6.7577,1.28391 -9.32289,3.84909 -2.53897,2.5665 -3.80846,5.67435 -3.80846,9.32289 v 0.27789 l 22.1757,-9.95731 c -1.95699,-2.32597 -4.97177,-3.49256 -9.04435,-3.49256 z" />
-      <path d="m 415.48166,242.03442 c 1.2957,0 2.41969,0.46336 3.37262,1.38876 0.95162,0.95097 1.42809,2.08938 1.42809,3.4113 v 11.46403 h 5.95092 c 1.2957,0 2.41903,0.47647 3.37262,1.43006 0.95163,0.95097 1.42678,2.08938 1.42678,3.40998 v 0.0793 c 0,1.34945 -0.47515,2.47409 -1.42678,3.37263 -0.95293,0.95097 -2.07692,1.42874 -3.37262,1.42874 h -5.95092 v 23.52252 c 0,0.76811 0.26347,1.41695 0.79367,1.94453 0.5289,0.53021 1.19019,0.79368 1.98321,0.79368 h 3.17404 c 1.2957,0 2.41903,0.47646 3.37262,1.42874 0.95163,0.95228 1.42678,2.09003 1.42678,3.41129 v 0.0806 c 0,1.34813 -0.47515,2.47146 -1.42678,3.37065 C 428.65298,303.52484 427.52899,304 426.23329,304 h -3.17404 c -3.43817,0 -6.38675,-1.21574 -8.84642,-3.6492 -2.43411,-2.45901 -3.6492,-5.39515 -3.6492,-8.80775 v -44.70726 c 0,-1.32258 0.47581,-2.46033 1.42809,-3.4113 0.95228,-0.9254 2.07627,-1.38876 3.37197,-1.38876 h 0.11797 z" />
-      <path d="m 448.88545,268.01922 c -1.16397,0 -2.14246,0.39586 -2.93548,1.18888 -0.79368,0.82054 -1.19019,1.79838 -1.19019,2.93548 0,1.58735 0.76681,2.77753 2.30042,3.56989 0.5302,0.29165 2.7382,0.95228 6.62596,1.98386 3.14652,0.89985 5.48691,2.07627 7.02117,3.53057 2.19489,2.09003 3.29267,5.06549 3.29267,8.92704 0,3.80714 -1.34945,7.0736 -4.04637,9.79739 -2.72379,2.69823 -5.99089,4.04636 -9.79869,4.04636 h -10.35382 c -1.29635,0 -2.41969,-0.47516 -3.37262,-1.42875 -0.95228,-0.89853 -1.42744,-2.02252 -1.42744,-3.37065 v -0.0806 c 0,-1.32126 0.47516,-2.45901 1.42744,-3.41129 0.95228,-0.95228 2.07627,-1.42874 3.37262,-1.42874 h 10.75032 c 1.16332,0 2.14312,-0.39586 2.93549,-1.18888 0.79367,-0.79367 1.19018,-1.77151 1.19018,-2.93548 0,-1.45561 -0.7537,-2.55339 -2.26043,-3.29201 -0.39782,-0.18678 -2.61893,-0.84742 -6.66529,-1.98386 -3.14783,-0.9254 -5.48887,-2.14377 -7.02248,-3.65051 -2.19555,-2.1418 -3.29201,-5.17035 -3.29201,-9.08432 0,-3.80846 1.34944,-7.06049 4.04701,-9.75807 2.72314,-2.72379 5.99025,-4.087 9.7987,-4.087 h 7.29906 c 1.32322,0 2.45967,0.47647 3.41129,1.43006 0.95228,0.95097 1.42809,2.08938 1.42809,3.40998 v 0.0793 c 0,1.34945 -0.47581,2.47409 -1.42809,3.37263 -0.95162,0.95097 -2.08872,1.42874 -3.41129,1.42874 z" />
-    </g>
-  </g>
-</svg>
diff --git a/tests/wpt/tests/tools/third_party/websockets/performance/mem_client.py b/tests/wpt/tests/tools/third_party/websockets/performance/mem_client.py
deleted file mode 100644
index 890216edf80..00000000000
--- a/tests/wpt/tests/tools/third_party/websockets/performance/mem_client.py
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/usr/bin/env python
-
-import asyncio
-import statistics
-import tracemalloc
-
-import websockets
-from websockets.extensions import permessage_deflate
-
-
-CLIENTS = 10
-INTERVAL = 1 / 10  # seconds
-
-MEM_SIZE = []
-
-
-async def mem_client(client):
-    # Space out connections to make them sequential.
-    await asyncio.sleep(client * INTERVAL)
-
-    tracemalloc.start()
-
-    async with websockets.connect(
-        "ws://localhost:8765",
-        extensions=[
-            permessage_deflate.ClientPerMessageDeflateFactory(
-                server_max_window_bits=10,
-                client_max_window_bits=10,
-                compress_settings={"memLevel": 3},
-            )
-        ],
-    ) as ws:
-        await ws.send("hello")
-        await ws.recv()
-
-        await ws.send(b"hello")
-        await ws.recv()
-
-        MEM_SIZE.append(tracemalloc.get_traced_memory()[0])
-        tracemalloc.stop()
-
-        # Hold connection open until the end of the test.
-        await asyncio.sleep(CLIENTS * INTERVAL)
-
-
-asyncio.get_event_loop().run_until_complete(
-    asyncio.gather(*[mem_client(client) for client in range(CLIENTS + 1)])
-)
-
-# First connection incurs non-representative setup costs.
-del MEM_SIZE[0]
-
-print(f"µ = {statistics.mean(MEM_SIZE) / 1024:.1f} KiB")
-print(f"σ = {statistics.stdev(MEM_SIZE) / 1024:.1f} KiB")
diff --git a/tests/wpt/tests/tools/third_party/websockets/performance/mem_server.py b/tests/wpt/tests/tools/third_party/websockets/performance/mem_server.py
deleted file mode 100644
index 0a4a29f76c6..00000000000
--- a/tests/wpt/tests/tools/third_party/websockets/performance/mem_server.py
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/usr/bin/env python
-
-import asyncio
-import signal
-import statistics
-import tracemalloc
-
-import websockets
-from websockets.extensions import permessage_deflate
-
-
-CLIENTS = 10
-INTERVAL = 1 / 10  # seconds
-
-MEM_SIZE = []
-
-
-async def handler(ws, path):
-    msg = await ws.recv()
-    await ws.send(msg)
-
-    msg = await ws.recv()
-    await ws.send(msg)
-
-    MEM_SIZE.append(tracemalloc.get_traced_memory()[0])
-    tracemalloc.stop()
-
-    tracemalloc.start()
-
-    # Hold connection open until the end of the test.
-    await asyncio.sleep(CLIENTS * INTERVAL)
-
-
-async def mem_server(stop):
-    async with websockets.serve(
-        handler,
-        "localhost",
-        8765,
-        extensions=[
-            permessage_deflate.ServerPerMessageDeflateFactory(
-                server_max_window_bits=10,
-                client_max_window_bits=10,
-                compress_settings={"memLevel": 3},
-            )
-        ],
-    ):
-        await stop
-
-
-loop = asyncio.get_event_loop()
-
-stop = loop.create_future()
-loop.add_signal_handler(signal.SIGINT, stop.set_result, None)
-
-tracemalloc.start()
-
-loop.run_until_complete(mem_server(stop))
-
-# First connection incurs non-representative setup costs.
-del MEM_SIZE[0]
-
-print(f"µ = {statistics.mean(MEM_SIZE) / 1024:.1f} KiB")
-print(f"σ = {statistics.stdev(MEM_SIZE) / 1024:.1f} KiB")
diff --git a/tests/wpt/tests/tools/third_party/websockets/setup.cfg b/tests/wpt/tests/tools/third_party/websockets/setup.cfg
index c306b2d4fb7..dc424fe1955 100644
--- a/tests/wpt/tests/tools/third_party/websockets/setup.cfg
+++ b/tests/wpt/tests/tools/third_party/websockets/setup.cfg
@@ -1,30 +1,42 @@
 [bdist_wheel]
-python-tag = py36.py37
+python-tag = py37.py38.py39.py310
 
 [metadata]
 license_file = LICENSE
+project_urls = 
+	Changelog = https://websockets.readthedocs.io/en/stable/project/changelog.html
+	Documentation = https://websockets.readthedocs.io/
+	Funding = https://tidelift.com/subscription/pkg/pypi-websockets?utm_source=pypi-websockets&utm_medium=referral&utm_campaign=readme
+	Tracker = https://github.com/aaugustin/websockets/issues
 
 [flake8]
-ignore = E731,F403,F405,W503
+ignore = E203,E731,F403,F405,W503
 max-line-length = 88
 
 [isort]
+profile = black
 combine_as_imports = True
-force_grid_wrap = 0
-include_trailing_comma = True
-known_standard_library = asyncio
-line_length = 88
 lines_after_imports = 2
-multi_line_output = 3
 
 [coverage:run]
 branch = True
-omit = */__main__.py
-source =
-    websockets
-    tests
+omit = 
+	*/__main__.py
+source = 
+	websockets
+	tests
 
 [coverage:paths]
-source =
-    src/websockets
-   .tox/*/lib/python*/site-packages/websockets
+source = 
+	src/websockets
+	.tox/*/lib/python*/site-packages/websockets
+
+[coverage:report]
+exclude_lines = 
+	if self.debug:
+	pragma: no cover
+
+[egg_info]
+tag_build = 
+tag_date = 0
+
diff --git a/tests/wpt/tests/tools/third_party/websockets/setup.py b/tests/wpt/tests/tools/third_party/websockets/setup.py
index f3581924770..b2d07737d22 100644
--- a/tests/wpt/tests/tools/third_party/websockets/setup.py
+++ b/tests/wpt/tests/tools/third_party/websockets/setup.py
@@ -1,6 +1,5 @@
 import pathlib
 import re
-import sys
 
 import setuptools
 
@@ -21,10 +20,7 @@ long_description = re.sub(
 
 exec((root_dir / 'src' / 'websockets' / 'version.py').read_text(encoding='utf-8'))
 
-if sys.version_info[:3] < (3, 6, 1):
-    raise Exception("websockets requires Python >= 3.6.1.")
-
-packages = ['websockets', 'websockets/extensions']
+packages = ['websockets', 'websockets/legacy', 'websockets/extensions']
 
 ext_modules = [
     setuptools.Extension(
@@ -51,9 +47,10 @@ setuptools.setup(
         'Operating System :: OS Independent',
         'Programming Language :: Python',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
     ],
     package_dir = {'': 'src'},
     package_data = {'websockets': ['py.typed']},
@@ -61,6 +58,6 @@ setuptools.setup(
     ext_modules=ext_modules,
     include_package_data=True,
     zip_safe=False,
-    python_requires='>=3.6.1',
+    python_requires='>=3.7',
     test_loader='unittest:TestLoader',
 )
diff --git a/tests/wpt/tests/tools/third_party/websockets/src/websockets.egg-info/PKG-INFO b/tests/wpt/tests/tools/third_party/websockets/src/websockets.egg-info/PKG-INFO
new file mode 100644
index 00000000000..3b042a3f9f8
--- /dev/null
+++ b/tests/wpt/tests/tools/third_party/websockets/src/websockets.egg-info/PKG-INFO
@@ -0,0 +1,174 @@
+Metadata-Version: 2.1
+Name: websockets
+Version: 10.3
+Summary: An implementation of the WebSocket Protocol (RFC 6455 & 7692)
+Home-page: https://github.com/aaugustin/websockets
+Author: Aymeric Augustin
+Author-email: aymeric.augustin@m4x.org
+License: BSD
+Project-URL: Changelog, https://websockets.readthedocs.io/en/stable/project/changelog.html
+Project-URL: Documentation, https://websockets.readthedocs.io/
+Project-URL: Funding, https://tidelift.com/subscription/pkg/pypi-websockets?utm_source=pypi-websockets&utm_medium=referral&utm_campaign=readme
+Project-URL: Tracker, https://github.com/aaugustin/websockets/issues
+Platform: UNKNOWN
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Web Environment
+Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved :: BSD License
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Requires-Python: >=3.7
+License-File: LICENSE
+
+.. image:: logo/horizontal.svg
+   :width: 480px
+   :alt: websockets
+
+|licence| |version| |pyversions| |wheel| |tests| |docs|
+
+.. |licence| image:: https://img.shields.io/pypi/l/websockets.svg
+    :target: https://pypi.python.org/pypi/websockets
+
+.. |version| image:: https://img.shields.io/pypi/v/websockets.svg
+    :target: https://pypi.python.org/pypi/websockets
+
+.. |pyversions| image:: https://img.shields.io/pypi/pyversions/websockets.svg
+    :target: https://pypi.python.org/pypi/websockets
+
+.. |wheel| image:: https://img.shields.io/pypi/wheel/websockets.svg
+    :target: https://pypi.python.org/pypi/websockets
+
+.. |tests| image:: https://img.shields.io/github/checks-status/aaugustin/websockets/main
+   :target: https://github.com/aaugustin/websockets/actions/workflows/tests.yml
+
+.. |docs| image:: https://img.shields.io/readthedocs/websockets.svg
+   :target: https://websockets.readthedocs.io/
+
+What is ``websockets``?
+-----------------------
+
+websockets is a library for building WebSocket_ servers and clients in Python
+with a focus on correctness, simplicity, robustness, and performance.
+
+.. _WebSocket: https://developer.mozilla.org/en-US/docs/Web/API/WebSockets_API
+
+Built on top of ``asyncio``, Python's standard asynchronous I/O framework, it
+provides an elegant coroutine-based API.
+
+`Documentation is available on Read the Docs. <https://websockets.readthedocs.io/>`_
+
+Here's how a client sends and receives messages:
+
+.. copy-pasted because GitHub doesn't support the include directive
+
+.. code:: python
+
+    #!/usr/bin/env python
+
+    import asyncio
+    from websockets import connect
+
+    async def hello(uri):
+        async with connect(uri) as websocket:
+            await websocket.send("Hello world!")
+            await websocket.recv()
+
+    asyncio.run(hello("ws://localhost:8765"))
+
+And here's an echo server:
+
+.. code:: python
+
+    #!/usr/bin/env python
+
+    import asyncio
+    from websockets import serve
+
+    async def echo(websocket):
+        async for message in websocket:
+            await websocket.send(message)
+
+    async def main():
+        async with serve(echo, "localhost", 8765):
+            await asyncio.Future()  # run forever
+
+    asyncio.run(main())
+
+Does that look good?
+
+`Get started with the tutorial! <https://websockets.readthedocs.io/en/stable/intro/index.html>`_
+
+Why should I use ``websockets``?
+--------------------------------
+
+The development of ``websockets`` is shaped by four principles:
+
+1. **Correctness**: ``websockets`` is heavily tested for compliance
+   with :rfc:`6455`. Continuous integration fails under 100% branch
+   coverage.
+
+2. **Simplicity**: all you need to understand is ``msg = await ws.recv()`` and
+   ``await ws.send(msg)``. ``websockets`` takes care of managing connections
+   so you can focus on your application.
+
+3. **Robustness**: ``websockets`` is built for production. For example, it was
+   the only library to `handle backpressure correctly`_ before the issue
+   became widely known in the Python community.
+
+4. **Performance**: memory usage is optimized and configurable. A C extension
+   accelerates expensive operations. It's pre-compiled for Linux, macOS and
+   Windows and packaged in the wheel format for each system and Python version.
+
+Documentation is a first class concern in the project. Head over to `Read the
+Docs`_ and see for yourself.
+
+.. _Read the Docs: https://websockets.readthedocs.io/
+.. _handle backpressure correctly: https://vorpus.org/blog/some-thoughts-on-asynchronous-api-design-in-a-post-asyncawait-world/#websocket-servers
+
+Why shouldn't I use ``websockets``?
+-----------------------------------
+
+* If you prefer callbacks over coroutines: ``websockets`` was created to
+  provide the best coroutine-based API to manage WebSocket connections in
+  Python. Pick another library for a callback-based API.
+
+* If you're looking for a mixed HTTP / WebSocket library: ``websockets`` aims
+  at being an excellent implementation of :rfc:`6455`: The WebSocket Protocol
+  and :rfc:`7692`: Compression Extensions for WebSocket. Its support for HTTP
+  is minimal — just enough for a HTTP health check.
+
+  If you want to do both in the same server, look at HTTP frameworks that
+  build on top of ``websockets`` to support WebSocket connections, like
+  Sanic_.
+
+.. _Sanic: https://sanicframework.org/en/
+
+What else?
+----------
+
+Bug reports, patches and suggestions are welcome!
+
+To report a security vulnerability, please use the `Tidelift security
+contact`_. Tidelift will coordinate the fix and disclosure.
+
+.. _Tidelift security contact: https://tidelift.com/security
+
+For anything else, please open an issue_ or send a `pull request`_.
+
+.. _issue: https://github.com/aaugustin/websockets/issues/new
+.. _pull request: https://github.com/aaugustin/websockets/compare/
+
+Participants must uphold the `Contributor Covenant code of conduct`_.
+
+.. _Contributor Covenant code of conduct: https://github.com/aaugustin/websockets/blob/main/CODE_OF_CONDUCT.md
+
+``websockets`` is released under the `BSD license`_.
+
+.. _BSD license: https://github.com/aaugustin/websockets/blob/main/LICENSE
+
+
diff --git a/tests/wpt/tests/tools/third_party/websockets/src/websockets.egg-info/SOURCES.txt b/tests/wpt/tests/tools/third_party/websockets/src/websockets.egg-info/SOURCES.txt
new file mode 100644
index 00000000000..2a51106feeb
--- /dev/null
+++ b/tests/wpt/tests/tools/third_party/websockets/src/websockets.egg-info/SOURCES.txt
@@ -0,0 +1,42 @@
+LICENSE
+MANIFEST.in
+README.rst
+setup.cfg
+setup.py
+src/websockets/__init__.py
+src/websockets/__main__.py
+src/websockets/auth.py
+src/websockets/client.py
+src/websockets/connection.py
+src/websockets/datastructures.py
+src/websockets/exceptions.py
+src/websockets/frames.py
+src/websockets/headers.py
+src/websockets/http.py
+src/websockets/http11.py
+src/websockets/imports.py
+src/websockets/py.typed
+src/websockets/server.py
+src/websockets/speedups.c
+src/websockets/streams.py
+src/websockets/typing.py
+src/websockets/uri.py
+src/websockets/utils.py
+src/websockets/version.py
+src/websockets.egg-info/PKG-INFO
+src/websockets.egg-info/SOURCES.txt
+src/websockets.egg-info/dependency_links.txt
+src/websockets.egg-info/not-zip-safe
+src/websockets.egg-info/top_level.txt
+src/websockets/extensions/__init__.py
+src/websockets/extensions/base.py
+src/websockets/extensions/permessage_deflate.py
+src/websockets/legacy/__init__.py
+src/websockets/legacy/auth.py
+src/websockets/legacy/client.py
+src/websockets/legacy/compatibility.py
+src/websockets/legacy/framing.py
+src/websockets/legacy/handshake.py
+src/websockets/legacy/http.py
+src/websockets/legacy/protocol.py
+src/websockets/legacy/server.py
\ No newline at end of file
diff --git a/tests/wpt/tests/tools/third_party/websockets/src/websockets.egg-info/dependency_links.txt b/tests/wpt/tests/tools/third_party/websockets/src/websockets.egg-info/dependency_links.txt
new file mode 100644
index 00000000000..8b137891791
--- /dev/null
+++ b/tests/wpt/tests/tools/third_party/websockets/src/websockets.egg-info/dependency_links.txt
@@ -0,0 +1 @@
+
diff --git a/tests/wpt/tests/tools/third_party/websockets/src/websockets.egg-info/not-zip-safe b/tests/wpt/tests/tools/third_party/websockets/src/websockets.egg-info/not-zip-safe
new file mode 100644
index 00000000000..8b137891791
--- /dev/null
+++ b/tests/wpt/tests/tools/third_party/websockets/src/websockets.egg-info/not-zip-safe
@@ -0,0 +1 @@
+
diff --git a/tests/wpt/tests/tools/third_party/websockets/src/websockets.egg-info/top_level.txt b/tests/wpt/tests/tools/third_party/websockets/src/websockets.egg-info/top_level.txt
new file mode 100644
index 00000000000..5474af7431b
--- /dev/null
+++ b/tests/wpt/tests/tools/third_party/websockets/src/websockets.egg-info/top_level.txt
@@ -0,0 +1,3 @@
+websockets
+websockets/extensions
+websockets/legacy
diff --git a/tests/wpt/tests/tools/third_party/websockets/src/websockets/__init__.py b/tests/wpt/tests/tools/third_party/websockets/src/websockets/__init__.py
index ea1d829a335..ec34841247b 100644
--- a/tests/wpt/tests/tools/third_party/websockets/src/websockets/__init__.py
+++ b/tests/wpt/tests/tools/third_party/websockets/src/websockets/__init__.py
@@ -1,26 +1,22 @@
-# This relies on each of the submodules having an __all__ variable.
+from __future__ import annotations
 
-from .auth import *  # noqa
-from .client import *  # noqa
-from .exceptions import *  # noqa
-from .protocol import *  # noqa
-from .server import *  # noqa
-from .typing import *  # noqa
-from .uri import *  # noqa
+from .imports import lazy_import
 from .version import version as __version__  # noqa
 
 
-__all__ = [
+__all__ = [  # noqa
     "AbortHandshake",
     "basic_auth_protocol_factory",
     "BasicAuthWebSocketServerProtocol",
+    "broadcast",
+    "ClientConnection",
     "connect",
     "ConnectionClosed",
     "ConnectionClosedError",
     "ConnectionClosedOK",
     "Data",
     "DuplicateParameter",
-    "ExtensionHeader",
+    "ExtensionName",
     "ExtensionParameter",
     "InvalidHandshake",
     "InvalidHeader",
@@ -31,9 +27,11 @@ __all__ = [
     "InvalidParameterName",
     "InvalidParameterValue",
     "InvalidState",
+    "InvalidStatus",
     "InvalidStatusCode",
     "InvalidUpgrade",
     "InvalidURI",
+    "LoggerLike",
     "NegotiationError",
     "Origin",
     "parse_uri",
@@ -42,6 +40,7 @@ __all__ = [
     "RedirectHandshake",
     "SecurityError",
     "serve",
+    "ServerConnection",
     "Subprotocol",
     "unix_connect",
     "unix_serve",
@@ -53,3 +52,63 @@ __all__ = [
     "WebSocketServerProtocol",
     "WebSocketURI",
 ]
+
+lazy_import(
+    globals(),
+    aliases={
+        "auth": ".legacy",
+        "basic_auth_protocol_factory": ".legacy.auth",
+        "BasicAuthWebSocketServerProtocol": ".legacy.auth",
+        "broadcast": ".legacy.protocol",
+        "ClientConnection": ".client",
+        "connect": ".legacy.client",
+        "unix_connect": ".legacy.client",
+        "WebSocketClientProtocol": ".legacy.client",
+        "Headers": ".datastructures",
+        "MultipleValuesError": ".datastructures",
+        "WebSocketException": ".exceptions",
+        "ConnectionClosed": ".exceptions",
+        "ConnectionClosedError": ".exceptions",
+        "ConnectionClosedOK": ".exceptions",
+        "InvalidHandshake": ".exceptions",
+        "SecurityError": ".exceptions",
+        "InvalidMessage": ".exceptions",
+        "InvalidHeader": ".exceptions",
+        "InvalidHeaderFormat": ".exceptions",
+        "InvalidHeaderValue": ".exceptions",
+        "InvalidOrigin": ".exceptions",
+        "InvalidUpgrade": ".exceptions",
+        "InvalidStatus": ".exceptions",
+        "InvalidStatusCode": ".exceptions",
+        "NegotiationError": ".exceptions",
+        "DuplicateParameter": ".exceptions",
+        "InvalidParameterName": ".exceptions",
+        "InvalidParameterValue": ".exceptions",
+        "AbortHandshake": ".exceptions",
+        "RedirectHandshake": ".exceptions",
+        "InvalidState": ".exceptions",
+        "InvalidURI": ".exceptions",
+        "PayloadTooBig": ".exceptions",
+        "ProtocolError": ".exceptions",
+        "WebSocketProtocolError": ".exceptions",
+        "protocol": ".legacy",
+        "WebSocketCommonProtocol": ".legacy.protocol",
+        "ServerConnection": ".server",
+        "serve": ".legacy.server",
+        "unix_serve": ".legacy.server",
+        "WebSocketServerProtocol": ".legacy.server",
+        "WebSocketServer": ".legacy.server",
+        "Data": ".typing",
+        "LoggerLike": ".typing",
+        "Origin": ".typing",
+        "ExtensionHeader": ".typing",
+        "ExtensionParameter": ".typing",
+        "Subprotocol": ".typing",
+    },
+    deprecated_aliases={
+        "framing": ".legacy",
+        "handshake": ".legacy",
+        "parse_uri": ".uri",
+        "WebSocketURI": ".uri",
+    },
+)
diff --git a/tests/wpt/tests/tools/third_party/websockets/src/websockets/__main__.py b/tests/wpt/tests/tools/third_party/websockets/src/websockets/__main__.py
index 394f7ac799c..c562d21b544 100644
--- a/tests/wpt/tests/tools/third_party/websockets/src/websockets/__main__.py
+++ b/tests/wpt/tests/tools/third_party/websockets/src/websockets/__main__.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import argparse
 import asyncio
 import os
@@ -6,8 +8,10 @@ import sys
 import threading
 from typing import Any, Set
 
-from .client import connect
-from .exceptions import ConnectionClosed, format_close
+from .exceptions import ConnectionClosed
+from .frames import Close
+from .legacy.client import connect
+from .version import version as websockets_version
 
 
 if sys.platform == "win32":
@@ -43,16 +47,17 @@ if sys.platform == "win32":
 
 
 def exit_from_event_loop_thread(
-    loop: asyncio.AbstractEventLoop, stop: "asyncio.Future[None]"
+    loop: asyncio.AbstractEventLoop,
+    stop: asyncio.Future[None],
 ) -> None:
     loop.stop()
     if not stop.done():
         # When exiting the thread that runs the event loop, raise
         # KeyboardInterrupt in the main thread to exit the program.
-        try:
-            ctrl_c = signal.CTRL_C_EVENT  # Windows
-        except AttributeError:
-            ctrl_c = signal.SIGINT  # POSIX
+        if sys.platform == "win32":
+            ctrl_c = signal.CTRL_C_EVENT
+        else:
+            ctrl_c = signal.SIGINT
         os.kill(os.getpid(), ctrl_c)
 
 
@@ -91,8 +96,8 @@ def print_over_input(string: str) -> None:
 async def run_client(
     uri: str,
     loop: asyncio.AbstractEventLoop,
-    inputs: "asyncio.Queue[str]",
-    stop: "asyncio.Future[None]",
+    inputs: asyncio.Queue[str],
+    stop: asyncio.Future[None],
 ) -> None:
     try:
         websocket = await connect(uri)
@@ -105,8 +110,8 @@ async def run_client(
 
     try:
         while True:
-            incoming: asyncio.Future[Any] = asyncio.ensure_future(websocket.recv())
-            outgoing: asyncio.Future[Any] = asyncio.ensure_future(inputs.get())
+            incoming: asyncio.Future[Any] = asyncio.create_task(websocket.recv())
+            outgoing: asyncio.Future[Any] = asyncio.create_task(inputs.get())
             done: Set[asyncio.Future[Any]]
             pending: Set[asyncio.Future[Any]]
             done, pending = await asyncio.wait(
@@ -139,7 +144,8 @@ async def run_client(
 
     finally:
         await websocket.close()
-        close_status = format_close(websocket.close_code, websocket.close_reason)
+        assert websocket.close_code is not None and websocket.close_reason is not None
+        close_status = Close(websocket.close_code, websocket.close_reason)
 
         print_over_input(f"Connection closed: {close_status}.")
 
@@ -147,6 +153,24 @@ async def run_client(
 
 
 def main() -> None:
+    # Parse command line arguments.
+    parser = argparse.ArgumentParser(
+        prog="python -m websockets",
+        description="Interactive WebSocket client.",
+        add_help=False,
+    )
+    group = parser.add_mutually_exclusive_group()
+    group.add_argument("--version", action="store_true")
+    group.add_argument("uri", metavar="<uri>", nargs="?")
+    args = parser.parse_args()
+
+    if args.version:
+        print(f"websockets {websockets_version}")
+        return
+
+    if args.uri is None:
+        parser.error("the following arguments are required: <uri>")
+
     # If we're on Windows, enable VT100 terminal support.
     if sys.platform == "win32":
         try:
@@ -164,26 +188,22 @@ def main() -> None:
     except ImportError:  # Windows has no `readline` normally
         pass
 
-    # Parse command line arguments.
-    parser = argparse.ArgumentParser(
-        prog="python -m websockets",
-        description="Interactive WebSocket client.",
-        add_help=False,
-    )
-    parser.add_argument("uri", metavar="<uri>")
-    args = parser.parse_args()
-
     # Create an event loop that will run in a background thread.
     loop = asyncio.new_event_loop()
 
+    # Due to zealous removal of the loop parameter in the Queue constructor,
+    # we need a factory coroutine to run in the freshly created event loop.
+    async def queue_factory() -> asyncio.Queue[str]:
+        return asyncio.Queue()
+
     # Create a queue of user inputs. There's no need to limit its size.
-    inputs: asyncio.Queue[str] = asyncio.Queue(loop=loop)
+    inputs: asyncio.Queue[str] = loop.run_until_complete(queue_factory())
 
     # Create a stop condition when receiving SIGINT or SIGTERM.
     stop: asyncio.Future[None] = loop.create_future()
 
     # Schedule the task that will manage the connection.
-    asyncio.ensure_future(run_client(args.uri, loop, inputs, stop), loop=loop)
+    loop.create_task(run_client(args.uri, loop, inputs, stop))
 
     # Start the event loop in a background thread.
     thread = threading.Thread(target=loop.run_forever)
@@ -201,6 +221,10 @@ def main() -> None:
     # Wait for the event loop to terminate.
     thread.join()
 
+    # For reasons unclear, even though the loop is closed in the thread,
+    # it still thinks it's running here.
+    loop.close()
+
 
 if __name__ == "__main__":
     main()
diff --git a/tests/wpt/tests/tools/third_party/websockets/src/websockets/auth.py b/tests/wpt/tests/tools/third_party/websockets/src/websockets/auth.py
index ae204b8d9c7..afcb38cffe2 100644
--- a/tests/wpt/tests/tools/third_party/websockets/src/websockets/auth.py
+++ b/tests/wpt/tests/tools/third_party/websockets/src/websockets/auth.py
@@ -1,160 +1,4 @@
-"""
-:mod:`websockets.auth` provides HTTP Basic Authentication according to
-:rfc:`7235` and :rfc:`7617`.
+from __future__ import annotations
 
-"""
-
-
-import functools
-import http
-from typing import Any, Awaitable, Callable, Iterable, Optional, Tuple, Type, Union
-
-from .exceptions import InvalidHeader
-from .headers import build_www_authenticate_basic, parse_authorization_basic
-from .http import Headers
-from .server import HTTPResponse, WebSocketServerProtocol
-
-
-__all__ = ["BasicAuthWebSocketServerProtocol", "basic_auth_protocol_factory"]
-
-Credentials = Tuple[str, str]
-
-
-def is_credentials(value: Any) -> bool:
-    try:
-        username, password = value
-    except (TypeError, ValueError):
-        return False
-    else:
-        return isinstance(username, str) and isinstance(password, str)
-
-
-class BasicAuthWebSocketServerProtocol(WebSocketServerProtocol):
-    """
-    WebSocket server protocol that enforces HTTP Basic Auth.
-
-    """
-
-    def __init__(
-        self,
-        *args: Any,
-        realm: str,
-        check_credentials: Callable[[str, str], Awaitable[bool]],
-        **kwargs: Any,
-    ) -> None:
-        self.realm = realm
-        self.check_credentials = check_credentials
-        super().__init__(*args, **kwargs)
-
-    async def process_request(
-        self, path: str, request_headers: Headers
-    ) -> Optional[HTTPResponse]:
-        """
-        Check HTTP Basic Auth and return a HTTP 401 or 403 response if needed.
-
-        If authentication succeeds, the username of the authenticated user is
-        stored in the ``username`` attribute.
-
-        """
-        try:
-            authorization = request_headers["Authorization"]
-        except KeyError:
-            return (
-                http.HTTPStatus.UNAUTHORIZED,
-                [("WWW-Authenticate", build_www_authenticate_basic(self.realm))],
-                b"Missing credentials\n",
-            )
-
-        try:
-            username, password = parse_authorization_basic(authorization)
-        except InvalidHeader:
-            return (
-                http.HTTPStatus.UNAUTHORIZED,
-                [("WWW-Authenticate", build_www_authenticate_basic(self.realm))],
-                b"Unsupported credentials\n",
-            )
-
-        if not await self.check_credentials(username, password):
-            return (
-                http.HTTPStatus.UNAUTHORIZED,
-                [("WWW-Authenticate", build_www_authenticate_basic(self.realm))],
-                b"Invalid credentials\n",
-            )
-
-        self.username = username
-
-        return await super().process_request(path, request_headers)
-
-
-def basic_auth_protocol_factory(
-    realm: str,
-    credentials: Optional[Union[Credentials, Iterable[Credentials]]] = None,
-    check_credentials: Optional[Callable[[str, str], Awaitable[bool]]] = None,
-    create_protocol: Type[
-        BasicAuthWebSocketServerProtocol
-    ] = BasicAuthWebSocketServerProtocol,
-) -> Callable[[Any], BasicAuthWebSocketServerProtocol]:
-    """
-    Protocol factory that enforces HTTP Basic Auth.
-
-    ``basic_auth_protocol_factory`` is designed to integrate with
-    :func:`~websockets.server.serve` like this::
-
-        websockets.serve(
-            ...,
-            create_protocol=websockets.basic_auth_protocol_factory(
-                realm="my dev server",
-                credentials=("hello", "iloveyou"),
-            )
-        )
-
-    ``realm`` indicates the scope of protection. It should contain only ASCII
-    characters because the encoding of non-ASCII characters is undefined.
-    Refer to section 2.2 of :rfc:`7235` for details.
-
-    ``credentials`` defines hard coded authorized credentials. It can be a
-    ``(username, password)`` pair or a list of such pairs.
-
-    ``check_credentials`` defines a coroutine that checks whether credentials
-    are authorized. This coroutine receives ``username`` and ``password``
-    arguments and returns a :class:`bool`.
-
-    One of ``credentials`` or ``check_credentials`` must be provided but not
-    both.
-
-    By default, ``basic_auth_protocol_factory`` creates a factory for building
-    :class:`BasicAuthWebSocketServerProtocol` instances. You can override this
-    with the ``create_protocol`` parameter.
-
-    :param realm: scope of protection
-    :param credentials: hard coded credentials
-    :param check_credentials: coroutine that verifies credentials
-    :raises TypeError: if the credentials argument has the wrong type
-
-    """
-    if (credentials is None) == (check_credentials is None):
-        raise TypeError("provide either credentials or check_credentials")
-
-    if credentials is not None:
-        if is_credentials(credentials):
-
-            async def check_credentials(username: str, password: str) -> bool:
-                return (username, password) == credentials
-
-        elif isinstance(credentials, Iterable):
-            credentials_list = list(credentials)
-            if all(is_credentials(item) for item in credentials_list):
-                credentials_dict = dict(credentials_list)
-
-                async def check_credentials(username: str, password: str) -> bool:
-                    return credentials_dict.get(username) == password
-
-            else:
-                raise TypeError(f"invalid credentials argument: {credentials}")
-
-        else:
-            raise TypeError(f"invalid credentials argument: {credentials}")
-
-    return functools.partial(
-        create_protocol, realm=realm, check_credentials=check_credentials
-    )
+# See #940 for why lazy_import isn't used here for backwards compatibility.
+from .legacy.auth import *  # noqa
diff --git a/tests/wpt/tests/tools/third_party/websockets/src/websockets/client.py b/tests/wpt/tests/tools/third_party/websockets/src/websockets/client.py
index eb58f9f4842..df8e53429ab 100644
--- a/tests/wpt/tests/tools/third_party/websockets/src/websockets/client.py
+++ b/tests/wpt/tests/tools/third_party/websockets/src/websockets/client.py
@@ -1,161 +1,239 @@
-"""
-:mod:`websockets.client` defines the WebSocket client APIs.
+from __future__ import annotations
 
-"""
-
-import asyncio
-import collections.abc
-import functools
-import logging
-import warnings
-from types import TracebackType
-from typing import Any, Generator, List, Optional, Sequence, Tuple, Type, cast
+from typing import Generator, List, Optional, Sequence
 
+from .connection import CLIENT, CONNECTING, OPEN, Connection, State
+from .datastructures import Headers, MultipleValuesError
 from .exceptions import (
     InvalidHandshake,
     InvalidHeader,
-    InvalidMessage,
-    InvalidStatusCode,
+    InvalidHeaderValue,
+    InvalidStatus,
+    InvalidUpgrade,
     NegotiationError,
-    RedirectHandshake,
-    SecurityError,
 )
-from .extensions.base import ClientExtensionFactory, Extension
-from .extensions.permessage_deflate import ClientPerMessageDeflateFactory
-from .handshake import build_request, check_response
+from .extensions import ClientExtensionFactory, Extension
 from .headers import (
     build_authorization_basic,
     build_extension,
+    build_host,
     build_subprotocol,
+    parse_connection,
     parse_extension,
     parse_subprotocol,
+    parse_upgrade,
 )
-from .http import USER_AGENT, Headers, HeadersLike, read_response
-from .protocol import WebSocketCommonProtocol
-from .typing import ExtensionHeader, Origin, Subprotocol
-from .uri import WebSocketURI, parse_uri
+from .http import USER_AGENT
+from .http11 import Request, Response
+from .typing import (
+    ConnectionOption,
+    ExtensionHeader,
+    LoggerLike,
+    Origin,
+    Subprotocol,
+    UpgradeProtocol,
+)
+from .uri import WebSocketURI
+from .utils import accept_key, generate_key
 
 
-__all__ = ["connect", "unix_connect", "WebSocketClientProtocol"]
-
-logger = logging.getLogger(__name__)
+# See #940 for why lazy_import isn't used here for backwards compatibility.
+from .legacy.client import *  # isort:skip  # noqa
 
 
-class WebSocketClientProtocol(WebSocketCommonProtocol):
+__all__ = ["ClientConnection"]
+
+
+class ClientConnection(Connection):
     """
-    :class:`~asyncio.Protocol` subclass implementing a WebSocket client.
+    Sans-I/O implementation of a WebSocket client connection.
 
-    This class inherits most of its methods from
-    :class:`~websockets.protocol.WebSocketCommonProtocol`.
+    Args:
+        wsuri: URI of the WebSocket server, parsed
+            with :func:`~websockets.uri.parse_uri`.
+        origin: value of the ``Origin`` header. This is useful when connecting
+            to a server that validates the ``Origin`` header to defend against
+            Cross-Site WebSocket Hijacking attacks.
+        extensions: list of supported extensions, in order in which they
+            should be tried.
+        subprotocols: list of supported subprotocols, in order of decreasing
+            preference.
+        state: initial state of the WebSocket connection.
+        max_size: maximum size of incoming messages in bytes;
+            :obj:`None` to disable the limit.
+        logger: logger for this connection;
+            defaults to ``logging.getLogger("websockets.client")``;
+            see the :doc:`logging guide <../topics/logging>` for details.
 
     """
 
-    is_client = True
-    side = "client"
-
     def __init__(
         self,
-        *,
+        wsuri: WebSocketURI,
         origin: Optional[Origin] = None,
         extensions: Optional[Sequence[ClientExtensionFactory]] = None,
         subprotocols: Optional[Sequence[Subprotocol]] = None,
-        extra_headers: Optional[HeadersLike] = None,
-        **kwargs: Any,
-    ) -> None:
+        state: State = CONNECTING,
+        max_size: Optional[int] = 2**20,
+        logger: Optional[LoggerLike] = None,
+    ):
+        super().__init__(
+            side=CLIENT,
+            state=state,
+            max_size=max_size,
+            logger=logger,
+        )
+        self.wsuri = wsuri
         self.origin = origin
         self.available_extensions = extensions
         self.available_subprotocols = subprotocols
-        self.extra_headers = extra_headers
-        super().__init__(**kwargs)
+        self.key = generate_key()
 
-    def write_http_request(self, path: str, headers: Headers) -> None:
+    def connect(self) -> Request:  # noqa: F811
         """
-        Write request line and headers to the HTTP request.
+        Create a handshake request to open a connection.
+
+        You must send the handshake request with :meth:`send_request`.
+
+        You can modify it before sending it, for example to add HTTP headers.
+
+        Returns:
+            Request: WebSocket handshake request event to send to the server.
 
         """
-        self.path = path
-        self.request_headers = headers
+        headers = Headers()
 
-        logger.debug("%s > GET %s HTTP/1.1", self.side, path)
-        logger.debug("%s > %r", self.side, headers)
+        headers["Host"] = build_host(
+            self.wsuri.host, self.wsuri.port, self.wsuri.secure
+        )
 
-        # Since the path and headers only contain ASCII characters,
-        # we can keep this simple.
-        request = f"GET {path} HTTP/1.1\r\n"
-        request += str(headers)
+        if self.wsuri.user_info:
+            headers["Authorization"] = build_authorization_basic(*self.wsuri.user_info)
 
-        self.transport.write(request.encode())
+        if self.origin is not None:
+            headers["Origin"] = self.origin
 
-    async def read_http_response(self) -> Tuple[int, Headers]:
+        headers["Upgrade"] = "websocket"
+        headers["Connection"] = "Upgrade"
+        headers["Sec-WebSocket-Key"] = self.key
+        headers["Sec-WebSocket-Version"] = "13"
+
+        if self.available_extensions is not None:
+            extensions_header = build_extension(
+                [
+                    (extension_factory.name, extension_factory.get_request_params())
+                    for extension_factory in self.available_extensions
+                ]
+            )
+            headers["Sec-WebSocket-Extensions"] = extensions_header
+
+        if self.available_subprotocols is not None:
+            protocol_header = build_subprotocol(self.available_subprotocols)
+            headers["Sec-WebSocket-Protocol"] = protocol_header
+
+        headers["User-Agent"] = USER_AGENT
+
+        return Request(self.wsuri.resource_name, headers)
+
+    def process_response(self, response: Response) -> None:
         """
-        Read status line and headers from the HTTP response.
+        Check a handshake response.
 
-        If the response contains a body, it may be read from ``self.reader``
-        after this coroutine returns.
+        Args:
+            request: WebSocket handshake response received from the server.
 
-        :raises ~websockets.exceptions.InvalidMessage: if the HTTP message is
-            malformed or isn't an HTTP/1.1 GET response
+        Raises:
+            InvalidHandshake: if the handshake response is invalid.
 
         """
+
+        if response.status_code != 101:
+            raise InvalidStatus(response)
+
+        headers = response.headers
+
+        connection: List[ConnectionOption] = sum(
+            [parse_connection(value) for value in headers.get_all("Connection")], []
+        )
+
+        if not any(value.lower() == "upgrade" for value in connection):
+            raise InvalidUpgrade(
+                "Connection", ", ".join(connection) if connection else None
+            )
+
+        upgrade: List[UpgradeProtocol] = sum(
+            [parse_upgrade(value) for value in headers.get_all("Upgrade")], []
+        )
+
+        # For compatibility with non-strict implementations, ignore case when
+        # checking the Upgrade header. It's supposed to be 'WebSocket'.
+        if not (len(upgrade) == 1 and upgrade[0].lower() == "websocket"):
+            raise InvalidUpgrade("Upgrade", ", ".join(upgrade) if upgrade else None)
+
         try:
-            status_code, reason, headers = await read_response(self.reader)
-        except Exception as exc:
-            raise InvalidMessage("did not receive a valid HTTP response") from exc
+            s_w_accept = headers["Sec-WebSocket-Accept"]
+        except KeyError as exc:
+            raise InvalidHeader("Sec-WebSocket-Accept") from exc
+        except MultipleValuesError as exc:
+            raise InvalidHeader(
+                "Sec-WebSocket-Accept",
+                "more than one Sec-WebSocket-Accept header found",
+            ) from exc
 
-        logger.debug("%s < HTTP/1.1 %d %s", self.side, status_code, reason)
-        logger.debug("%s < %r", self.side, headers)
+        if s_w_accept != accept_key(self.key):
+            raise InvalidHeaderValue("Sec-WebSocket-Accept", s_w_accept)
 
-        self.response_headers = headers
+        self.extensions = self.process_extensions(headers)
 
-        return status_code, self.response_headers
+        self.subprotocol = self.process_subprotocol(headers)
 
-    @staticmethod
-    def process_extensions(
-        headers: Headers,
-        available_extensions: Optional[Sequence[ClientExtensionFactory]],
-    ) -> List[Extension]:
+    def process_extensions(self, headers: Headers) -> List[Extension]:
         """
         Handle the Sec-WebSocket-Extensions HTTP response header.
 
         Check that each extension is supported, as well as its parameters.
 
-        Return the list of accepted extensions.
-
-        Raise :exc:`~websockets.exceptions.InvalidHandshake` to abort the
-        connection.
-
         :rfc:`6455` leaves the rules up to the specification of each
-        :extension.
+        extension.
 
         To provide this level of flexibility, for each extension accepted by
         the server, we check for a match with each extension available in the
         client configuration. If no match is found, an exception is raised.
 
         If several variants of the same extension are accepted by the server,
-        it may be configured severel times, which won't make sense in general.
+        it may be configured several times, which won't make sense in general.
         Extensions must implement their own requirements. For this purpose,
         the list of previously accepted extensions is provided.
 
         Other requirements, for example related to mandatory extensions or the
         order of extensions, may be implemented by overriding this method.
 
+        Args:
+            headers: WebSocket handshake response headers.
+
+        Returns:
+            List[Extension]: List of accepted extensions.
+
+        Raises:
+            InvalidHandshake: to abort the handshake.
+
         """
         accepted_extensions: List[Extension] = []
 
-        header_values = headers.get_all("Sec-WebSocket-Extensions")
+        extensions = headers.get_all("Sec-WebSocket-Extensions")
 
-        if header_values:
+        if extensions:
 
-            if available_extensions is None:
+            if self.available_extensions is None:
                 raise InvalidHandshake("no extensions supported")
 
-            parsed_header_values: List[ExtensionHeader] = sum(
-                [parse_extension(header_value) for header_value in header_values], []
+            parsed_extensions: List[ExtensionHeader] = sum(
+                [parse_extension(header_value) for header_value in extensions], []
             )
 
-            for name, response_params in parsed_header_values:
+            for name, response_params in parsed_extensions:
 
-                for extension_factory in available_extensions:
+                for extension_factory in self.available_extensions:
 
                     # Skip non-matching extensions based on their name.
                     if extension_factory.name != name:
@@ -185,400 +263,85 @@ class WebSocketClientProtocol(WebSocketCommonProtocol):
 
         return accepted_extensions
 
-    @staticmethod
-    def process_subprotocol(
-        headers: Headers, available_subprotocols: Optional[Sequence[Subprotocol]]
-    ) -> Optional[Subprotocol]:
+    def process_subprotocol(self, headers: Headers) -> Optional[Subprotocol]:
         """
         Handle the Sec-WebSocket-Protocol HTTP response header.
 
-        Check that it contains exactly one supported subprotocol.
+        If provided, check that it contains exactly one supported subprotocol.
 
-        Return the selected subprotocol.
+        Args:
+            headers: WebSocket handshake response headers.
+
+        Returns:
+           Optional[Subprotocol]: Subprotocol, if one was selected.
 
         """
         subprotocol: Optional[Subprotocol] = None
 
-        header_values = headers.get_all("Sec-WebSocket-Protocol")
+        subprotocols = headers.get_all("Sec-WebSocket-Protocol")
 
-        if header_values:
+        if subprotocols:
 
-            if available_subprotocols is None:
+            if self.available_subprotocols is None:
                 raise InvalidHandshake("no subprotocols supported")
 
-            parsed_header_values: Sequence[Subprotocol] = sum(
-                [parse_subprotocol(header_value) for header_value in header_values], []
+            parsed_subprotocols: Sequence[Subprotocol] = sum(
+                [parse_subprotocol(header_value) for header_value in subprotocols], []
             )
 
-            if len(parsed_header_values) > 1:
-                subprotocols = ", ".join(parsed_header_values)
-                raise InvalidHandshake(f"multiple subprotocols: {subprotocols}")
+            if len(parsed_subprotocols) > 1:
+                subprotocols_display = ", ".join(parsed_subprotocols)
+                raise InvalidHandshake(f"multiple subprotocols: {subprotocols_display}")
 
-            subprotocol = parsed_header_values[0]
+            subprotocol = parsed_subprotocols[0]
 
-            if subprotocol not in available_subprotocols:
+            if subprotocol not in self.available_subprotocols:
                 raise NegotiationError(f"unsupported subprotocol: {subprotocol}")
 
         return subprotocol
 
-    async def handshake(
-        self,
-        wsuri: WebSocketURI,
-        origin: Optional[Origin] = None,
-        available_extensions: Optional[Sequence[ClientExtensionFactory]] = None,
-        available_subprotocols: Optional[Sequence[Subprotocol]] = None,
-        extra_headers: Optional[HeadersLike] = None,
-    ) -> None:
+    def send_request(self, request: Request) -> None:
         """
-        Perform the client side of the opening handshake.
+        Send a handshake request to the server.
 
-        :param origin: sets the Origin HTTP header
-        :param available_extensions: list of supported extensions in the order
-            in which they should be used
-        :param available_subprotocols: list of supported subprotocols in order
-            of decreasing preference
-        :param extra_headers: sets additional HTTP request headers; it must be
-            a :class:`~websockets.http.Headers` instance, a
-            :class:`~collections.abc.Mapping`, or an iterable of ``(name,
-            value)`` pairs
-        :raises ~websockets.exceptions.InvalidHandshake: if the handshake
-            fails
+        Args:
+            request: WebSocket handshake request event.
 
         """
-        request_headers = Headers()
+        if self.debug:
+            self.logger.debug("> GET %s HTTP/1.1", request.path)
+            for key, value in request.headers.raw_items():
+                self.logger.debug("> %s: %s", key, value)
 
-        if wsuri.port == (443 if wsuri.secure else 80):  # pragma: no cover
-            request_headers["Host"] = wsuri.host
-        else:
-            request_headers["Host"] = f"{wsuri.host}:{wsuri.port}"
+        self.writes.append(request.serialize())
 
-        if wsuri.user_info:
-            request_headers["Authorization"] = build_authorization_basic(
-                *wsuri.user_info
+    def parse(self) -> Generator[None, None, None]:
+        if self.state is CONNECTING:
+            response = yield from Response.parse(
+                self.reader.read_line,
+                self.reader.read_exact,
+                self.reader.read_to_eof,
             )
 
-        if origin is not None:
-            request_headers["Origin"] = origin
-
-        key = build_request(request_headers)
-
-        if available_extensions is not None:
-            extensions_header = build_extension(
-                [
-                    (extension_factory.name, extension_factory.get_request_params())
-                    for extension_factory in available_extensions
-                ]
-            )
-            request_headers["Sec-WebSocket-Extensions"] = extensions_header
-
-        if available_subprotocols is not None:
-            protocol_header = build_subprotocol(available_subprotocols)
-            request_headers["Sec-WebSocket-Protocol"] = protocol_header
-
-        if extra_headers is not None:
-            if isinstance(extra_headers, Headers):
-                extra_headers = extra_headers.raw_items()
-            elif isinstance(extra_headers, collections.abc.Mapping):
-                extra_headers = extra_headers.items()
-            for name, value in extra_headers:
-                request_headers[name] = value
-
-        request_headers.setdefault("User-Agent", USER_AGENT)
-
-        self.write_http_request(wsuri.resource_name, request_headers)
-
-        status_code, response_headers = await self.read_http_response()
-        if status_code in (301, 302, 303, 307, 308):
-            if "Location" not in response_headers:
-                raise InvalidHeader("Location")
-            raise RedirectHandshake(response_headers["Location"])
-        elif status_code != 101:
-            raise InvalidStatusCode(status_code)
-
-        check_response(response_headers, key)
-
-        self.extensions = self.process_extensions(
-            response_headers, available_extensions
-        )
-
-        self.subprotocol = self.process_subprotocol(
-            response_headers, available_subprotocols
-        )
-
-        self.connection_open()
-
-
-class Connect:
-    """
-    Connect to the WebSocket server at the given ``uri``.
-
-    Awaiting :func:`connect` yields a :class:`WebSocketClientProtocol` which
-    can then be used to send and receive messages.
-
-    :func:`connect` can also be used as a asynchronous context manager. In
-    that case, the connection is closed when exiting the context.
-
-    :func:`connect` is a wrapper around the event loop's
-    :meth:`~asyncio.loop.create_connection` method. Unknown keyword arguments
-    are passed to :meth:`~asyncio.loop.create_connection`.
-
-    For example, you can set the ``ssl`` keyword argument to a
-    :class:`~ssl.SSLContext` to enforce some TLS settings. When connecting to
-    a ``wss://`` URI, if this argument isn't provided explicitly,
-    :func:`ssl.create_default_context` is called to create a context.
-
-    You can connect to a different host and port from those found in ``uri``
-    by setting ``host`` and ``port`` keyword arguments. This only changes the
-    destination of the TCP connection. The host name from ``uri`` is still
-    used in the TLS handshake for secure connections and in the ``Host`` HTTP
-    header.
-
-    The ``create_protocol`` parameter allows customizing the
-    :class:`~asyncio.Protocol` that manages the connection. It should be a
-    callable or class accepting the same arguments as
-    :class:`WebSocketClientProtocol` and returning an instance of
-    :class:`WebSocketClientProtocol` or a subclass. It defaults to
-    :class:`WebSocketClientProtocol`.
-
-    The behavior of ``ping_interval``, ``ping_timeout``, ``close_timeout``,
-    ``max_size``, ``max_queue``, ``read_limit``, and ``write_limit`` is
-    described in :class:`~websockets.protocol.WebSocketCommonProtocol`.
-
-    :func:`connect` also accepts the following optional arguments:
-
-    * ``compression`` is a shortcut to configure compression extensions;
-      by default it enables the "permessage-deflate" extension; set it to
-      ``None`` to disable compression
-    * ``origin`` sets the Origin HTTP header
-    * ``extensions`` is a list of supported extensions in order of
-      decreasing preference
-    * ``subprotocols`` is a list of supported subprotocols in order of
-      decreasing preference
-    * ``extra_headers`` sets additional HTTP request headers; it can be a
-      :class:`~websockets.http.Headers` instance, a
-      :class:`~collections.abc.Mapping`, or an iterable of ``(name, value)``
-      pairs
-
-    :raises ~websockets.uri.InvalidURI: if ``uri`` is invalid
-    :raises ~websockets.handshake.InvalidHandshake: if the opening handshake
-        fails
-
-    """
-
-    MAX_REDIRECTS_ALLOWED = 10
-
-    def __init__(
-        self,
-        uri: str,
-        *,
-        path: Optional[str] = None,
-        create_protocol: Optional[Type[WebSocketClientProtocol]] = None,
-        ping_interval: float = 20,
-        ping_timeout: float = 20,
-        close_timeout: Optional[float] = None,
-        max_size: int = 2 ** 20,
-        max_queue: int = 2 ** 5,
-        read_limit: int = 2 ** 16,
-        write_limit: int = 2 ** 16,
-        loop: Optional[asyncio.AbstractEventLoop] = None,
-        legacy_recv: bool = False,
-        klass: Optional[Type[WebSocketClientProtocol]] = None,
-        timeout: Optional[float] = None,
-        compression: Optional[str] = "deflate",
-        origin: Optional[Origin] = None,
-        extensions: Optional[Sequence[ClientExtensionFactory]] = None,
-        subprotocols: Optional[Sequence[Subprotocol]] = None,
-        extra_headers: Optional[HeadersLike] = None,
-        **kwargs: Any,
-    ) -> None:
-        # Backwards compatibility: close_timeout used to be called timeout.
-        if timeout is None:
-            timeout = 10
-        else:
-            warnings.warn("rename timeout to close_timeout", DeprecationWarning)
-        # If both are specified, timeout is ignored.
-        if close_timeout is None:
-            close_timeout = timeout
-
-        # Backwards compatibility: create_protocol used to be called klass.
-        if klass is None:
-            klass = WebSocketClientProtocol
-        else:
-            warnings.warn("rename klass to create_protocol", DeprecationWarning)
-        # If both are specified, klass is ignored.
-        if create_protocol is None:
-            create_protocol = klass
-
-        if loop is None:
-            loop = asyncio.get_event_loop()
-
-        wsuri = parse_uri(uri)
-        if wsuri.secure:
-            kwargs.setdefault("ssl", True)
-        elif kwargs.get("ssl") is not None:
-            raise ValueError(
-                "connect() received a ssl argument for a ws:// URI, "
-                "use a wss:// URI to enable TLS"
-            )
-
-        if compression == "deflate":
-            if extensions is None:
-                extensions = []
-            if not any(
-                extension_factory.name == ClientPerMessageDeflateFactory.name
-                for extension_factory in extensions
-            ):
-                extensions = list(extensions) + [
-                    ClientPerMessageDeflateFactory(client_max_window_bits=True)
-                ]
-        elif compression is not None:
-            raise ValueError(f"unsupported compression: {compression}")
-
-        factory = functools.partial(
-            create_protocol,
-            ping_interval=ping_interval,
-            ping_timeout=ping_timeout,
-            close_timeout=close_timeout,
-            max_size=max_size,
-            max_queue=max_queue,
-            read_limit=read_limit,
-            write_limit=write_limit,
-            loop=loop,
-            host=wsuri.host,
-            port=wsuri.port,
-            secure=wsuri.secure,
-            legacy_recv=legacy_recv,
-            origin=origin,
-            extensions=extensions,
-            subprotocols=subprotocols,
-            extra_headers=extra_headers,
-        )
-
-        if path is None:
-            host: Optional[str]
-            port: Optional[int]
-            if kwargs.get("sock") is None:
-                host, port = wsuri.host, wsuri.port
-            else:
-                # If sock is given, host and port shouldn't be specified.
-                host, port = None, None
-            # If host and port are given, override values from the URI.
-            host = kwargs.pop("host", host)
-            port = kwargs.pop("port", port)
-            create_connection = functools.partial(
-                loop.create_connection, factory, host, port, **kwargs
-            )
-        else:
-            create_connection = functools.partial(
-                loop.create_unix_connection, factory, path, **kwargs
-            )
-
-        # This is a coroutine function.
-        self._create_connection = create_connection
-        self._wsuri = wsuri
-
-    def handle_redirect(self, uri: str) -> None:
-        # Update the state of this instance to connect to a new URI.
-        old_wsuri = self._wsuri
-        new_wsuri = parse_uri(uri)
-
-        # Forbid TLS downgrade.
-        if old_wsuri.secure and not new_wsuri.secure:
-            raise SecurityError("redirect from WSS to WS")
-
-        same_origin = (
-            old_wsuri.host == new_wsuri.host and old_wsuri.port == new_wsuri.port
-        )
-
-        # Rewrite the host and port arguments for cross-origin redirects.
-        # This preserves connection overrides with the host and port
-        # arguments if the redirect points to the same host and port.
-        if not same_origin:
-            # Replace the host and port argument passed to the protocol factory.
-            factory = self._create_connection.args[0]
-            factory = functools.partial(
-                factory.func,
-                *factory.args,
-                **dict(factory.keywords, host=new_wsuri.host, port=new_wsuri.port),
-            )
-            # Replace the host and port argument passed to create_connection.
-            self._create_connection = functools.partial(
-                self._create_connection.func,
-                *(factory, new_wsuri.host, new_wsuri.port),
-                **self._create_connection.keywords,
-            )
-
-        # Set the new WebSocket URI. This suffices for same-origin redirects.
-        self._wsuri = new_wsuri
-
-    # async with connect(...)
-
-    async def __aenter__(self) -> WebSocketClientProtocol:
-        return await self
-
-    async def __aexit__(
-        self,
-        exc_type: Optional[Type[BaseException]],
-        exc_value: Optional[BaseException],
-        traceback: Optional[TracebackType],
-    ) -> None:
-        await self.ws_client.close()
-
-    # await connect(...)
-
-    def __await__(self) -> Generator[Any, None, WebSocketClientProtocol]:
-        # Create a suitable iterator by calling __await__ on a coroutine.
-        return self.__await_impl__().__await__()
-
-    async def __await_impl__(self) -> WebSocketClientProtocol:
-        for redirects in range(self.MAX_REDIRECTS_ALLOWED):
-            transport, protocol = await self._create_connection()
-            # https://github.com/python/typeshed/pull/2756
-            transport = cast(asyncio.Transport, transport)
-            protocol = cast(WebSocketClientProtocol, protocol)
+            if self.debug:
+                code, phrase = response.status_code, response.reason_phrase
+                self.logger.debug("< HTTP/1.1 %d %s", code, phrase)
+                for key, value in response.headers.raw_items():
+                    self.logger.debug("< %s: %s", key, value)
+                if response.body is not None:
+                    self.logger.debug("< [body] (%d bytes)", len(response.body))
 
             try:
-                try:
-                    await protocol.handshake(
-                        self._wsuri,
-                        origin=protocol.origin,
-                        available_extensions=protocol.available_extensions,
-                        available_subprotocols=protocol.available_subprotocols,
-                        extra_headers=protocol.extra_headers,
-                    )
-                except Exception:
-                    protocol.fail_connection()
-                    await protocol.wait_closed()
-                    raise
-                else:
-                    self.ws_client = protocol
-                    return protocol
-            except RedirectHandshake as exc:
-                self.handle_redirect(exc.uri)
-        else:
-            raise SecurityError("too many redirects")
+                self.process_response(response)
+            except InvalidHandshake as exc:
+                response._exception = exc
+                self.handshake_exc = exc
+                self.parser = self.discard()
+                next(self.parser)  # start coroutine
+            else:
+                assert self.state is CONNECTING
+                self.state = OPEN
+            finally:
+                self.events.append(response)
 
-    # yield from connect(...)
-
-    __iter__ = __await__
-
-
-connect = Connect
-
-
-def unix_connect(path: str, uri: str = "ws://localhost/", **kwargs: Any) -> Connect:
-    """
-    Similar to :func:`connect`, but for connecting to a Unix socket.
-
-    This function calls the event loop's
-    :meth:`~asyncio.loop.create_unix_connection` method.
-
-    It is only available on Unix.
-
-    It's mainly useful for debugging servers listening on Unix sockets.
-
-    :param path: file system path to the Unix socket
-    :param uri: WebSocket URI
-
-    """
-    return connect(uri=uri, path=path, **kwargs)
+        yield from super().parse()
diff --git a/tests/wpt/tests/tools/third_party/websockets/src/websockets/connection.py b/tests/wpt/tests/tools/third_party/websockets/src/websockets/connection.py
new file mode 100644
index 00000000000..db8b5369935
--- /dev/null
+++ b/tests/wpt/tests/tools/third_party/websockets/src/websockets/connection.py
@@ -0,0 +1,702 @@
+from __future__ import annotations
+
+import enum
+import logging
+import uuid
+from typing import Generator, List, Optional, Type, Union
+
+from .exceptions import (
+    ConnectionClosed,
+    ConnectionClosedError,
+    ConnectionClosedOK,
+    InvalidState,
+    PayloadTooBig,
+    ProtocolError,
+)
+from .extensions import Extension
+from .frames import (
+    OK_CLOSE_CODES,
+    OP_BINARY,
+    OP_CLOSE,
+    OP_CONT,
+    OP_PING,
+    OP_PONG,
+    OP_TEXT,
+    Close,
+    Frame,
+)
+from .http11 import Request, Response
+from .streams import StreamReader
+from .typing import LoggerLike, Origin, Subprotocol
+
+
+__all__ = [
+    "Connection",
+    "Side",
+    "State",
+    "SEND_EOF",
+]
+
+Event = Union[Request, Response, Frame]
+"""Events that :meth:`~Connection.events_received` may return."""
+
+
+class Side(enum.IntEnum):
+    """A WebSocket connection is either a server or a client."""
+
+    SERVER, CLIENT = range(2)
+
+
+SERVER = Side.SERVER
+CLIENT = Side.CLIENT
+
+
+class State(enum.IntEnum):
+    """A WebSocket connection is in one of these four states."""
+
+    CONNECTING, OPEN, CLOSING, CLOSED = range(4)
+
+
+CONNECTING = State.CONNECTING
+OPEN = State.OPEN
+CLOSING = State.CLOSING
+CLOSED = State.CLOSED
+
+
+SEND_EOF = b""
+"""Sentinel signaling that the TCP connection must be half-closed."""
+
+
+class Connection:
+    """
+    Sans-I/O implementation of a WebSocket connection.
+
+    Args:
+        side: :attr:`~Side.CLIENT` or :attr:`~Side.SERVER`.
+        state: initial state of the WebSocket connection.
+        max_size: maximum size of incoming messages in bytes;
+            :obj:`None` to disable the limit.
+        logger: logger for this connection; depending on ``side``,
+            defaults to ``logging.getLogger("websockets.client")``
+            or ``logging.getLogger("websockets.server")``;
+            see the :doc:`logging guide <../topics/logging>` for details.
+
+    """
+
+    def __init__(
+        self,
+        side: Side,
+        state: State = OPEN,
+        max_size: Optional[int] = 2**20,
+        logger: Optional[LoggerLike] = None,
+    ) -> None:
+        # Unique identifier. For logs.
+        self.id: uuid.UUID = uuid.uuid4()
+        """Unique identifier of the connection. Useful in logs."""
+
+        # Logger or LoggerAdapter for this connection.
+        if logger is None:
+            logger = logging.getLogger(f"websockets.{side.name.lower()}")
+        self.logger: LoggerLike = logger
+        """Logger for this connection."""
+
+        # Track if DEBUG is enabled. Shortcut logging calls if it isn't.
+        self.debug = logger.isEnabledFor(logging.DEBUG)
+
+        # Connection side. CLIENT or SERVER.
+        self.side = side
+
+        # Connection state. Initially OPEN because subclasses handle CONNECTING.
+        self.state = state
+
+        # Maximum size of incoming messages in bytes.
+        self.max_size = max_size
+
+        # Current size of incoming message in bytes. Only set while reading a
+        # fragmented message i.e. a data frames with the FIN bit not set.
+        self.cur_size: Optional[int] = None
+
+        # True while sending a fragmented message i.e. a data frames with the
+        # FIN bit not set.
+        self.expect_continuation_frame = False
+
+        # WebSocket protocol parameters.
+        self.origin: Optional[Origin] = None
+        self.extensions: List[Extension] = []
+        self.subprotocol: Optional[Subprotocol] = None
+
+        # Close code and reason, set when a close frame is sent or received.
+        self.close_rcvd: Optional[Close] = None
+        self.close_sent: Optional[Close] = None
+        self.close_rcvd_then_sent: Optional[bool] = None
+
+        # Track if an exception happened during the handshake.
+        self.handshake_exc: Optional[Exception] = None
+        """
+        Exception to raise if the opening handshake failed.
+
+        :obj:`None` if the opening handshake succeeded.
+
+        """
+
+        # Track if send_eof() was called.
+        self.eof_sent = False
+
+        # Parser state.
+        self.reader = StreamReader()
+        self.events: List[Event] = []
+        self.writes: List[bytes] = []
+        self.parser = self.parse()
+        next(self.parser)  # start coroutine
+        self.parser_exc: Optional[Exception] = None
+
+    @property
+    def state(self) -> State:
+        """
+        WebSocket connection state.
+
+        Defined in 4.1, 4.2, 7.1.3, and 7.1.4 of :rfc:`6455`.
+
+        """
+        return self._state
+
+    @state.setter
+    def state(self, state: State) -> None:
+        if self.debug:
+            self.logger.debug("= connection is %s", state.name)
+        self._state = state
+
+    @property
+    def close_code(self) -> Optional[int]:
+        """
+        `WebSocket close code`_.
+
+        .. _WebSocket close code:
+            https://www.rfc-editor.org/rfc/rfc6455.html#section-7.1.5
+
+        :obj:`None` if the connection isn't closed yet.
+
+        """
+        if self.state is not CLOSED:
+            return None
+        elif self.close_rcvd is None:
+            return 1006
+        else:
+            return self.close_rcvd.code
+
+    @property
+    def close_reason(self) -> Optional[str]:
+        """
+        `WebSocket close reason`_.
+
+        .. _WebSocket close reason:
+            https://www.rfc-editor.org/rfc/rfc6455.html#section-7.1.6
+
+        :obj:`None` if the connection isn't closed yet.
+
+        """
+        if self.state is not CLOSED:
+            return None
+        elif self.close_rcvd is None:
+            return ""
+        else:
+            return self.close_rcvd.reason
+
+    @property
+    def close_exc(self) -> ConnectionClosed:
+        """
+        Exception to raise when trying to interact with a closed connection.
+
+        Don't raise this exception while the connection :attr:`state`
+        is :attr:`~websockets.connection.State.CLOSING`; wait until
+        it's :attr:`~websockets.connection.State.CLOSED`.
+
+        Indeed, the exception includes the close code and reason, which are
+        known only once the connection is closed.
+
+        Raises:
+            AssertionError: if the connection isn't closed yet.
+
+        """
+        assert self.state is CLOSED, "connection isn't closed yet"
+        exc_type: Type[ConnectionClosed]
+        if (
+            self.close_rcvd is not None
+            and self.close_sent is not None
+            and self.close_rcvd.code in OK_CLOSE_CODES
+            and self.close_sent.code in OK_CLOSE_CODES
+        ):
+            exc_type = ConnectionClosedOK
+        else:
+            exc_type = ConnectionClosedError
+        exc: ConnectionClosed = exc_type(
+            self.close_rcvd,
+            self.close_sent,
+            self.close_rcvd_then_sent,
+        )
+        # Chain to the exception raised in the parser, if any.
+        exc.__cause__ = self.parser_exc
+        return exc
+
+    # Public methods for receiving data.
+
+    def receive_data(self, data: bytes) -> None:
+        """
+        Receive data from the network.
+
+        After calling this method:
+
+        - You must call :meth:`data_to_send` and send this data to the network.
+        - You should call :meth:`events_received` and process resulting events.
+
+        Raises:
+            EOFError: if :meth:`receive_eof` was called earlier.
+
+        """
+        self.reader.feed_data(data)
+        next(self.parser)
+
+    def receive_eof(self) -> None:
+        """
+        Receive the end of the data stream from the network.
+
+        After calling this method:
+
+        - You must call :meth:`data_to_send` and send this data to the network.
+        - You aren't expected to call :meth:`events_received`; it won't return
+          any new events.
+
+        Raises:
+            EOFError: if :meth:`receive_eof` was called earlier.
+
+        """
+        self.reader.feed_eof()
+        next(self.parser)
+
+    # Public methods for sending events.
+
+    def send_continuation(self, data: bytes, fin: bool) -> None:
+        """
+        Send a `Continuation frame`_.
+
+        .. _Continuation frame:
+            https://datatracker.ietf.org/doc/html/rfc6455#section-5.6
+
+        Parameters:
+            data: payload containing the same kind of data
+                as the initial frame.
+            fin: FIN bit; set it to :obj:`True` if this is the last frame
+                of a fragmented message and to :obj:`False` otherwise.
+
+        Raises:
+            ProtocolError: if a fragmented message isn't in progress.
+
+        """
+        if not self.expect_continuation_frame:
+            raise ProtocolError("unexpected continuation frame")
+        self.expect_continuation_frame = not fin
+        self.send_frame(Frame(OP_CONT, data, fin))
+
+    def send_text(self, data: bytes, fin: bool = True) -> None:
+        """
+        Send a `Text frame`_.
+
+        .. _Text frame:
+            https://datatracker.ietf.org/doc/html/rfc6455#section-5.6
+
+        Parameters:
+            data: payload containing text encoded with UTF-8.
+            fin: FIN bit; set it to :obj:`False` if this is the first frame of
+                a fragmented message.
+
+        Raises:
+            ProtocolError: if a fragmented message is in progress.
+
+        """
+        if self.expect_continuation_frame:
+            raise ProtocolError("expected a continuation frame")
+        self.expect_continuation_frame = not fin
+        self.send_frame(Frame(OP_TEXT, data, fin))
+
+    def send_binary(self, data: bytes, fin: bool = True) -> None:
+        """
+        Send a `Binary frame`_.
+
+        .. _Binary frame:
+            https://datatracker.ietf.org/doc/html/rfc6455#section-5.6
+
+        Parameters:
+            data: payload containing arbitrary binary data.
+            fin: FIN bit; set it to :obj:`False` if this is the first frame of
+                a fragmented message.
+
+        Raises:
+            ProtocolError: if a fragmented message is in progress.
+
+        """
+        if self.expect_continuation_frame:
+            raise ProtocolError("expected a continuation frame")
+        self.expect_continuation_frame = not fin
+        self.send_frame(Frame(OP_BINARY, data, fin))
+
+    def send_close(self, code: Optional[int] = None, reason: str = "") -> None:
+        """
+        Send a `Close frame`_.
+
+        .. _Close frame:
+            https://datatracker.ietf.org/doc/html/rfc6455#section-5.5.1
+
+        Parameters:
+            code: close code.
+            reason: close reason.
+
+        Raises:
+            ProtocolError: if a fragmented message is being sent, if the code
+                isn't valid, or if a reason is provided without a code
+
+        """
+        if self.expect_continuation_frame:
+            raise ProtocolError("expected a continuation frame")
+        if code is None:
+            if reason != "":
+                raise ProtocolError("cannot send a reason without a code")
+            close = Close(1005, "")
+            data = b""
+        else:
+            close = Close(code, reason)
+            data = close.serialize()
+        # send_frame() guarantees that self.state is OPEN at this point.
+        # 7.1.3. The WebSocket Closing Handshake is Started
+        self.send_frame(Frame(OP_CLOSE, data))
+        self.close_sent = close
+        self.state = CLOSING
+
+    def send_ping(self, data: bytes) -> None:
+        """
+        Send a `Ping frame`_.
+
+        .. _Ping frame:
+            https://datatracker.ietf.org/doc/html/rfc6455#section-5.5.2
+
+        Parameters:
+            data: payload containing arbitrary binary data.
+
+        """
+        self.send_frame(Frame(OP_PING, data))
+
+    def send_pong(self, data: bytes) -> None:
+        """
+        Send a `Pong frame`_.
+
+        .. _Pong frame:
+            https://datatracker.ietf.org/doc/html/rfc6455#section-5.5.3
+
+        Parameters:
+            data: payload containing arbitrary binary data.
+
+        """
+        self.send_frame(Frame(OP_PONG, data))
+
+    def fail(self, code: int, reason: str = "") -> None:
+        """
+        `Fail the WebSocket connection`_.
+
+        .. _Fail the WebSocket connection:
+            https://datatracker.ietf.org/doc/html/rfc6455#section-7.1.7
+
+        Parameters:
+            code: close code
+            reason: close reason
+
+        Raises:
+            ProtocolError: if the code isn't valid.
+        """
+        # 7.1.7. Fail the WebSocket Connection
+
+        # Send a close frame when the state is OPEN (a close frame was already
+        # sent if it's CLOSING), except when failing the connection because
+        # of an error reading from or writing to the network.
+        if self.state is OPEN:
+            if code != 1006:
+                close = Close(code, reason)
+                data = close.serialize()
+                self.send_frame(Frame(OP_CLOSE, data))
+                self.close_sent = close
+                self.state = CLOSING
+
+        # When failing the connection, a server closes the TCP connection
+        # without waiting for the client to complete the handshake, while a
+        # client waits for the server to close the TCP connection, possibly
+        # after sending a close frame that the client will ignore.
+        if self.side is SERVER and not self.eof_sent:
+            self.send_eof()
+
+        # 7.1.7. Fail the WebSocket Connection "An endpoint MUST NOT continue
+        # to attempt to process data(including a responding Close frame) from
+        # the remote endpoint after being instructed to _Fail the WebSocket
+        # Connection_."
+        self.parser = self.discard()
+        next(self.parser)  # start coroutine
+
+    # Public method for getting incoming events after receiving data.
+
+    def events_received(self) -> List[Event]:
+        """
+        Fetch events generated from data received from the network.
+
+        Call this method immediately after any of the ``receive_*()`` methods.
+
+        Process resulting events, likely by passing them to the application.
+
+        Returns:
+            List[Event]: Events read from the connection.
+        """
+        events, self.events = self.events, []
+        return events
+
+    # Public method for getting outgoing data after receiving data or sending events.
+
+    def data_to_send(self) -> List[bytes]:
+        """
+        Obtain data to send to the network.
+
+        Call this method immediately after any of the ``receive_*()``,
+        ``send_*()``, or :meth:`fail` methods.
+
+        Write resulting data to the connection.
+
+        The empty bytestring :data:`~websockets.connection.SEND_EOF` signals
+        the end of the data stream. When you receive it, half-close the TCP
+        connection.
+
+        Returns:
+            List[bytes]: Data to write to the connection.
+
+        """
+        writes, self.writes = self.writes, []
+        return writes
+
+    def close_expected(self) -> bool:
+        """
+        Tell if the TCP connection is expected to close soon.
+
+        Call this method immediately after any of the ``receive_*()`` or
+        :meth:`fail` methods.
+
+        If it returns :obj:`True`, schedule closing the TCP connection after a
+        short timeout if the other side hasn't already closed it.
+
+        Returns:
+            bool: Whether the TCP connection is expected to close soon.
+
+        """
+        # We expect a TCP close if and only if we sent a close frame:
+        # * Normal closure: once we send a close frame, we expect a TCP close:
+        #   server waits for client to complete the TCP closing handshake;
+        #   client waits for server to initiate the TCP closing handshake.
+        # * Abnormal closure: we always send a close frame and the same logic
+        #   applies, except on EOFError where we don't send a close frame
+        #   because we already received the TCP close, so we don't expect it.
+        # We already got a TCP Close if and only if the state is CLOSED.
+        return self.state is CLOSING or self.handshake_exc is not None
+
+    # Private methods for receiving data.
+
+    def parse(self) -> Generator[None, None, None]:
+        """
+        Parse incoming data into frames.
+
+        :meth:`receive_data` and :meth:`receive_eof` run this generator
+        coroutine until it needs more data or reaches EOF.
+
+        """
+        try:
+            while True:
+                if (yield from self.reader.at_eof()):
+                    if self.debug:
+                        self.logger.debug("< EOF")
+                    # If the WebSocket connection is closed cleanly, with a
+                    # closing handhshake, recv_frame() substitutes parse()
+                    # with discard(). This branch is reached only when the
+                    # connection isn't closed cleanly.
+                    raise EOFError("unexpected end of stream")
+
+                if self.max_size is None:
+                    max_size = None
+                elif self.cur_size is None:
+                    max_size = self.max_size
+                else:
+                    max_size = self.max_size - self.cur_size
+
+                # During a normal closure, execution ends here on the next
+                # iteration of the loop after receiving a close frame. At
+                # this point, recv_frame() replaced parse() by discard().
+                frame = yield from Frame.parse(
+                    self.reader.read_exact,
+                    mask=self.side is SERVER,
+                    max_size=max_size,
+                    extensions=self.extensions,
+                )
+
+                if self.debug:
+                    self.logger.debug("< %s", frame)
+
+                self.recv_frame(frame)
+
+        except ProtocolError as exc:
+            self.fail(1002, str(exc))
+            self.parser_exc = exc
+
+        except EOFError as exc:
+            self.fail(1006, str(exc))
+            self.parser_exc = exc
+
+        except UnicodeDecodeError as exc:
+            self.fail(1007, f"{exc.reason} at position {exc.start}")
+            self.parser_exc = exc
+
+        except PayloadTooBig as exc:
+            self.fail(1009, str(exc))
+            self.parser_exc = exc
+
+        except Exception as exc:
+            self.logger.error("parser failed", exc_info=True)
+            # Don't include exception details, which may be security-sensitive.
+            self.fail(1011)
+            self.parser_exc = exc
+
+        # During an abnormal closure, execution ends here after catching an
+        # exception. At this point, fail() replaced parse() by discard().
+        yield
+        raise AssertionError("parse() shouldn't step after error")  # pragma: no cover
+
+    def discard(self) -> Generator[None, None, None]:
+        """
+        Discard incoming data.
+
+        This coroutine replaces :meth:`parse`:
+
+        - after receiving a close frame, during a normal closure (1.4);
+        - after sending a close frame, during an abnormal closure (7.1.7).
+
+        """
+        # The server close the TCP connection in the same circumstances where
+        # discard() replaces parse(). The client closes the connection later,
+        # after the server closes the connection or a timeout elapses.
+        # (The latter case cannot be handled in this Sans-I/O layer.)
+        assert (self.side is SERVER) == (self.eof_sent)
+        while not (yield from self.reader.at_eof()):
+            self.reader.discard()
+        if self.debug:
+            self.logger.debug("< EOF")
+        # A server closes the TCP connection immediately, while a client
+        # waits for the server to close the TCP connection.
+        if self.side is CLIENT:
+            self.send_eof()
+        self.state = CLOSED
+        # If discard() completes normally, execution ends here.
+        yield
+        # Once the reader reaches EOF, its feed_data/eof() methods raise an
+        # error, so our receive_data/eof() methods don't step the generator.
+        raise AssertionError("discard() shouldn't step after EOF")  # pragma: no cover
+
+    def recv_frame(self, frame: Frame) -> None:
+        """
+        Process an incoming frame.
+
+        """
+        if frame.opcode is OP_TEXT or frame.opcode is OP_BINARY:
+            if self.cur_size is not None:
+                raise ProtocolError("expected a continuation frame")
+            if frame.fin:
+                self.cur_size = None
+            else:
+                self.cur_size = len(frame.data)
+
+        elif frame.opcode is OP_CONT:
+            if self.cur_size is None:
+                raise ProtocolError("unexpected continuation frame")
+            if frame.fin:
+                self.cur_size = None
+            else:
+                self.cur_size += len(frame.data)
+
+        elif frame.opcode is OP_PING:
+            # 5.5.2. Ping: "Upon receipt of a Ping frame, an endpoint MUST
+            # send a Pong frame in response"
+            pong_frame = Frame(OP_PONG, frame.data)
+            self.send_frame(pong_frame)
+
+        elif frame.opcode is OP_PONG:
+            # 5.5.3 Pong: "A response to an unsolicited Pong frame is not
+            # expected."
+            pass
+
+        elif frame.opcode is OP_CLOSE:
+            # 7.1.5.  The WebSocket Connection Close Code
+            # 7.1.6.  The WebSocket Connection Close Reason
+            self.close_rcvd = Close.parse(frame.data)
+            if self.state is CLOSING:
+                assert self.close_sent is not None
+                self.close_rcvd_then_sent = False
+
+            if self.cur_size is not None:
+                raise ProtocolError("incomplete fragmented message")
+
+            # 5.5.1 Close: "If an endpoint receives a Close frame and did
+            # not previously send a Close frame, the endpoint MUST send a
+            # Close frame in response. (When sending a Close frame in
+            # response, the endpoint typically echos the status code it
+            # received.)"
+
+            if self.state is OPEN:
+                # Echo the original data instead of re-serializing it with
+                # Close.serialize() because that fails when the close frame
+                # is empty and Close.parse() synthetizes a 1005 close code.
+                # The rest is identical to send_close().
+                self.send_frame(Frame(OP_CLOSE, frame.data))
+                self.close_sent = self.close_rcvd
+                self.close_rcvd_then_sent = True
+                self.state = CLOSING
+
+            # 7.1.2. Start the WebSocket Closing Handshake: "Once an
+            # endpoint has both sent and received a Close control frame,
+            # that endpoint SHOULD _Close the WebSocket Connection_"
+
+            # A server closes the TCP connection immediately, while a client
+            # waits for the server to close the TCP connection.
+            if self.side is SERVER:
+                self.send_eof()
+
+            # 1.4. Closing Handshake: "after receiving a control frame
+            # indicating the connection should be closed, a peer discards
+            # any further data received."
+            self.parser = self.discard()
+            next(self.parser)  # start coroutine
+
+        else:  # pragma: no cover
+            # This can't happen because Frame.parse() validates opcodes.
+            raise AssertionError(f"unexpected opcode: {frame.opcode:02x}")
+
+        self.events.append(frame)
+
+    # Private methods for sending events.
+
+    def send_frame(self, frame: Frame) -> None:
+        if self.state is not OPEN:
+            raise InvalidState(
+                f"cannot write to a WebSocket in the {self.state.name} state"
+            )
+
+        if self.debug:
+            self.logger.debug("> %s", frame)
+        self.writes.append(
+            frame.serialize(mask=self.side is CLIENT, extensions=self.extensions)
+        )
+
+    def send_eof(self) -> None:
+        assert not self.eof_sent
+        self.eof_sent = True
+        if self.debug:
+            self.logger.debug("> EOF")
+        self.writes.append(SEND_EOF)
diff --git a/tests/wpt/tests/tools/third_party/websockets/src/websockets/datastructures.py b/tests/wpt/tests/tools/third_party/websockets/src/websockets/datastructures.py
new file mode 100644
index 00000000000..36a2cbaf99c
--- /dev/null
+++ b/tests/wpt/tests/tools/third_party/websockets/src/websockets/datastructures.py
@@ -0,0 +1,200 @@
+from __future__ import annotations
+
+import sys
+from typing import (
+    Any,
+    Dict,
+    Iterable,
+    Iterator,
+    List,
+    Mapping,
+    MutableMapping,
+    Tuple,
+    Union,
+)
+
+
+if sys.version_info[:2] >= (3, 8):
+    from typing import Protocol
+else:  # pragma: no cover
+    Protocol = object  # mypy will report errors on Python 3.7.
+
+
+__all__ = ["Headers", "HeadersLike", "MultipleValuesError"]
+
+
+class MultipleValuesError(LookupError):
+    """
+    Exception raised when :class:`Headers` has more than one value for a key.
+
+    """
+
+    def __str__(self) -> str:
+        # Implement the same logic as KeyError_str in Objects/exceptions.c.
+        if len(self.args) == 1:
+            return repr(self.args[0])
+        return super().__str__()
+
+
+class Headers(MutableMapping[str, str]):
+    """
+    Efficient data structure for manipulating HTTP headers.
+
+    A :class:`list` of ``(name, values)`` is inefficient for lookups.
+
+    A :class:`dict` doesn't suffice because header names are case-insensitive
+    and multiple occurrences of headers with the same name are possible.
+
+    :class:`Headers` stores HTTP headers in a hybrid data structure to provide
+    efficient insertions and lookups while preserving the original data.
+
+    In order to account for multiple values with minimal hassle,
+    :class:`Headers` follows this logic:
+
+    - When getting a header with ``headers[name]``:
+        - if there's no value, :exc:`KeyError` is raised;
+        - if there's exactly one value, it's returned;
+        - if there's more than one value, :exc:`MultipleValuesError` is raised.
+
+    - When setting a header with ``headers[name] = value``, the value is
+      appended to the list of values for that header.
+
+    - When deleting a header with ``del headers[name]``, all values for that
+      header are removed (this is slow).
+
+    Other methods for manipulating headers are consistent with this logic.
+
+    As long as no header occurs multiple times, :class:`Headers` behaves like
+    :class:`dict`, except keys are lower-cased to provide case-insensitivity.
+
+    Two methods support manipulating multiple values explicitly:
+
+    - :meth:`get_all` returns a list of all values for a header;
+    - :meth:`raw_items` returns an iterator of ``(name, values)`` pairs.
+
+    """
+
+    __slots__ = ["_dict", "_list"]
+
+    # Like dict, Headers accepts an optional "mapping or iterable" argument.
+    def __init__(self, *args: HeadersLike, **kwargs: str) -> None:
+        self._dict: Dict[str, List[str]] = {}
+        self._list: List[Tuple[str, str]] = []
+        self.update(*args, **kwargs)
+
+    def __str__(self) -> str:
+        return "".join(f"{key}: {value}\r\n" for key, value in self._list) + "\r\n"
+
+    def __repr__(self) -> str:
+        return f"{self.__class__.__name__}({self._list!r})"
+
+    def copy(self) -> Headers:
+        copy = self.__class__()
+        copy._dict = self._dict.copy()
+        copy._list = self._list.copy()
+        return copy
+
+    def serialize(self) -> bytes:
+        # Since headers only contain ASCII characters, we can keep this simple.
+        return str(self).encode()
+
+    # Collection methods
+
+    def __contains__(self, key: object) -> bool:
+        return isinstance(key, str) and key.lower() in self._dict
+
+    def __iter__(self) -> Iterator[str]:
+        return iter(self._dict)
+
+    def __len__(self) -> int:
+        return len(self._dict)
+
+    # MutableMapping methods
+
+    def __getitem__(self, key: str) -> str:
+        value = self._dict[key.lower()]
+        if len(value) == 1:
+            return value[0]
+        else:
+            raise MultipleValuesError(key)
+
+    def __setitem__(self, key: str, value: str) -> None:
+        self._dict.setdefault(key.lower(), []).append(value)
+        self._list.append((key, value))
+
+    def __delitem__(self, key: str) -> None:
+        key_lower = key.lower()
+        self._dict.__delitem__(key_lower)
+        # This is inefficient. Fortunately deleting HTTP headers is uncommon.
+        self._list = [(k, v) for k, v in self._list if k.lower() != key_lower]
+
+    def __eq__(self, other: Any) -> bool:
+        if not isinstance(other, Headers):
+            return NotImplemented
+        return self._dict == other._dict
+
+    def clear(self) -> None:
+        """
+        Remove all headers.
+
+        """
+        self._dict = {}
+        self._list = []
+
+    def update(self, *args: HeadersLike, **kwargs: str) -> None:
+        """
+        Update from a :class:`Headers` instance and/or keyword arguments.
+
+        """
+        args = tuple(
+            arg.raw_items() if isinstance(arg, Headers) else arg for arg in args
+        )
+        super().update(*args, **kwargs)
+
+    # Methods for handling multiple values
+
+    def get_all(self, key: str) -> List[str]:
+        """
+        Return the (possibly empty) list of all values for a header.
+
+        Args:
+            key: header name.
+
+        """
+        return self._dict.get(key.lower(), [])
+
+    def raw_items(self) -> Iterator[Tuple[str, str]]:
+        """
+        Return an iterator of all values as ``(name, value)`` pairs.
+
+        """
+        return iter(self._list)
+
+
+# copy of _typeshed.SupportsKeysAndGetItem.
+class SupportsKeysAndGetItem(Protocol):  # pragma: no cover
+    """
+    Dict-like types with ``keys() -> str`` and ``__getitem__(key: str) -> str`` methods.
+
+    """
+
+    def keys(self) -> Iterable[str]:
+        ...
+
+    def __getitem__(self, key: str) -> str:
+        ...
+
+
+HeadersLike = Union[
+    Headers,
+    Mapping[str, str],
+    Iterable[Tuple[str, str]],
+    SupportsKeysAndGetItem,
+]
+"""
+Types accepted where :class:`Headers` is expected.
+
+In addition to :class:`Headers` itself, this includes dict-like types where both
+keys and values are :class:`str`.
+
+"""
diff --git a/tests/wpt/tests/tools/third_party/websockets/src/websockets/exceptions.py b/tests/wpt/tests/tools/third_party/websockets/src/websockets/exceptions.py
index 9873a171703..0c4fc51851a 100644
--- a/tests/wpt/tests/tools/third_party/websockets/src/websockets/exceptions.py
+++ b/tests/wpt/tests/tools/third_party/websockets/src/websockets/exceptions.py
@@ -13,7 +13,8 @@
             * :exc:`InvalidHeaderValue`
             * :exc:`InvalidOrigin`
             * :exc:`InvalidUpgrade`
-        * :exc:`InvalidStatusCode`
+        * :exc:`InvalidStatus`
+        * :exc:`InvalidStatusCode` (legacy)
         * :exc:`NegotiationError`
             * :exc:`DuplicateParameter`
             * :exc:`InvalidParameterName`
@@ -27,10 +28,12 @@
 
 """
 
+from __future__ import annotations
+
 import http
 from typing import Optional
 
-from .http import Headers, HeadersLike
+from . import datastructures, frames, http11
 
 
 __all__ = [
@@ -46,6 +49,7 @@ __all__ = [
     "InvalidHeaderValue",
     "InvalidOrigin",
     "InvalidUpgrade",
+    "InvalidStatus",
     "InvalidStatusCode",
     "NegotiationError",
     "DuplicateParameter",
@@ -63,89 +67,84 @@ __all__ = [
 
 class WebSocketException(Exception):
     """
-    Base class for all exceptions defined by :mod:`websockets`.
+    Base class for all exceptions defined by websockets.
 
     """
 
 
-CLOSE_CODES = {
-    1000: "OK",
-    1001: "going away",
-    1002: "protocol error",
-    1003: "unsupported type",
-    # 1004 is reserved
-    1005: "no status code [internal]",
-    1006: "connection closed abnormally [internal]",
-    1007: "invalid data",
-    1008: "policy violation",
-    1009: "message too big",
-    1010: "extension required",
-    1011: "unexpected error",
-    1015: "TLS failure [internal]",
-}
-
-
-def format_close(code: int, reason: str) -> str:
-    """
-    Display a human-readable version of the close code and reason.
-
-    """
-    if 3000 <= code < 4000:
-        explanation = "registered"
-    elif 4000 <= code < 5000:
-        explanation = "private use"
-    else:
-        explanation = CLOSE_CODES.get(code, "unknown")
-    result = f"code = {code} ({explanation}), "
-
-    if reason:
-        result += f"reason = {reason}"
-    else:
-        result += "no reason"
-
-    return result
-
-
 class ConnectionClosed(WebSocketException):
     """
     Raised when trying to interact with a closed connection.
 
-    Provides the connection close code and reason in its ``code`` and
-    ``reason`` attributes respectively.
+    Attributes:
+        rcvd (Optional[Close]): if a close frame was received, its code and
+            reason are available in ``rcvd.code`` and ``rcvd.reason``.
+        sent (Optional[Close]): if a close frame was sent, its code and reason
+            are available in ``sent.code`` and ``sent.reason``.
+        rcvd_then_sent (Optional[bool]): if close frames were received and
+            sent, this attribute tells in which order this happened, from the
+            perspective of this side of the connection.
 
     """
 
-    def __init__(self, code: int, reason: str) -> None:
-        self.code = code
-        self.reason = reason
-        super().__init__(format_close(code, reason))
+    def __init__(
+        self,
+        rcvd: Optional[frames.Close],
+        sent: Optional[frames.Close],
+        rcvd_then_sent: Optional[bool] = None,
+    ) -> None:
+        self.rcvd = rcvd
+        self.sent = sent
+        self.rcvd_then_sent = rcvd_then_sent
+
+    def __str__(self) -> str:
+        if self.rcvd is None:
+            if self.sent is None:
+                assert self.rcvd_then_sent is None
+                return "no close frame received or sent"
+            else:
+                assert self.rcvd_then_sent is None
+                return f"sent {self.sent}; no close frame received"
+        else:
+            if self.sent is None:
+                assert self.rcvd_then_sent is None
+                return f"received {self.rcvd}; no close frame sent"
+            else:
+                assert self.rcvd_then_sent is not None
+                if self.rcvd_then_sent:
+                    return f"received {self.rcvd}; then sent {self.sent}"
+                else:
+                    return f"sent {self.sent}; then received {self.rcvd}"
+
+    # code and reason attributes are provided for backwards-compatibility
+
+    @property
+    def code(self) -> int:
+        return 1006 if self.rcvd is None else self.rcvd.code
+
+    @property
+    def reason(self) -> str:
+        return "" if self.rcvd is None else self.rcvd.reason
 
 
 class ConnectionClosedError(ConnectionClosed):
     """
     Like :exc:`ConnectionClosed`, when the connection terminated with an error.
 
-    This means the close code is different from 1000 (OK) and 1001 (going away).
+    A close code other than 1000 (OK) or 1001 (going away) was received or
+    sent, or the closing handshake didn't complete properly.
 
     """
 
-    def __init__(self, code: int, reason: str) -> None:
-        assert code != 1000 and code != 1001
-        super().__init__(code, reason)
-
 
 class ConnectionClosedOK(ConnectionClosed):
     """
     Like :exc:`ConnectionClosed`, when the connection terminated properly.
 
-    This means the close code is 1000 (OK) or 1001 (going away).
+    A close code 1000 (OK) or 1001 (going away) was received and sent.
 
     """
 
-    def __init__(self, code: int, reason: str) -> None:
-        assert code == 1000 or code == 1001
-        super().__init__(code, reason)
-
 
 class InvalidHandshake(WebSocketException):
     """
@@ -179,13 +178,14 @@ class InvalidHeader(InvalidHandshake):
     def __init__(self, name: str, value: Optional[str] = None) -> None:
         self.name = name
         self.value = value
-        if value is None:
-            message = f"missing {name} header"
-        elif value == "":
-            message = f"empty {name} header"
+
+    def __str__(self) -> str:
+        if self.value is None:
+            return f"missing {self.name} header"
+        elif self.value == "":
+            return f"empty {self.name} header"
         else:
-            message = f"invalid {name} header: {value}"
-        super().__init__(message)
+            return f"invalid {self.name} header: {self.value}"
 
 
 class InvalidHeaderFormat(InvalidHeader):
@@ -197,9 +197,7 @@ class InvalidHeaderFormat(InvalidHeader):
     """
 
     def __init__(self, name: str, error: str, header: str, pos: int) -> None:
-        self.name = name
-        error = f"{error} at {pos} in {header}"
-        super().__init__(name, error)
+        super().__init__(name, f"{error} at {pos} in {header}")
 
 
 class InvalidHeaderValue(InvalidHeader):
@@ -228,18 +226,34 @@ class InvalidUpgrade(InvalidHeader):
     """
 
 
+class InvalidStatus(InvalidHandshake):
+    """
+    Raised when a handshake response rejects the WebSocket upgrade.
+
+    """
+
+    def __init__(self, response: http11.Response) -> None:
+        self.response = response
+
+    def __str__(self) -> str:
+        return (
+            "server rejected WebSocket connection: "
+            f"HTTP {self.response.status_code:d}"
+        )
+
+
 class InvalidStatusCode(InvalidHandshake):
     """
     Raised when a handshake response status code is invalid.
 
-    The integer status code is available in the ``status_code`` attribute.
-
     """
 
-    def __init__(self, status_code: int) -> None:
+    def __init__(self, status_code: int, headers: datastructures.Headers) -> None:
         self.status_code = status_code
-        message = f"server rejected WebSocket connection: HTTP {status_code}"
-        super().__init__(message)
+        self.headers = headers
+
+    def __str__(self) -> str:
+        return f"server rejected WebSocket connection: HTTP {self.status_code}"
 
 
 class NegotiationError(InvalidHandshake):
@@ -257,8 +271,9 @@ class DuplicateParameter(NegotiationError):
 
     def __init__(self, name: str) -> None:
         self.name = name
-        message = f"duplicate parameter: {name}"
-        super().__init__(message)
+
+    def __str__(self) -> str:
+        return f"duplicate parameter: {self.name}"
 
 
 class InvalidParameterName(NegotiationError):
@@ -269,8 +284,9 @@ class InvalidParameterName(NegotiationError):
 
     def __init__(self, name: str) -> None:
         self.name = name
-        message = f"invalid parameter name: {name}"
-        super().__init__(message)
+
+    def __str__(self) -> str:
+        return f"invalid parameter name: {self.name}"
 
 
 class InvalidParameterValue(NegotiationError):
@@ -282,13 +298,14 @@ class InvalidParameterValue(NegotiationError):
     def __init__(self, name: str, value: Optional[str]) -> None:
         self.name = name
         self.value = value
-        if value is None:
-            message = f"missing value for parameter {name}"
-        elif value == "":
-            message = f"empty value for parameter {name}"
+
+    def __str__(self) -> str:
+        if self.value is None:
+            return f"missing value for parameter {self.name}"
+        elif self.value == "":
+            return f"empty value for parameter {self.name}"
         else:
-            message = f"invalid value for parameter {name}: {value}"
-        super().__init__(message)
+            return f"invalid value for parameter {self.name}: {self.value}"
 
 
 class AbortHandshake(InvalidHandshake):
@@ -297,18 +314,31 @@ class AbortHandshake(InvalidHandshake):
 
     This exception is an implementation detail.
 
-    The public API is :meth:`~server.WebSocketServerProtocol.process_request`.
+    The public API
+    is :meth:`~websockets.server.WebSocketServerProtocol.process_request`.
 
+    Attributes:
+        status (~http.HTTPStatus): HTTP status code.
+        headers (Headers): HTTP response headers.
+        body (bytes): HTTP response body.
     """
 
     def __init__(
-        self, status: http.HTTPStatus, headers: HeadersLike, body: bytes = b""
+        self,
+        status: http.HTTPStatus,
+        headers: datastructures.HeadersLike,
+        body: bytes = b"",
     ) -> None:
         self.status = status
-        self.headers = Headers(headers)
+        self.headers = datastructures.Headers(headers)
         self.body = body
-        message = f"HTTP {status}, {len(self.headers)} headers, {len(body)} bytes"
-        super().__init__(message)
+
+    def __str__(self) -> str:
+        return (
+            f"HTTP {self.status:d}, "
+            f"{len(self.headers)} headers, "
+            f"{len(self.body)} bytes"
+        )
 
 
 class RedirectHandshake(InvalidHandshake):
@@ -343,10 +373,12 @@ class InvalidURI(WebSocketException):
 
     """
 
-    def __init__(self, uri: str) -> None:
+    def __init__(self, uri: str, msg: str) -> None:
         self.uri = uri
-        message = "{} isn't a valid URI".format(uri)
-        super().__init__(message)
+        self.msg = msg
+
+    def __str__(self) -> str:
+        return f"{self.uri} isn't a valid URI: {self.msg}"
 
 
 class PayloadTooBig(WebSocketException):
@@ -358,7 +390,7 @@ class PayloadTooBig(WebSocketException):
 
 class ProtocolError(WebSocketException):
     """
-    Raised when the other side breaks the protocol.
+    Raised when a frame breaks the protocol.
 
     """
 
diff --git a/tests/wpt/tests/tools/third_party/websockets/src/websockets/extensions/__init__.py b/tests/wpt/tests/tools/third_party/websockets/src/websockets/extensions/__init__.py
index e69de29bb2d..02838b98a53 100644
--- a/tests/wpt/tests/tools/third_party/websockets/src/websockets/extensions/__init__.py
+++ b/tests/wpt/tests/tools/third_party/websockets/src/websockets/extensions/__init__.py
@@ -0,0 +1,4 @@
+from .base import *
+
+
+__all__ = ["Extension", "ClientExtensionFactory", "ServerExtensionFactory"]
diff --git a/tests/wpt/tests/tools/third_party/websockets/src/websockets/extensions/base.py b/tests/wpt/tests/tools/third_party/websockets/src/websockets/extensions/base.py
index aa52a7adbf4..06096761857 100644
--- a/tests/wpt/tests/tools/third_party/websockets/src/websockets/extensions/base.py
+++ b/tests/wpt/tests/tools/third_party/websockets/src/websockets/extensions/base.py
@@ -1,16 +1,8 @@
-"""
-:mod:`websockets.extensions.base` defines abstract classes for implementing
-extensions.
-
-See `section 9 of RFC 6455`_.
-
-.. _section 9 of RFC 6455: http://tools.ietf.org/html/rfc6455#section-9
-
-"""
+from __future__ import annotations
 
 from typing import List, Optional, Sequence, Tuple
 
-from ..framing import Frame
+from .. import frames
 from ..typing import ExtensionName, ExtensionParameter
 
 
@@ -19,53 +11,62 @@ __all__ = ["Extension", "ClientExtensionFactory", "ServerExtensionFactory"]
 
 class Extension:
     """
-    Abstract class for extensions.
+    Base class for extensions.
 
     """
 
-    @property
-    def name(self) -> ExtensionName:
-        """
-        Extension identifier.
+    name: ExtensionName
+    """Extension identifier."""
 
-        """
-
-    def decode(self, frame: Frame, *, max_size: Optional[int] = None) -> Frame:
+    def decode(
+        self,
+        frame: frames.Frame,
+        *,
+        max_size: Optional[int] = None,
+    ) -> frames.Frame:
         """
         Decode an incoming frame.
 
-        :param frame: incoming frame
-        :param max_size: maximum payload size in bytes
+        Args:
+            frame (Frame): incoming frame.
+            max_size: maximum payload size in bytes.
+
+        Returns:
+            Frame: Decoded frame.
+
+        Raises:
+            PayloadTooBig: if decoding the payload exceeds ``max_size``.
 
         """
 
-    def encode(self, frame: Frame) -> Frame:
+    def encode(self, frame: frames.Frame) -> frames.Frame:
         """
         Encode an outgoing frame.
 
-        :param frame: outgoing frame
+        Args:
+            frame (Frame): outgoing frame.
+
+        Returns:
+            Frame: Encoded frame.
 
         """
 
 
 class ClientExtensionFactory:
     """
-    Abstract class for client-side extension factories.
+    Base class for client-side extension factories.
 
     """
 
-    @property
-    def name(self) -> ExtensionName:
-        """
-        Extension identifier.
-
-        """
+    name: ExtensionName
+    """Extension identifier."""
 
     def get_request_params(self) -> List[ExtensionParameter]:
         """
-        Build request parameters.
+        Build parameters to send to the server for this extension.
 
-        Return a list of ``(name, value)`` pairs.
+        Returns:
+            List[ExtensionParameter]: Parameters to send to the server.
 
         """
 
@@ -75,28 +76,31 @@ class ClientExtensionFactory:
         accepted_extensions: Sequence[Extension],
     ) -> Extension:
         """
-        Process response parameters received from the server.
+        Process parameters received from the server.
 
-        :param params: list of ``(name, value)`` pairs.
-        :param accepted_extensions: list of previously accepted extensions.
-        :raises ~websockets.exceptions.NegotiationError: if parameters aren't
-            acceptable
+        Args:
+            params (Sequence[ExtensionParameter]): parameters received from
+                the server for this extension.
+            accepted_extensions (Sequence[Extension]): list of previously
+                accepted extensions.
+
+        Returns:
+            Extension: An extension instance.
+
+        Raises:
+            NegotiationError: if parameters aren't acceptable.
 
         """
 
 
 class ServerExtensionFactory:
     """
-    Abstract class for server-side extension factories.
+    Base class for server-side extension factories.
 
     """
 
-    @property
-    def name(self) -> ExtensionName:
-        """
-        Extension identifier.
-
-        """
+    name: ExtensionName
+    """Extension identifier."""
 
     def process_request_params(
         self,
@@ -104,16 +108,21 @@ class ServerExtensionFactory:
         accepted_extensions: Sequence[Extension],
     ) -> Tuple[List[ExtensionParameter], Extension]:
         """
-        Process request parameters received from the client.
+        Process parameters received from the client.
 
-        To accept the offer, return a 2-uple containing:
+        Args:
+            params (Sequence[ExtensionParameter]): parameters received from
+                the client for this extension.
+            accepted_extensions (Sequence[Extension]): list of previously
+                accepted extensions.
 
-        - response parameters: a list of ``(name, value)`` pairs
-        - an extension: an instance of a subclass of :class:`Extension`
+        Returns:
+            Tuple[List[ExtensionParameter], Extension]: To accept the offer,
+            parameters to send to the client for this extension and an
+            extension instance.
 
-        :param params: list of ``(name, value)`` pairs.
-        :param accepted_extensions: list of previously accepted extensions.
-        :raises ~websockets.exceptions.NegotiationError: to reject the offer,
-            if parameters aren't acceptable
+        Raises:
+            NegotiationError: to reject the offer, if parameters received from
+                the client aren't acceptable.
 
         """
diff --git a/tests/wpt/tests/tools/third_party/websockets/src/websockets/extensions/permessage_deflate.py b/tests/wpt/tests/tools/third_party/websockets/src/websockets/extensions/permessage_deflate.py
index e38d9edaba6..e0de5e8f855 100644
--- a/tests/wpt/tests/tools/third_party/websockets/src/websockets/extensions/permessage_deflate.py
+++ b/tests/wpt/tests/tools/third_party/websockets/src/websockets/extensions/permessage_deflate.py
@@ -1,20 +1,10 @@
-"""
-:mod:`websockets.extensions.permessage_deflate` implements the Compression
-Extensions for WebSocket as specified in :rfc:`7692`.
-
-"""
+from __future__ import annotations
 
+import dataclasses
 import zlib
 from typing import Any, Dict, List, Optional, Sequence, Tuple, Union
 
-from ..exceptions import (
-    DuplicateParameter,
-    InvalidParameterName,
-    InvalidParameterValue,
-    NegotiationError,
-    PayloadTooBig,
-)
-from ..framing import CTRL_OPCODES, OP_CONT, Frame
+from .. import exceptions, frames
 from ..typing import ExtensionName, ExtensionParameter
 from .base import ClientExtensionFactory, Extension, ServerExtensionFactory
 
@@ -22,7 +12,9 @@ from .base import ClientExtensionFactory, Extension, ServerExtensionFactory
 __all__ = [
     "PerMessageDeflate",
     "ClientPerMessageDeflateFactory",
+    "enable_client_permessage_deflate",
     "ServerPerMessageDeflateFactory",
+    "enable_server_permessage_deflate",
 ]
 
 _EMPTY_UNCOMPRESSED_BLOCK = b"\x00\x00\xff\xff"
@@ -88,76 +80,86 @@ class PerMessageDeflate(Extension):
             f"local_max_window_bits={self.local_max_window_bits})"
         )
 
-    def decode(self, frame: Frame, *, max_size: Optional[int] = None) -> Frame:
+    def decode(
+        self,
+        frame: frames.Frame,
+        *,
+        max_size: Optional[int] = None,
+    ) -> frames.Frame:
         """
         Decode an incoming frame.
 
         """
         # Skip control frames.
-        if frame.opcode in CTRL_OPCODES:
+        if frame.opcode in frames.CTRL_OPCODES:
             return frame
 
         # Handle continuation data frames:
-        # - skip if the initial data frame wasn't encoded
+        # - skip if the message isn't encoded
         # - reset "decode continuation data" flag if it's a final frame
-        if frame.opcode == OP_CONT:
+        if frame.opcode is frames.OP_CONT:
             if not self.decode_cont_data:
                 return frame
             if frame.fin:
                 self.decode_cont_data = False
 
         # Handle text and binary data frames:
-        # - skip if the frame isn't encoded
+        # - skip if the message isn't encoded
+        # - unset the rsv1 flag on the first frame of a compressed message
         # - set "decode continuation data" flag if it's a non-final frame
         else:
             if not frame.rsv1:
                 return frame
-            if not frame.fin:  # frame.rsv1 is True at this point
+            frame = dataclasses.replace(frame, rsv1=False)
+            if not frame.fin:
                 self.decode_cont_data = True
 
             # Re-initialize per-message decoder.
             if self.remote_no_context_takeover:
                 self.decoder = zlib.decompressobj(wbits=-self.remote_max_window_bits)
 
-        # Uncompress compressed frames. Protect against zip bombs by
-        # preventing zlib from decompressing more than max_length bytes
-        # (except when the limit is disabled with max_size = None).
+        # Uncompress data. Protect against zip bombs by preventing zlib from
+        # decompressing more than max_length bytes (except when the limit is
+        # disabled with max_size = None).
         data = frame.data
         if frame.fin:
             data += _EMPTY_UNCOMPRESSED_BLOCK
         max_length = 0 if max_size is None else max_size
-        data = self.decoder.decompress(data, max_length)
+        try:
+            data = self.decoder.decompress(data, max_length)
+        except zlib.error as exc:
+            raise exceptions.ProtocolError("decompression failed") from exc
         if self.decoder.unconsumed_tail:
-            raise PayloadTooBig(
-                f"Uncompressed payload length exceeds size limit (? > {max_size} bytes)"
-            )
+            raise exceptions.PayloadTooBig(f"over size limit (? > {max_size} bytes)")
 
         # Allow garbage collection of the decoder if it won't be reused.
         if frame.fin and self.remote_no_context_takeover:
             del self.decoder
 
-        return frame._replace(data=data, rsv1=False)
+        return dataclasses.replace(frame, data=data)
 
-    def encode(self, frame: Frame) -> Frame:
+    def encode(self, frame: frames.Frame) -> frames.Frame:
         """
         Encode an outgoing frame.
 
         """
         # Skip control frames.
-        if frame.opcode in CTRL_OPCODES:
+        if frame.opcode in frames.CTRL_OPCODES:
             return frame
 
-        # Since we always encode and never fragment messages, there's no logic
-        # similar to decode() here at this time.
+        # Since we always encode messages, there's no "encode continuation
+        # data" flag similar to "decode continuation data" at this time.
 
-        if frame.opcode != OP_CONT:
+        if frame.opcode is not frames.OP_CONT:
+            # Set the rsv1 flag on the first frame of a compressed message.
+            frame = dataclasses.replace(frame, rsv1=True)
             # Re-initialize per-message decoder.
             if self.local_no_context_takeover:
                 self.encoder = zlib.compressobj(
                     wbits=-self.local_max_window_bits, **self.compress_settings
                 )
 
-        # Compress data frames.
+        # Compress data.
         data = self.encoder.compress(frame.data) + self.encoder.flush(zlib.Z_SYNC_FLUSH)
         if frame.fin and data.endswith(_EMPTY_UNCOMPRESSED_BLOCK):
             data = data[:-4]
@@ -166,7 +168,7 @@ class PerMessageDeflate(Extension):
         if frame.fin and self.local_no_context_takeover:
             del self.encoder
 
-        return frame._replace(data=data, rsv1=True)
+        return dataclasses.replace(frame, data=data)
 
 
 def _build_parameters(
@@ -199,8 +201,8 @@ def _extract_parameters(
     """
     Extract compression parameters from a list of ``(name, value)`` pairs.
 
-    If ``is_server`` is ``True``, ``client_max_window_bits`` may be provided
-    without a value. This is only allow in handshake requests.
+    If ``is_server`` is :obj:`True`, ``client_max_window_bits`` may be
+    provided without a value. This is only allowed in handshake requests.
 
     """
     server_no_context_takeover: bool = False
@@ -212,40 +214,40 @@ def _extract_parameters(
 
         if name == "server_no_context_takeover":
             if server_no_context_takeover:
-                raise DuplicateParameter(name)
+                raise exceptions.DuplicateParameter(name)
             if value is None:
                 server_no_context_takeover = True
             else:
-                raise InvalidParameterValue(name, value)
+                raise exceptions.InvalidParameterValue(name, value)
 
         elif name == "client_no_context_takeover":
             if client_no_context_takeover:
-                raise DuplicateParameter(name)
+                raise exceptions.DuplicateParameter(name)
             if value is None:
                 client_no_context_takeover = True
             else:
-                raise InvalidParameterValue(name, value)
+                raise exceptions.InvalidParameterValue(name, value)
 
         elif name == "server_max_window_bits":
             if server_max_window_bits is not None:
-                raise DuplicateParameter(name)
+                raise exceptions.DuplicateParameter(name)
             if value in _MAX_WINDOW_BITS_VALUES:
                 server_max_window_bits = int(value)
             else:
-                raise InvalidParameterValue(name, value)
+                raise exceptions.InvalidParameterValue(name, value)
 
         elif name == "client_max_window_bits":
             if client_max_window_bits is not None:
-                raise DuplicateParameter(name)
+                raise exceptions.DuplicateParameter(name)
             if is_server and value is None:  # only in handshake requests
                 client_max_window_bits = True
             elif value in _MAX_WINDOW_BITS_VALUES:
                 client_max_window_bits = int(value)
             else:
-                raise InvalidParameterValue(name, value)
+                raise exceptions.InvalidParameterValue(name, value)
 
         else:
-            raise InvalidParameterName(name)
+            raise exceptions.InvalidParameterName(name)
 
     return (
         server_no_context_takeover,
@@ -259,18 +261,23 @@ class ClientPerMessageDeflateFactory(ClientExtensionFactory):
     """
     Client-side extension factory for the Per-Message Deflate extension.
 
-    Parameters behave as described in `section 7.1 of RFC 7692`_. Set them to
-    ``True`` to include them in the negotiation offer without a value or to an
-    integer value to include them with this value.
+    Parameters behave as described in `section 7.1 of RFC 7692`_.
 
-    .. _section 7.1 of RFC 7692: https://tools.ietf.org/html/rfc7692#section-7.1
+    .. _section 7.1 of RFC 7692: https://www.rfc-editor.org/rfc/rfc7692.html#section-7.1
 
-    :param server_no_context_takeover: defaults to ``False``
-    :param client_no_context_takeover: defaults to ``False``
-    :param server_max_window_bits: optional, defaults to ``None``
-    :param client_max_window_bits: optional, defaults to ``None``
-    :param compress_settings: optional, keyword arguments for
-        :func:`zlib.compressobj`, excluding ``wbits``
+    Set them to :obj:`True` to include them in the negotiation offer without a
+    value or to an integer value to include them with this value.
+
+    Args:
+        server_no_context_takeover: prevent server from using context takeover.
+        client_no_context_takeover: prevent client from using context takeover.
+        server_max_window_bits: maximum size of the server's LZ77 sliding window
+            in bits, between 8 and 15.
+        client_max_window_bits: maximum size of the client's LZ77 sliding window
+            in bits, between 8 and 15, or :obj:`True` to indicate support without
+            setting a limit.
+        compress_settings: additional keyword arguments for :func:`zlib.compressobj`,
+            excluding ``wbits``.
 
     """
 
@@ -281,7 +288,7 @@ class ClientPerMessageDeflateFactory(ClientExtensionFactory):
         server_no_context_takeover: bool = False,
         client_no_context_takeover: bool = False,
         server_max_window_bits: Optional[int] = None,
-        client_max_window_bits: Optional[Union[int, bool]] = None,
+        client_max_window_bits: Optional[Union[int, bool]] = True,
         compress_settings: Optional[Dict[str, Any]] = None,
     ) -> None:
         """
@@ -323,7 +330,7 @@ class ClientPerMessageDeflateFactory(ClientExtensionFactory):
     def process_response_params(
         self,
         params: Sequence[ExtensionParameter],
-        accepted_extensions: Sequence["Extension"],
+        accepted_extensions: Sequence[Extension],
     ) -> PerMessageDeflate:
         """
         Process response parameters.
@@ -332,7 +339,7 @@ class ClientPerMessageDeflateFactory(ClientExtensionFactory):
 
         """
         if any(other.name == self.name for other in accepted_extensions):
-            raise NegotiationError(f"received duplicate {self.name}")
+            raise exceptions.NegotiationError(f"received duplicate {self.name}")
 
         # Request parameters are available in instance variables.
 
@@ -358,7 +365,7 @@ class ClientPerMessageDeflateFactory(ClientExtensionFactory):
 
         if self.server_no_context_takeover:
             if not server_no_context_takeover:
-                raise NegotiationError("expected server_no_context_takeover")
+                raise exceptions.NegotiationError("expected server_no_context_takeover")
 
         # client_no_context_takeover
         #
@@ -388,9 +395,9 @@ class ClientPerMessageDeflateFactory(ClientExtensionFactory):
 
         else:
             if server_max_window_bits is None:
-                raise NegotiationError("expected server_max_window_bits")
+                raise exceptions.NegotiationError("expected server_max_window_bits")
             elif server_max_window_bits > self.server_max_window_bits:
-                raise NegotiationError("unsupported server_max_window_bits")
+                raise exceptions.NegotiationError("unsupported server_max_window_bits")
 
         # client_max_window_bits
 
@@ -406,7 +413,7 @@ class ClientPerMessageDeflateFactory(ClientExtensionFactory):
 
         if self.client_max_window_bits is None:
             if client_max_window_bits is not None:
-                raise NegotiationError("unexpected client_max_window_bits")
+                raise exceptions.NegotiationError("unexpected client_max_window_bits")
 
         elif self.client_max_window_bits is True:
             pass
@@ -415,7 +422,7 @@ class ClientPerMessageDeflateFactory(ClientExtensionFactory):
             if client_max_window_bits is None:
                 client_max_window_bits = self.client_max_window_bits
             elif client_max_window_bits > self.client_max_window_bits:
-                raise NegotiationError("unsupported client_max_window_bits")
+                raise exceptions.NegotiationError("unsupported client_max_window_bits")
 
         return PerMessageDeflate(
             server_no_context_takeover,  # remote_no_context_takeover
@@ -426,22 +433,54 @@ class ClientPerMessageDeflateFactory(ClientExtensionFactory):
         )
 
 
+def enable_client_permessage_deflate(
+    extensions: Optional[Sequence[ClientExtensionFactory]],
+) -> Sequence[ClientExtensionFactory]:
+    """
+    Enable Per-Message Deflate with default settings in client extensions.
+
+    If the extension is already present, perhaps with non-default settings,
+    the configuration isn't changed.
+
+    """
+    if extensions is None:
+        extensions = []
+    if not any(
+        extension_factory.name == ClientPerMessageDeflateFactory.name
+        for extension_factory in extensions
+    ):
+        extensions = list(extensions) + [
+            ClientPerMessageDeflateFactory(
+                compress_settings={"memLevel": 5},
+            )
+        ]
+    return extensions
+
+
 class ServerPerMessageDeflateFactory(ServerExtensionFactory):
     """
     Server-side extension factory for the Per-Message Deflate extension.
 
-    Parameters behave as described in `section 7.1 of RFC 7692`_. Set them to
-    ``True`` to include them in the negotiation offer without a value or to an
-    integer value to include them with this value.
+    Parameters behave as described in `section 7.1 of RFC 7692`_.
 
-    .. _section 7.1 of RFC 7692: https://tools.ietf.org/html/rfc7692#section-7.1
+    .. _section 7.1 of RFC 7692: https://www.rfc-editor.org/rfc/rfc7692.html#section-7.1
 
-    :param server_no_context_takeover: defaults to ``False``
-    :param client_no_context_takeover: defaults to ``False``
-    :param server_max_window_bits: optional, defaults to ``None``
-    :param client_max_window_bits: optional, defaults to ``None``
-    :param compress_settings: optional, keyword arguments for
-        :func:`zlib.compressobj`, excluding ``wbits``
+    Set them to :obj:`True` to include them in the negotiation offer without a
+    value or to an integer value to include them with this value.
+
+    Args:
+        server_no_context_takeover: prevent server from using context takeover.
+        client_no_context_takeover: prevent client from using context takeover.
+        server_max_window_bits: maximum size of the server's LZ77 sliding window
+            in bits, between 8 and 15.
+        client_max_window_bits: maximum size of the client's LZ77 sliding window
+            in bits, between 8 and 15.
+        compress_settings: additional keyword arguments for :func:`zlib.compressobj`,
+            excluding ``wbits``.
+        require_client_max_window_bits: do not enable compression at all if
+            client doesn't advertise support for ``client_max_window_bits``;
+            the default behavior is to enable compression without enforcing
+            ``client_max_window_bits``.
 
     """
 
@@ -454,6 +493,7 @@ class ServerPerMessageDeflateFactory(ServerExtensionFactory):
         server_max_window_bits: Optional[int] = None,
         client_max_window_bits: Optional[int] = None,
         compress_settings: Optional[Dict[str, Any]] = None,
+        require_client_max_window_bits: bool = False,
     ) -> None:
         """
         Configure the Per-Message Deflate extension factory.
@@ -468,17 +508,23 @@ class ServerPerMessageDeflateFactory(ServerExtensionFactory):
                 "compress_settings must not include wbits, "
                 "set server_max_window_bits instead"
             )
+        if client_max_window_bits is None and require_client_max_window_bits:
+            raise ValueError(
+                "require_client_max_window_bits is enabled, "
+                "but client_max_window_bits isn't configured"
+            )
 
         self.server_no_context_takeover = server_no_context_takeover
         self.client_no_context_takeover = client_no_context_takeover
         self.server_max_window_bits = server_max_window_bits
         self.client_max_window_bits = client_max_window_bits
         self.compress_settings = compress_settings
+        self.require_client_max_window_bits = require_client_max_window_bits
 
     def process_request_params(
         self,
         params: Sequence[ExtensionParameter],
-        accepted_extensions: Sequence["Extension"],
+        accepted_extensions: Sequence[Extension],
     ) -> Tuple[List[ExtensionParameter], PerMessageDeflate]:
         """
         Process request parameters.
@@ -487,7 +533,7 @@ class ServerPerMessageDeflateFactory(ServerExtensionFactory):
 
         """
         if any(other.name == self.name for other in accepted_extensions):
-            raise NegotiationError(f"skipped duplicate {self.name}")
+            raise exceptions.NegotiationError(f"skipped duplicate {self.name}")
 
         # Load request parameters in local variables.
         (
@@ -554,7 +600,7 @@ class ServerPerMessageDeflateFactory(ServerExtensionFactory):
         #   None    None    None
         #   None    True    None - must change value
         #   None    8≤M≤15  M (or None)
-        #   8≤N≤15  None    Error!
+        #   8≤N≤15  None    None or Error!
         #   8≤N≤15  True    N - must change value
         #   8≤N≤15  8≤M≤N   M (or None)
         #   8≤N≤15  N<M≤15  N
@@ -565,7 +611,8 @@ class ServerPerMessageDeflateFactory(ServerExtensionFactory):
 
         else:
             if client_max_window_bits is None:
-                raise NegotiationError("required client_max_window_bits")
+                if self.require_client_max_window_bits:
+                    raise exceptions.NegotiationError("required client_max_window_bits")
             elif client_max_window_bits is True:
                 client_max_window_bits = self.client_max_window_bits
             elif self.client_max_window_bits < client_max_window_bits:
@@ -586,3 +633,29 @@ class ServerPerMessageDeflateFactory(ServerExtensionFactory):
                 self.compress_settings,
             ),
         )
+
+
+def enable_server_permessage_deflate(
+    extensions: Optional[Sequence[ServerExtensionFactory]],
+) -> Sequence[ServerExtensionFactory]:
+    """
+    Enable Per-Message Deflate with default settings in server extensions.
+
+    If the extension is already present, perhaps with non-default settings,
+    the configuration isn't changed.
+
+    """
+    if extensions is None:
+        extensions = []
+    if not any(
+        ext_factory.name == ServerPerMessageDeflateFactory.name
+        for ext_factory in extensions
+    ):
+        extensions = list(extensions) + [
+            ServerPerMessageDeflateFactory(
+                server_max_window_bits=12,
+                client_max_window_bits=12,
+                compress_settings={"memLevel": 5},
+            )
+        ]
+    return extensions
diff --git a/tests/wpt/tests/tools/third_party/websockets/src/websockets/frames.py b/tests/wpt/tests/tools/third_party/websockets/src/websockets/frames.py
new file mode 100644
index 00000000000..043b688b522
--- /dev/null
+++ b/tests/wpt/tests/tools/third_party/websockets/src/websockets/frames.py
@@ -0,0 +1,443 @@
+from __future__ import annotations
+
+import dataclasses
+import enum
+import io
+import secrets
+import struct
+from typing import Callable, Generator, Optional, Sequence, Tuple
+
+from . import exceptions, extensions
+from .typing import Data
+
+
+try:
+    from .speedups import apply_mask
+except ImportError:  # pragma: no cover
+    from .utils import apply_mask
+
+
+__all__ = [
+    "Opcode",
+    "OP_CONT",
+    "OP_TEXT",
+    "OP_BINARY",
+    "OP_CLOSE",
+    "OP_PING",
+    "OP_PONG",
+    "DATA_OPCODES",
+    "CTRL_OPCODES",
+    "Frame",
+    "prepare_data",
+    "prepare_ctrl",
+    "Close",
+]
+
+
+class Opcode(enum.IntEnum):
+    """Opcode values for WebSocket frames."""
+
+    CONT, TEXT, BINARY = 0x00, 0x01, 0x02
+    CLOSE, PING, PONG = 0x08, 0x09, 0x0A
+
+
+OP_CONT = Opcode.CONT
+OP_TEXT = Opcode.TEXT
+OP_BINARY = Opcode.BINARY
+OP_CLOSE = Opcode.CLOSE
+OP_PING = Opcode.PING
+OP_PONG = Opcode.PONG
+
+DATA_OPCODES = OP_CONT, OP_TEXT, OP_BINARY
+CTRL_OPCODES = OP_CLOSE, OP_PING, OP_PONG
+
+
+# See https://www.iana.org/assignments/websocket/websocket.xhtml
+CLOSE_CODES = {
+    1000: "OK",
+    1001: "going away",
+    1002: "protocol error",
+    1003: "unsupported type",
+    # 1004 is reserved
+    1005: "no status code [internal]",
+    1006: "connection closed abnormally [internal]",
+    1007: "invalid data",
+    1008: "policy violation",
+    1009: "message too big",
+    1010: "extension required",
+    1011: "unexpected error",
+    1012: "service restart",
+    1013: "try again later",
+    1014: "bad gateway",
+    1015: "TLS failure [internal]",
+}
+
+
+# Close code that are allowed in a close frame.
+# Using a set optimizes `code in EXTERNAL_CLOSE_CODES`.
+EXTERNAL_CLOSE_CODES = {
+    1000,
+    1001,
+    1002,
+    1003,
+    1007,
+    1008,
+    1009,
+    1010,
+    1011,
+    1012,
+    1013,
+    1014,
+}
+
+OK_CLOSE_CODES = {1000, 1001}
+
+
+BytesLike = bytes, bytearray, memoryview
+
+
+@dataclasses.dataclass
+class Frame:
+    """
+    WebSocket frame.
+
+    Attributes:
+        opcode: Opcode.
+        data: Payload data.
+        fin: FIN bit.
+        rsv1: RSV1 bit.
+        rsv2: RSV2 bit.
+        rsv3: RSV3 bit.
+
+    Only these fields are needed. The MASK bit, payload length and masking-key
+    are handled on the fly when parsing and serializing frames.
+
+    """
+
+    opcode: Opcode
+    data: bytes
+    fin: bool = True
+    rsv1: bool = False
+    rsv2: bool = False
+    rsv3: bool = False
+
+    def __str__(self) -> str:
+        """
+        Return a human-readable represention of a frame.
+
+        """
+        coding = None
+        length = f"{len(self.data)} byte{'' if len(self.data) == 1 else 's'}"
+        non_final = "" if self.fin else "continued"
+
+        if self.opcode is OP_TEXT:
+            # Decoding only the beginning and the end is needlessly hard.
+            # Decode the entire payload then elide later if necessary.
+            data = repr(self.data.decode())
+        elif self.opcode is OP_BINARY:
+            # We'll show at most the first 16 bytes and the last 8 bytes.
+            # Encode just what we need, plus two dummy bytes to elide later.
+            binary = self.data
+            if len(binary) > 25:
+                binary = b"".join([binary[:16], b"\x00\x00", binary[-8:]])
+            data = " ".join(f"{byte:02x}" for byte in binary)
+        elif self.opcode is OP_CLOSE:
+            data = str(Close.parse(self.data))
+        elif self.data:
+            # We don't know if a Continuation frame contains text or binary.
+            # Ping and Pong frames could contain UTF-8.
+            # Attempt to decode as UTF-8 and display it as text; fallback to
+            # binary. If self.data is a memoryview, it has no decode() method,
+            # which raises AttributeError.
+            try:
+                data = repr(self.data.decode())
+                coding = "text"
+            except (UnicodeDecodeError, AttributeError):
+                binary = self.data
+                if len(binary) > 25:
+                    binary = b"".join([binary[:16], b"\x00\x00", binary[-8:]])
+                data = " ".join(f"{byte:02x}" for byte in binary)
+                coding = "binary"
+        else:
+            data = "''"
+
+        if len(data) > 75:
+            data = data[:48] + "..." + data[-24:]
+
+        metadata = ", ".join(filter(None, [coding, length, non_final]))
+
+        return f"{self.opcode.name} {data} [{metadata}]"
+
+    @classmethod
+    def parse(
+        cls,
+        read_exact: Callable[[int], Generator[None, None, bytes]],
+        *,
+        mask: bool,
+        max_size: Optional[int] = None,
+        extensions: Optional[Sequence[extensions.Extension]] = None,
+    ) -> Generator[None, None, Frame]:
+        """
+        Parse a WebSocket frame.
+
+        This is a generator-based coroutine.
+
+        Args:
+            read_exact: generator-based coroutine that reads the requested
+                bytes or raises an exception if there isn't enough data.
+            mask: whether the frame should be masked i.e. whether the read
+                happens on the server side.
+            max_size: maximum payload size in bytes.
+            extensions: list of extensions, applied in reverse order.
+
+        Raises:
+            PayloadTooBig: if the frame's payload size exceeds ``max_size``.
+            ProtocolError: if the frame contains incorrect values.
+
+        """
+        # Read the header.
+        data = yield from read_exact(2)
+        head1, head2 = struct.unpack("!BB", data)
+
+        # While not Pythonic, this is marginally faster than calling bool().
+        fin = True if head1 & 0b10000000 else False
+        rsv1 = True if head1 & 0b01000000 else False
+        rsv2 = True if head1 & 0b00100000 else False
+        rsv3 = True if head1 & 0b00010000 else False
+
+        try:
+            opcode = Opcode(head1 & 0b00001111)
+        except ValueError as exc:
+            raise exceptions.ProtocolError("invalid opcode") from exc
+
+        if (True if head2 & 0b10000000 else False) != mask:
+            raise exceptions.ProtocolError("incorrect masking")
+
+        length = head2 & 0b01111111
+        if length == 126:
+            data = yield from read_exact(2)
+            (length,) = struct.unpack("!H", data)
+        elif length == 127:
+            data = yield from read_exact(8)
+            (length,) = struct.unpack("!Q", data)
+        if max_size is not None and length > max_size:
+            raise exceptions.PayloadTooBig(
+                f"over size limit ({length} > {max_size} bytes)"
+            )
+        if mask:
+            mask_bytes = yield from read_exact(4)
+
+        # Read the data.
+        data = yield from read_exact(length)
+        if mask:
+            data = apply_mask(data, mask_bytes)
+
+        frame = cls(opcode, data, fin, rsv1, rsv2, rsv3)
+
+        if extensions is None:
+            extensions = []
+        for extension in reversed(extensions):
+            frame = extension.decode(frame, max_size=max_size)
+
+        frame.check()
+
+        return frame
+
+    def serialize(
+        self,
+        *,
+        mask: bool,
+        extensions: Optional[Sequence[extensions.Extension]] = None,
+    ) -> bytes:
+        """
+        Serialize a WebSocket frame.
+
+        Args:
+            mask: whether the frame should be masked i.e. whether the write
+                happens on the client side.
+            extensions: list of extensions, applied in order.
+
+        Raises:
+            ProtocolError: if the frame contains incorrect values.
+
+        """
+        self.check()
+
+        if extensions is None:
+            extensions = []
+        for extension in extensions:
+            self = extension.encode(self)
+
+        output = io.BytesIO()
+
+        # Prepare the header.
+        head1 = (
+            (0b10000000 if self.fin else 0)
+            | (0b01000000 if self.rsv1 else 0)
+            | (0b00100000 if self.rsv2 else 0)
+            | (0b00010000 if self.rsv3 else 0)
+            | self.opcode
+        )
+
+        head2 = 0b10000000 if mask else 0
+
+        length = len(self.data)
+        if length < 126:
+            output.write(struct.pack("!BB", head1, head2 | length))
+        elif length < 65536:
+            output.write(struct.pack("!BBH", head1, head2 | 126, length))
+        else:
+            output.write(struct.pack("!BBQ", head1, head2 | 127, length))
+
+        if mask:
+            mask_bytes = secrets.token_bytes(4)
+            output.write(mask_bytes)
+
+        # Prepare the data.
+        if mask:
+            data = apply_mask(self.data, mask_bytes)
+        else:
+            data = self.data
+        output.write(data)
+
+        return output.getvalue()
+
+    def check(self) -> None:
+        """
+        Check that reserved bits and opcode have acceptable values.
+
+        Raises:
+            ProtocolError: if a reserved bit or the opcode is invalid.
+
+        """
+        if self.rsv1 or self.rsv2 or self.rsv3:
+            raise exceptions.ProtocolError("reserved bits must be 0")
+
+        if self.opcode in CTRL_OPCODES:
+            if len(self.data) > 125:
+                raise exceptions.ProtocolError("control frame too long")
+            if not self.fin:
+                raise exceptions.ProtocolError("fragmented control frame")
+
+
+def prepare_data(data: Data) -> Tuple[int, bytes]:
+    """
+    Convert a string or byte-like object to an opcode and a bytes-like object.
+
+    This function is designed for data frames.
+
+    If ``data`` is a :class:`str`, return ``OP_TEXT`` and a :class:`bytes`
+    object encoding ``data`` in UTF-8.
+
+    If ``data`` is a bytes-like object, return ``OP_BINARY`` and a bytes-like
+    object.
+
+    Raises:
+        TypeError: if ``data`` doesn't have a supported type.
+
+    """
+    if isinstance(data, str):
+        return OP_TEXT, data.encode("utf-8")
+    elif isinstance(data, BytesLike):
+        return OP_BINARY, data
+    else:
+        raise TypeError("data must be str or bytes-like")
+
+
+def prepare_ctrl(data: Data) -> bytes:
+    """
+    Convert a string or byte-like object to bytes.
+
+    This function is designed for ping and pong frames.
+
+    If ``data`` is a :class:`str`, return a :class:`bytes` object encoding
+    ``data`` in UTF-8.
+
+    If ``data`` is a bytes-like object, return a :class:`bytes` object.
+
+    Raises:
+        TypeError: if ``data`` doesn't have a supported type.
+
+    """
+    if isinstance(data, str):
+        return data.encode("utf-8")
+    elif isinstance(data, BytesLike):
+        return bytes(data)
+    else:
+        raise TypeError("data must be str or bytes-like")
+
+
+@dataclasses.dataclass
+class Close:
+    """
+    Code and reason for WebSocket close frames.
+
+    Attributes:
+        code: Close code.
+        reason: Close reason.
+
+    """
+
+    code: int
+    reason: str
+
+    def __str__(self) -> str:
+        """
+        Return a human-readable represention of a close code and reason.
+
+        """
+        if 3000 <= self.code < 4000:
+            explanation = "registered"
+        elif 4000 <= self.code < 5000:
+            explanation = "private use"
+        else:
+            explanation = CLOSE_CODES.get(self.code, "unknown")
+        result = f"{self.code} ({explanation})"
+
+        if self.reason:
+            result = f"{result} {self.reason}"
+
+        return result
+
+    @classmethod
+    def parse(cls, data: bytes) -> Close:
+        """
+        Parse the payload of a close frame.
+
+        Args:
+            data: payload of the close frame.
+
+        Raises:
+            ProtocolError: if data is ill-formed.
+            UnicodeDecodeError: if the reason isn't valid UTF-8.
+
+        """
+        if len(data) >= 2:
+            (code,) = struct.unpack("!H", data[:2])
+            reason = data[2:].decode("utf-8")
+            close = cls(code, reason)
+            close.check()
+            return close
+        elif len(data) == 0:
+            return cls(1005, "")
+        else:
+            raise exceptions.ProtocolError("close frame too short")
+
+    def serialize(self) -> bytes:
+        """
+        Serialize the payload of a close frame.
+
+        """
+        self.check()
+        return struct.pack("!H", self.code) + self.reason.encode("utf-8")
+
+    def check(self) -> None:
+        """
+        Check that the close code has a valid value for a close frame.
+
+        Raises:
+            ProtocolError: if the close code is invalid.
+
+        """
+        if not (self.code in EXTERNAL_CLOSE_CODES or 3000 <= self.code < 5000):
+            raise exceptions.ProtocolError("invalid status code")
diff --git a/tests/wpt/tests/tools/third_party/websockets/src/websockets/framing.py b/tests/wpt/tests/tools/third_party/websockets/src/websockets/framing.py
deleted file mode 100644
index 26e58cdbfbb..00000000000
--- a/tests/wpt/tests/tools/third_party/websockets/src/websockets/framing.py
+++ /dev/null
@@ -1,342 +0,0 @@
-"""
-:mod:`websockets.framing` reads and writes WebSocket frames.
-
-It deals with a single frame at a time. Anything that depends on the sequence
-of frames is implemented in :mod:`websockets.protocol`.
-
-See `section 5 of RFC 6455`_.
-
-.. _section 5 of RFC 6455: http://tools.ietf.org/html/rfc6455#section-5
-
-"""
-
-import io
-import random
-import struct
-from typing import Any, Awaitable, Callable, NamedTuple, Optional, Sequence, Tuple
-
-from .exceptions import PayloadTooBig, ProtocolError
-from .typing import Data
-
-
-try:
-    from .speedups import apply_mask
-except ImportError:  # pragma: no cover
-    from .utils import apply_mask
-
-
-__all__ = [
-    "DATA_OPCODES",
-    "CTRL_OPCODES",
-    "OP_CONT",
-    "OP_TEXT",
-    "OP_BINARY",
-    "OP_CLOSE",
-    "OP_PING",
-    "OP_PONG",
-    "Frame",
-    "prepare_data",
-    "encode_data",
-    "parse_close",
-    "serialize_close",
-]
-
-DATA_OPCODES = OP_CONT, OP_TEXT, OP_BINARY = 0x00, 0x01, 0x02
-CTRL_OPCODES = OP_CLOSE, OP_PING, OP_PONG = 0x08, 0x09, 0x0A
-
-# Close code that are allowed in a close frame.
-# Using a list optimizes `code in EXTERNAL_CLOSE_CODES`.
-EXTERNAL_CLOSE_CODES = [1000, 1001, 1002, 1003, 1007, 1008, 1009, 1010, 1011]
-
-
-# Consider converting to a dataclass when dropping support for Python < 3.7.
-
-
-class Frame(NamedTuple):
-    """
-    WebSocket frame.
-
-    :param bool fin: FIN bit
-    :param bool rsv1: RSV1 bit
-    :param bool rsv2: RSV2 bit
-    :param bool rsv3: RSV3 bit
-    :param int opcode: opcode
-    :param bytes data: payload data
-
-    Only these fields are needed. The MASK bit, payload length and masking-key
-    are handled on the fly by :meth:`read` and :meth:`write`.
-
-    """
-
-    fin: bool
-    opcode: int
-    data: bytes
-    rsv1: bool = False
-    rsv2: bool = False
-    rsv3: bool = False
-
-    @classmethod
-    async def read(
-        cls,
-        reader: Callable[[int], Awaitable[bytes]],
-        *,
-        mask: bool,
-        max_size: Optional[int] = None,
-        extensions: Optional[Sequence["websockets.extensions.base.Extension"]] = None,
-    ) -> "Frame":
-        """
-        Read a WebSocket frame.
-
-        :param reader: coroutine that reads exactly the requested number of
-            bytes, unless the end of file is reached
-        :param mask: whether the frame should be masked i.e. whether the read
-            happens on the server side
-        :param max_size: maximum payload size in bytes
-        :param extensions: list of classes with a ``decode()`` method that
-            transforms the frame and return a new frame; extensions are applied
-            in reverse order
-        :raises ~websockets.exceptions.PayloadTooBig: if the frame exceeds
-            ``max_size``
-        :raises ~websockets.exceptions.ProtocolError: if the frame
-            contains incorrect values
-
-        """
-        # Read the header.
-        data = await reader(2)
-        head1, head2 = struct.unpack("!BB", data)
-
-        # While not Pythonic, this is marginally faster than calling bool().
-        fin = True if head1 & 0b10000000 else False
-        rsv1 = True if head1 & 0b01000000 else False
-        rsv2 = True if head1 & 0b00100000 else False
-        rsv3 = True if head1 & 0b00010000 else False
-        opcode = head1 & 0b00001111
-
-        if (True if head2 & 0b10000000 else False) != mask:
-            raise ProtocolError("incorrect masking")
-
-        length = head2 & 0b01111111
-        if length == 126:
-            data = await reader(2)
-            (length,) = struct.unpack("!H", data)
-        elif length == 127:
-            data = await reader(8)
-            (length,) = struct.unpack("!Q", data)
-        if max_size is not None and length > max_size:
-            raise PayloadTooBig(
-                f"payload length exceeds size limit ({length} > {max_size} bytes)"
-            )
-        if mask:
-            mask_bits = await reader(4)
-
-        # Read the data.
-        data = await reader(length)
-        if mask:
-            data = apply_mask(data, mask_bits)
-
-        frame = cls(fin, opcode, data, rsv1, rsv2, rsv3)
-
-        if extensions is None:
-            extensions = []
-        for extension in reversed(extensions):
-            frame = extension.decode(frame, max_size=max_size)
-
-        frame.check()
-
-        return frame
-
-    def write(
-        frame,
-        write: Callable[[bytes], Any],
-        *,
-        mask: bool,
-        extensions: Optional[Sequence["websockets.extensions.base.Extension"]] = None,
-    ) -> None:
-        """
-        Write a WebSocket frame.
-
-        :param frame: frame to write
-        :param write: function that writes bytes
-        :param mask: whether the frame should be masked i.e. whether the write
-            happens on the client side
-        :param extensions: list of classes with an ``encode()`` method that
-            transform the frame and return a new frame; extensions are applied
-            in order
-        :raises ~websockets.exceptions.ProtocolError: if the frame
-            contains incorrect values
-
-        """
-        # The first parameter is called `frame` rather than `self`,
-        # but it's the instance of class to which this method is bound.
-
-        frame.check()
-
-        if extensions is None:
-            extensions = []
-        for extension in extensions:
-            frame = extension.encode(frame)
-
-        output = io.BytesIO()
-
-        # Prepare the header.
-        head1 = (
-            (0b10000000 if frame.fin else 0)
-            | (0b01000000 if frame.rsv1 else 0)
-            | (0b00100000 if frame.rsv2 else 0)
-            | (0b00010000 if frame.rsv3 else 0)
-            | frame.opcode
-        )
-
-        head2 = 0b10000000 if mask else 0
-
-        length = len(frame.data)
-        if length < 126:
-            output.write(struct.pack("!BB", head1, head2 | length))
-        elif length < 65536:
-            output.write(struct.pack("!BBH", head1, head2 | 126, length))
-        else:
-            output.write(struct.pack("!BBQ", head1, head2 | 127, length))
-
-        if mask:
-            mask_bits = struct.pack("!I", random.getrandbits(32))
-            output.write(mask_bits)
-
-        # Prepare the data.
-        if mask:
-            data = apply_mask(frame.data, mask_bits)
-        else:
-            data = frame.data
-        output.write(data)
-
-        # Send the frame.
-
-        # The frame is written in a single call to write in order to prevent
-        # TCP fragmentation. See #68 for details. This also makes it safe to
-        # send frames concurrently from multiple coroutines.
-        write(output.getvalue())
-
-    def check(frame) -> None:
-        """
-        Check that reserved bits and opcode have acceptable values.
-
-        :raises ~websockets.exceptions.ProtocolError: if a reserved
-            bit or the opcode is invalid
-
-        """
-        # The first parameter is called `frame` rather than `self`,
-        # but it's the instance of class to which this method is bound.
-
-        if frame.rsv1 or frame.rsv2 or frame.rsv3:
-            raise ProtocolError("reserved bits must be 0")
-
-        if frame.opcode in DATA_OPCODES:
-            return
-        elif frame.opcode in CTRL_OPCODES:
-            if len(frame.data) > 125:
-                raise ProtocolError("control frame too long")
-            if not frame.fin:
-                raise ProtocolError("fragmented control frame")
-        else:
-            raise ProtocolError(f"invalid opcode: {frame.opcode}")
-
-
-def prepare_data(data: Data) -> Tuple[int, bytes]:
-    """
-    Convert a string or byte-like object to an opcode and a bytes-like object.
-
-    This function is designed for data frames.
-
-    If ``data`` is a :class:`str`, return ``OP_TEXT`` and a :class:`bytes`
-    object encoding ``data`` in UTF-8.
-
-    If ``data`` is a bytes-like object, return ``OP_BINARY`` and a bytes-like
-    object.
-
-    :raises TypeError: if ``data`` doesn't have a supported type
-
-    """
-    if isinstance(data, str):
-        return OP_TEXT, data.encode("utf-8")
-    elif isinstance(data, (bytes, bytearray)):
-        return OP_BINARY, data
-    elif isinstance(data, memoryview):
-        if data.c_contiguous:
-            return OP_BINARY, data
-        else:
-            return OP_BINARY, data.tobytes()
-    else:
-        raise TypeError("data must be bytes-like or str")
-
-
-def encode_data(data: Data) -> bytes:
-    """
-    Convert a string or byte-like object to bytes.
-
-    This function is designed for ping and pong frames.
-
-    If ``data`` is a :class:`str`, return a :class:`bytes` object encoding
-    ``data`` in UTF-8.
-
-    If ``data`` is a bytes-like object, return a :class:`bytes` object.
-
-    :raises TypeError: if ``data`` doesn't have a supported type
-
-    """
-    if isinstance(data, str):
-        return data.encode("utf-8")
-    elif isinstance(data, (bytes, bytearray)):
-        return bytes(data)
-    elif isinstance(data, memoryview):
-        return data.tobytes()
-    else:
-        raise TypeError("data must be bytes-like or str")
-
-
-def parse_close(data: bytes) -> Tuple[int, str]:
-    """
-    Parse the payload from a close frame.
-
-    Return ``(code, reason)``.
-
-    :raises ~websockets.exceptions.ProtocolError: if data is ill-formed
-    :raises UnicodeDecodeError: if the reason isn't valid UTF-8
-
-    """
-    length = len(data)
-    if length >= 2:
-        (code,) = struct.unpack("!H", data[:2])
-        check_close(code)
-        reason = data[2:].decode("utf-8")
-        return code, reason
-    elif length == 0:
-        return 1005, ""
-    else:
-        assert length == 1
-        raise ProtocolError("close frame too short")
-
-
-def serialize_close(code: int, reason: str) -> bytes:
-    """
-    Serialize the payload for a close frame.
-
-    This is the reverse of :func:`parse_close`.
-
-    """
-    check_close(code)
-    return struct.pack("!H", code) + reason.encode("utf-8")
-
-
-def check_close(code: int) -> None:
-    """
-    Check that the close code has an acceptable value for a close frame.
-
-    :raises ~websockets.exceptions.ProtocolError: if the close code
-        is invalid
-
-    """
-    if not (code in EXTERNAL_CLOSE_CODES or 3000 <= code < 5000):
-        raise ProtocolError("invalid status code")
-
-
-# at the bottom to allow circular import, because Extension depends on Frame
-import websockets.extensions.base  # isort:skip # noqa
diff --git a/tests/wpt/tests/tools/third_party/websockets/src/websockets/headers.py b/tests/wpt/tests/tools/third_party/websockets/src/websockets/headers.py
index f33c94c0464..9ae3035a5b8 100644
--- a/tests/wpt/tests/tools/third_party/websockets/src/websockets/headers.py
+++ b/tests/wpt/tests/tools/third_party/websockets/src/websockets/headers.py
@@ -1,28 +1,31 @@
-"""
-:mod:`websockets.headers` provides parsers and serializers for HTTP headers
-used in WebSocket handshake messages.
-
-These APIs cannot be imported from :mod:`websockets`. They must be imported
-from :mod:`websockets.headers`.
-
-"""
+from __future__ import annotations
 
 import base64
 import binascii
+import ipaddress
 import re
-from typing import Callable, List, NewType, Optional, Sequence, Tuple, TypeVar, cast
+from typing import Callable, List, Optional, Sequence, Tuple, TypeVar, cast
 
-from .exceptions import InvalidHeaderFormat, InvalidHeaderValue
-from .typing import ExtensionHeader, ExtensionName, ExtensionParameter, Subprotocol
+from . import exceptions
+from .typing import (
+    ConnectionOption,
+    ExtensionHeader,
+    ExtensionName,
+    ExtensionParameter,
+    Subprotocol,
+    UpgradeProtocol,
+)
 
 
 __all__ = [
+    "build_host",
     "parse_connection",
     "parse_upgrade",
     "parse_extension",
     "build_extension",
     "parse_subprotocol",
     "build_subprotocol",
+    "validate_subprotocols",
     "build_www_authenticate_basic",
     "parse_authorization_basic",
     "build_authorization_basic",
@@ -31,20 +34,40 @@ __all__ = [
 
 T = TypeVar("T")
 
-ConnectionOption = NewType("ConnectionOption", str)
-UpgradeProtocol = NewType("UpgradeProtocol", str)
+
+def build_host(host: str, port: int, secure: bool) -> str:
+    """
+    Build a ``Host`` header.
+
+    """
+    # https://www.rfc-editor.org/rfc/rfc3986.html#section-3.2.2
+    # IPv6 addresses must be enclosed in brackets.
+    try:
+        address = ipaddress.ip_address(host)
+    except ValueError:
+        # host is a hostname
+        pass
+    else:
+        # host is an IP address
+        if address.version == 6:
+            host = f"[{host}]"
+
+    if port != (443 if secure else 80):
+        host = f"{host}:{port}"
+
+    return host
 
 
 # To avoid a dependency on a parsing library, we implement manually the ABNF
-# described in https://tools.ietf.org/html/rfc6455#section-9.1 with the
-# definitions from https://tools.ietf.org/html/rfc7230#appendix-B.
+# described in https://www.rfc-editor.org/rfc/rfc6455.html#section-9.1 and
+# https://www.rfc-editor.org/rfc/rfc7230.html#appendix-B.
 
 
 def peek_ahead(header: str, pos: int) -> Optional[str]:
     """
     Return the next character from ``header`` at the given position.
 
-    Return ``None`` at the end of ``header``.
+    Return :obj:`None` at the end of ``header``.
 
     We never need to peek more than one character ahead.
 
@@ -79,12 +102,13 @@ def parse_token(header: str, pos: int, header_name: str) -> Tuple[str, int]:
 
     Return the token value and the new position.
 
-    :raises ~websockets.exceptions.InvalidHeaderFormat: on invalid inputs.
+    Raises:
+        InvalidHeaderFormat: on invalid inputs.
 
     """
     match = _token_re.match(header, pos)
     if match is None:
-        raise InvalidHeaderFormat(header_name, "expected token", header, pos)
+        raise exceptions.InvalidHeaderFormat(header_name, "expected token", header, pos)
     return match.group(), match.end()
 
 
@@ -102,12 +126,15 @@ def parse_quoted_string(header: str, pos: int, header_name: str) -> Tuple[str, i
 
     Return the unquoted value and the new position.
 
-    :raises ~websockets.exceptions.InvalidHeaderFormat: on invalid inputs.
+    Raises:
+        InvalidHeaderFormat: on invalid inputs.
 
     """
     match = _quoted_string_re.match(header, pos)
     if match is None:
-        raise InvalidHeaderFormat(header_name, "expected quoted string", header, pos)
+        raise exceptions.InvalidHeaderFormat(
+            header_name, "expected quoted string", header, pos
+        )
     return _unquote_re.sub(r"\1", match.group()[1:-1]), match.end()
 
 
@@ -152,12 +179,13 @@ def parse_list(
 
     Return a list of items.
 
-    :raises ~websockets.exceptions.InvalidHeaderFormat: on invalid inputs.
+    Raises:
+        InvalidHeaderFormat: on invalid inputs.
 
     """
-    # Per https://tools.ietf.org/html/rfc7230#section-7, "a recipient MUST
-    # parse and ignore a reasonable number of empty list elements"; hence
-    # while loops that remove extra delimiters.
+    # Per https://www.rfc-editor.org/rfc/rfc7230.html#section-7, "a recipient
+    # MUST parse and ignore a reasonable number of empty list elements";
+    # hence while loops that remove extra delimiters.
 
     # Remove extra delimiters before the first item.
     while peek_ahead(header, pos) == ",":
@@ -178,7 +206,9 @@ def parse_list(
         if peek_ahead(header, pos) == ",":
             pos = parse_OWS(header, pos + 1)
         else:
-            raise InvalidHeaderFormat(header_name, "expected comma", header, pos)
+            raise exceptions.InvalidHeaderFormat(
+                header_name, "expected comma", header, pos
+            )
 
         # Remove extra delimiters before the next item.
         while peek_ahead(header, pos) == ",":
@@ -203,7 +233,8 @@ def parse_connection_option(
 
     Return the protocol value and the new position.
 
-    :raises ~websockets.exceptions.InvalidHeaderFormat: on invalid inputs.
+    Raises:
+        InvalidHeaderFormat: on invalid inputs.
 
     """
     item, pos = parse_token(header, pos, header_name)
@@ -216,8 +247,11 @@ def parse_connection(header: str) -> List[ConnectionOption]:
 
     Return a list of HTTP connection options.
 
-    :param header: value of the ``Connection`` header
-    :raises ~websockets.exceptions.InvalidHeaderFormat: on invalid inputs.
+    Args
+        header: value of the ``Connection`` header.
+
+    Raises:
+        InvalidHeaderFormat: on invalid inputs.
 
     """
     return parse_list(parse_connection_option, header, 0, "Connection")
@@ -236,12 +270,15 @@ def parse_upgrade_protocol(
 
     Return the protocol value and the new position.
 
-    :raises ~websockets.exceptions.InvalidHeaderFormat: on invalid inputs.
+    Raises:
+        InvalidHeaderFormat: on invalid inputs.
 
     """
     match = _protocol_re.match(header, pos)
     if match is None:
-        raise InvalidHeaderFormat(header_name, "expected protocol", header, pos)
+        raise exceptions.InvalidHeaderFormat(
+            header_name, "expected protocol", header, pos
+        )
     return cast(UpgradeProtocol, match.group()), match.end()
 
 
@@ -251,8 +288,11 @@ def parse_upgrade(header: str) -> List[UpgradeProtocol]:
 
     Return a list of HTTP protocols.
 
-    :param header: value of the ``Upgrade`` header
-    :raises ~websockets.exceptions.InvalidHeaderFormat: on invalid inputs.
+    Args:
+        header: value of the ``Upgrade`` header.
+
+    Raises:
+        InvalidHeaderFormat: on invalid inputs.
 
     """
     return parse_list(parse_upgrade_protocol, header, 0, "Upgrade")
@@ -266,7 +306,8 @@ def parse_extension_item_param(
 
     Return a ``(name, value)`` pair and the new position.
 
-    :raises ~websockets.exceptions.InvalidHeaderFormat: on invalid inputs.
+    Raises:
+        InvalidHeaderFormat: on invalid inputs.
 
     """
     # Extract parameter name.
@@ -279,10 +320,11 @@ def parse_extension_item_param(
         if peek_ahead(header, pos) == '"':
             pos_before = pos  # for proper error reporting below
             value, pos = parse_quoted_string(header, pos, header_name)
-            # https://tools.ietf.org/html/rfc6455#section-9.1 says: the value
-            # after quoted-string unescaping MUST conform to the 'token' ABNF.
+            # https://www.rfc-editor.org/rfc/rfc6455.html#section-9.1 says:
+            # the value after quoted-string unescaping MUST conform to
+            # the 'token' ABNF.
             if _token_re.fullmatch(value) is None:
-                raise InvalidHeaderFormat(
+                raise exceptions.InvalidHeaderFormat(
                     header_name, "invalid quoted header content", header, pos_before
                 )
         else:
@@ -301,7 +343,8 @@ def parse_extension_item(
     Return an ``(extension name, parameters)`` pair, where ``parameters`` is a
     list of ``(name, value)`` pairs, and the new position.
 
-    :raises ~websockets.exceptions.InvalidHeaderFormat: on invalid inputs.
+    Raises:
+        InvalidHeaderFormat: on invalid inputs.
 
     """
     # Extract extension name.
@@ -333,9 +376,10 @@ def parse_extension(header: str) -> List[ExtensionHeader]:
             ...
         ]
 
-    Parameter values are ``None`` when no value is provided.
+    Parameter values are :obj:`None` when no value is provided.
 
-    :raises ~websockets.exceptions.InvalidHeaderFormat: on invalid inputs.
+    Raises:
+        InvalidHeaderFormat: on invalid inputs.
 
     """
     return parse_list(parse_extension_item, header, 0, "Sec-WebSocket-Extensions")
@@ -386,7 +430,8 @@ def parse_subprotocol_item(
 
     Return the subprotocol value and the new position.
 
-    :raises ~websockets.exceptions.InvalidHeaderFormat: on invalid inputs.
+    Raises:
+        InvalidHeaderFormat: on invalid inputs.
 
     """
     item, pos = parse_token(header, pos, header_name)
@@ -399,7 +444,8 @@ def parse_subprotocol(header: str) -> List[Subprotocol]:
 
     Return a list of WebSocket subprotocols.
 
-    :raises ~websockets.exceptions.InvalidHeaderFormat: on invalid inputs.
+    Raises:
+        InvalidHeaderFormat: on invalid inputs.
 
     """
     return parse_list(parse_subprotocol_item, header, 0, "Sec-WebSocket-Protocol")
@@ -408,27 +454,42 @@ def parse_subprotocol(header: str) -> List[Subprotocol]:
 parse_subprotocol_list = parse_subprotocol  # alias for backwards compatibility
 
 
-def build_subprotocol(protocols: Sequence[Subprotocol]) -> str:
+def build_subprotocol(subprotocols: Sequence[Subprotocol]) -> str:
     """
     Build a ``Sec-WebSocket-Protocol`` header.
 
     This is the reverse of :func:`parse_subprotocol`.
 
     """
-    return ", ".join(protocols)
+    return ", ".join(subprotocols)
 
 
 build_subprotocol_list = build_subprotocol  # alias for backwards compatibility
 
 
+def validate_subprotocols(subprotocols: Sequence[Subprotocol]) -> None:
+    """
+    Validate that ``subprotocols`` is suitable for :func:`build_subprotocol`.
+
+    """
+    if not isinstance(subprotocols, Sequence):
+        raise TypeError("subprotocols must be a list")
+    if isinstance(subprotocols, str):
+        raise TypeError("subprotocols must be a list, not a str")
+    for subprotocol in subprotocols:
+        if not _token_re.fullmatch(subprotocol):
+            raise ValueError(f"invalid subprotocol: {subprotocol}")
+
+
 def build_www_authenticate_basic(realm: str) -> str:
     """
     Build a ``WWW-Authenticate`` header for HTTP Basic Auth.
 
-    :param realm: authentication realm
+    Args:
+        realm: identifier of the protection space.
 
     """
-    # https://tools.ietf.org/html/rfc7617#section-2
+    # https://www.rfc-editor.org/rfc/rfc7617.html#section-2
     realm = build_quoted_string(realm)
     charset = build_quoted_string("UTF-8")
     return f"Basic realm={realm}, charset={charset}"
@@ -443,12 +504,15 @@ def parse_token68(header: str, pos: int, header_name: str) -> Tuple[str, int]:
 
     Return the token value and the new position.
 
-    :raises ~websockets.exceptions.InvalidHeaderFormat: on invalid inputs.
+    Raises:
+        InvalidHeaderFormat: on invalid inputs.
 
     """
     match = _token68_re.match(header, pos)
     if match is None:
-        raise InvalidHeaderFormat(header_name, "expected token68", header, pos)
+        raise exceptions.InvalidHeaderFormat(
+            header_name, "expected token68", header, pos
+        )
     return match.group(), match.end()
 
 
@@ -458,7 +522,7 @@ def parse_end(header: str, pos: int, header_name: str) -> None:
 
     """
     if pos < len(header):
-        raise InvalidHeaderFormat(header_name, "trailing data", header, pos)
+        raise exceptions.InvalidHeaderFormat(header_name, "trailing data", header, pos)
 
 
 def parse_authorization_basic(header: str) -> Tuple[str, str]:
@@ -467,18 +531,24 @@ def parse_authorization_basic(header: str) -> Tuple[str, str]:
 
     Return a ``(username, password)`` tuple.
 
-    :param header: value of the ``Authorization`` header
-    :raises InvalidHeaderFormat: on invalid inputs
-    :raises InvalidHeaderValue: on unsupported inputs
+    Args:
+        header: value of the ``Authorization`` header.
+
+    Raises:
+        InvalidHeaderFormat: on invalid inputs.
+        InvalidHeaderValue: on unsupported inputs.
 
     """
-    # https://tools.ietf.org/html/rfc7235#section-2.1
-    # https://tools.ietf.org/html/rfc7617#section-2
+    # https://www.rfc-editor.org/rfc/rfc7235.html#section-2.1
+    # https://www.rfc-editor.org/rfc/rfc7617.html#section-2
     scheme, pos = parse_token(header, 0, "Authorization")
     if scheme.lower() != "basic":
-        raise InvalidHeaderValue("Authorization", f"unsupported scheme: {scheme}")
+        raise exceptions.InvalidHeaderValue(
+            "Authorization",
+            f"unsupported scheme: {scheme}",
+        )
     if peek_ahead(header, pos) != " ":
-        raise InvalidHeaderFormat(
+        raise exceptions.InvalidHeaderFormat(
             "Authorization", "expected space after scheme", header, pos
         )
     pos += 1
@@ -488,14 +558,16 @@ def parse_authorization_basic(header: str) -> Tuple[str, str]:
     try:
         user_pass = base64.b64decode(basic_credentials.encode()).decode()
     except binascii.Error:
-        raise InvalidHeaderValue(
-            "Authorization", "expected base64-encoded credentials"
+        raise exceptions.InvalidHeaderValue(
+            "Authorization",
+            "expected base64-encoded credentials",
         ) from None
     try:
         username, password = user_pass.split(":", 1)
     except ValueError:
-        raise InvalidHeaderValue(
-            "Authorization", "expected username:password credentials"
+        raise exceptions.InvalidHeaderValue(
+            "Authorization",
+            "expected username:password credentials",
         ) from None
 
     return username, password
@@ -508,7 +580,7 @@ def build_authorization_basic(username: str, password: str) -> str:
     This is the reverse of :func:`parse_authorization_basic`.
 
     """
-    # https://tools.ietf.org/html/rfc7617#section-2
+    # https://www.rfc-editor.org/rfc/rfc7617.html#section-2
     assert ":" not in username
     user_pass = f"{username}:{password}"
     basic_credentials = base64.b64encode(user_pass.encode()).decode()
diff --git a/tests/wpt/tests/tools/third_party/websockets/src/websockets/http.py b/tests/wpt/tests/tools/third_party/websockets/src/websockets/http.py
index ba6d274bf14..b14fa94bdce 100644
--- a/tests/wpt/tests/tools/third_party/websockets/src/websockets/http.py
+++ b/tests/wpt/tests/tools/third_party/websockets/src/websockets/http.py
@@ -1,360 +1,30 @@
-"""
-:mod:`websockets.http` module provides basic HTTP/1.1 support. It is merely
-:adequate for WebSocket handshake messages.
+from __future__ import annotations
 
-These APIs cannot be imported from :mod:`websockets`. They must be imported
-from :mod:`websockets.http`.
-
-"""
-
-import asyncio
-import re
 import sys
-from typing import (
-    Any,
-    Dict,
-    Iterable,
-    Iterator,
-    List,
-    Mapping,
-    MutableMapping,
-    Tuple,
-    Union,
-)
 
+from .imports import lazy_import
 from .version import version as websockets_version
 
 
-__all__ = [
-    "read_request",
-    "read_response",
-    "Headers",
-    "MultipleValuesError",
-    "USER_AGENT",
-]
+# For backwards compatibility:
 
-MAX_HEADERS = 256
-MAX_LINE = 4096
 
-USER_AGENT = f"Python/{sys.version[:3]} websockets/{websockets_version}"
+lazy_import(
+    globals(),
+    # Headers and MultipleValuesError used to be defined in this module.
+    aliases={
+        "Headers": ".datastructures",
+        "MultipleValuesError": ".datastructures",
+    },
+    deprecated_aliases={
+        "read_request": ".legacy.http",
+        "read_response": ".legacy.http",
+    },
+)
 
 
-def d(value: bytes) -> str:
-    """
-    Decode a bytestring for interpolating into an error message.
+__all__ = ["USER_AGENT"]
 
-    """
-    return value.decode(errors="backslashreplace")
 
-
-# See https://tools.ietf.org/html/rfc7230#appendix-B.
-
-# Regex for validating header names.
-
-_token_re = re.compile(rb"[-!#$%&\'*+.^_`|~0-9a-zA-Z]+")
-
-# Regex for validating header values.
-
-# We don't attempt to support obsolete line folding.
-
-# Include HTAB (\x09), SP (\x20), VCHAR (\x21-\x7e), obs-text (\x80-\xff).
-
-# The ABNF is complicated because it attempts to express that optional
-# whitespace is ignored. We strip whitespace and don't revalidate that.
-
-# See also https://www.rfc-editor.org/errata_search.php?rfc=7230&eid=4189
-
-_value_re = re.compile(rb"[\x09\x20-\x7e\x80-\xff]*")
-
-
-async def read_request(stream: asyncio.StreamReader) -> Tuple[str, "Headers"]:
-    """
-    Read an HTTP/1.1 GET request and return ``(path, headers)``.
-
-    ``path`` isn't URL-decoded or validated in any way.
-
-    ``path`` and ``headers`` are expected to contain only ASCII characters.
-    Other characters are represented with surrogate escapes.
-
-    :func:`read_request` doesn't attempt to read the request body because
-    WebSocket handshake requests don't have one. If the request contains a
-    body, it may be read from ``stream`` after this coroutine returns.
-
-    :param stream: input to read the request from
-    :raises EOFError: if the connection is closed without a full HTTP request
-    :raises SecurityError: if the request exceeds a security limit
-    :raises ValueError: if the request isn't well formatted
-
-    """
-    # https://tools.ietf.org/html/rfc7230#section-3.1.1
-
-    # Parsing is simple because fixed values are expected for method and
-    # version and because path isn't checked. Since WebSocket software tends
-    # to implement HTTP/1.1 strictly, there's little need for lenient parsing.
-
-    try:
-        request_line = await read_line(stream)
-    except EOFError as exc:
-        raise EOFError("connection closed while reading HTTP request line") from exc
-
-    try:
-        method, raw_path, version = request_line.split(b" ", 2)
-    except ValueError:  # not enough values to unpack (expected 3, got 1-2)
-        raise ValueError(f"invalid HTTP request line: {d(request_line)}") from None
-
-    if method != b"GET":
-        raise ValueError(f"unsupported HTTP method: {d(method)}")
-    if version != b"HTTP/1.1":
-        raise ValueError(f"unsupported HTTP version: {d(version)}")
-    path = raw_path.decode("ascii", "surrogateescape")
-
-    headers = await read_headers(stream)
-
-    return path, headers
-
-
-async def read_response(stream: asyncio.StreamReader) -> Tuple[int, str, "Headers"]:
-    """
-    Read an HTTP/1.1 response and return ``(status_code, reason, headers)``.
-
-    ``reason`` and ``headers`` are expected to contain only ASCII characters.
-    Other characters are represented with surrogate escapes.
-
-    :func:`read_request` doesn't attempt to read the response body because
-    WebSocket handshake responses don't have one. If the response contains a
-    body, it may be read from ``stream`` after this coroutine returns.
-
-    :param stream: input to read the response from
-    :raises EOFError: if the connection is closed without a full HTTP response
-    :raises SecurityError: if the response exceeds a security limit
-    :raises ValueError: if the response isn't well formatted
-
-    """
-    # https://tools.ietf.org/html/rfc7230#section-3.1.2
-
-    # As in read_request, parsing is simple because a fixed value is expected
-    # for version, status_code is a 3-digit number, and reason can be ignored.
-
-    try:
-        status_line = await read_line(stream)
-    except EOFError as exc:
-        raise EOFError("connection closed while reading HTTP status line") from exc
-
-    try:
-        version, raw_status_code, raw_reason = status_line.split(b" ", 2)
-    except ValueError:  # not enough values to unpack (expected 3, got 1-2)
-        raise ValueError(f"invalid HTTP status line: {d(status_line)}") from None
-
-    if version != b"HTTP/1.1":
-        raise ValueError(f"unsupported HTTP version: {d(version)}")
-    try:
-        status_code = int(raw_status_code)
-    except ValueError:  # invalid literal for int() with base 10
-        raise ValueError(f"invalid HTTP status code: {d(raw_status_code)}") from None
-    if not 100 <= status_code < 1000:
-        raise ValueError(f"unsupported HTTP status code: {d(raw_status_code)}")
-    if not _value_re.fullmatch(raw_reason):
-        raise ValueError(f"invalid HTTP reason phrase: {d(raw_reason)}")
-    reason = raw_reason.decode()
-
-    headers = await read_headers(stream)
-
-    return status_code, reason, headers
-
-
-async def read_headers(stream: asyncio.StreamReader) -> "Headers":
-    """
-    Read HTTP headers from ``stream``.
-
-    Non-ASCII characters are represented with surrogate escapes.
-
-    """
-    # https://tools.ietf.org/html/rfc7230#section-3.2
-
-    # We don't attempt to support obsolete line folding.
-
-    headers = Headers()
-    for _ in range(MAX_HEADERS + 1):
-        try:
-            line = await read_line(stream)
-        except EOFError as exc:
-            raise EOFError("connection closed while reading HTTP headers") from exc
-        if line == b"":
-            break
-
-        try:
-            raw_name, raw_value = line.split(b":", 1)
-        except ValueError:  # not enough values to unpack (expected 2, got 1)
-            raise ValueError(f"invalid HTTP header line: {d(line)}") from None
-        if not _token_re.fullmatch(raw_name):
-            raise ValueError(f"invalid HTTP header name: {d(raw_name)}")
-        raw_value = raw_value.strip(b" \t")
-        if not _value_re.fullmatch(raw_value):
-            raise ValueError(f"invalid HTTP header value: {d(raw_value)}")
-
-        name = raw_name.decode("ascii")  # guaranteed to be ASCII at this point
-        value = raw_value.decode("ascii", "surrogateescape")
-        headers[name] = value
-
-    else:
-        raise websockets.exceptions.SecurityError("too many HTTP headers")
-
-    return headers
-
-
-async def read_line(stream: asyncio.StreamReader) -> bytes:
-    """
-    Read a single line from ``stream``.
-
-    CRLF is stripped from the return value.
-
-    """
-    # Security: this is bounded by the StreamReader's limit (default = 32 KiB).
-    line = await stream.readline()
-    # Security: this guarantees header values are small (hard-coded = 4 KiB)
-    if len(line) > MAX_LINE:
-        raise websockets.exceptions.SecurityError("line too long")
-    # Not mandatory but safe - https://tools.ietf.org/html/rfc7230#section-3.5
-    if not line.endswith(b"\r\n"):
-        raise EOFError("line without CRLF")
-    return line[:-2]
-
-
-class MultipleValuesError(LookupError):
-    """
-    Exception raised when :class:`Headers` has more than one value for a key.
-
-    """
-
-    def __str__(self) -> str:
-        # Implement the same logic as KeyError_str in Objects/exceptions.c.
-        if len(self.args) == 1:
-            return repr(self.args[0])
-        return super().__str__()
-
-
-class Headers(MutableMapping[str, str]):
-    """
-    Efficient data structure for manipulating HTTP headers.
-
-    A :class:`list` of ``(name, values)`` is inefficient for lookups.
-
-    A :class:`dict` doesn't suffice because header names are case-insensitive
-    and multiple occurrences of headers with the same name are possible.
-
-    :class:`Headers` stores HTTP headers in a hybrid data structure to provide
-    efficient insertions and lookups while preserving the original data.
-
-    In order to account for multiple values with minimal hassle,
-    :class:`Headers` follows this logic:
-
-    - When getting a header with ``headers[name]``:
-        - if there's no value, :exc:`KeyError` is raised;
-        - if there's exactly one value, it's returned;
-        - if there's more than one value, :exc:`MultipleValuesError` is raised.
-
-    - When setting a header with ``headers[name] = value``, the value is
-      appended to the list of values for that header.
-
-    - When deleting a header with ``del headers[name]``, all values for that
-      header are removed (this is slow).
-
-    Other methods for manipulating headers are consistent with this logic.
-
-    As long as no header occurs multiple times, :class:`Headers` behaves like
-    :class:`dict`, except keys are lower-cased to provide case-insensitivity.
-
-    Two methods support support manipulating multiple values explicitly:
-
-    - :meth:`get_all` returns a list of all values for a header;
-    - :meth:`raw_items` returns an iterator of ``(name, values)`` pairs.
-
-    """
-
-    __slots__ = ["_dict", "_list"]
-
-    def __init__(self, *args: Any, **kwargs: str) -> None:
-        self._dict: Dict[str, List[str]] = {}
-        self._list: List[Tuple[str, str]] = []
-        # MutableMapping.update calls __setitem__ for each (name, value) pair.
-        self.update(*args, **kwargs)
-
-    def __str__(self) -> str:
-        return "".join(f"{key}: {value}\r\n" for key, value in self._list) + "\r\n"
-
-    def __repr__(self) -> str:
-        return f"{self.__class__.__name__}({self._list!r})"
-
-    def copy(self) -> "Headers":
-        copy = self.__class__()
-        copy._dict = self._dict.copy()
-        copy._list = self._list.copy()
-        return copy
-
-    # Collection methods
-
-    def __contains__(self, key: object) -> bool:
-        return isinstance(key, str) and key.lower() in self._dict
-
-    def __iter__(self) -> Iterator[str]:
-        return iter(self._dict)
-
-    def __len__(self) -> int:
-        return len(self._dict)
-
-    # MutableMapping methods
-
-    def __getitem__(self, key: str) -> str:
-        value = self._dict[key.lower()]
-        if len(value) == 1:
-            return value[0]
-        else:
-            raise MultipleValuesError(key)
-
-    def __setitem__(self, key: str, value: str) -> None:
-        self._dict.setdefault(key.lower(), []).append(value)
-        self._list.append((key, value))
-
-    def __delitem__(self, key: str) -> None:
-        key_lower = key.lower()
-        self._dict.__delitem__(key_lower)
-        # This is inefficent. Fortunately deleting HTTP headers is uncommon.
-        self._list = [(k, v) for k, v in self._list if k.lower() != key_lower]
-
-    def __eq__(self, other: Any) -> bool:
-        if not isinstance(other, Headers):
-            return NotImplemented
-        return self._list == other._list
-
-    def clear(self) -> None:
-        """
-        Remove all headers.
-
-        """
-        self._dict = {}
-        self._list = []
-
-    # Methods for handling multiple values
-
-    def get_all(self, key: str) -> List[str]:
-        """
-        Return the (possibly empty) list of all values for a header.
-
-        :param key: header name
-
-        """
-        return self._dict.get(key.lower(), [])
-
-    def raw_items(self) -> Iterator[Tuple[str, str]]:
-        """
-        Return an iterator of all values as ``(name, value)`` pairs.
-
-        """
-        return iter(self._list)
-
-
-HeadersLike = Union[Headers, Mapping[str, str], Iterable[Tuple[str, str]]]
-
-
-# at the bottom to allow circular import, because AbortHandshake depends on HeadersLike
-import websockets.exceptions  # isort:skip # noqa
+PYTHON_VERSION = "{}.{}".format(*sys.version_info)
+USER_AGENT = f"Python/{PYTHON_VERSION} websockets/{websockets_version}"
diff --git a/tests/wpt/tests/tools/third_party/websockets/src/websockets/http11.py b/tests/wpt/tests/tools/third_party/websockets/src/websockets/http11.py
new file mode 100644
index 00000000000..84048fa47b3
--- /dev/null
+++ b/tests/wpt/tests/tools/third_party/websockets/src/websockets/http11.py
@@ -0,0 +1,366 @@
+from __future__ import annotations
+
+import dataclasses
+import re
+import warnings
+from typing import Callable, Generator, Optional
+
+from . import datastructures, exceptions
+
+
+# Maximum total size of headers is around 256 * 4 KiB = 1 MiB
+MAX_HEADERS = 256
+
+# We can use the same limit for the request line and header lines:
+# "GET <4096 bytes> HTTP/1.1\r\n" = 4111 bytes
+# "Set-Cookie: <4097 bytes>\r\n" = 4111 bytes
+# (RFC requires 4096 bytes; for some reason Firefox supports 4097 bytes.)
+MAX_LINE = 4111
+
+# Support for HTTP response bodies is intended to read an error message
+# returned by a server. It isn't designed to perform large file transfers.
+MAX_BODY = 2**20  # 1 MiB
+
+
+def d(value: bytes) -> str:
+    """
+    Decode a bytestring for interpolating into an error message.
+
+    """
+    return value.decode(errors="backslashreplace")
+
+
+# See https://www.rfc-editor.org/rfc/rfc7230.html#appendix-B.
+
+# Regex for validating header names.
+
+_token_re = re.compile(rb"[-!#$%&\'*+.^_`|~0-9a-zA-Z]+")
+
+# Regex for validating header values.
+
+# We don't attempt to support obsolete line folding.
+
+# Include HTAB (\x09), SP (\x20), VCHAR (\x21-\x7e), obs-text (\x80-\xff).
+
+# The ABNF is complicated because it attempts to express that optional
+# whitespace is ignored. We strip whitespace and don't revalidate that.
+
+# See also https://www.rfc-editor.org/errata_search.php?rfc=7230&eid=4189
+
+_value_re = re.compile(rb"[\x09\x20-\x7e\x80-\xff]*")
+
+
+@dataclasses.dataclass
+class Request:
+    """
+    WebSocket handshake request.
+
+    Attributes:
+        path: Request path, including optional query.
+        headers: Request headers.
+    """
+
+    path: str
+    headers: datastructures.Headers
+    # body isn't useful is the context of this library.
+
+    _exception: Optional[Exception] = None
+
+    @property
+    def exception(self) -> Optional[Exception]:  # pragma: no cover
+        warnings.warn(
+            "Request.exception is deprecated; "
+            "use ServerConnection.handshake_exc instead",
+            DeprecationWarning,
+        )
+        return self._exception
+
+    @classmethod
+    def parse(
+        cls,
+        read_line: Callable[[int], Generator[None, None, bytes]],
+    ) -> Generator[None, None, Request]:
+        """
+        Parse a WebSocket handshake request.
+
+        This is a generator-based coroutine.
+
+        The request path isn't URL-decoded or validated in any way.
+
+        The request path and headers are expected to contain only ASCII
+        characters. Other characters are represented with surrogate escapes.
+
+        :meth:`parse` doesn't attempt to read the request body because
+        WebSocket handshake requests don't have one. If the request contains a
+        body, it may be read from the data stream after :meth:`parse` returns.
+
+        Args:
+            read_line: generator-based coroutine that reads a LF-terminated
+                line or raises an exception if there isn't enough data
+
+        Raises:
+            EOFError: if the connection is closed without a full HTTP request.
+            SecurityError: if the request exceeds a security limit.
+            ValueError: if the request isn't well formatted.
+
+        """
+        # https://www.rfc-editor.org/rfc/rfc7230.html#section-3.1.1
+
+        # Parsing is simple because fixed values are expected for method and
+        # version and because path isn't checked. Since WebSocket software tends
+        # to implement HTTP/1.1 strictly, there's little need for lenient parsing.
+
+        try:
+            request_line = yield from parse_line(read_line)
+        except EOFError as exc:
+            raise EOFError("connection closed while reading HTTP request line") from exc
+
+        try:
+            method, raw_path, version = request_line.split(b" ", 2)
+        except ValueError:  # not enough values to unpack (expected 3, got 1-2)
+            raise ValueError(f"invalid HTTP request line: {d(request_line)}") from None
+
+        if method != b"GET":
+            raise ValueError(f"unsupported HTTP method: {d(method)}")
+        if version != b"HTTP/1.1":
+            raise ValueError(f"unsupported HTTP version: {d(version)}")
+        path = raw_path.decode("ascii", "surrogateescape")
+
+        headers = yield from parse_headers(read_line)
+
+        # https://www.rfc-editor.org/rfc/rfc7230.html#section-3.3.3
+
+        if "Transfer-Encoding" in headers:
+            raise NotImplementedError("transfer codings aren't supported")
+
+        if "Content-Length" in headers:
+            raise ValueError("unsupported request body")
+
+        return cls(path, headers)
+
+    def serialize(self) -> bytes:
+        """
+        Serialize a WebSocket handshake request.
+
+        """
+        # Since the request line and headers only contain ASCII characters,
+        # we can keep this simple.
+        request = f"GET {self.path} HTTP/1.1\r\n".encode()
+        request += self.headers.serialize()
+        return request
+
+
+@dataclasses.dataclass
+class Response:
+    """
+    WebSocket handshake response.
+
+    Attributes:
+        status_code: Response code.
+        reason_phrase: Response reason.
+        headers: Response headers.
+        body: Response body, if any.
+
+    """
+
+    status_code: int
+    reason_phrase: str
+    headers: datastructures.Headers
+    body: Optional[bytes] = None
+
+    _exception: Optional[Exception] = None
+
+    @property
+    def exception(self) -> Optional[Exception]:  # pragma: no cover
+        warnings.warn(
+            "Response.exception is deprecated; "
+            "use ClientConnection.handshake_exc instead",
+            DeprecationWarning,
+        )
+        return self._exception
+
+    @classmethod
+    def parse(
+        cls,
+        read_line: Callable[[int], Generator[None, None, bytes]],
+        read_exact: Callable[[int], Generator[None, None, bytes]],
+        read_to_eof: Callable[[int], Generator[None, None, bytes]],
+    ) -> Generator[None, None, Response]:
+        """
+        Parse a WebSocket handshake response.
+
+        This is a generator-based coroutine.
+
+        The reason phrase and headers are expected to contain only ASCII
+        characters. Other characters are represented with surrogate escapes.
+
+        Args:
+            read_line: generator-based coroutine that reads a LF-terminated
+                line or raises an exception if there isn't enough data.
+            read_exact: generator-based coroutine that reads the requested
+                bytes or raises an exception if there isn't enough data.
+            read_to_eof: generator-based coroutine that reads until the end
+                of the stream.
+
+        Raises:
+            EOFError: if the connection is closed without a full HTTP response.
+            SecurityError: if the response exceeds a security limit.
+            LookupError: if the response isn't well formatted.
+            ValueError: if the response isn't well formatted.
+
+        """
+        # https://www.rfc-editor.org/rfc/rfc7230.html#section-3.1.2
+
+        try:
+            status_line = yield from parse_line(read_line)
+        except EOFError as exc:
+            raise EOFError("connection closed while reading HTTP status line") from exc
+
+        try:
+            version, raw_status_code, raw_reason = status_line.split(b" ", 2)
+        except ValueError:  # not enough values to unpack (expected 3, got 1-2)
+            raise ValueError(f"invalid HTTP status line: {d(status_line)}") from None
+
+        if version != b"HTTP/1.1":
+            raise ValueError(f"unsupported HTTP version: {d(version)}")
+        try:
+            status_code = int(raw_status_code)
+        except ValueError:  # invalid literal for int() with base 10
+            raise ValueError(
+                f"invalid HTTP status code: {d(raw_status_code)}"
+            ) from None
+        if not 100 <= status_code < 1000:
+            raise ValueError(f"unsupported HTTP status code: {d(raw_status_code)}")
+        if not _value_re.fullmatch(raw_reason):
+            raise ValueError(f"invalid HTTP reason phrase: {d(raw_reason)}")
+        reason = raw_reason.decode()
+
+        headers = yield from parse_headers(read_line)
+
+        # https://www.rfc-editor.org/rfc/rfc7230.html#section-3.3.3
+
+        if "Transfer-Encoding" in headers:
+            raise NotImplementedError("transfer codings aren't supported")
+
+        # Since websockets only does GET requests (no HEAD, no CONNECT), all
+        # responses except 1xx, 204, and 304 include a message body.
+        if 100 <= status_code < 200 or status_code == 204 or status_code == 304:
+            body = None
+        else:
+            content_length: Optional[int]
+            try:
+                # MultipleValuesError is sufficiently unlikely that we don't
+                # attempt to handle it. Instead we document that its parent
+                # class, LookupError, may be raised.
+                raw_content_length = headers["Content-Length"]
+            except KeyError:
+                content_length = None
+            else:
+                content_length = int(raw_content_length)
+
+            if content_length is None:
+                try:
+                    body = yield from read_to_eof(MAX_BODY)
+                except RuntimeError:
+                    raise exceptions.SecurityError(
+                        f"body too large: over {MAX_BODY} bytes"
+                    )
+            elif content_length > MAX_BODY:
+                raise exceptions.SecurityError(
+                    f"body too large: {content_length} bytes"
+                )
+            else:
+                body = yield from read_exact(content_length)
+
+        return cls(status_code, reason, headers, body)
+
+    def serialize(self) -> bytes:
+        """
+        Serialize a WebSocket handshake response.
+
+        """
+        # Since the status line and headers only contain ASCII characters,
+        # we can keep this simple.
+        response = f"HTTP/1.1 {self.status_code} {self.reason_phrase}\r\n".encode()
+        response += self.headers.serialize()
+        if self.body is not None:
+            response += self.body
+        return response
+
+
+def parse_headers(
+    read_line: Callable[[int], Generator[None, None, bytes]],
+) -> Generator[None, None, datastructures.Headers]:
+    """
+    Parse HTTP headers.
+
+    Non-ASCII characters are represented with surrogate escapes.
+
+    Args:
+        read_line: generator-based coroutine that reads a LF-terminated line
+            or raises an exception if there isn't enough data.
+
+    Raises:
+        EOFError: if the connection is closed without complete headers.
+        SecurityError: if the request exceeds a security limit.
+        ValueError: if the request isn't well formatted.
+
+    """
+    # https://www.rfc-editor.org/rfc/rfc7230.html#section-3.2
+
+    # We don't attempt to support obsolete line folding.
+
+    headers = datastructures.Headers()
+    for _ in range(MAX_HEADERS + 1):
+        try:
+            line = yield from parse_line(read_line)
+        except EOFError as exc:
+            raise EOFError("connection closed while reading HTTP headers") from exc
+        if line == b"":
+            break
+
+        try:
+            raw_name, raw_value = line.split(b":", 1)
+        except ValueError:  # not enough values to unpack (expected 2, got 1)
+            raise ValueError(f"invalid HTTP header line: {d(line)}") from None
+        if not _token_re.fullmatch(raw_name):
+            raise ValueError(f"invalid HTTP header name: {d(raw_name)}")
+        raw_value = raw_value.strip(b" \t")
+        if not _value_re.fullmatch(raw_value):
+            raise ValueError(f"invalid HTTP header value: {d(raw_value)}")
+
+        name = raw_name.decode("ascii")  # guaranteed to be ASCII at this point
+        value = raw_value.decode("ascii", "surrogateescape")
+        headers[name] = value
+
+    else:
+        raise exceptions.SecurityError("too many HTTP headers")
+
+    return headers
+
+
+def parse_line(
+    read_line: Callable[[int], Generator[None, None, bytes]],
+) -> Generator[None, None, bytes]:
+    """
+    Parse a single line.
+
+    CRLF is stripped from the return value.
+
+    Args:
+        read_line: generator-based coroutine that reads a LF-terminated line
+            or raises an exception if there isn't enough data.
+
+    Raises:
+        EOFError: if the connection is closed without a CRLF.
+        SecurityError: if the response exceeds a security limit.
+
+    """
+    try:
+        line = yield from read_line(MAX_LINE)
+    except RuntimeError:
+        raise exceptions.SecurityError("line too long")
+    # Not mandatory but safe - https://www.rfc-editor.org/rfc/rfc7230.html#section-3.5
+    if not line.endswith(b"\r\n"):
+        raise EOFError("line without CRLF")
+    return line[:-2]
diff --git a/tests/wpt/tests/tools/third_party/websockets/src/websockets/imports.py b/tests/wpt/tests/tools/third_party/websockets/src/websockets/imports.py
new file mode 100644
index 00000000000..a6a59d4c2ee
--- /dev/null
+++ b/tests/wpt/tests/tools/third_party/websockets/src/websockets/imports.py
@@ -0,0 +1,99 @@
+from __future__ import annotations
+
+import warnings
+from typing import Any, Dict, Iterable, Optional
+
+
+__all__ = ["lazy_import"]
+
+
+def import_name(name: str, source: str, namespace: Dict[str, Any]) -> Any:
+    """
+    Import ``name`` from ``source`` in ``namespace``.
+
+    There are two use cases:
+
+    - ``name`` is an object defined in ``source``;
+    - ``name`` is a submodule of ``source``.
+
+    Neither :func:`__import__` nor :func:`~importlib.import_module` does
+    exactly this. :func:`__import__` is closer to the intended behavior.
+
+    """
+    level = 0
+    while source[level] == ".":
+        level += 1
+        assert level < len(source), "importing from parent isn't supported"
+    module = __import__(source[level:], namespace, None, [name], level)
+    return getattr(module, name)
+
+
+def lazy_import(
+    namespace: Dict[str, Any],
+    aliases: Optional[Dict[str, str]] = None,
+    deprecated_aliases: Optional[Dict[str, str]] = None,
+) -> None:
+    """
+    Provide lazy, module-level imports.
+
+    Typical use::
+
+        __getattr__, __dir__ = lazy_import(
+            globals(),
+            aliases={
+                "<name>": "<source module>",
+                ...
+            },
+            deprecated_aliases={
+                ...,
+            }
+        )
+
+    This function defines ``__getattr__`` and ``__dir__`` per :pep:`562`.
+
+    """
+    if aliases is None:
+        aliases = {}
+    if deprecated_aliases is None:
+        deprecated_aliases = {}
+
+    namespace_set = set(namespace)
+    aliases_set = set(aliases)
+    deprecated_aliases_set = set(deprecated_aliases)
+
+    assert not namespace_set & aliases_set, "namespace conflict"
+    assert not namespace_set & deprecated_aliases_set, "namespace conflict"
+    assert not aliases_set & deprecated_aliases_set, "namespace conflict"
+
+    package = namespace["__name__"]
+
+    def __getattr__(name: str) -> Any:
+        assert aliases is not None  # mypy cannot figure this out
+        try:
+            source = aliases[name]
+        except KeyError:
+            pass
+        else:
+            return import_name(name, source, namespace)
+
+        assert deprecated_aliases is not None  # mypy cannot figure this out
+        try:
+            source = deprecated_aliases[name]
+        except KeyError:
+            pass
+        else:
+            warnings.warn(
+                f"{package}.{name} is deprecated",
+                DeprecationWarning,
+                stacklevel=2,
+            )
+            return import_name(name, source, namespace)
+
+        raise AttributeError(f"module {package!r} has no attribute {name!r}")
+
+    namespace["__getattr__"] = __getattr__
+
+    def __dir__() -> Iterable[str]:
+        return sorted(namespace_set | aliases_set | deprecated_aliases_set)
+
+    namespace["__dir__"] = __dir__
diff --git a/tests/wpt/tests/tools/third_party/websockets/tests/extensions/__init__.py b/tests/wpt/tests/tools/third_party/websockets/src/websockets/legacy/__init__.py
similarity index 100%
rename from tests/wpt/tests/tools/third_party/websockets/tests/extensions/__init__.py
rename to tests/wpt/tests/tools/third_party/websockets/src/websockets/legacy/__init__.py
diff --git a/tests/wpt/tests/tools/third_party/websockets/src/websockets/legacy/auth.py b/tests/wpt/tests/tools/third_party/websockets/src/websockets/legacy/auth.py
new file mode 100644
index 00000000000..8825c14ecf7
--- /dev/null
+++ b/tests/wpt/tests/tools/third_party/websockets/src/websockets/legacy/auth.py
@@ -0,0 +1,188 @@
+from __future__ import annotations
+
+import functools
+import hmac
+import http
+from typing import Any, Awaitable, Callable, Iterable, Optional, Tuple, Union, cast
+
+from ..datastructures import Headers
+from ..exceptions import InvalidHeader
+from ..headers import build_www_authenticate_basic, parse_authorization_basic
+from .server import HTTPResponse, WebSocketServerProtocol
+
+
+__all__ = ["BasicAuthWebSocketServerProtocol", "basic_auth_protocol_factory"]
+
+Credentials = Tuple[str, str]
+
+
+def is_credentials(value: Any) -> bool:
+    try:
+        username, password = value
+    except (TypeError, ValueError):
+        return False
+    else:
+        return isinstance(username, str) and isinstance(password, str)
+
+
+class BasicAuthWebSocketServerProtocol(WebSocketServerProtocol):
+    """
+    WebSocket server protocol that enforces HTTP Basic Auth.
+
+    """
+
+    realm: str = ""
+    """
+    Scope of protection.
+
+    If provided, it should contain only ASCII characters because the
+    encoding of non-ASCII characters is undefined.
+    """
+
+    username: Optional[str] = None
+    """Username of the authenticated user."""
+
+    def __init__(
+        self,
+        *args: Any,
+        realm: Optional[str] = None,
+        check_credentials: Optional[Callable[[str, str], Awaitable[bool]]] = None,
+        **kwargs: Any,
+    ) -> None:
+        if realm is not None:
+            self.realm = realm  # shadow class attribute
+        self._check_credentials = check_credentials
+        super().__init__(*args, **kwargs)
+
+    async def check_credentials(self, username: str, password: str) -> bool:
+        """
+        Check whether credentials are authorized.
+
+        This coroutine may be overridden in a subclass, for example to
+        authenticate against a database or an external service.
+
+        Args:
+            username: HTTP Basic Auth username.
+            password: HTTP Basic Auth password.
+
+        Returns:
+            bool: :obj:`True` if the handshake should continue;
+            :obj:`False` if it should fail with a HTTP 401 error.
+
+        """
+        if self._check_credentials is not None:
+            return await self._check_credentials(username, password)
+
+        return False
+
+    async def process_request(
+        self,
+        path: str,
+        request_headers: Headers,
+    ) -> Optional[HTTPResponse]:
+        """
+        Check HTTP Basic Auth and return a HTTP 401 response if needed.
+
+        """
+        try:
+            authorization = request_headers["Authorization"]
+        except KeyError:
+            return (
+                http.HTTPStatus.UNAUTHORIZED,
+                [("WWW-Authenticate", build_www_authenticate_basic(self.realm))],
+                b"Missing credentials\n",
+            )
+
+        try:
+            username, password = parse_authorization_basic(authorization)
+        except InvalidHeader:
+            return (
+                http.HTTPStatus.UNAUTHORIZED,
+                [("WWW-Authenticate", build_www_authenticate_basic(self.realm))],
+                b"Unsupported credentials\n",
+            )
+
+        if not await self.check_credentials(username, password):
+            return (
+                http.HTTPStatus.UNAUTHORIZED,
+                [("WWW-Authenticate", build_www_authenticate_basic(self.realm))],
+                b"Invalid credentials\n",
+            )
+
+        self.username = username
+
+        return await super().process_request(path, request_headers)
+
+
+def basic_auth_protocol_factory(
+    realm: Optional[str] = None,
+    credentials: Optional[Union[Credentials, Iterable[Credentials]]] = None,
+    check_credentials: Optional[Callable[[str, str], Awaitable[bool]]] = None,
+    create_protocol: Optional[Callable[[Any], BasicAuthWebSocketServerProtocol]] = None,
+) -> Callable[[Any], BasicAuthWebSocketServerProtocol]:
+    """
+    Protocol factory that enforces HTTP Basic Auth.
+
+    :func:`basic_auth_protocol_factory` is designed to integrate with
+    :func:`~websockets.server.serve` like this::
+
+        websockets.serve(
+            ...,
+            create_protocol=websockets.basic_auth_protocol_factory(
+                realm="my dev server",
+                credentials=("hello", "iloveyou"),
+            )
+        )
+
+    Args:
+        realm: indicates the scope of protection. It should contain only ASCII
+            characters because the encoding of non-ASCII characters is
+            undefined. Refer to section 2.2 of :rfc:`7235` for details.
+        credentials: defines hard coded authorized credentials. It can be a
+            ``(username, password)`` pair or a list of such pairs.
+        check_credentials: defines a coroutine that verifies credentials.
+            This coroutine receives ``username`` and ``password`` arguments
+            and returns a :class:`bool`. One of ``credentials`` or
+            ``check_credentials`` must be provided but not both.
+        create_protocol: factory that creates the protocol. By default, this
+            is :class:`BasicAuthWebSocketServerProtocol`. It can be replaced
+            by a subclass.
+    Raises:
+        TypeError: if the ``credentials`` or ``check_credentials`` argument is
+            wrong.
+
+    """
+    if (credentials is None) == (check_credentials is None):
+        raise TypeError("provide either credentials or check_credentials")
+
+    if credentials is not None:
+        if is_credentials(credentials):
+            credentials_list = [cast(Credentials, credentials)]
+        elif isinstance(credentials, Iterable):
+            credentials_list = list(credentials)
+            if not all(is_credentials(item) for item in credentials_list):
+                raise TypeError(f"invalid credentials argument: {credentials}")
+        else:
+            raise TypeError(f"invalid credentials argument: {credentials}")
+
+        credentials_dict = dict(credentials_list)
+
+        async def check_credentials(username: str, password: str) -> bool:
+            try:
+                expected_password = credentials_dict[username]
+            except KeyError:
+                return False
+            return hmac.compare_digest(expected_password, password)
+
+    if create_protocol is None:
+        # Not sure why mypy cannot figure this out.
+        create_protocol = cast(
+            Callable[[Any], BasicAuthWebSocketServerProtocol],
+            BasicAuthWebSocketServerProtocol,
+        )
+
+    return functools.partial(
+        create_protocol,
+        realm=realm,
+        check_credentials=check_credentials,
+    )
diff --git a/tests/wpt/tests/tools/third_party/websockets/src/websockets/legacy/client.py b/tests/wpt/tests/tools/third_party/websockets/src/websockets/legacy/client.py
new file mode 100644
index 00000000000..fadc3efe876
--- /dev/null
+++ b/tests/wpt/tests/tools/third_party/websockets/src/websockets/legacy/client.py
@@ -0,0 +1,709 @@
+from __future__ import annotations
+
+import asyncio
+import functools
+import logging
+import random
+import urllib.parse
+import warnings
+from types import TracebackType
+from typing import (
+    Any,
+    AsyncIterator,
+    Callable,
+    Generator,
+    List,
+    Optional,
+    Sequence,
+    Tuple,
+    Type,
+    cast,
+)
+
+from ..datastructures import Headers, HeadersLike
+from ..exceptions import (
+    InvalidHandshake,
+    InvalidHeader,
+    InvalidMessage,
+    InvalidStatusCode,
+    NegotiationError,
+    RedirectHandshake,
+    SecurityError,
+)
+from ..extensions import ClientExtensionFactory, Extension
+from ..extensions.permessage_deflate import enable_client_permessage_deflate
+from ..headers import (
+    build_authorization_basic,
+    build_extension,
+    build_host,
+    build_subprotocol,
+    parse_extension,
+    parse_subprotocol,
+    validate_subprotocols,
+)
+from ..http import USER_AGENT
+from ..typing import ExtensionHeader, LoggerLike, Origin, Subprotocol
+from ..uri import WebSocketURI, parse_uri
+from .handshake import build_request, check_response
+from .http import read_response
+from .protocol import WebSocketCommonProtocol
+
+
+__all__ = ["connect", "unix_connect", "WebSocketClientProtocol"]
+
+
+class WebSocketClientProtocol(WebSocketCommonProtocol):
+    """
+    WebSocket client connection.
+
+    :class:`WebSocketClientProtocol` provides :meth:`recv` and :meth:`send`
+    coroutines for receiving and sending messages.
+
+    It supports asynchronous iteration to receive incoming messages::
+
+        async for message in websocket:
+            await process(message)
+
+    The iterator exits normally when the connection is closed with close code
+    1000 (OK) or 1001 (going away). It raises
+    a :exc:`~websockets.exceptions.ConnectionClosedError` when the connection
+    is closed with any other code.
+
+    See :func:`connect` for the documentation of ``logger``, ``origin``,
+    ``extensions``, ``subprotocols``, and ``extra_headers``.
+
+    See :class:`~websockets.legacy.protocol.WebSocketCommonProtocol` for the
+    documentation of ``ping_interval``, ``ping_timeout``, ``close_timeout``,
+    ``max_size``, ``max_queue``, ``read_limit``, and ``write_limit``.
+
+    """
+
+    is_client = True
+    side = "client"
+
+    def __init__(
+        self,
+        *,
+        logger: Optional[LoggerLike] = None,
+        origin: Optional[Origin] = None,
+        extensions: Optional[Sequence[ClientExtensionFactory]] = None,
+        subprotocols: Optional[Sequence[Subprotocol]] = None,
+        extra_headers: Optional[HeadersLike] = None,
+        **kwargs: Any,
+    ) -> None:
+        if logger is None:
+            logger = logging.getLogger("websockets.client")
+        super().__init__(logger=logger, **kwargs)
+        self.origin = origin
+        self.available_extensions = extensions
+        self.available_subprotocols = subprotocols
+        self.extra_headers = extra_headers
+
+    def write_http_request(self, path: str, headers: Headers) -> None:
+        """
+        Write request line and headers to the HTTP request.
+
+        """
+        self.path = path
+        self.request_headers = headers
+
+        if self.debug:
+            self.logger.debug("> GET %s HTTP/1.1", path)
+            for key, value in headers.raw_items():
+                self.logger.debug("> %s: %s", key, value)
+
+        # Since the path and headers only contain ASCII characters,
+        # we can keep this simple.
+        request = f"GET {path} HTTP/1.1\r\n"
+        request += str(headers)
+
+        self.transport.write(request.encode())
+
+    async def read_http_response(self) -> Tuple[int, Headers]:
+        """
+        Read status line and headers from the HTTP response.
+
+        If the response contains a body, it may be read from ``self.reader``
+        after this coroutine returns.
+
+        Raises:
+            InvalidMessage: if the HTTP message is malformed or isn't an
+                HTTP/1.1 GET response.
+
+        """
+        try:
+            status_code, reason, headers = await read_response(self.reader)
+        # Remove this branch when dropping support for Python < 3.8
+        # because CancelledError no longer inherits Exception.
+        except asyncio.CancelledError:  # pragma: no cover
+            raise
+        except Exception as exc:
+            raise InvalidMessage("did not receive a valid HTTP response") from exc
+
+        if self.debug:
+            self.logger.debug("< HTTP/1.1 %d %s", status_code, reason)
+            for key, value in headers.raw_items():
+                self.logger.debug("< %s: %s", key, value)
+
+        self.response_headers = headers
+
+        return status_code, self.response_headers
+
+    @staticmethod
+    def process_extensions(
+        headers: Headers,
+        available_extensions: Optional[Sequence[ClientExtensionFactory]],
+    ) -> List[Extension]:
+        """
+        Handle the Sec-WebSocket-Extensions HTTP response header.
+
+        Check that each extension is supported, as well as its parameters.
+
+        Return the list of accepted extensions.
+
+        Raise :exc:`~websockets.exceptions.InvalidHandshake` to abort the
+        connection.
+
+        :rfc:`6455` leaves the rules up to the specification of each
+        :extension.
+
+        To provide this level of flexibility, for each extension accepted by
+        the server, we check for a match with each extension available in the
+        client configuration. If no match is found, an exception is raised.
+
+        If several variants of the same extension are accepted by the server,
+        it may be configured several times, which won't make sense in general.
+        Extensions must implement their own requirements. For this purpose,
+        the list of previously accepted extensions is provided.
+
+        Other requirements, for example related to mandatory extensions or the
+        order of extensions, may be implemented by overriding this method.
+
+        """
+        accepted_extensions: List[Extension] = []
+
+        header_values = headers.get_all("Sec-WebSocket-Extensions")
+
+        if header_values:
+
+            if available_extensions is None:
+                raise InvalidHandshake("no extensions supported")
+
+            parsed_header_values: List[ExtensionHeader] = sum(
+                [parse_extension(header_value) for header_value in header_values], []
+            )
+
+            for name, response_params in parsed_header_values:
+
+                for extension_factory in available_extensions:
+
+                    # Skip non-matching extensions based on their name.
+                    if extension_factory.name != name:
+                        continue
+
+                    # Skip non-matching extensions based on their params.
+                    try:
+                        extension = extension_factory.process_response_params(
+                            response_params, accepted_extensions
+                        )
+                    except NegotiationError:
+                        continue
+
+                    # Add matching extension to the final list.
+                    accepted_extensions.append(extension)
+
+                    # Break out of the loop once we have a match.
+                    break
+
+                # If we didn't break from the loop, no extension in our list
+                # matched what the server sent. Fail the connection.
+                else:
+                    raise NegotiationError(
+                        f"Unsupported extension: "
+                        f"name = {name}, params = {response_params}"
+                    )
+
+        return accepted_extensions
+
+    @staticmethod
+    def process_subprotocol(
+        headers: Headers, available_subprotocols: Optional[Sequence[Subprotocol]]
+    ) -> Optional[Subprotocol]:
+        """
+        Handle the Sec-WebSocket-Protocol HTTP response header.
+
+        Check that it contains exactly one supported subprotocol.
+
+        Return the selected subprotocol.
+
+        """
+        subprotocol: Optional[Subprotocol] = None
+
+        header_values = headers.get_all("Sec-WebSocket-Protocol")
+
+        if header_values:
+
+            if available_subprotocols is None:
+                raise InvalidHandshake("no subprotocols supported")
+
+            parsed_header_values: Sequence[Subprotocol] = sum(
+                [parse_subprotocol(header_value) for header_value in header_values], []
+            )
+
+            if len(parsed_header_values) > 1:
+                subprotocols = ", ".join(parsed_header_values)
+                raise InvalidHandshake(f"multiple subprotocols: {subprotocols}")
+
+            subprotocol = parsed_header_values[0]
+
+            if subprotocol not in available_subprotocols:
+                raise NegotiationError(f"unsupported subprotocol: {subprotocol}")
+
+        return subprotocol
+
+    async def handshake(
+        self,
+        wsuri: WebSocketURI,
+        origin: Optional[Origin] = None,
+        available_extensions: Optional[Sequence[ClientExtensionFactory]] = None,
+        available_subprotocols: Optional[Sequence[Subprotocol]] = None,
+        extra_headers: Optional[HeadersLike] = None,
+    ) -> None:
+        """
+        Perform the client side of the opening handshake.
+
+        Args:
+            wsuri: URI of the WebSocket server.
+            origin: value of the ``Origin`` header.
+            available_extensions: list of supported extensions, in order in
+                which they should be tried.
+            available_subprotocols: list of supported subprotocols, in order
+                of decreasing preference.
+            extra_headers: arbitrary HTTP headers to add to the request.
+
+        Raises:
+            InvalidHandshake: if the handshake fails.
+
+        """
+        request_headers = Headers()
+
+        request_headers["Host"] = build_host(wsuri.host, wsuri.port, wsuri.secure)
+
+        if wsuri.user_info:
+            request_headers["Authorization"] = build_authorization_basic(
+                *wsuri.user_info
+            )
+
+        if origin is not None:
+            request_headers["Origin"] = origin
+
+        key = build_request(request_headers)
+
+        if available_extensions is not None:
+            extensions_header = build_extension(
+                [
+                    (extension_factory.name, extension_factory.get_request_params())
+                    for extension_factory in available_extensions
+                ]
+            )
+            request_headers["Sec-WebSocket-Extensions"] = extensions_header
+
+        if available_subprotocols is not None:
+            protocol_header = build_subprotocol(available_subprotocols)
+            request_headers["Sec-WebSocket-Protocol"] = protocol_header
+
+        if self.extra_headers is not None:
+            request_headers.update(self.extra_headers)
+
+        request_headers.setdefault("User-Agent", USER_AGENT)
+
+        self.write_http_request(wsuri.resource_name, request_headers)
+
+        status_code, response_headers = await self.read_http_response()
+        if status_code in (301, 302, 303, 307, 308):
+            if "Location" not in response_headers:
+                raise InvalidHeader("Location")
+            raise RedirectHandshake(response_headers["Location"])
+        elif status_code != 101:
+            raise InvalidStatusCode(status_code, response_headers)
+
+        check_response(response_headers, key)
+
+        self.extensions = self.process_extensions(
+            response_headers, available_extensions
+        )
+
+        self.subprotocol = self.process_subprotocol(
+            response_headers, available_subprotocols
+        )
+
+        self.connection_open()
+
+
+class Connect:
+    """
+    Connect to the WebSocket server at ``uri``.
+
+    Awaiting :func:`connect` yields a :class:`WebSocketClientProtocol` which
+    can then be used to send and receive messages.
+
+    :func:`connect` can be used as a asynchronous context manager::
+
+        async with websockets.connect(...) as websocket:
+            ...
+
+    The connection is closed automatically when exiting the context.
+
+    :func:`connect` can be used as an infinite asynchronous iterator to
+    reconnect automatically on errors::
+
+        async for websocket in websockets.connect(...):
+            try:
+                ...
+            except websockets.ConnectionClosed:
+                continue
+
+    The connection is closed automatically after each iteration of the loop.
+
+    If an error occurs while establishing the connection, :func:`connect`
+    retries with exponential backoff. The backoff delay starts at three
+    seconds and increases up to one minute.
+
+    If an error occurs in the body of the loop, you can handle the exception
+    and :func:`connect` will reconnect with the next iteration; or you can
+    let the exception bubble up and break out of the loop. This lets you
+    decide which errors trigger a reconnection and which errors are fatal.
+
+    Args:
+        uri: URI of the WebSocket server.
+        create_protocol: factory for the :class:`asyncio.Protocol` managing
+            the connection; defaults to :class:`WebSocketClientProtocol`; may
+            be set to a wrapper or a subclass to customize connection handling.
+        logger: logger for this connection;
+            defaults to ``logging.getLogger("websockets.client")``;
+            see the :doc:`logging guide <../topics/logging>` for details.
+        compression: shortcut that enables the "permessage-deflate" extension
+            by default; may be set to :obj:`None` to disable compression;
+            see the :doc:`compression guide <../topics/compression>` for details.
+        origin: value of the ``Origin`` header. This is useful when connecting
+            to a server that validates the ``Origin`` header to defend against
+            Cross-Site WebSocket Hijacking attacks.
+        extensions: list of supported extensions, in order in which they
+            should be tried.
+        subprotocols: list of supported subprotocols, in order of decreasing
+            preference.
+        extra_headers: arbitrary HTTP headers to add to the request.
+        open_timeout: timeout for opening the connection in seconds;
+            :obj:`None` to disable the timeout
+
+    See :class:`~websockets.legacy.protocol.WebSocketCommonProtocol` for the
+    documentation of ``ping_interval``, ``ping_timeout``, ``close_timeout``,
+    ``max_size``, ``max_queue``, ``read_limit``, and ``write_limit``.
+
+    Any other keyword arguments are passed the event loop's
+    :meth:`~asyncio.loop.create_connection` method.
+
+    For example:
+
+    * You can set ``ssl`` to a :class:`~ssl.SSLContext` to enforce TLS
+      settings. When connecting to a ``wss://`` URI, if ``ssl`` isn't
+      provided, a TLS context is created
+      with :func:`~ssl.create_default_context`.
+
+    * You can set ``host`` and ``port`` to connect to a different host and
+      port from those found in ``uri``. This only changes the destination of
+      the TCP connection. The host name from ``uri`` is still used in the TLS
+      handshake for secure connections and in the ``Host`` header.
+
+    Returns:
+        WebSocketClientProtocol: WebSocket connection.
+
+    Raises:
+        InvalidURI: if ``uri`` isn't a valid WebSocket URI.
+        InvalidHandshake: if the opening handshake fails.
+        ~asyncio.TimeoutError: if the opening handshake times out.
+
+    """
+
+    MAX_REDIRECTS_ALLOWED = 10
+
+    def __init__(
+        self,
+        uri: str,
+        *,
+        create_protocol: Optional[Callable[[Any], WebSocketClientProtocol]] = None,
+        logger: Optional[LoggerLike] = None,
+        compression: Optional[str] = "deflate",
+        origin: Optional[Origin] = None,
+        extensions: Optional[Sequence[ClientExtensionFactory]] = None,
+        subprotocols: Optional[Sequence[Subprotocol]] = None,
+        extra_headers: Optional[HeadersLike] = None,
+        open_timeout: Optional[float] = 10,
+        ping_interval: Optional[float] = 20,
+        ping_timeout: Optional[float] = 20,
+        close_timeout: Optional[float] = None,
+        max_size: Optional[int] = 2**20,
+        max_queue: Optional[int] = 2**5,
+        read_limit: int = 2**16,
+        write_limit: int = 2**16,
+        **kwargs: Any,
+    ) -> None:
+        # Backwards compatibility: close_timeout used to be called timeout.
+        timeout: Optional[float] = kwargs.pop("timeout", None)
+        if timeout is None:
+            timeout = 10
+        else:
+            warnings.warn("rename timeout to close_timeout", DeprecationWarning)
+        # If both are specified, timeout is ignored.
+        if close_timeout is None:
+            close_timeout = timeout
+
+        # Backwards compatibility: create_protocol used to be called klass.
+        klass: Optional[Type[WebSocketClientProtocol]] = kwargs.pop("klass", None)
+        if klass is None:
+            klass = WebSocketClientProtocol
+        else:
+            warnings.warn("rename klass to create_protocol", DeprecationWarning)
+        # If both are specified, klass is ignored.
+        if create_protocol is None:
+            create_protocol = klass
+
+        # Backwards compatibility: recv() used to return None on closed connections
+        legacy_recv: bool = kwargs.pop("legacy_recv", False)
+
+        # Backwards compatibility: the loop parameter used to be supported.
+        _loop: Optional[asyncio.AbstractEventLoop] = kwargs.pop("loop", None)
+        if _loop is None:
+            loop = asyncio.get_event_loop()
+        else:
+            loop = _loop
+            warnings.warn("remove loop argument", DeprecationWarning)
+
+        wsuri = parse_uri(uri)
+        if wsuri.secure:
+            kwargs.setdefault("ssl", True)
+        elif kwargs.get("ssl") is not None:
+            raise ValueError(
+                "connect() received a ssl argument for a ws:// URI, "
+                "use a wss:// URI to enable TLS"
+            )
+
+        if compression == "deflate":
+            extensions = enable_client_permessage_deflate(extensions)
+        elif compression is not None:
+            raise ValueError(f"unsupported compression: {compression}")
+
+        if subprotocols is not None:
+            validate_subprotocols(subprotocols)
+
+        factory = functools.partial(
+            create_protocol,
+            logger=logger,
+            origin=origin,
+            extensions=extensions,
+            subprotocols=subprotocols,
+            extra_headers=extra_headers,
+            ping_interval=ping_interval,
+            ping_timeout=ping_timeout,
+            close_timeout=close_timeout,
+            max_size=max_size,
+            max_queue=max_queue,
+            read_limit=read_limit,
+            write_limit=write_limit,
+            host=wsuri.host,
+            port=wsuri.port,
+            secure=wsuri.secure,
+            legacy_recv=legacy_recv,
+            loop=_loop,
+        )
+
+        if kwargs.pop("unix", False):
+            path: Optional[str] = kwargs.pop("path", None)
+            create_connection = functools.partial(
+                loop.create_unix_connection, factory, path, **kwargs
+            )
+        else:
+            host: Optional[str]
+            port: Optional[int]
+            if kwargs.get("sock") is None:
+                host, port = wsuri.host, wsuri.port
+            else:
+                # If sock is given, host and port shouldn't be specified.
+                host, port = None, None
+            # If host and port are given, override values from the URI.
+            host = kwargs.pop("host", host)
+            port = kwargs.pop("port", port)
+            create_connection = functools.partial(
+                loop.create_connection, factory, host, port, **kwargs
+            )
+
+        self.open_timeout = open_timeout
+        if logger is None:
+            logger = logging.getLogger("websockets.client")
+        self.logger = logger
+
+        # This is a coroutine function.
+        self._create_connection = create_connection
+        self._uri = uri
+        self._wsuri = wsuri
+
+    def handle_redirect(self, uri: str) -> None:
+        # Update the state of this instance to connect to a new URI.
+        old_uri = self._uri
+        old_wsuri = self._wsuri
+        new_uri = urllib.parse.urljoin(old_uri, uri)
+        new_wsuri = parse_uri(new_uri)
+
+        # Forbid TLS downgrade.
+        if old_wsuri.secure and not new_wsuri.secure:
+            raise SecurityError("redirect from WSS to WS")
+
+        same_origin = (
+            old_wsuri.host == new_wsuri.host and old_wsuri.port == new_wsuri.port
+        )
+
+        # Rewrite the host and port arguments for cross-origin redirects.
+        # This preserves connection overrides with the host and port
+        # arguments if the redirect points to the same host and port.
+        if not same_origin:
+            # Replace the host and port argument passed to the protocol factory.
+            factory = self._create_connection.args[0]
+            factory = functools.partial(
+                factory.func,
+                *factory.args,
+                **dict(factory.keywords, host=new_wsuri.host, port=new_wsuri.port),
+            )
+            # Replace the host and port argument passed to create_connection.
+            self._create_connection = functools.partial(
+                self._create_connection.func,
+                *(factory, new_wsuri.host, new_wsuri.port),
+                **self._create_connection.keywords,
+            )
+
+        # Set the new WebSocket URI. This suffices for same-origin redirects.
+        self._uri = new_uri
+        self._wsuri = new_wsuri
+
+    # async for ... in connect(...):
+
+    BACKOFF_MIN = 1.92
+    BACKOFF_MAX = 60.0
+    BACKOFF_FACTOR = 1.618
+    BACKOFF_INITIAL = 5
+
+    async def __aiter__(self) -> AsyncIterator[WebSocketClientProtocol]:
+        backoff_delay = self.BACKOFF_MIN
+        while True:
+            try:
+                async with self as protocol:
+                    yield protocol
+            # Remove this branch when dropping support for Python < 3.8
+            # because CancelledError no longer inherits Exception.
+            except asyncio.CancelledError:  # pragma: no cover
+                raise
+            except Exception:
+                # Add a random initial delay between 0 and 5 seconds.
+                # See 7.2.3. Recovering from Abnormal Closure in RFC 6544.
+                if backoff_delay == self.BACKOFF_MIN:
+                    initial_delay = random.random() * self.BACKOFF_INITIAL
+                    self.logger.info(
+                        "! connect failed; reconnecting in %.1f seconds",
+                        initial_delay,
+                        exc_info=True,
+                    )
+                    await asyncio.sleep(initial_delay)
+                else:
+                    self.logger.info(
+                        "! connect failed again; retrying in %d seconds",
+                        int(backoff_delay),
+                        exc_info=True,
+                    )
+                    await asyncio.sleep(int(backoff_delay))
+                # Increase delay with truncated exponential backoff.
+                backoff_delay = backoff_delay * self.BACKOFF_FACTOR
+                backoff_delay = min(backoff_delay, self.BACKOFF_MAX)
+                continue
+            else:
+                # Connection succeeded - reset backoff delay
+                backoff_delay = self.BACKOFF_MIN
+
+    # async with connect(...) as ...:
+
+    async def __aenter__(self) -> WebSocketClientProtocol:
+        return await self
+
+    async def __aexit__(
+        self,
+        exc_type: Optional[Type[BaseException]],
+        exc_value: Optional[BaseException],
+        traceback: Optional[TracebackType],
+    ) -> None:
+        await self.protocol.close()
+
+    # ... = await connect(...)
+
+    def __await__(self) -> Generator[Any, None, WebSocketClientProtocol]:
+        # Create a suitable iterator by calling __await__ on a coroutine.
+        return self.__await_impl_timeout__().__await__()
+
+    async def __await_impl_timeout__(self) -> WebSocketClientProtocol:
+        return await asyncio.wait_for(self.__await_impl__(), self.open_timeout)
+
+    async def __await_impl__(self) -> WebSocketClientProtocol:
+        for redirects in range(self.MAX_REDIRECTS_ALLOWED):
+            transport, protocol = await self._create_connection()
+            protocol = cast(WebSocketClientProtocol, protocol)
+
+            try:
+                await protocol.handshake(
+                    self._wsuri,
+                    origin=protocol.origin,
+                    available_extensions=protocol.available_extensions,
+                    available_subprotocols=protocol.available_subprotocols,
+                    extra_headers=protocol.extra_headers,
+                )
+            except RedirectHandshake as exc:
+                protocol.fail_connection()
+                await protocol.wait_closed()
+                self.handle_redirect(exc.uri)
+            # Avoid leaking a connected socket when the handshake fails.
+            except (Exception, asyncio.CancelledError):
+                protocol.fail_connection()
+                await protocol.wait_closed()
+                raise
+            else:
+                self.protocol = protocol
+                return protocol
+        else:
+            raise SecurityError("too many redirects")
+
+    # ... = yield from connect(...) - remove when dropping Python < 3.10
+
+    __iter__ = __await__
+
+
+connect = Connect
+
+
+def unix_connect(
+    path: Optional[str] = None,
+    uri: str = "ws://localhost/",
+    **kwargs: Any,
+) -> Connect:
+    """
+    Similar to :func:`connect`, but for connecting to a Unix socket.
+
+    This function builds upon the event loop's
+    :meth:`~asyncio.loop.create_unix_connection` method.
+
+    It is only available on Unix.
+
+    It's mainly useful for debugging servers listening on Unix sockets.
+
+    Args:
+        path: file system path to the Unix socket.
+        uri: URI of the WebSocket server; the host is used in the TLS
+            handshake for secure connections and in the ``Host`` header.
+
+    """
+    return connect(uri=uri, path=path, unix=True, **kwargs)
diff --git a/tests/wpt/tests/tools/third_party/websockets/src/websockets/legacy/compatibility.py b/tests/wpt/tests/tools/third_party/websockets/src/websockets/legacy/compatibility.py
new file mode 100644
index 00000000000..df81de9dbce
--- /dev/null
+++ b/tests/wpt/tests/tools/third_party/websockets/src/websockets/legacy/compatibility.py
@@ -0,0 +1,13 @@
+from __future__ import annotations
+
+import asyncio
+import sys
+from typing import Any, Dict
+
+
+def loop_if_py_lt_38(loop: asyncio.AbstractEventLoop) -> Dict[str, Any]:
+    """
+    Helper for the removal of the loop argument in Python 3.10.
+
+    """
+    return {"loop": loop} if sys.version_info[:2] < (3, 8) else {}
diff --git a/tests/wpt/tests/tools/third_party/websockets/src/websockets/legacy/framing.py b/tests/wpt/tests/tools/third_party/websockets/src/websockets/legacy/framing.py
new file mode 100644
index 00000000000..c4de7eb28bc
--- /dev/null
+++ b/tests/wpt/tests/tools/third_party/websockets/src/websockets/legacy/framing.py
@@ -0,0 +1,174 @@
+from __future__ import annotations
+
+import dataclasses
+import struct
+from typing import Any, Awaitable, Callable, NamedTuple, Optional, Sequence, Tuple
+
+from .. import extensions, frames
+from ..exceptions import PayloadTooBig, ProtocolError
+
+
+try:
+    from ..speedups import apply_mask
+except ImportError:  # pragma: no cover
+    from ..utils import apply_mask
+
+
+class Frame(NamedTuple):
+
+    fin: bool
+    opcode: frames.Opcode
+    data: bytes
+    rsv1: bool = False
+    rsv2: bool = False
+    rsv3: bool = False
+
+    @property
+    def new_frame(self) -> frames.Frame:
+        return frames.Frame(
+            self.opcode,
+            self.data,
+            self.fin,
+            self.rsv1,
+            self.rsv2,
+            self.rsv3,
+        )
+
+    def __str__(self) -> str:
+        return str(self.new_frame)
+
+    def check(self) -> None:
+        return self.new_frame.check()
+
+    @classmethod
+    async def read(
+        cls,
+        reader: Callable[[int], Awaitable[bytes]],
+        *,
+        mask: bool,
+        max_size: Optional[int] = None,
+        extensions: Optional[Sequence[extensions.Extension]] = None,
+    ) -> Frame:
+        """
+        Read a WebSocket frame.
+
+        Args:
+            reader: coroutine that reads exactly the requested number of
+                bytes, unless the end of file is reached.
+            mask: whether the frame should be masked i.e. whether the read
+                happens on the server side.
+            max_size: maximum payload size in bytes.
+            extensions: list of extensions, applied in reverse order.
+
+        Raises:
+            PayloadTooBig: if the frame exceeds ``max_size``.
+            ProtocolError: if the frame contains incorrect values.
+
+        """
+
+        # Read the header.
+        data = await reader(2)
+        head1, head2 = struct.unpack("!BB", data)
+
+        # While not Pythonic, this is marginally faster than calling bool().
+        fin = True if head1 & 0b10000000 else False
+        rsv1 = True if head1 & 0b01000000 else False
+        rsv2 = True if head1 & 0b00100000 else False
+        rsv3 = True if head1 & 0b00010000 else False
+
+        try:
+            opcode = frames.Opcode(head1 & 0b00001111)
+        except ValueError as exc:
+            raise ProtocolError("invalid opcode") from exc
+
+        if (True if head2 & 0b10000000 else False) != mask:
+            raise ProtocolError("incorrect masking")
+
+        length = head2 & 0b01111111
+        if length == 126:
+            data = await reader(2)
+            (length,) = struct.unpack("!H", data)
+        elif length == 127:
+            data = await reader(8)
+            (length,) = struct.unpack("!Q", data)
+        if max_size is not None and length > max_size:
+            raise PayloadTooBig(f"over size limit ({length} > {max_size} bytes)")
+        if mask:
+            mask_bits = await reader(4)
+
+        # Read the data.
+        data = await reader(length)
+        if mask:
+            data = apply_mask(data, mask_bits)
+
+        new_frame = frames.Frame(opcode, data, fin, rsv1, rsv2, rsv3)
+
+        if extensions is None:
+            extensions = []
+        for extension in reversed(extensions):
+            new_frame = extension.decode(new_frame, max_size=max_size)
+
+        new_frame.check()
+
+        return cls(
+            new_frame.fin,
+            new_frame.opcode,
+            new_frame.data,
+            new_frame.rsv1,
+            new_frame.rsv2,
+            new_frame.rsv3,
+        )
+
+    def write(
+        self,
+        write: Callable[[bytes], Any],
+        *,
+        mask: bool,
+        extensions: Optional[Sequence[extensions.Extension]] = None,
+    ) -> None:
+        """
+        Write a WebSocket frame.
+
+        Args:
+            frame: frame to write.
+            write: function that writes bytes.
+            mask: whether the frame should be masked i.e. whether the write
+                happens on the client side.
+            extensions: list of extensions, applied in order.
+
+        Raises:
+            ProtocolError: if the frame contains incorrect values.
+
+        """
+        # The frame is written in a single call to write in order to prevent
+        # TCP fragmentation. See #68 for details. This also makes it safe to
+        # send frames concurrently from multiple coroutines.
+        write(self.new_frame.serialize(mask=mask, extensions=extensions))
+
+
+# Backwards compatibility with previously documented public APIs
+
+from ..frames import Close, prepare_ctrl as encode_data, prepare_data  # noqa
+
+
+def parse_close(data: bytes) -> Tuple[int, str]:
+    """
+    Parse the payload from a close frame.
+
+    Returns:
+        Tuple[int, str]: close code and reason.
+
+    Raises:
+        ProtocolError: if data is ill-formed.
+        UnicodeDecodeError: if the reason isn't valid UTF-8.
+
+    """
+    return dataclasses.astuple(Close.parse(data))  # type: ignore
+
+
+def serialize_close(code: int, reason: str) -> bytes:
+    """
+    Serialize the payload for a close frame.
+
+    """
+    return Close(code, reason).serialize()
diff --git a/tests/wpt/tests/tools/third_party/websockets/src/websockets/handshake.py b/tests/wpt/tests/tools/third_party/websockets/src/websockets/legacy/handshake.py
similarity index 58%
rename from tests/wpt/tests/tools/third_party/websockets/src/websockets/handshake.py
rename to tests/wpt/tests/tools/third_party/websockets/src/websockets/legacy/handshake.py
index 9bfe27754fa..569937bb9a9 100644
--- a/tests/wpt/tests/tools/third_party/websockets/src/websockets/handshake.py
+++ b/tests/wpt/tests/tools/third_party/websockets/src/websockets/legacy/handshake.py
@@ -1,45 +1,18 @@
-"""
-:mod:`websockets.handshake` provides helpers for the WebSocket handshake.
-
-See `section 4 of RFC 6455`_.
-
-.. _section 4 of RFC 6455: http://tools.ietf.org/html/rfc6455#section-4
-
-Some checks cannot be performed because they depend too much on the
-context; instead, they're documented below.
-
-To accept a connection, a server must:
-
-- Read the request, check that the method is GET, and check the headers with
-  :func:`check_request`,
-- Send a 101 response to the client with the headers created by
-  :func:`build_response` if the request is valid; otherwise, send an
-  appropriate HTTP error code.
-
-To open a connection, a client must:
-
-- Send a GET request to the server with the headers created by
-  :func:`build_request`,
-- Read the response, check that the status code is 101, and check the headers
-  with :func:`check_response`.
-
-"""
+from __future__ import annotations
 
 import base64
 import binascii
-import hashlib
-import random
 from typing import List
 
-from .exceptions import InvalidHeader, InvalidHeaderValue, InvalidUpgrade
-from .headers import ConnectionOption, UpgradeProtocol, parse_connection, parse_upgrade
-from .http import Headers, MultipleValuesError
+from ..datastructures import Headers, MultipleValuesError
+from ..exceptions import InvalidHeader, InvalidHeaderValue, InvalidUpgrade
+from ..headers import parse_connection, parse_upgrade
+from ..typing import ConnectionOption, UpgradeProtocol
+from ..utils import accept_key as accept, generate_key
 
 
 __all__ = ["build_request", "check_request", "build_response", "check_response"]
 
-GUID = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11"
-
 
 def build_request(headers: Headers) -> str:
     """
@@ -47,12 +20,14 @@ def build_request(headers: Headers) -> str:
 
     Update request headers passed in argument.
 
-    :param headers: request headers
-    :returns: ``key`` which must be passed to :func:`check_response`
+    Args:
+        headers: handshake request headers.
+
+    Returns:
+        str: ``key`` that must be passed to :func:`check_response`.
 
     """
-    raw_key = bytes(random.getrandbits(8) for _ in range(16))
-    key = base64.b64encode(raw_key).decode()
+    key = generate_key()
     headers["Upgrade"] = "websocket"
     headers["Connection"] = "Upgrade"
     headers["Sec-WebSocket-Key"] = key
@@ -69,10 +44,15 @@ def check_request(headers: Headers) -> str:
     are usually performed earlier in the HTTP request handling code. They're
     the responsibility of the caller.
 
-    :param headers: request headers
-    :returns: ``key`` which must be passed to :func:`build_response`
-    :raises ~websockets.exceptions.InvalidHandshake: if the handshake request
-        is invalid; then the server must return 400 Bad Request error
+    Args:
+        headers: handshake request headers.
+
+    Returns:
+        str: ``key`` that must be passed to :func:`build_response`.
+
+    Raises:
+        InvalidHandshake: if the handshake request is invalid;
+            then the server must return 400 Bad Request error.
 
     """
     connection: List[ConnectionOption] = sum(
@@ -87,34 +67,35 @@ def check_request(headers: Headers) -> str:
     )
 
     # For compatibility with non-strict implementations, ignore case when
-    # checking the Upgrade header. It's supposed to be 'WebSocket'.
+    # checking the Upgrade header. The RFC always uses "websocket", except
+    # in section 11.2. (IANA registration) where it uses "WebSocket".
     if not (len(upgrade) == 1 and upgrade[0].lower() == "websocket"):
         raise InvalidUpgrade("Upgrade", ", ".join(upgrade))
 
     try:
         s_w_key = headers["Sec-WebSocket-Key"]
-    except KeyError:
-        raise InvalidHeader("Sec-WebSocket-Key")
-    except MultipleValuesError:
+    except KeyError as exc:
+        raise InvalidHeader("Sec-WebSocket-Key") from exc
+    except MultipleValuesError as exc:
         raise InvalidHeader(
             "Sec-WebSocket-Key", "more than one Sec-WebSocket-Key header found"
-        )
+        ) from exc
 
     try:
         raw_key = base64.b64decode(s_w_key.encode(), validate=True)
-    except binascii.Error:
-        raise InvalidHeaderValue("Sec-WebSocket-Key", s_w_key)
+    except binascii.Error as exc:
+        raise InvalidHeaderValue("Sec-WebSocket-Key", s_w_key) from exc
     if len(raw_key) != 16:
         raise InvalidHeaderValue("Sec-WebSocket-Key", s_w_key)
 
     try:
         s_w_version = headers["Sec-WebSocket-Version"]
-    except KeyError:
-        raise InvalidHeader("Sec-WebSocket-Version")
-    except MultipleValuesError:
+    except KeyError as exc:
+        raise InvalidHeader("Sec-WebSocket-Version") from exc
+    except MultipleValuesError as exc:
         raise InvalidHeader(
             "Sec-WebSocket-Version", "more than one Sec-WebSocket-Version header found"
-        )
+        ) from exc
 
     if s_w_version != "13":
         raise InvalidHeaderValue("Sec-WebSocket-Version", s_w_version)
@@ -128,8 +109,9 @@ def build_response(headers: Headers, key: str) -> None:
 
     Update response headers passed in argument.
 
-    :param headers: response headers
-    :param key: comes from :func:`check_request`
+    Args:
+        headers: handshake response headers.
+        key: returned by :func:`check_request`.
 
     """
     headers["Upgrade"] = "websocket"
@@ -145,10 +127,12 @@ def check_response(headers: Headers, key: str) -> None:
     response with a 101 status code. These controls are the responsibility of
     the caller.
 
-    :param headers: response headers
-    :param key: comes from :func:`build_request`
-    :raises ~websockets.exceptions.InvalidHandshake: if the handshake response
-        is invalid
+    Args:
+        headers: handshake response headers.
+        key: returned by :func:`build_request`.
+
+    Raises:
+        InvalidHandshake: if the handshake response is invalid.
 
     """
     connection: List[ConnectionOption] = sum(
@@ -163,23 +147,19 @@ def check_response(headers: Headers, key: str) -> None:
     )
 
     # For compatibility with non-strict implementations, ignore case when
-    # checking the Upgrade header. It's supposed to be 'WebSocket'.
+    # checking the Upgrade header. The RFC always uses "websocket", except
+    # in section 11.2. (IANA registration) where it uses "WebSocket".
     if not (len(upgrade) == 1 and upgrade[0].lower() == "websocket"):
         raise InvalidUpgrade("Upgrade", ", ".join(upgrade))
 
     try:
         s_w_accept = headers["Sec-WebSocket-Accept"]
-    except KeyError:
-        raise InvalidHeader("Sec-WebSocket-Accept")
-    except MultipleValuesError:
+    except KeyError as exc:
+        raise InvalidHeader("Sec-WebSocket-Accept") from exc
+    except MultipleValuesError as exc:
         raise InvalidHeader(
             "Sec-WebSocket-Accept", "more than one Sec-WebSocket-Accept header found"
-        )
+        ) from exc
 
     if s_w_accept != accept(key):
         raise InvalidHeaderValue("Sec-WebSocket-Accept", s_w_accept)
-
-
-def accept(key: str) -> str:
-    sha1 = hashlib.sha1((key + GUID).encode()).digest()
-    return base64.b64encode(sha1).decode()
diff --git a/tests/wpt/tests/tools/third_party/websockets/src/websockets/legacy/http.py b/tests/wpt/tests/tools/third_party/websockets/src/websockets/legacy/http.py
new file mode 100644
index 00000000000..cc2ef1f067d
--- /dev/null
+++ b/tests/wpt/tests/tools/third_party/websockets/src/websockets/legacy/http.py
@@ -0,0 +1,201 @@
+from __future__ import annotations
+
+import asyncio
+import re
+from typing import Tuple
+
+from ..datastructures import Headers
+from ..exceptions import SecurityError
+
+
+__all__ = ["read_request", "read_response"]
+
+MAX_HEADERS = 256
+MAX_LINE = 4110
+
+
+def d(value: bytes) -> str:
+    """
+    Decode a bytestring for interpolating into an error message.
+
+    """
+    return value.decode(errors="backslashreplace")
+
+
+# See https://www.rfc-editor.org/rfc/rfc7230.html#appendix-B.
+
+# Regex for validating header names.
+
+_token_re = re.compile(rb"[-!#$%&\'*+.^_`|~0-9a-zA-Z]+")
+
+# Regex for validating header values.
+
+# We don't attempt to support obsolete line folding.
+
+# Include HTAB (\x09), SP (\x20), VCHAR (\x21-\x7e), obs-text (\x80-\xff).
+
+# The ABNF is complicated because it attempts to express that optional
+# whitespace is ignored. We strip whitespace and don't revalidate that.
+
+# See also https://www.rfc-editor.org/errata_search.php?rfc=7230&eid=4189
+
+_value_re = re.compile(rb"[\x09\x20-\x7e\x80-\xff]*")
+
+
+async def read_request(stream: asyncio.StreamReader) -> Tuple[str, Headers]:
+    """
+    Read an HTTP/1.1 GET request and return ``(path, headers)``.
+
+    ``path`` isn't URL-decoded or validated in any way.
+
+    ``path`` and ``headers`` are expected to contain only ASCII characters.
+    Other characters are represented with surrogate escapes.
+
+    :func:`read_request` doesn't attempt to read the request body because
+    WebSocket handshake requests don't have one. If the request contains a
+    body, it may be read from ``stream`` after this coroutine returns.
+
+    Args:
+        stream: input to read the request from
+
+    Raises:
+        EOFError: if the connection is closed without a full HTTP request
+        SecurityError: if the request exceeds a security limit
+        ValueError: if the request isn't well formatted
+
+    """
+    # https://www.rfc-editor.org/rfc/rfc7230.html#section-3.1.1
+
+    # Parsing is simple because fixed values are expected for method and
+    # version and because path isn't checked. Since WebSocket software tends
+    # to implement HTTP/1.1 strictly, there's little need for lenient parsing.
+
+    try:
+        request_line = await read_line(stream)
+    except EOFError as exc:
+        raise EOFError("connection closed while reading HTTP request line") from exc
+
+    try:
+        method, raw_path, version = request_line.split(b" ", 2)
+    except ValueError:  # not enough values to unpack (expected 3, got 1-2)
+        raise ValueError(f"invalid HTTP request line: {d(request_line)}") from None
+
+    if method != b"GET":
+        raise ValueError(f"unsupported HTTP method: {d(method)}")
+    if version != b"HTTP/1.1":
+        raise ValueError(f"unsupported HTTP version: {d(version)}")
+    path = raw_path.decode("ascii", "surrogateescape")
+
+    headers = await read_headers(stream)
+
+    return path, headers
+
+
+async def read_response(stream: asyncio.StreamReader) -> Tuple[int, str, Headers]:
+    """
+    Read an HTTP/1.1 response and return ``(status_code, reason, headers)``.
+
+    ``reason`` and ``headers`` are expected to contain only ASCII characters.
+    Other characters are represented with surrogate escapes.
+
+    :func:`read_request` doesn't attempt to read the response body because
+    WebSocket handshake responses don't have one. If the response contains a
+    body, it may be read from ``stream`` after this coroutine returns.
+
+    Args:
+        stream: input to read the response from
+
+    Raises:
+        EOFError: if the connection is closed without a full HTTP response
+        SecurityError: if the response exceeds a security limit
+        ValueError: if the response isn't well formatted
+
+    """
+    # https://www.rfc-editor.org/rfc/rfc7230.html#section-3.1.2
+
+    # As in read_request, parsing is simple because a fixed value is expected
+    # for version, status_code is a 3-digit number, and reason can be ignored.
+
+    try:
+        status_line = await read_line(stream)
+    except EOFError as exc:
+        raise EOFError("connection closed while reading HTTP status line") from exc
+
+    try:
+        version, raw_status_code, raw_reason = status_line.split(b" ", 2)
+    except ValueError:  # not enough values to unpack (expected 3, got 1-2)
+        raise ValueError(f"invalid HTTP status line: {d(status_line)}") from None
+
+    if version != b"HTTP/1.1":
+        raise ValueError(f"unsupported HTTP version: {d(version)}")
+    try:
+        status_code = int(raw_status_code)
+    except ValueError:  # invalid literal for int() with base 10
+        raise ValueError(f"invalid HTTP status code: {d(raw_status_code)}") from None
+    if not 100 <= status_code < 1000:
+        raise ValueError(f"unsupported HTTP status code: {d(raw_status_code)}")
+    if not _value_re.fullmatch(raw_reason):
+        raise ValueError(f"invalid HTTP reason phrase: {d(raw_reason)}")
+    reason = raw_reason.decode()
+
+    headers = await read_headers(stream)
+
+    return status_code, reason, headers
+
+
+async def read_headers(stream: asyncio.StreamReader) -> Headers:
+    """
+    Read HTTP headers from ``stream``.
+
+    Non-ASCII characters are represented with surrogate escapes.
+
+    """
+    # https://www.rfc-editor.org/rfc/rfc7230.html#section-3.2
+
+    # We don't attempt to support obsolete line folding.
+
+    headers = Headers()
+    for _ in range(MAX_HEADERS + 1):
+        try:
+            line = await read_line(stream)
+        except EOFError as exc:
+            raise EOFError("connection closed while reading HTTP headers") from exc
+        if line == b"":
+            break
+
+        try:
+            raw_name, raw_value = line.split(b":", 1)
+        except ValueError:  # not enough values to unpack (expected 2, got 1)
+            raise ValueError(f"invalid HTTP header line: {d(line)}") from None
+        if not _token_re.fullmatch(raw_name):
+            raise ValueError(f"invalid HTTP header name: {d(raw_name)}")
+        raw_value = raw_value.strip(b" \t")
+        if not _value_re.fullmatch(raw_value):
+            raise ValueError(f"invalid HTTP header value: {d(raw_value)}")
+
+        name = raw_name.decode("ascii")  # guaranteed to be ASCII at this point
+        value = raw_value.decode("ascii", "surrogateescape")
+        headers[name] = value
+
+    else:
+        raise SecurityError("too many HTTP headers")
+
+    return headers
+
+
+async def read_line(stream: asyncio.StreamReader) -> bytes:
+    """
+    Read a single line from ``stream``.
+
+    CRLF is stripped from the return value.
+
+    """
+    # Security: this is bounded by the StreamReader's limit (default = 32 KiB).
+    line = await stream.readline()
+    # Security: this guarantees header values are small (hard-coded = 4 KiB)
+    if len(line) > MAX_LINE:
+        raise SecurityError("line too long")
+    # Not mandatory but safe - https://www.rfc-editor.org/rfc/rfc7230.html#section-3.5
+    if not line.endswith(b"\r\n"):
+        raise EOFError("line without CRLF")
+    return line[:-2]
diff --git a/tests/wpt/tests/tools/third_party/websockets/src/websockets/protocol.py b/tests/wpt/tests/tools/third_party/websockets/src/websockets/legacy/protocol.py
similarity index 62%
rename from tests/wpt/tests/tools/third_party/websockets/src/websockets/protocol.py
rename to tests/wpt/tests/tools/third_party/websockets/src/websockets/legacy/protocol.py
index ede636d0db6..3f734fe7602 100644
--- a/tests/wpt/tests/tools/third_party/websockets/src/websockets/protocol.py
+++ b/tests/wpt/tests/tools/third_party/websockets/src/websockets/legacy/protocol.py
@@ -1,20 +1,13 @@
-"""
-:mod:`websockets.protocol` handles WebSocket control and data frames.
-
-See `sections 4 to 8 of RFC 6455`_.
-
-.. _sections 4 to 8 of RFC 6455: http://tools.ietf.org/html/rfc6455#section-4
-
-"""
+from __future__ import annotations
 
 import asyncio
 import codecs
 import collections
-import enum
 import logging
 import random
+import ssl
 import struct
-import sys
+import uuid
 import warnings
 from typing import (
     Any,
@@ -25,12 +18,15 @@ from typing import (
     Dict,
     Iterable,
     List,
+    Mapping,
     Optional,
     Union,
     cast,
 )
 
-from .exceptions import (
+from ..connection import State
+from ..datastructures import Headers
+from ..exceptions import (
     ConnectionClosed,
     ConnectionClosedError,
     ConnectionClosedOK,
@@ -38,23 +34,26 @@ from .exceptions import (
     PayloadTooBig,
     ProtocolError,
 )
-from .extensions.base import Extension
-from .framing import *
-from .handshake import *
-from .http import Headers
-from .typing import Data
+from ..extensions import Extension
+from ..frames import (
+    OK_CLOSE_CODES,
+    OP_BINARY,
+    OP_CLOSE,
+    OP_CONT,
+    OP_PING,
+    OP_PONG,
+    OP_TEXT,
+    Close,
+    Opcode,
+    prepare_ctrl,
+    prepare_data,
+)
+from ..typing import Data, LoggerLike, Subprotocol
+from .compatibility import loop_if_py_lt_38
+from .framing import Frame
 
 
-__all__ = ["WebSocketCommonProtocol"]
-
-logger = logging.getLogger(__name__)
-
-
-# A WebSocket connection goes through the following four states, in order:
-
-
-class State(enum.IntEnum):
-    CONNECTING, OPEN, CLOSING, CLOSED = range(4)
+__all__ = ["WebSocketCommonProtocol", "broadcast"]
 
 
 # In order to ensure consistency, the code always checks the current value of
@@ -64,111 +63,99 @@ class State(enum.IntEnum):
 
 class WebSocketCommonProtocol(asyncio.Protocol):
     """
-    :class:`~asyncio.Protocol` subclass implementing the data transfer phase.
+    WebSocket connection.
 
-    Once the WebSocket connection is established, during the data transfer
-    phase, the protocol is almost symmetrical between the server side and the
-    client side. :class:`WebSocketCommonProtocol` implements logic that's
-    shared between servers and clients..
+    :class:`WebSocketCommonProtocol` provides APIs shared between WebSocket
+    servers and clients. You shouldn't use it directly. Instead, use
+    :class:`~websockets.client.WebSocketClientProtocol` or
+    :class:`~websockets.server.WebSocketServerProtocol`.
 
-    Subclasses such as :class:`~websockets.server.WebSocketServerProtocol` and
-    :class:`~websockets.client.WebSocketClientProtocol` implement the opening
-    handshake, which is different between servers and clients.
+    This documentation focuses on low-level details that aren't covered in the
+    documentation of :class:`~websockets.client.WebSocketClientProtocol` and
+    :class:`~websockets.server.WebSocketServerProtocol` for the sake of
+    simplicity.
 
-    :class:`WebSocketCommonProtocol` performs four functions:
+    Once the connection is open, a Ping_ frame is sent every ``ping_interval``
+    seconds. This serves as a keepalive. It helps keeping the connection
+    open, especially in the presence of proxies with short timeouts on
+    inactive connections. Set ``ping_interval`` to :obj:`None` to disable
+    this behavior.
 
-    * It runs a task that stores incoming data frames in a queue and makes
-      them available with the :meth:`recv` coroutine.
-    * It sends outgoing data frames with the :meth:`send` coroutine.
-    * It deals with control frames automatically.
-    * It performs the closing handshake.
+    .. _Ping: https://www.rfc-editor.org/rfc/rfc6455.html#section-5.5.2
 
-    :class:`WebSocketCommonProtocol` supports asynchronous iteration::
+    If the corresponding Pong_ frame isn't received within ``ping_timeout``
+    seconds, the connection is considered unusable and is closed with code
+    1011. This ensures that the remote endpoint remains responsive. Set
+    ``ping_timeout`` to :obj:`None` to disable this behavior.
 
-        async for message in websocket:
-            await process(message)
+    .. _Pong: https://www.rfc-editor.org/rfc/rfc6455.html#section-5.5.3
 
-    The iterator yields incoming messages. It exits normally when the
-    connection is closed with the close code 1000 (OK) or 1001 (going away).
-    It raises a :exc:`~websockets.exceptions.ConnectionClosedError` exception
-    when the connection is closed with any other code.
+    The ``close_timeout`` parameter defines a maximum wait time for completing
+    the closing handshake and terminating the TCP connection. For legacy
+    reasons, :meth:`close` completes in at most ``5 * close_timeout`` seconds
+    for clients and ``4 * close_timeout`` for servers.
 
-    Once the connection is open, a `Ping frame`_ is sent every
-    ``ping_interval`` seconds. This serves as a keepalive. It helps keeping
-    the connection open, especially in the presence of proxies with short
-    timeouts on inactive connections. Set ``ping_interval`` to ``None`` to
-    disable this behavior.
-
-    .. _Ping frame: https://tools.ietf.org/html/rfc6455#section-5.5.2
-
-    If the corresponding `Pong frame`_ isn't received within ``ping_timeout``
-    seconds, the connection is considered unusable and is closed with
-    code 1011. This ensures that the remote endpoint remains responsive. Set
-    ``ping_timeout`` to ``None`` to disable this behavior.
-
-    .. _Pong frame: https://tools.ietf.org/html/rfc6455#section-5.5.3
-
-    The ``close_timeout`` parameter defines a maximum wait time in seconds for
-    completing the closing handshake and terminating the TCP connection.
-    :meth:`close` completes in at most ``4 * close_timeout`` on the server
-    side and ``5 * close_timeout`` on the client side.
+    See the discussion of :doc:`timeouts <../topics/timeouts>` for details.
 
     ``close_timeout`` needs to be a parameter of the protocol because
-    ``websockets`` usually calls :meth:`close` implicitly:
+    websockets usually calls :meth:`close` implicitly upon exit:
 
-    - on the server side, when the connection handler terminates,
-    - on the client side, when exiting the context manager for the connection.
+    * on the client side, when :func:`~websockets.client.connect` is used as a
+      context manager;
+    * on the server side, when the connection handler terminates;
 
     To apply a timeout to any other API, wrap it in :func:`~asyncio.wait_for`.
 
     The ``max_size`` parameter enforces the maximum size for incoming messages
-    in bytes. The default value is 1 MiB. ``None`` disables the limit. If a
-    message larger than the maximum size is received, :meth:`recv` will
-    raise :exc:`~websockets.exceptions.ConnectionClosedError` and the
-    connection will be closed with code 1009.
+    in bytes. The default value is 1 MiB. If a larger message is received,
+    :meth:`recv` will raise :exc:`~websockets.exceptions.ConnectionClosedError`
+    and the connection will be closed with code 1009.
 
     The ``max_queue`` parameter sets the maximum length of the queue that
-    holds incoming messages. The default value is ``32``. ``None`` disables
-    the limit. Messages are added to an in-memory queue when they're received;
-    then :meth:`recv` pops from that queue. In order to prevent excessive
-    memory consumption when messages are received faster than they can be
-    processed, the queue must be bounded. If the queue fills up, the protocol
-    stops processing incoming data until :meth:`recv` is called. In this
-    situation, various receive buffers (at least in ``asyncio`` and in the OS)
-    will fill up, then the TCP receive window will shrink, slowing down
-    transmission to avoid packet loss.
+    holds incoming messages. The default value is ``32``. Messages are added
+    to an in-memory queue when they're received; then :meth:`recv` pops from
+    that queue. In order to prevent excessive memory consumption when
+    messages are received faster than they can be processed, the queue must
+    be bounded. If the queue fills up, the protocol stops processing incoming
+    data until :meth:`recv` is called. In this situation, various receive
+    buffers (at least in :mod:`asyncio` and in the OS) will fill up, then the
+    TCP receive window will shrink, slowing down transmission to avoid packet
+    loss.
 
     Since Python can use up to 4 bytes of memory to represent a single
     character, each connection may use up to ``4 * max_size * max_queue``
-    bytes of memory to store incoming messages. By default, this is 128 MiB.
+    bytes of memory to store incoming messages. By default, this is 128 MiB.
     You may want to lower the limits, depending on your application's
     requirements.
 
     The ``read_limit`` argument sets the high-water limit of the buffer for
     incoming bytes. The low-water limit is half the high-water limit. The
-    default value is 64 KiB, half of asyncio's default (based on the current
+    default value is 64 KiB, half of asyncio's default (based on the current
     implementation of :class:`~asyncio.StreamReader`).
 
     The ``write_limit`` argument sets the high-water limit of the buffer for
     outgoing bytes. The low-water limit is a quarter of the high-water limit.
-    The default value is 64 KiB, equal to asyncio's default (based on the
+    The default value is 64 KiB, equal to asyncio's default (based on the
     current implementation of ``FlowControlMixin``).
 
-    As soon as the HTTP request and response in the opening handshake are
-    processed:
+    See the discussion of :doc:`memory usage <../topics/memory>` for details.
 
-    * the request path is available in the :attr:`path` attribute;
-    * the request and response HTTP headers are available in the
-      :attr:`request_headers` and :attr:`response_headers` attributes,
-      which are :class:`~websockets.http.Headers` instances.
-
-    If a subprotocol was negotiated, it's available in the :attr:`subprotocol`
-    attribute.
-
-    Once the connection is closed, the code is available in the
-    :attr:`close_code` attribute and the reason in :attr:`close_reason`.
-
-    All these attributes must be treated as read-only.
+    Args:
+        logger: logger for this connection;
+            defaults to ``logging.getLogger("websockets.protocol")``;
+            see the :doc:`logging guide <../topics/logging>` for details.
+        ping_interval: delay between keepalive pings in seconds;
+            :obj:`None` to disable keepalive pings.
+        ping_timeout: timeout for keepalive pings in seconds;
+            :obj:`None` to disable timeouts.
+        close_timeout: timeout for closing the connection in seconds;
+            for legacy reasons, the actual timeout is 4 or 5 times larger.
+        max_size: maximum size of incoming messages in bytes;
+            :obj:`None` to disable the limit.
+        max_queue: maximum number of incoming messages in receive buffer;
+            :obj:`None` to disable the limit.
+        read_limit: high-water mark of read buffer in bytes.
+        write_limit: high-water mark of write buffer in bytes.
 
     """
 
@@ -181,21 +168,25 @@ class WebSocketCommonProtocol(asyncio.Protocol):
     def __init__(
         self,
         *,
+        logger: Optional[LoggerLike] = None,
         ping_interval: Optional[float] = 20,
         ping_timeout: Optional[float] = 20,
         close_timeout: Optional[float] = None,
-        max_size: Optional[int] = 2 ** 20,
-        max_queue: Optional[int] = 2 ** 5,
-        read_limit: int = 2 ** 16,
-        write_limit: int = 2 ** 16,
-        loop: Optional[asyncio.AbstractEventLoop] = None,
+        max_size: Optional[int] = 2**20,
+        max_queue: Optional[int] = 2**5,
+        read_limit: int = 2**16,
+        write_limit: int = 2**16,
         # The following arguments are kept only for backwards compatibility.
         host: Optional[str] = None,
         port: Optional[int] = None,
         secure: Optional[bool] = None,
         legacy_recv: bool = False,
+        loop: Optional[asyncio.AbstractEventLoop] = None,
         timeout: Optional[float] = None,
     ) -> None:
+        if legacy_recv:  # pragma: no cover
+            warnings.warn("legacy_recv is deprecated", DeprecationWarning)
+
         # Backwards compatibility: close_timeout used to be called timeout.
         if timeout is None:
             timeout = 10
@@ -205,6 +196,12 @@ class WebSocketCommonProtocol(asyncio.Protocol):
         if close_timeout is None:
             close_timeout = timeout
 
+        # Backwards compatibility: the loop parameter used to be supported.
+        if loop is None:
+            loop = asyncio.get_event_loop()
+        else:
+            warnings.warn("remove loop argument", DeprecationWarning)
+
         self.ping_interval = ping_interval
         self.ping_timeout = ping_timeout
         self.close_timeout = close_timeout
@@ -213,8 +210,21 @@ class WebSocketCommonProtocol(asyncio.Protocol):
         self.read_limit = read_limit
         self.write_limit = write_limit
 
-        if loop is None:
-            loop = asyncio.get_event_loop()
+        # Unique identifier. For logs.
+        self.id: uuid.UUID = uuid.uuid4()
+        """Unique identifier of the connection. Useful in logs."""
+
+        # Logger or LoggerAdapter for this connection.
+        if logger is None:
+            logger = logging.getLogger("websockets.protocol")
+        # https://github.com/python/typeshed/issues/5561
+        logger = cast(logging.Logger, logger)
+        self.logger: LoggerLike = logging.LoggerAdapter(logger, {"websocket": self})
+        """Logger for this connection."""
+
+        # Track if DEBUG is enabled. Shortcut logging calls if it isn't.
+        self.debug = logger.isEnabledFor(logging.DEBUG)
+
         self.loop = loop
 
         self._host = host
@@ -232,30 +242,33 @@ class WebSocketCommonProtocol(asyncio.Protocol):
         self._paused = False
         self._drain_waiter: Optional[asyncio.Future[None]] = None
 
-        self._drain_lock = asyncio.Lock(
-            **({"loop": loop} if sys.version_info[:2] < (3, 8) else {})
-        )
+        self._drain_lock = asyncio.Lock(**loop_if_py_lt_38(loop))
 
         # This class implements the data transfer and closing handshake, which
         # are shared between the client-side and the server-side.
         # Subclasses implement the opening handshake and, on success, execute
         # :meth:`connection_open` to change the state to OPEN.
         self.state = State.CONNECTING
-        logger.debug("%s - state = CONNECTING", self.side)
+        if self.debug:
+            self.logger.debug("= connection is CONNECTING")
 
         # HTTP protocol parameters.
         self.path: str
+        """Path of the opening handshake request."""
         self.request_headers: Headers
+        """Opening handshake request headers."""
         self.response_headers: Headers
+        """Opening handshake response headers."""
 
         # WebSocket protocol parameters.
         self.extensions: List[Extension] = []
-        self.subprotocol: Optional[str] = None
+        self.subprotocol: Optional[Subprotocol] = None
+        """Subprotocol, if one was negotiated."""
 
-        # The close code and reason are set when receiving a close frame or
-        # losing the TCP connection.
-        self.close_code: int
-        self.close_reason: str
+        # Close code and reason, set when a close frame is sent or received.
+        self.close_rcvd: Optional[Close] = None
+        self.close_sent: Optional[Close] = None
+        self.close_rcvd_then_sent: Optional[bool] = None
 
         # Completed when the connection state becomes CLOSED. Translates the
         # :meth:`connection_lost` callback to a :class:`~asyncio.Future`
@@ -271,7 +284,7 @@ class WebSocketCommonProtocol(asyncio.Protocol):
         # Protect sending fragmented messages.
         self._fragmented_message_waiter: Optional[asyncio.Future[None]] = None
 
-        # Mapping of ping IDs to waiters, in chronological order.
+        # Mapping of ping IDs to pong waiters, in chronological order.
         self.pings: Dict[bytes, asyncio.Future[None]] = {}
 
         # Task running the data transfer.
@@ -312,9 +325,7 @@ class WebSocketCommonProtocol(asyncio.Protocol):
                 #     write(...); yield from drain()
                 # in a loop would never call connection_lost(), so it
                 # would not see an error when the socket is closed.
-                await asyncio.sleep(
-                    0, **({"loop": self.loop} if sys.version_info[:2] < (3, 8) else {})
-                )
+                await asyncio.sleep(0, **loop_if_py_lt_38(self.loop))
         await self._drain_helper()
 
     def connection_open(self) -> None:
@@ -327,7 +338,8 @@ class WebSocketCommonProtocol(asyncio.Protocol):
         # 4.1. The WebSocket Connection is Established.
         assert self.state is State.CONNECTING
         self.state = State.OPEN
-        logger.debug("%s - state = OPEN", self.side)
+        if self.debug:
+            self.logger.debug("= connection is OPEN")
         # Start the task that receives incoming WebSocket messages.
         self.transfer_data_task = self.loop.create_task(self.transfer_data())
         # Start the task that sends pings at regular intervals.
@@ -349,7 +361,7 @@ class WebSocketCommonProtocol(asyncio.Protocol):
 
     @property
     def secure(self) -> Optional[bool]:
-        warnings.warn(f"don't use secure", DeprecationWarning)
+        warnings.warn("don't use secure", DeprecationWarning)
         return self._secure
 
     # Public API
@@ -359,8 +371,12 @@ class WebSocketCommonProtocol(asyncio.Protocol):
         """
         Local address of the connection.
 
-        This is a ``(host, port)`` tuple or ``None`` if the connection hasn't
-        been established yet.
+        For IPv4 connections, this is a ``(host, port)`` tuple.
+
+        The format of the address depends on the address family;
+        see :meth:`~socket.socket.getsockname`.
+
+        :obj:`None` if the TCP connection isn't established yet.
 
         """
         try:
@@ -375,8 +391,12 @@ class WebSocketCommonProtocol(asyncio.Protocol):
         """
         Remote address of the connection.
 
-        This is a ``(host, port)`` tuple or ``None`` if the connection hasn't
-        been established yet.
+        For IPv4 connections, this is a ``(host, port)`` tuple.
+
+        The format of the address depends on the address family;
+        see :meth:`~socket.socket.getpeername`.
+
+        :obj:`None` if the TCP connection isn't established yet.
 
         """
         try:
@@ -389,13 +409,11 @@ class WebSocketCommonProtocol(asyncio.Protocol):
     @property
     def open(self) -> bool:
         """
-        ``True`` when the connection is usable.
+        :obj:`True` when the connection is open; :obj:`False` otherwise.
 
-        It may be used to detect disconnections. However, this approach is
-        discouraged per the EAFP_ principle.
-
-        When ``open`` is ``False``, using the connection raises a
-        :exc:`~websockets.exceptions.ConnectionClosed` exception.
+        This attribute may be used to detect disconnections. However, this
+        approach is discouraged per the EAFP_ principle. Instead, you should
+        handle :exc:`~websockets.exceptions.ConnectionClosed` exceptions.
 
         .. _EAFP: https://docs.python.org/3/glossary.html#term-eafp
 
@@ -405,33 +423,58 @@ class WebSocketCommonProtocol(asyncio.Protocol):
     @property
     def closed(self) -> bool:
         """
-        ``True`` once the connection is closed.
+        :obj:`True` when the connection is closed; :obj:`False` otherwise.
 
-        Be aware that both :attr:`open` and :attr:`closed` are ``False`` during
-        the opening and closing sequences.
+        Be aware that both :attr:`open` and :attr:`closed` are :obj:`False`
+        during the opening and closing sequences.
 
         """
         return self.state is State.CLOSED
 
-    async def wait_closed(self) -> None:
+    @property
+    def close_code(self) -> Optional[int]:
         """
-        Wait until the connection is closed.
+        WebSocket close code, defined in `section 7.1.5 of RFC 6455`_.
 
-        This is identical to :attr:`closed`, except it can be awaited.
+        .. _section 7.1.5 of RFC 6455:
+            https://www.rfc-editor.org/rfc/rfc6455.html#section-7.1.5
 
-        This can make it easier to handle connection termination, regardless
-        of its cause, in tasks that interact with the WebSocket connection.
+        :obj:`None` if the connection isn't closed yet.
 
         """
-        await asyncio.shield(self.connection_lost_waiter)
+        if self.state is not State.CLOSED:
+            return None
+        elif self.close_rcvd is None:
+            return 1006
+        else:
+            return self.close_rcvd.code
+
+    @property
+    def close_reason(self) -> Optional[str]:
+        """
+        WebSocket close reason, defined in `section 7.1.6 of RFC 6455`_.
+
+        .. _section 7.1.6 of RFC 6455:
+            https://www.rfc-editor.org/rfc/rfc6455.html#section-7.1.6
+
+        :obj:`None` if the connection isn't closed yet.
+
+        """
+        if self.state is not State.CLOSED:
+            return None
+        elif self.close_rcvd is None:
+            return ""
+        else:
+            return self.close_rcvd.reason
 
     async def __aiter__(self) -> AsyncIterator[Data]:
         """
-        Iterate on received messages.
+        Iterate on incoming messages.
 
-        Exit normally when the connection is closed with code 1000 or 1001.
-
-        Raise an exception in other cases.
+        The iterator  exits normally when the connection is closed with the
+        close code 1000 (OK) or 1001(going away). It raises
+        a :exc:`~websockets.exceptions.ConnectionClosedError` exception when
+        the connection is closed with any other code.
 
         """
         try:
@@ -444,29 +487,30 @@ class WebSocketCommonProtocol(asyncio.Protocol):
         """
         Receive the next message.
 
-        Return a :class:`str` for a text frame and :class:`bytes` for a binary
-        frame.
-
-        When the end of the message stream is reached, :meth:`recv` raises
+        When the connection is closed, :meth:`recv` raises
         :exc:`~websockets.exceptions.ConnectionClosed`. Specifically, it
         raises :exc:`~websockets.exceptions.ConnectionClosedOK` after a normal
         connection closure and
         :exc:`~websockets.exceptions.ConnectionClosedError` after a protocol
-        error or a network failure.
-
-        .. versionchanged:: 3.0
-
-            :meth:`recv` used to return ``None`` instead. Refer to the
-            changelog for details.
+        error or a network failure. This is how you detect the end of the
+        message stream.
 
         Canceling :meth:`recv` is safe. There's no risk of losing the next
-        message. The next invocation of :meth:`recv` will return it. This
-        makes it possible to enforce a timeout by wrapping :meth:`recv` in
-        :func:`~asyncio.wait_for`.
+        message. The next invocation of :meth:`recv` will return it.
 
-        :raises ~websockets.exceptions.ConnectionClosed: when the
-            connection is closed
-        :raises RuntimeError: if two coroutines call :meth:`recv` concurrently
+        This makes it possible to enforce a timeout by wrapping :meth:`recv`
+        in :func:`~asyncio.wait_for`.
+
+        Returns:
+            Data: A string (:class:`str`) for a Text_ frame. A bytestring
+            (:class:`bytes`) for a Binary_ frame.
+
+            .. _Text: https://www.rfc-editor.org/rfc/rfc6455.html#section-5.6
+            .. _Binary: https://www.rfc-editor.org/rfc/rfc6455.html#section-5.6
+
+        Raises:
+            ConnectionClosed: when the connection is closed.
+            RuntimeError: if two coroutines call :meth:`recv` concurrently.
 
         """
         if self._pop_message_waiter is not None:
@@ -491,8 +535,8 @@ class WebSocketCommonProtocol(asyncio.Protocol):
                 # pop_message_waiter and self.transfer_data_task.
                 await asyncio.wait(
                     [pop_message_waiter, self.transfer_data_task],
-                    **({"loop": self.loop} if sys.version_info[:2] < (3, 8) else {}),
                     return_when=asyncio.FIRST_COMPLETED,
+                    **loop_if_py_lt_38(self.loop),
                 )
             finally:
                 self._pop_message_waiter = None
@@ -519,37 +563,58 @@ class WebSocketCommonProtocol(asyncio.Protocol):
         return message
 
     async def send(
-        self, message: Union[Data, Iterable[Data], AsyncIterable[Data]]
+        self,
+        message: Union[Data, Iterable[Data], AsyncIterable[Data]],
     ) -> None:
         """
         Send a message.
 
-        A string (:class:`str`) is sent as a `Text frame`_. A bytestring or
+        A string (:class:`str`) is sent as a Text_ frame. A bytestring or
         bytes-like object (:class:`bytes`, :class:`bytearray`, or
-        :class:`memoryview`) is sent as a `Binary frame`_.
+        :class:`memoryview`) is sent as a Binary_ frame.
 
-        .. _Text frame: https://tools.ietf.org/html/rfc6455#section-5.6
-        .. _Binary frame: https://tools.ietf.org/html/rfc6455#section-5.6
+        .. _Text: https://www.rfc-editor.org/rfc/rfc6455.html#section-5.6
+        .. _Binary: https://www.rfc-editor.org/rfc/rfc6455.html#section-5.6
 
         :meth:`send` also accepts an iterable or an asynchronous iterable of
-        strings, bytestrings, or bytes-like objects. In that case the message
-        is fragmented. Each item is treated as a message fragment and sent in
-        its own frame. All items must be of the same type, or else
-        :meth:`send` will raise a :exc:`TypeError` and the connection will be
-        closed.
+        strings, bytestrings, or bytes-like objects to enable fragmentation_.
+        Each item is treated as a message fragment and sent in its own frame.
+        All items must be of the same type, or else :meth:`send` will raise a
+        :exc:`TypeError` and the connection will be closed.
+
+        .. _fragmentation: https://www.rfc-editor.org/rfc/rfc6455.html#section-5.4
+
+        :meth:`send` rejects dict-like objects because this is often an error.
+        (If you want to send the keys of a dict-like object as fragments, call
+        its :meth:`~dict.keys` method and pass the result to :meth:`send`.)
 
         Canceling :meth:`send` is discouraged. Instead, you should close the
-        connection with :meth:`close`. Indeed, there only two situations where
-        :meth:`send` yields control to the event loop:
+        connection with :meth:`close`. Indeed, there are only two situations
+        where :meth:`send` may yield control to the event loop and then get
+        canceled; in both cases, :meth:`close` has the same effect and is
+        more clear:
 
         1. The write buffer is full. If you don't want to wait until enough
            data is sent, your only alternative is to close the connection.
            :meth:`close` will likely time out then abort the TCP connection.
-        2. ``message`` is an asynchronous iterator. Stopping in the middle of
-           a fragmented message will cause a protocol error. Closing the
-           connection has the same effect.
+        2. ``message`` is an asynchronous iterator that yields control.
+           Stopping in the middle of a fragmented message will cause a
+           protocol error and the connection will be closed.
 
-        :raises TypeError: for unsupported inputs
+        When the connection is closed, :meth:`send` raises
+        :exc:`~websockets.exceptions.ConnectionClosed`. Specifically, it
+        raises :exc:`~websockets.exceptions.ConnectionClosedOK` after a normal
+        connection closure and
+        :exc:`~websockets.exceptions.ConnectionClosedError` after a protocol
+        error or a network failure.
+
+        Args:
+            message (Union[Data, Iterable[Data], AsyncIterable[Data]): message
+                to send.
+
+        Raises:
+            ConnectionClosed: when the connection is closed.
+            TypeError: if ``message`` doesn't have a supported type.
 
         """
         await self.ensure_open()
@@ -566,6 +631,11 @@ class WebSocketCommonProtocol(asyncio.Protocol):
             opcode, data = prepare_data(message)
             await self.write_frame(True, opcode, data)
 
+        # Catch a common mistake -- passing a dict to send().
+
+        elif isinstance(message, Mapping):
+            raise TypeError("data is a dict-like object")
+
         # Fragmented message -- regular iterator.
 
         elif isinstance(message, Iterable):
@@ -595,7 +665,7 @@ class WebSocketCommonProtocol(asyncio.Protocol):
                 # Final fragment.
                 await self.write_frame(True, OP_CONT, b"")
 
-            except Exception:
+            except (Exception, asyncio.CancelledError):
                 # We're half-way through a fragmented message and we can't
                 # complete it. This makes the connection unusable.
                 self.fail_connection(1011)
@@ -628,7 +698,9 @@ class WebSocketCommonProtocol(asyncio.Protocol):
 
                 # Other fragments.
                 # https://github.com/python/mypy/issues/5738
-                async for message_chunk in aiter_message:  # type: ignore
+                # coverage reports this code as not covered, but it is
+                # exercised by tests - changing it breaks the tests!
+                async for message_chunk in aiter_message:  # type: ignore  # pragma: no cover  # noqa
                     confirm_opcode, data = prepare_data(message_chunk)
                     if confirm_opcode != opcode:
                         raise TypeError("data contains inconsistent types")
@@ -637,7 +709,7 @@ class WebSocketCommonProtocol(asyncio.Protocol):
                 # Final fragment.
                 await self.write_frame(True, OP_CONT, b"")
 
-            except Exception:
+            except (Exception, asyncio.CancelledError):
                 # We're half-way through a fragmented message and we can't
                 # complete it. This makes the connection unusable.
                 self.fail_connection(1011)
@@ -648,7 +720,7 @@ class WebSocketCommonProtocol(asyncio.Protocol):
                 self._fragmented_message_waiter = None
 
         else:
-            raise TypeError("data must be bytes, str, or iterable")
+            raise TypeError("data must be str, bytes-like, or iterable")
 
     async def close(self, code: int = 1000, reason: str = "") -> None:
         """
@@ -656,7 +728,7 @@ class WebSocketCommonProtocol(asyncio.Protocol):
 
         :meth:`close` waits for the other end to complete the handshake and
         for the TCP connection to terminate. As a consequence, there's no need
-        to await :meth:`wait_closed`; :meth:`close` already does it.
+        to await :meth:`wait_closed` after :meth:`close`.
 
         :meth:`close` is idempotent: it doesn't do anything once the
         connection is closed.
@@ -666,17 +738,19 @@ class WebSocketCommonProtocol(asyncio.Protocol):
 
         Canceling :meth:`close` is discouraged. If it takes too long, you can
         set a shorter ``close_timeout``. If you don't want to wait, let the
-        Python process exit, then the OS will close the TCP connection.
+        Python process exit, then the OS will take care of closing the TCP
+        connection.
 
-        :param code: WebSocket close code
-        :param reason: WebSocket close reason
+        Args:
+            code: WebSocket close code.
+            reason: WebSocket close reason.
 
         """
         try:
             await asyncio.wait_for(
-                self.write_close_frame(serialize_close(code, reason)),
+                self.write_close_frame(Close(code, reason)),
                 self.close_timeout,
-                **({"loop": self.loop} if sys.version_info[:2] < (3, 8) else {}),
+                **loop_if_py_lt_38(self.loop),
             )
         except asyncio.TimeoutError:
             # If the close frame cannot be sent because the send buffers
@@ -688,7 +762,7 @@ class WebSocketCommonProtocol(asyncio.Protocol):
         # the data transfer task and raises TimeoutError.
 
         # If close() is called multiple times concurrently and one of these
-        # calls hits the timeout, the data transfer task will be cancelled.
+        # calls hits the timeout, the data transfer task will be canceled.
         # Other calls will receive a CancelledError here.
 
         try:
@@ -697,7 +771,7 @@ class WebSocketCommonProtocol(asyncio.Protocol):
             await asyncio.wait_for(
                 self.transfer_data_task,
                 self.close_timeout,
-                **({"loop": self.loop} if sys.version_info[:2] < (3, 8) else {}),
+                **loop_if_py_lt_38(self.loop),
             )
         except (asyncio.TimeoutError, asyncio.CancelledError):
             pass
@@ -705,23 +779,27 @@ class WebSocketCommonProtocol(asyncio.Protocol):
         # Wait for the close connection task to close the TCP connection.
         await asyncio.shield(self.close_connection_task)
 
+    async def wait_closed(self) -> None:
+        """
+        Wait until the connection is closed.
+
+        This coroutine is identical to the :attr:`closed` attribute, except it
+        can be awaited.
+
+        This can make it easier to detect connection termination, regardless
+        of its cause, in tasks that interact with the WebSocket connection.
+
+        """
+        await asyncio.shield(self.connection_lost_waiter)
+
     async def ping(self, data: Optional[Data] = None) -> Awaitable[None]:
         """
-        Send a ping.
+        Send a Ping_.
 
-        Return a :class:`~asyncio.Future` which will be completed when the
-        corresponding pong is received and which you may ignore if you don't
-        want to wait.
+        .. _Ping: https://www.rfc-editor.org/rfc/rfc6455.html#section-5.5.2
 
         A ping may serve as a keepalive or as a check that the remote endpoint
-        received all messages up to this point::
-
-            pong_waiter = await ws.ping()
-            await pong_waiter   # only if you want to wait for the pong
-
-        By default, the ping contains four random bytes. This payload may be
-        overridden with the optional ``data`` argument which must be a string
-        (which will be encoded to UTF-8) or a bytes-like object.
+        received all messages up to this point
 
         Canceling :meth:`ping` is discouraged. If :meth:`ping` doesn't return
         immediately, it means the write buffer is full. If you don't want to
@@ -730,15 +808,35 @@ class WebSocketCommonProtocol(asyncio.Protocol):
         Canceling the :class:`~asyncio.Future` returned by :meth:`ping` has no
         effect.
 
+        Args:
+            data (Optional[Data]): payload of the ping; a string will be
+                encoded to UTF-8; or :obj:`None` to generate a payload
+                containing four random bytes.
+
+        Returns:
+            ~asyncio.Future: A future that will be completed when the
+            corresponding pong is received. You can ignore it if you
+            don't intend to wait.
+
+            ::
+
+                pong_waiter = await ws.ping()
+                await pong_waiter  # only if you want to wait for the pong
+
+        Raises:
+            ConnectionClosed: when the connection is closed.
+            RuntimeError: if another ping was sent with the same data and
+                the corresponding pong wasn't received yet.
+
         """
         await self.ensure_open()
 
         if data is not None:
-            data = encode_data(data)
+            data = prepare_ctrl(data)
 
         # Protect against duplicates if a payload is explicitly set.
         if data in self.pings:
-            raise ValueError("already waiting for a pong with the same data")
+            raise RuntimeError("already waiting for a pong with the same data")
 
         # Generate a unique random payload otherwise.
         while data is None or data in self.pings:
@@ -752,34 +850,54 @@ class WebSocketCommonProtocol(asyncio.Protocol):
 
     async def pong(self, data: Data = b"") -> None:
         """
-        Send a pong.
+        Send a Pong_.
+
+        .. _Pong: https://www.rfc-editor.org/rfc/rfc6455.html#section-5.5.3
 
         An unsolicited pong may serve as a unidirectional heartbeat.
 
-        The payload may be set with the optional ``data`` argument which must
-        be a string (which will be encoded to UTF-8) or a bytes-like object.
+        Canceling :meth:`pong` is discouraged. If :meth:`pong` doesn't return
+        immediately, it means the write buffer is full. If you don't want to
+        wait, you should close the connection.
 
-        Canceling :meth:`pong` is discouraged for the same reason as
-        :meth:`ping`.
+        Args:
+            data (Data): payload of the pong; a string will be encoded to
+                UTF-8.
+
+        Raises:
+            ConnectionClosed: when the connection is closed.
 
         """
         await self.ensure_open()
 
-        data = encode_data(data)
+        data = prepare_ctrl(data)
 
         await self.write_frame(True, OP_PONG, data)
 
     # Private methods - no guarantees.
 
     def connection_closed_exc(self) -> ConnectionClosed:
-        exception: ConnectionClosed
-        if self.close_code == 1000 or self.close_code == 1001:
-            exception = ConnectionClosedOK(self.close_code, self.close_reason)
+        exc: ConnectionClosed
+        if (
+            self.close_rcvd is not None
+            and self.close_rcvd.code in OK_CLOSE_CODES
+            and self.close_sent is not None
+            and self.close_sent.code in OK_CLOSE_CODES
+        ):
+            exc = ConnectionClosedOK(
+                self.close_rcvd,
+                self.close_sent,
+                self.close_rcvd_then_sent,
+            )
         else:
-            exception = ConnectionClosedError(self.close_code, self.close_reason)
+            exc = ConnectionClosedError(
+                self.close_rcvd,
+                self.close_sent,
+                self.close_rcvd_then_sent,
+            )
         # Chain to the exception that terminated data transfer, if any.
-        exception.__cause__ = self.transfer_data_exc
-        return exception
+        exc.__cause__ = self.transfer_data_exc
+        return exc
 
     async def ensure_open(self) -> None:
         """
@@ -857,12 +975,14 @@ class WebSocketCommonProtocol(asyncio.Protocol):
             self.transfer_data_exc = exc
             self.fail_connection(1002)
 
-        except (ConnectionError, EOFError) as exc:
+        except (ConnectionError, TimeoutError, EOFError, ssl.SSLError) as exc:
             # Reading data with self.reader.readexactly may raise:
             # - most subclasses of ConnectionError if the TCP connection
             #   breaks, is reset, or is aborted;
+            # - TimeoutError if the TCP connection times out;
             # - IncompleteReadError, a subclass of EOFError, if fewer
-            #   bytes are available than requested.
+            #   bytes are available than requested;
+            # - ssl.SSLError if the other side infringes the TLS protocol.
             self.transfer_data_exc = exc
             self.fail_connection(1006)
 
@@ -878,7 +998,7 @@ class WebSocketCommonProtocol(asyncio.Protocol):
             # This shouldn't happen often because exceptions expected under
             # regular circumstances are handled above. If it does, consider
             # catching and handling more exceptions.
-            logger.error("Error in data transfer", exc_info=True)
+            self.logger.error("data transfer failed", exc_info=True)
 
             self.transfer_data_exc = exc
             self.fail_connection(1011)
@@ -889,7 +1009,7 @@ class WebSocketCommonProtocol(asyncio.Protocol):
 
         Re-assemble data frames if the message is fragmented.
 
-        Return ``None`` when the closing handshake is started.
+        Return :obj:`None` when the closing handshake is started.
 
         """
         frame = await self.read_data_frame(max_size=self.max_size)
@@ -954,8 +1074,7 @@ class WebSocketCommonProtocol(asyncio.Protocol):
                 raise ProtocolError("unexpected opcode")
             append(frame)
 
-        # mypy cannot figure out that chunks have the proper type.
-        return ("" if text else b"").join(chunks)  # type: ignore
+        return ("" if text else b"").join(chunks)
 
     async def read_data_frame(self, max_size: Optional[int]) -> Optional[Frame]:
         """
@@ -963,7 +1082,7 @@ class WebSocketCommonProtocol(asyncio.Protocol):
 
         Process control frames received before the next data frame.
 
-        Return ``None`` if a close frame is encountered before any data frame.
+        Return :obj:`None` if a close frame is encountered before any data frame.
 
         """
         # 6.2. Receiving Data
@@ -974,35 +1093,32 @@ class WebSocketCommonProtocol(asyncio.Protocol):
             if frame.opcode == OP_CLOSE:
                 # 7.1.5.  The WebSocket Connection Close Code
                 # 7.1.6.  The WebSocket Connection Close Reason
-                self.close_code, self.close_reason = parse_close(frame.data)
+                self.close_rcvd = Close.parse(frame.data)
+                if self.close_sent is not None:
+                    self.close_rcvd_then_sent = False
                 try:
                     # Echo the original data instead of re-serializing it with
-                    # serialize_close() because that fails when the close frame
-                    # is empty and parse_close() synthetizes a 1005 close code.
-                    await self.write_close_frame(frame.data)
+                    # Close.serialize() because that fails when the close frame
+                    # is empty and Close.parse() synthetizes a 1005 close code.
+                    await self.write_close_frame(self.close_rcvd, frame.data)
                 except ConnectionClosed:
-                    # It doesn't really matter if the connection was closed
-                    # before we could send back a close frame.
+                    # Connection closed before we could echo the close frame.
                     pass
                 return None
 
             elif frame.opcode == OP_PING:
-                # Answer pings.
-                ping_hex = frame.data.hex() or "[empty]"
-                logger.debug(
-                    "%s - received ping, sending pong: %s", self.side, ping_hex
-                )
-                await self.pong(frame.data)
+                # Answer pings, unless connection is CLOSING.
+                if self.state is State.OPEN:
+                    try:
+                        await self.pong(frame.data)
+                    except ConnectionClosed:
+                        # Connection closed while draining write buffer.
+                        pass
 
             elif frame.opcode == OP_PONG:
-                # Acknowledge pings on solicited pongs.
                 if frame.data in self.pings:
-                    logger.debug(
-                        "%s - received solicited pong: %s",
-                        self.side,
-                        frame.data.hex() or "[empty]",
-                    )
-                    # Acknowledge all pings up to the one matching this pong.
+                    # Sending a pong for only the most recent ping is legal.
+                    # Acknowledge all previous pings too in that case.
                     ping_id = None
                     ping_ids = []
                     for ping_id, ping in self.pings.items():
@@ -1016,24 +1132,6 @@ class WebSocketCommonProtocol(asyncio.Protocol):
                     # Remove acknowledged pings from self.pings.
                     for ping_id in ping_ids:
                         del self.pings[ping_id]
-                    ping_ids = ping_ids[:-1]
-                    if ping_ids:
-                        pings_hex = ", ".join(
-                            ping_id.hex() or "[empty]" for ping_id in ping_ids
-                        )
-                        plural = "s" if len(ping_ids) > 1 else ""
-                        logger.debug(
-                            "%s - acknowledged previous ping%s: %s",
-                            self.side,
-                            plural,
-                            pings_hex,
-                        )
-                else:
-                    logger.debug(
-                        "%s - received unsolicited pong: %s",
-                        self.side,
-                        frame.data.hex() or "[empty]",
-                    )
 
             # 5.6. Data Frames
             else:
@@ -1050,24 +1148,21 @@ class WebSocketCommonProtocol(asyncio.Protocol):
             max_size=max_size,
             extensions=self.extensions,
         )
-        logger.debug("%s < %r", self.side, frame)
+        if self.debug:
+            self.logger.debug("< %s", frame)
         return frame
 
-    async def write_frame(
-        self, fin: bool, opcode: int, data: bytes, *, _expected_state: int = State.OPEN
-    ) -> None:
-        # Defensive assertion for protocol compliance.
-        if self.state is not _expected_state:  # pragma: no cover
-            raise InvalidState(
-                f"Cannot write to a WebSocket in the {self.state.name} state"
-            )
-
-        frame = Frame(fin, opcode, data)
-        logger.debug("%s > %r", self.side, frame)
+    def write_frame_sync(self, fin: bool, opcode: int, data: bytes) -> None:
+        frame = Frame(fin, Opcode(opcode), data)
+        if self.debug:
+            self.logger.debug("> %s", frame)
         frame.write(
-            self.transport.write, mask=self.is_client, extensions=self.extensions
+            self.transport.write,
+            mask=self.is_client,
+            extensions=self.extensions,
         )
 
+    async def drain(self) -> None:
         try:
             # drain() cannot be called concurrently by multiple coroutines:
             # http://bugs.python.org/issue29930. Remove this lock when no
@@ -1082,7 +1177,20 @@ class WebSocketCommonProtocol(asyncio.Protocol):
             # with the correct code and reason.
             await self.ensure_open()
 
-    async def write_close_frame(self, data: bytes = b"") -> None:
+    async def write_frame(
+        self, fin: bool, opcode: int, data: bytes, *, _state: int = State.OPEN
+    ) -> None:
+        # Defensive assertion for protocol compliance.
+        if self.state is not _state:  # pragma: no cover
+            raise InvalidState(
+                f"Cannot write to a WebSocket in the {self.state.name} state"
+            )
+        self.write_frame_sync(fin, opcode, data)
+        await self.drain()
+
+    async def write_close_frame(
+        self, close: Close, data: Optional[bytes] = None
+    ) -> None:
         """
         Write a close frame if and only if the connection state is OPEN.
 
@@ -1095,10 +1203,17 @@ class WebSocketCommonProtocol(asyncio.Protocol):
         if self.state is State.OPEN:
             # 7.1.3. The WebSocket Closing Handshake is Started
             self.state = State.CLOSING
-            logger.debug("%s - state = CLOSING", self.side)
+            if self.debug:
+                self.logger.debug("= connection is CLOSING")
+
+            self.close_sent = close
+            if self.close_rcvd is not None:
+                self.close_rcvd_then_sent = True
+            if data is None:
+                data = close.serialize()
 
             # 7.1.2. Start the WebSocket Closing Handshake
-            await self.write_frame(True, OP_CLOSE, data, _expected_state=State.CLOSING)
+            await self.write_frame(True, OP_CLOSE, data, _state=State.CLOSING)
 
     async def keepalive_ping(self) -> None:
         """
@@ -1118,7 +1233,7 @@ class WebSocketCommonProtocol(asyncio.Protocol):
             while True:
                 await asyncio.sleep(
                     self.ping_interval,
-                    **({"loop": self.loop} if sys.version_info[:2] < (3, 8) else {}),
+                    **loop_if_py_lt_38(self.loop),
                 )
 
                 # ping() raises CancelledError if the connection is closed,
@@ -1127,20 +1242,25 @@ class WebSocketCommonProtocol(asyncio.Protocol):
                 # ping() raises ConnectionClosed if the connection is lost,
                 # when connection_lost() calls abort_pings().
 
-                ping_waiter = await self.ping()
+                self.logger.debug("% sending keepalive ping")
+                pong_waiter = await self.ping()
 
                 if self.ping_timeout is not None:
                     try:
                         await asyncio.wait_for(
-                            ping_waiter,
+                            pong_waiter,
                             self.ping_timeout,
-                            **({"loop": self.loop} if sys.version_info[:2] < (3, 8) else {}),
+                            **loop_if_py_lt_38(self.loop),
                         )
+                        self.logger.debug("% received keepalive pong")
                     except asyncio.TimeoutError:
-                        logger.debug("%s ! timed out waiting for pong", self.side)
-                        self.fail_connection(1011)
+                        if self.debug:
+                            self.logger.debug("! timed out waiting for keepalive pong")
+                        self.fail_connection(1011, "keepalive ping timeout")
                         break
 
+        # Remove this branch when dropping support for Python < 3.8
+        # because CancelledError no longer inherits Exception.
         except asyncio.CancelledError:
             raise
 
@@ -1148,7 +1268,7 @@ class WebSocketCommonProtocol(asyncio.Protocol):
             pass
 
         except Exception:
-            logger.warning("Unexpected exception in keepalive ping task", exc_info=True)
+            self.logger.error("keepalive ping failed", exc_info=True)
 
     async def close_connection(self) -> None:
         """
@@ -1177,48 +1297,74 @@ class WebSocketCommonProtocol(asyncio.Protocol):
             # A client should wait for a TCP close from the server.
             if self.is_client and hasattr(self, "transfer_data_task"):
                 if await self.wait_for_connection_lost():
-                    return
-                logger.debug("%s ! timed out waiting for TCP close", self.side)
+                    # Coverage marks this line as a partially executed branch.
+                    # I supect a bug in coverage. Ignore it for now.
+                    return  # pragma: no cover
+                if self.debug:
+                    self.logger.debug("! timed out waiting for TCP close")
 
             # Half-close the TCP connection if possible (when there's no TLS).
             if self.transport.can_write_eof():
-                logger.debug("%s x half-closing TCP connection", self.side)
-                self.transport.write_eof()
+                if self.debug:
+                    self.logger.debug("x half-closing TCP connection")
+                # write_eof() doesn't document which exceptions it raises.
+                # "[Errno 107] Transport endpoint is not connected" happens
+                # but it isn't completely clear under which circumstances.
+                # uvloop can raise RuntimeError here.
+                try:
+                    self.transport.write_eof()
+                except (OSError, RuntimeError):  # pragma: no cover
+                    pass
 
                 if await self.wait_for_connection_lost():
-                    return
-                logger.debug("%s ! timed out waiting for TCP close", self.side)
+                    # Coverage marks this line as a partially executed branch.
+                    # I supect a bug in coverage. Ignore it for now.
+                    return  # pragma: no cover
+                if self.debug:
+                    self.logger.debug("! timed out waiting for TCP close")
 
         finally:
             # The try/finally ensures that the transport never remains open,
             # even if this coroutine is canceled (for example).
+            await self.close_transport()
 
-            # If connection_lost() was called, the TCP connection is closed.
-            # However, if TLS is enabled, the transport still needs closing.
-            # Else asyncio complains: ResourceWarning: unclosed transport.
-            if self.connection_lost_waiter.done() and self.transport.is_closing():
-                return
+    async def close_transport(self) -> None:
+        """
+        Close the TCP connection.
 
-            # Close the TCP connection. Buffers are flushed asynchronously.
-            logger.debug("%s x closing TCP connection", self.side)
-            self.transport.close()
+        """
+        # If connection_lost() was called, the TCP connection is closed.
+        # However, if TLS is enabled, the transport still needs closing.
+        # Else asyncio complains: ResourceWarning: unclosed transport.
+        if self.connection_lost_waiter.done() and self.transport.is_closing():
+            return
 
-            if await self.wait_for_connection_lost():
-                return
-            logger.debug("%s ! timed out waiting for TCP close", self.side)
+        # Close the TCP connection. Buffers are flushed asynchronously.
+        if self.debug:
+            self.logger.debug("x closing TCP connection")
+        self.transport.close()
 
-            # Abort the TCP connection. Buffers are discarded.
-            logger.debug("%s x aborting TCP connection", self.side)
-            self.transport.abort()
+        if await self.wait_for_connection_lost():
+            return
+        if self.debug:
+            self.logger.debug("! timed out waiting for TCP close")
 
-            # connection_lost() is called quickly after aborting.
-            await self.wait_for_connection_lost()
+        # Abort the TCP connection. Buffers are discarded.
+        if self.debug:
+            self.logger.debug("x aborting TCP connection")
+        self.transport.abort()
+
+        # connection_lost() is called quickly after aborting.
+        # Coverage marks this line as a partially executed branch.
+        # I supect a bug in coverage. Ignore it for now.
+        await self.wait_for_connection_lost()  # pragma: no cover
 
     async def wait_for_connection_lost(self) -> bool:
         """
         Wait until the TCP connection is closed or ``self.close_timeout`` elapses.
 
-        Return ``True`` if the connection is closed and ``False`` otherwise.
+        Return :obj:`True` if the connection is closed and :obj:`False`
+        otherwise.
 
         """
         if not self.connection_lost_waiter.done():
@@ -1226,7 +1372,7 @@ class WebSocketCommonProtocol(asyncio.Protocol):
                 await asyncio.wait_for(
                     asyncio.shield(self.connection_lost_waiter),
                     self.close_timeout,
-                    **({"loop": self.loop} if sys.version_info[:2] < (3, 8) else {}),
+                    **loop_if_py_lt_38(self.loop),
                 )
             except asyncio.TimeoutError:
                 pass
@@ -1254,12 +1400,8 @@ class WebSocketCommonProtocol(asyncio.Protocol):
         (The specification describes these steps in the opposite order.)
 
         """
-        logger.debug(
-            "%s ! failing %s WebSocket connection with code %d",
-            self.side,
-            self.state.name,
-            code,
-        )
+        if self.debug:
+            self.logger.debug("! failing connection with code %d", code)
 
         # Cancel transfer_data_task if the opening handshake succeeded.
         # cancel() is idempotent and ignored if the task is done already.
@@ -1271,8 +1413,7 @@ class WebSocketCommonProtocol(asyncio.Protocol):
         # an error reading from or writing to the network.
         # Don't send a close frame if the connection is broken.
         if code != 1006 and self.state is State.OPEN:
-
-            frame_data = serialize_close(code, reason)
+            close = Close(code, reason)
 
             # Write the close frame without draining the write buffer.
 
@@ -1280,17 +1421,19 @@ class WebSocketCommonProtocol(asyncio.Protocol):
             # get stuck and simplifies the implementation of the callers.
             # Not drainig the write buffer is acceptable in this context.
 
-            # This duplicates a few lines of code from write_close_frame()
-            # and write_frame().
+            # This duplicates a few lines of code from write_close_frame().
 
             self.state = State.CLOSING
-            logger.debug("%s - state = CLOSING", self.side)
+            if self.debug:
+                self.logger.debug("= connection is CLOSING")
 
-            frame = Frame(True, OP_CLOSE, frame_data)
-            logger.debug("%s > %r", self.side, frame)
-            frame.write(
-                self.transport.write, mask=self.is_client, extensions=self.extensions
-            )
+            # If self.close_rcvd was set, the connection state would be
+            # CLOSING. Therefore self.close_rcvd isn't set and we don't
+            # have to set self.close_rcvd_then_sent.
+            assert self.close_rcvd is None
+            self.close_sent = close
+
+            self.write_frame_sync(True, OP_CLOSE, close.serialize())
 
         # Start close_connection_task if the opening handshake didn't succeed.
         if not hasattr(self, "close_connection_task"):
@@ -1314,13 +1457,6 @@ class WebSocketCommonProtocol(asyncio.Protocol):
             # nothing, but it prevents logging the exception.
             ping.cancel()
 
-        if self.pings:
-            pings_hex = ", ".join(ping_id.hex() or "[empty]" for ping_id in self.pings)
-            plural = "s" if len(self.pings) > 1 else ""
-            logger.debug(
-                "%s - aborted pending ping%s: %s", self.side, plural, pings_hex
-            )
-
     # asyncio.Protocol methods
 
     def connection_made(self, transport: asyncio.BaseTransport) -> None:
@@ -1337,8 +1473,6 @@ class WebSocketCommonProtocol(asyncio.Protocol):
         which means it's the best point for configuring it.
 
         """
-        logger.debug("%s - event = connection_made(%s)", self.side, transport)
-
         transport = cast(asyncio.Transport, transport)
         transport.set_write_buffer_limits(self.write_limit)
         self.transport = transport
@@ -1351,20 +1485,11 @@ class WebSocketCommonProtocol(asyncio.Protocol):
         7.1.4. The WebSocket Connection is Closed.
 
         """
-        logger.debug("%s - event = connection_lost(%s)", self.side, exc)
         self.state = State.CLOSED
-        logger.debug("%s - state = CLOSED", self.side)
-        if not hasattr(self, "close_code"):
-            self.close_code = 1006
-        if not hasattr(self, "close_reason"):
-            self.close_reason = ""
-        logger.debug(
-            "%s x code = %d, reason = %s",
-            self.side,
-            self.close_code,
-            self.close_reason or "[no reason]",
-        )
+        self.logger.debug("= connection is CLOSED")
+
         self.abort_pings()
+
         # If self.connection_lost_waiter isn't pending, that's a bug, because:
         # - it's set only here in connection_lost() which is called only once;
         # - it must never be canceled.
@@ -1409,7 +1534,6 @@ class WebSocketCommonProtocol(asyncio.Protocol):
                 waiter.set_result(None)
 
     def data_received(self, data: bytes) -> None:
-        logger.debug("%s - event = data_received(<%d bytes>)", self.side, len(data))
         self.reader.feed_data(data)
 
     def eof_received(self) -> None:
@@ -1420,10 +1544,62 @@ class WebSocketCommonProtocol(asyncio.Protocol):
         the TCP or TLS connection after sending and receiving a close frame.
 
         As a consequence, they never need to write after receiving EOF, so
-        there's no reason to keep the transport open by returning ``True``.
+        there's no reason to keep the transport open by returning :obj:`True`.
 
         Besides, that doesn't work on TLS connections.
 
         """
-        logger.debug("%s - event = eof_received()", self.side)
         self.reader.feed_eof()
+
+
+def broadcast(websockets: Iterable[WebSocketCommonProtocol], message: Data) -> None:
+    """
+    Broadcast a message to several WebSocket connections.
+
+    A string (:class:`str`) is sent as a Text_ frame. A bytestring or
+    bytes-like object (:class:`bytes`, :class:`bytearray`, or
+    :class:`memoryview`) is sent as a Binary_ frame.
+
+    .. _Text: https://www.rfc-editor.org/rfc/rfc6455.html#section-5.6
+    .. _Binary: https://www.rfc-editor.org/rfc/rfc6455.html#section-5.6
+
+    :func:`broadcast` pushes the message synchronously to all connections even
+    if their write buffers are overflowing. There's no backpressure.
+
+    :func:`broadcast` skips silently connections that aren't open in order to
+    avoid errors on connections where the closing handshake is in progress.
+
+    If you broadcast messages faster than a connection can handle them,
+    messages will pile up in its write buffer until the connection times out.
+    Keep low values for ``ping_interval`` and ``ping_timeout`` to prevent
+    excessive memory usage by slow connections when you use :func:`broadcast`.
+
+    Unlike :meth:`~websockets.server.WebSocketServerProtocol.send`,
+    :func:`broadcast` doesn't support sending fragmented messages. Indeed,
+    fragmentation is useful for sending large messages without buffering
+    them in memory, while :func:`broadcast` buffers one copy per connection
+    as fast as possible.
+
+    Args:
+        websockets (Iterable[WebSocketCommonProtocol]): WebSocket connections
+            to which the message will be sent.
+        message (Data): message to send.
+
+    Raises:
+        RuntimeError: if a connection is busy sending a fragmented message.
+        TypeError: if ``message`` doesn't have a supported type.
+
+    """
+    if not isinstance(message, (str, bytes, bytearray, memoryview)):
+        raise TypeError("data must be str or bytes-like")
+
+    opcode, data = prepare_data(message)
+
+    for websocket in websockets:
+        if websocket.state is not State.OPEN:
+            continue
+
+        if websocket._fragmented_message_waiter is not None:
+            raise RuntimeError("busy sending a fragmented message")
+
+        websocket.write_frame_sync(True, opcode, data)
diff --git a/tests/wpt/tests/tools/third_party/websockets/src/websockets/legacy/server.py b/tests/wpt/tests/tools/third_party/websockets/src/websockets/legacy/server.py
new file mode 100644
index 00000000000..3e51db1b71e
--- /dev/null
+++ b/tests/wpt/tests/tools/third_party/websockets/src/websockets/legacy/server.py
@@ -0,0 +1,1156 @@
+from __future__ import annotations
+
+import asyncio
+import email.utils
+import functools
+import http
+import inspect
+import logging
+import socket
+import warnings
+from types import TracebackType
+from typing import (
+    Any,
+    Awaitable,
+    Callable,
+    Generator,
+    Iterable,
+    List,
+    Optional,
+    Sequence,
+    Set,
+    Tuple,
+    Type,
+    Union,
+    cast,
+)
+
+from ..connection import State
+from ..datastructures import Headers, HeadersLike, MultipleValuesError
+from ..exceptions import (
+    AbortHandshake,
+    InvalidHandshake,
+    InvalidHeader,
+    InvalidMessage,
+    InvalidOrigin,
+    InvalidUpgrade,
+    NegotiationError,
+)
+from ..extensions import Extension, ServerExtensionFactory
+from ..extensions.permessage_deflate import enable_server_permessage_deflate
+from ..headers import (
+    build_extension,
+    parse_extension,
+    parse_subprotocol,
+    validate_subprotocols,
+)
+from ..http import USER_AGENT
+from ..typing import ExtensionHeader, LoggerLike, Origin, Subprotocol
+from .compatibility import loop_if_py_lt_38
+from .handshake import build_response, check_request
+from .http import read_request
+from .protocol import WebSocketCommonProtocol
+
+
+__all__ = ["serve", "unix_serve", "WebSocketServerProtocol", "WebSocketServer"]
+
+
+HeadersLikeOrCallable = Union[HeadersLike, Callable[[str, Headers], HeadersLike]]
+
+HTTPResponse = Tuple[http.HTTPStatus, HeadersLike, bytes]
+
+
+class WebSocketServerProtocol(WebSocketCommonProtocol):
+    """
+    WebSocket server connection.
+
+    :class:`WebSocketServerProtocol` provides :meth:`recv` and :meth:`send`
+    coroutines for receiving and sending messages.
+
+    It supports asynchronous iteration to receive messages::
+
+        async for message in websocket:
+            await process(message)
+
+    The iterator exits normally when the connection is closed with close code
+    1000 (OK) or 1001 (going away). It raises
+    a :exc:`~websockets.exceptions.ConnectionClosedError` when the connection
+    is closed with any other code.
+
+    You may customize the opening handshake in a subclass by
+    overriding :meth:`process_request` or :meth:`select_subprotocol`.
+
+    Args:
+        ws_server: WebSocket server that created this connection.
+
+    See :func:`serve` for the documentation of ``ws_handler``, ``logger``, ``origins``,
+    ``extensions``, ``subprotocols``, and ``extra_headers``.
+
+    See :class:`~websockets.legacy.protocol.WebSocketCommonProtocol` for the
+    documentation of ``ping_interval``, ``ping_timeout``, ``close_timeout``,
+    ``max_size``, ``max_queue``, ``read_limit``, and ``write_limit``.
+
+    """
+
+    is_client = False
+    side = "server"
+
+    def __init__(
+        self,
+        ws_handler: Union[
+            Callable[[WebSocketServerProtocol], Awaitable[Any]],
+            Callable[[WebSocketServerProtocol, str], Awaitable[Any]],  # deprecated
+        ],
+        ws_server: WebSocketServer,
+        *,
+        logger: Optional[LoggerLike] = None,
+        origins: Optional[Sequence[Optional[Origin]]] = None,
+        extensions: Optional[Sequence[ServerExtensionFactory]] = None,
+        subprotocols: Optional[Sequence[Subprotocol]] = None,
+        extra_headers: Optional[HeadersLikeOrCallable] = None,
+        process_request: Optional[
+            Callable[[str, Headers], Awaitable[Optional[HTTPResponse]]]
+        ] = None,
+        select_subprotocol: Optional[
+            Callable[[Sequence[Subprotocol], Sequence[Subprotocol]], Subprotocol]
+        ] = None,
+        **kwargs: Any,
+    ) -> None:
+        if logger is None:
+            logger = logging.getLogger("websockets.server")
+        super().__init__(logger=logger, **kwargs)
+        # For backwards compatibility with 6.0 or earlier.
+        if origins is not None and "" in origins:
+            warnings.warn("use None instead of '' in origins", DeprecationWarning)
+            origins = [None if origin == "" else origin for origin in origins]
+        # For backwards compatibility with 10.0 or earlier. Done here in
+        # addition to serve to trigger the deprecation warning on direct
+        # use of WebSocketServerProtocol.
+        self.ws_handler = remove_path_argument(ws_handler)
+        self.ws_server = ws_server
+        self.origins = origins
+        self.available_extensions = extensions
+        self.available_subprotocols = subprotocols
+        self.extra_headers = extra_headers
+        self._process_request = process_request
+        self._select_subprotocol = select_subprotocol
+
+    def connection_made(self, transport: asyncio.BaseTransport) -> None:
+        """
+        Register connection and initialize a task to handle it.
+
+        """
+        super().connection_made(transport)
+        # Register the connection with the server before creating the handler
+        # task. Registering at the beginning of the handler coroutine would
+        # create a race condition between the creation of the task, which
+        # schedules its execution, and the moment the handler starts running.
+        self.ws_server.register(self)
+        self.handler_task = self.loop.create_task(self.handler())
+
+    async def handler(self) -> None:
+        """
+        Handle the lifecycle of a WebSocket connection.
+
+        Since this method doesn't have a caller able to handle exceptions, it
+        attemps to log relevant ones and guarantees that the TCP connection is
+        closed before exiting.
+
+        """
+        try:
+
+            try:
+                await self.handshake(
+                    origins=self.origins,
+                    available_extensions=self.available_extensions,
+                    available_subprotocols=self.available_subprotocols,
+                    extra_headers=self.extra_headers,
+                )
+            # Remove this branch when dropping support for Python < 3.8
+            # because CancelledError no longer inherits Exception.
+            except asyncio.CancelledError:  # pragma: no cover
+                raise
+            except ConnectionError:
+                raise
+            except Exception as exc:
+                if isinstance(exc, AbortHandshake):
+                    status, headers, body = exc.status, exc.headers, exc.body
+                elif isinstance(exc, InvalidOrigin):
+                    if self.debug:
+                        self.logger.debug("! invalid origin", exc_info=True)
+                    status, headers, body = (
+                        http.HTTPStatus.FORBIDDEN,
+                        Headers(),
+                        f"Failed to open a WebSocket connection: {exc}.\n".encode(),
+                    )
+                elif isinstance(exc, InvalidUpgrade):
+                    if self.debug:
+                        self.logger.debug("! invalid upgrade", exc_info=True)
+                    status, headers, body = (
+                        http.HTTPStatus.UPGRADE_REQUIRED,
+                        Headers([("Upgrade", "websocket")]),
+                        (
+                            f"Failed to open a WebSocket connection: {exc}.\n"
+                            f"\n"
+                            f"You cannot access a WebSocket server directly "
+                            f"with a browser. You need a WebSocket client.\n"
+                        ).encode(),
+                    )
+                elif isinstance(exc, InvalidHandshake):
+                    if self.debug:
+                        self.logger.debug("! invalid handshake", exc_info=True)
+                    status, headers, body = (
+                        http.HTTPStatus.BAD_REQUEST,
+                        Headers(),
+                        f"Failed to open a WebSocket connection: {exc}.\n".encode(),
+                    )
+                else:
+                    self.logger.error("opening handshake failed", exc_info=True)
+                    status, headers, body = (
+                        http.HTTPStatus.INTERNAL_SERVER_ERROR,
+                        Headers(),
+                        (
+                            b"Failed to open a WebSocket connection.\n"
+                            b"See server log for more information.\n"
+                        ),
+                    )
+
+                headers.setdefault("Date", email.utils.formatdate(usegmt=True))
+                headers.setdefault("Server", USER_AGENT)
+                headers.setdefault("Content-Length", str(len(body)))
+                headers.setdefault("Content-Type", "text/plain")
+                headers.setdefault("Connection", "close")
+
+                self.write_http_response(status, headers, body)
+                self.logger.info(
+                    "connection failed (%d %s)", status.value, status.phrase
+                )
+                await self.close_transport()
+                return
+
+            try:
+                await self.ws_handler(self)
+            except Exception:
+                self.logger.error("connection handler failed", exc_info=True)
+                if not self.closed:
+                    self.fail_connection(1011)
+                raise
+
+            try:
+                await self.close()
+            except ConnectionError:
+                raise
+            except Exception:
+                self.logger.error("closing handshake failed", exc_info=True)
+                raise
+
+        except Exception:
+            # Last-ditch attempt to avoid leaking connections on errors.
+            try:
+                self.transport.close()
+            except Exception:  # pragma: no cover
+                pass
+
+        finally:
+            # Unregister the connection with the server when the handler task
+            # terminates. Registration is tied to the lifecycle of the handler
+            # task because the server waits for tasks attached to registered
+            # connections before terminating.
+            self.ws_server.unregister(self)
+            self.logger.info("connection closed")
+
+    async def read_http_request(self) -> Tuple[str, Headers]:
+        """
+        Read request line and headers from the HTTP request.
+
+        If the request contains a body, it may be read from ``self.reader``
+        after this coroutine returns.
+
+        Raises:
+            InvalidMessage: if the HTTP message is malformed or isn't an
+                HTTP/1.1 GET request.
+
+        """
+        try:
+            path, headers = await read_request(self.reader)
+        except asyncio.CancelledError:  # pragma: no cover
+            raise
+        except Exception as exc:
+            raise InvalidMessage("did not receive a valid HTTP request") from exc
+
+        if self.debug:
+            self.logger.debug("< GET %s HTTP/1.1", path)
+            for key, value in headers.raw_items():
+                self.logger.debug("< %s: %s", key, value)
+
+        self.path = path
+        self.request_headers = headers
+
+        return path, headers
+
+    def write_http_response(
+        self, status: http.HTTPStatus, headers: Headers, body: Optional[bytes] = None
+    ) -> None:
+        """
+        Write status line and headers to the HTTP response.
+
+        This coroutine is also able to write a response body.
+
+        """
+        self.response_headers = headers
+
+        if self.debug:
+            self.logger.debug("> HTTP/1.1 %d %s", status.value, status.phrase)
+            for key, value in headers.raw_items():
+                self.logger.debug("> %s: %s", key, value)
+            if body is not None:
+                self.logger.debug("> [body] (%d bytes)", len(body))
+
+        # Since the status line and headers only contain ASCII characters,
+        # we can keep this simple.
+        response = f"HTTP/1.1 {status.value} {status.phrase}\r\n"
+        response += str(headers)
+
+        self.transport.write(response.encode())
+
+        if body is not None:
+            self.transport.write(body)
+
+    async def process_request(
+        self, path: str, request_headers: Headers
+    ) -> Optional[HTTPResponse]:
+        """
+        Intercept the HTTP request and return an HTTP response if appropriate.
+
+        You may override this method in a :class:`WebSocketServerProtocol`
+        subclass, for example:
+
+        * to return a HTTP 200 OK response on a given path; then a load
+          balancer can use this path for a health check;
+        * to authenticate the request and return a HTTP 401 Unauthorized or a
+          HTTP 403 Forbidden when authentication fails.
+
+        You may also override this method with the ``process_request``
+        argument of :func:`serve` and :class:`WebSocketServerProtocol`. This
+        is equivalent, except ``process_request`` won't have access to the
+        protocol instance, so it can't store information for later use.
+
+        :meth:`process_request` is expected to complete quickly. If it may run
+        for a long time, then it should await :meth:`wait_closed` and exit if
+        :meth:`wait_closed` completes, or else it could prevent the server
+        from shutting down.
+
+        Args:
+            path: request path, including optional query string.
+            request_headers: request headers.
+
+        Returns:
+            Optional[Tuple[http.HTTPStatus, HeadersLike, bytes]]: :obj:`None`
+            to continue the WebSocket handshake normally.
+
+            An HTTP response, represented by a 3-uple of the response status,
+            headers, and body, to abort the WebSocket handshake and return
+            that HTTP response instead.
+
+        """
+        if self._process_request is not None:
+            response = self._process_request(path, request_headers)
+            if isinstance(response, Awaitable):
+                return await response
+            else:
+                # For backwards compatibility with 7.0.
+                warnings.warn(
+                    "declare process_request as a coroutine", DeprecationWarning
+                )
+                return response
+        return None
+
+    @staticmethod
+    def process_origin(
+        headers: Headers, origins: Optional[Sequence[Optional[Origin]]] = None
+    ) -> Optional[Origin]:
+        """
+        Handle the Origin HTTP request header.
+
+        Args:
+            headers: request headers.
+            origins: optional list of acceptable origins.
+
+        Raises:
+            InvalidOrigin: if the origin isn't acceptable.
+
+        """
+        # "The user agent MUST NOT include more than one Origin header field"
+        # per https://www.rfc-editor.org/rfc/rfc6454.html#section-7.3.
+        try:
+            origin = cast(Optional[Origin], headers.get("Origin"))
+        except MultipleValuesError as exc:
+            raise InvalidHeader("Origin", "more than one Origin header found") from exc
+        if origins is not None:
+            if origin not in origins:
+                raise InvalidOrigin(origin)
+        return origin
+
+    @staticmethod
+    def process_extensions(
+        headers: Headers,
+        available_extensions: Optional[Sequence[ServerExtensionFactory]],
+    ) -> Tuple[Optional[str], List[Extension]]:
+        """
+        Handle the Sec-WebSocket-Extensions HTTP request header.
+
+        Accept or reject each extension proposed in the client request.
+        Negotiate parameters for accepted extensions.
+
+        Return the Sec-WebSocket-Extensions HTTP response header and the list
+        of accepted extensions.
+
+        :rfc:`6455` leaves the rules up to the specification of each
+        :extension.
+
+        To provide this level of flexibility, for each extension proposed by
+        the client, we check for a match with each extension available in the
+        server configuration. If no match is found, the extension is ignored.
+
+        If several variants of the same extension are proposed by the client,
+        it may be accepted several times, which won't make sense in general.
+        Extensions must implement their own requirements. For this purpose,
+        the list of previously accepted extensions is provided.
+
+        This process doesn't allow the server to reorder extensions. It can
+        only select a subset of the extensions proposed by the client.
+
+        Other requirements, for example related to mandatory extensions or the
+        order of extensions, may be implemented by overriding this method.
+
+        Args:
+            headers: request headers.
+            extensions: optional list of supported extensions.
+
+        Raises:
+            InvalidHandshake: to abort the handshake with an HTTP 400 error.
+
+        """
+        response_header_value: Optional[str] = None
+
+        extension_headers: List[ExtensionHeader] = []
+        accepted_extensions: List[Extension] = []
+
+        header_values = headers.get_all("Sec-WebSocket-Extensions")
+
+        if header_values and available_extensions:
+
+            parsed_header_values: List[ExtensionHeader] = sum(
+                [parse_extension(header_value) for header_value in header_values], []
+            )
+
+            for name, request_params in parsed_header_values:
+
+                for ext_factory in available_extensions:
+
+                    # Skip non-matching extensions based on their name.
+                    if ext_factory.name != name:
+                        continue
+
+                    # Skip non-matching extensions based on their params.
+                    try:
+                        response_params, extension = ext_factory.process_request_params(
+                            request_params, accepted_extensions
+                        )
+                    except NegotiationError:
+                        continue
+
+                    # Add matching extension to the final list.
+                    extension_headers.append((name, response_params))
+                    accepted_extensions.append(extension)
+
+                    # Break out of the loop once we have a match.
+                    break
+
+                # If we didn't break from the loop, no extension in our list
+                # matched what the client sent. The extension is declined.
+
+        # Serialize extension header.
+        if extension_headers:
+            response_header_value = build_extension(extension_headers)
+
+        return response_header_value, accepted_extensions
+
+    # Not @staticmethod because it calls self.select_subprotocol()
+    def process_subprotocol(
+        self, headers: Headers, available_subprotocols: Optional[Sequence[Subprotocol]]
+    ) -> Optional[Subprotocol]:
+        """
+        Handle the Sec-WebSocket-Protocol HTTP request header.
+
+        Return Sec-WebSocket-Protocol HTTP response header, which is the same
+        as the selected subprotocol.
+
+        Args:
+            headers: request headers.
+            available_subprotocols: optional list of supported subprotocols.
+
+        Raises:
+            InvalidHandshake: to abort the handshake with an HTTP 400 error.
+
+        """
+        subprotocol: Optional[Subprotocol] = None
+
+        header_values = headers.get_all("Sec-WebSocket-Protocol")
+
+        if header_values and available_subprotocols:
+
+            parsed_header_values: List[Subprotocol] = sum(
+                [parse_subprotocol(header_value) for header_value in header_values], []
+            )
+
+            subprotocol = self.select_subprotocol(
+                parsed_header_values, available_subprotocols
+            )
+
+        return subprotocol
+
+    def select_subprotocol(
+        self,
+        client_subprotocols: Sequence[Subprotocol],
+        server_subprotocols: Sequence[Subprotocol],
+    ) -> Optional[Subprotocol]:
+        """
+        Pick a subprotocol among those offered by the client.
+
+        If several subprotocols are supported by the client and the server,
+        the default implementation selects the preferred subprotocol by
+        giving equal value to the priorities of the client and the server.
+        If no subprotocol is supported by the client and the server, it
+        proceeds without a subprotocol.
+
+        This is unlikely to be the most useful implementation in practice.
+        Many servers providing a subprotocol will require that the client
+        uses that subprotocol. Such rules can be implemented in a subclass.
+
+        You may also override this method with the ``select_subprotocol``
+        argument of :func:`serve` and :class:`WebSocketServerProtocol`.
+
+        Args:
+            client_subprotocols: list of subprotocols offered by the client.
+            server_subprotocols: list of subprotocols available on the server.
+
+        Returns:
+            Optional[Subprotocol]: Selected subprotocol.
+
+            :obj:`None` to continue without a subprotocol.
+
+
+        """
+        if self._select_subprotocol is not None:
+            return self._select_subprotocol(client_subprotocols, server_subprotocols)
+
+        subprotocols = set(client_subprotocols) & set(server_subprotocols)
+        if not subprotocols:
+            return None
+        priority = lambda p: (
+            client_subprotocols.index(p) + server_subprotocols.index(p)
+        )
+        return sorted(subprotocols, key=priority)[0]
+
+    async def handshake(
+        self,
+        origins: Optional[Sequence[Optional[Origin]]] = None,
+        available_extensions: Optional[Sequence[ServerExtensionFactory]] = None,
+        available_subprotocols: Optional[Sequence[Subprotocol]] = None,
+        extra_headers: Optional[HeadersLikeOrCallable] = None,
+    ) -> str:
+        """
+        Perform the server side of the opening handshake.
+
+        Args:
+            origins: list of acceptable values of the Origin HTTP header;
+                include :obj:`None` if the lack of an origin is acceptable.
+            extensions: list of supported extensions, in order in which they
+                should be tried.
+            subprotocols: list of supported subprotocols, in order of
+                decreasing preference.
+            extra_headers: arbitrary HTTP headers to add to the response when
+                the handshake succeeds.
+
+        Returns:
+            str: path of the URI of the request.
+
+        Raises:
+            InvalidHandshake: if the handshake fails.
+
+        """
+        path, request_headers = await self.read_http_request()
+
+        # Hook for customizing request handling, for example checking
+        # authentication or treating some paths as plain HTTP endpoints.
+        early_response_awaitable = self.process_request(path, request_headers)
+        if isinstance(early_response_awaitable, Awaitable):
+            early_response = await early_response_awaitable
+        else:
+            # For backwards compatibility with 7.0.
+            warnings.warn("declare process_request as a coroutine", DeprecationWarning)
+            early_response = early_response_awaitable
+
+        # The connection may drop while process_request is running.
+        if self.state is State.CLOSED:
+            raise self.connection_closed_exc()  # pragma: no cover
+
+        # Change the response to a 503 error if the server is shutting down.
+        if not self.ws_server.is_serving():
+            early_response = (
+                http.HTTPStatus.SERVICE_UNAVAILABLE,
+                [],
+                b"Server is shutting down.\n",
+            )
+
+        if early_response is not None:
+            raise AbortHandshake(*early_response)
+
+        key = check_request(request_headers)
+
+        self.origin = self.process_origin(request_headers, origins)
+
+        extensions_header, self.extensions = self.process_extensions(
+            request_headers, available_extensions
+        )
+
+        protocol_header = self.subprotocol = self.process_subprotocol(
+            request_headers, available_subprotocols
+        )
+
+        response_headers = Headers()
+
+        build_response(response_headers, key)
+
+        if extensions_header is not None:
+            response_headers["Sec-WebSocket-Extensions"] = extensions_header
+
+        if protocol_header is not None:
+            response_headers["Sec-WebSocket-Protocol"] = protocol_header
+
+        if callable(extra_headers):
+            extra_headers = extra_headers(path, self.request_headers)
+        if extra_headers is not None:
+            response_headers.update(extra_headers)
+
+        response_headers.setdefault("Date", email.utils.formatdate(usegmt=True))
+        response_headers.setdefault("Server", USER_AGENT)
+
+        self.write_http_response(http.HTTPStatus.SWITCHING_PROTOCOLS, response_headers)
+
+        self.logger.info("connection open")
+
+        self.connection_open()
+
+        return path
+
+
+class WebSocketServer:
+    """
+    WebSocket server returned by :func:`serve`.
+
+    This class provides the same interface as :class:`~asyncio.Server`,
+    notably the :meth:`~asyncio.Server.close`
+    and :meth:`~asyncio.Server.wait_closed` methods.
+
+    It keeps track of WebSocket connections in order to close them properly
+    when shutting down.
+
+    Args:
+        logger: logger for this server;
+            defaults to ``logging.getLogger("websockets.server")``;
+            see the :doc:`logging guide <../topics/logging>` for details.
+
+    """
+
+    def __init__(self, logger: Optional[LoggerLike] = None):
+        if logger is None:
+            logger = logging.getLogger("websockets.server")
+        self.logger = logger
+
+        # Keep track of active connections.
+        self.websockets: Set[WebSocketServerProtocol] = set()
+
+        # Task responsible for closing the server and terminating connections.
+        self.close_task: Optional[asyncio.Task[None]] = None
+
+        # Completed when the server is closed and connections are terminated.
+        self.closed_waiter: asyncio.Future[None]
+
+    def wrap(self, server: asyncio.base_events.Server) -> None:
+        """
+        Attach to a given :class:`~asyncio.Server`.
+
+        Since :meth:`~asyncio.loop.create_server` doesn't support injecting a
+        custom ``Server`` class, the easiest solution that doesn't rely on
+        private :mod:`asyncio` APIs is to:
+
+        - instantiate a :class:`WebSocketServer`
+        - give the protocol factory a reference to that instance
+        - call :meth:`~asyncio.loop.create_server` with the factory
+        - attach the resulting :class:`~asyncio.Server` with this method
+
+        """
+        self.server = server
+        for sock in server.sockets:
+            if sock.family == socket.AF_INET:
+                name = "%s:%d" % sock.getsockname()
+            elif sock.family == socket.AF_INET6:
+                name = "[%s]:%d" % sock.getsockname()[:2]
+            elif sock.family == socket.AF_UNIX:
+                name = sock.getsockname()
+            # In the unlikely event that someone runs websockets over a
+            # protocol other than IP or Unix sockets, avoid crashing.
+            else:  # pragma: no cover
+                name = str(sock.getsockname())
+            self.logger.info("server listening on %s", name)
+
+        # Initialized here because we need a reference to the event loop.
+        # This should be moved back to __init__ in Python 3.10.
+        self.closed_waiter = server.get_loop().create_future()
+
+    def register(self, protocol: WebSocketServerProtocol) -> None:
+        """
+        Register a connection with this server.
+
+        """
+        self.websockets.add(protocol)
+
+    def unregister(self, protocol: WebSocketServerProtocol) -> None:
+        """
+        Unregister a connection with this server.
+
+        """
+        self.websockets.remove(protocol)
+
+    def close(self) -> None:
+        """
+        Close the server.
+
+        This method:
+
+        * closes the underlying :class:`~asyncio.Server`;
+        * rejects new WebSocket connections with an HTTP 503 (service
+          unavailable) error; this happens when the server accepted the TCP
+          connection but didn't complete the WebSocket opening handshake prior
+          to closing;
+        * closes open WebSocket connections with close code 1001 (going away).
+
+        :meth:`close` is idempotent.
+
+        """
+        if self.close_task is None:
+            self.close_task = self.get_loop().create_task(self._close())
+
+    async def _close(self) -> None:
+        """
+        Implementation of :meth:`close`.
+
+        This calls :meth:`~asyncio.Server.close` on the underlying
+        :class:`~asyncio.Server` object to stop accepting new connections and
+        then closes open connections with close code 1001.
+
+        """
+        self.logger.info("server closing")
+
+        # Stop accepting new connections.
+        self.server.close()
+
+        # Wait until self.server.close() completes.
+        await self.server.wait_closed()
+
+        # Wait until all accepted connections reach connection_made() and call
+        # register(). See https://bugs.python.org/issue34852 for details.
+        await asyncio.sleep(0, **loop_if_py_lt_38(self.get_loop()))
+
+        # Close OPEN connections with status code 1001. Since the server was
+        # closed, handshake() closes OPENING connections with a HTTP 503
+        # error. Wait until all connections are closed.
+
+        close_tasks = [
+            asyncio.create_task(websocket.close(1001))
+            for websocket in self.websockets
+            if websocket.state is not State.CONNECTING
+        ]
+        # asyncio.wait doesn't accept an empty first argument.
+        if close_tasks:
+            await asyncio.wait(
+                close_tasks,
+                **loop_if_py_lt_38(self.get_loop()),
+            )
+
+        # Wait until all connection handlers are complete.
+
+        # asyncio.wait doesn't accept an empty first argument.
+        if self.websockets:
+            await asyncio.wait(
+                [websocket.handler_task for websocket in self.websockets],
+                **loop_if_py_lt_38(self.get_loop()),
+            )
+
+        # Tell wait_closed() to return.
+        self.closed_waiter.set_result(None)
+
+        self.logger.info("server closed")
+
+    async def wait_closed(self) -> None:
+        """
+        Wait until the server is closed.
+
+        When :meth:`wait_closed` returns, all TCP connections are closed and
+        all connection handlers have returned.
+
+        To ensure a fast shutdown, a connection handler should always be
+        awaiting at least one of:
+
+        * :meth:`~WebSocketServerProtocol.recv`: when the connection is closed,
+          it raises :exc:`~websockets.exceptions.ConnectionClosedOK`;
+        * :meth:`~WebSocketServerProtocol.wait_closed`: when the connection is
+          closed, it returns.
+
+        Then the connection handler is immediately notified of the shutdown;
+        it can clean up and exit.
+
+        """
+        await asyncio.shield(self.closed_waiter)
+
+    def get_loop(self) -> asyncio.AbstractEventLoop:
+        """
+        See :meth:`asyncio.Server.get_loop`.
+
+        """
+        return self.server.get_loop()
+
+    def is_serving(self) -> bool:
+        """
+        See :meth:`asyncio.Server.is_serving`.
+
+        """
+        return self.server.is_serving()
+
+    async def start_serving(self) -> None:
+        """
+        See :meth:`asyncio.Server.start_serving`.
+
+        """
+        await self.server.start_serving()  # pragma: no cover
+
+    async def serve_forever(self) -> None:
+        """
+        See :meth:`asyncio.Server.serve_forever`.
+
+        """
+        await self.server.serve_forever()  # pragma: no cover
+
+    @property
+    def sockets(self) -> Iterable[socket.socket]:
+        """
+        See :attr:`asyncio.Server.sockets`.
+
+        """
+        return self.server.sockets
+
+    async def __aenter__(self) -> WebSocketServer:
+        return self  # pragma: no cover
+
+    async def __aexit__(
+        self,
+        exc_type: Optional[Type[BaseException]],
+        exc_value: Optional[BaseException],
+        traceback: Optional[TracebackType],
+    ) -> None:
+        self.close()  # pragma: no cover
+        await self.wait_closed()  # pragma: no cover
+
+
+class Serve:
+    """
+    Start a WebSocket server listening on ``host`` and ``port``.
+
+    Whenever a client connects, the server creates a
+    :class:`WebSocketServerProtocol`, performs the opening handshake, and
+    delegates to the connection handler, ``ws_handler``.
+
+    The handler receives the :class:`WebSocketServerProtocol` and uses it to
+    send and receive messages.
+
+    Once the handler completes, either normally or with an exception, the
+    server performs the closing handshake and closes the connection.
+
+    Awaiting :func:`serve` yields a :class:`WebSocketServer`. This object
+    provides :meth:`~WebSocketServer.close` and
+    :meth:`~WebSocketServer.wait_closed` methods for shutting down the server.
+
+    :func:`serve` can be used as an asynchronous context manager::
+
+        stop = asyncio.Future()  # set this future to exit the server
+
+        async with serve(...):
+            await stop
+
+    The server is shut down automatically when exiting the context.
+
+    Args:
+        ws_handler: connection handler. It receives the WebSocket connection,
+            which is a :class:`WebSocketServerProtocol`, in argument.
+        host: network interfaces the server is bound to;
+            see :meth:`~asyncio.loop.create_server` for details.
+        port: TCP port the server listens on;
+            see :meth:`~asyncio.loop.create_server` for details.
+        create_protocol: factory for the :class:`asyncio.Protocol` managing
+            the connection; defaults to :class:`WebSocketServerProtocol`; may
+            be set to a wrapper or a subclass to customize connection handling.
+        logger: logger for this server;
+            defaults to ``logging.getLogger("websockets.server")``;
+            see the :doc:`logging guide <../topics/logging>` for details.
+        compression: shortcut that enables the "permessage-deflate" extension
+            by default; may be set to :obj:`None` to disable compression;
+            see the :doc:`compression guide <../topics/compression>` for details.
+        origins: acceptable values of the ``Origin`` header; include
+            :obj:`None` in the list if the lack of an origin is acceptable.
+            This is useful for defending against Cross-Site WebSocket
+            Hijacking attacks.
+        extensions: list of supported extensions, in order in which they
+            should be tried.
+        subprotocols: list of supported subprotocols, in order of decreasing
+            preference.
+        extra_headers (Union[HeadersLike, Callable[[str, Headers], HeadersLike]]):
+            arbitrary HTTP headers to add to the request; this can be
+            a :data:`~websockets.datastructures.HeadersLike` or a callable
+            taking the request path and headers in arguments and returning
+            a :data:`~websockets.datastructures.HeadersLike`.
+        process_request (Optional[Callable[[str, Headers], \
+            Awaitable[Optional[Tuple[http.HTTPStatus, HeadersLike, bytes]]]]]):
+            intercept HTTP request before the opening handshake;
+            see :meth:`~WebSocketServerProtocol.process_request` for details.
+        select_subprotocol: select a subprotocol supported by the client;
+            see :meth:`~WebSocketServerProtocol.select_subprotocol` for details.
+
+    See :class:`~websockets.legacy.protocol.WebSocketCommonProtocol` for the
+    documentation of ``ping_interval``, ``ping_timeout``, ``close_timeout``,
+    ``max_size``, ``max_queue``, ``read_limit``, and ``write_limit``.
+
+    Any other keyword arguments are passed the event loop's
+    :meth:`~asyncio.loop.create_server` method.
+
+    For example:
+
+    * You can set ``ssl`` to a :class:`~ssl.SSLContext` to enable TLS.
+
+    * You can set ``sock`` to a :obj:`~socket.socket` that you created
+      outside of websockets.
+
+    Returns:
+        WebSocketServer: WebSocket server.
+
+    """
+
+    def __init__(
+        self,
+        ws_handler: Union[
+            Callable[[WebSocketServerProtocol], Awaitable[Any]],
+            Callable[[WebSocketServerProtocol, str], Awaitable[Any]],  # deprecated
+        ],
+        host: Optional[Union[str, Sequence[str]]] = None,
+        port: Optional[int] = None,
+        *,
+        create_protocol: Optional[Callable[[Any], WebSocketServerProtocol]] = None,
+        logger: Optional[LoggerLike] = None,
+        compression: Optional[str] = "deflate",
+        origins: Optional[Sequence[Optional[Origin]]] = None,
+        extensions: Optional[Sequence[ServerExtensionFactory]] = None,
+        subprotocols: Optional[Sequence[Subprotocol]] = None,
+        extra_headers: Optional[HeadersLikeOrCallable] = None,
+        process_request: Optional[
+            Callable[[str, Headers], Awaitable[Optional[HTTPResponse]]]
+        ] = None,
+        select_subprotocol: Optional[
+            Callable[[Sequence[Subprotocol], Sequence[Subprotocol]], Subprotocol]
+        ] = None,
+        ping_interval: Optional[float] = 20,
+        ping_timeout: Optional[float] = 20,
+        close_timeout: Optional[float] = None,
+        max_size: Optional[int] = 2**20,
+        max_queue: Optional[int] = 2**5,
+        read_limit: int = 2**16,
+        write_limit: int = 2**16,
+        **kwargs: Any,
+    ) -> None:
+        # Backwards compatibility: close_timeout used to be called timeout.
+        timeout: Optional[float] = kwargs.pop("timeout", None)
+        if timeout is None:
+            timeout = 10
+        else:
+            warnings.warn("rename timeout to close_timeout", DeprecationWarning)
+        # If both are specified, timeout is ignored.
+        if close_timeout is None:
+            close_timeout = timeout
+
+        # Backwards compatibility: create_protocol used to be called klass.
+        klass: Optional[Type[WebSocketServerProtocol]] = kwargs.pop("klass", None)
+        if klass is None:
+            klass = WebSocketServerProtocol
+        else:
+            warnings.warn("rename klass to create_protocol", DeprecationWarning)
+        # If both are specified, klass is ignored.
+        if create_protocol is None:
+            create_protocol = klass
+
+        # Backwards compatibility: recv() used to return None on closed connections
+        legacy_recv: bool = kwargs.pop("legacy_recv", False)
+
+        # Backwards compatibility: the loop parameter used to be supported.
+        _loop: Optional[asyncio.AbstractEventLoop] = kwargs.pop("loop", None)
+        if _loop is None:
+            loop = asyncio.get_event_loop()
+        else:
+            loop = _loop
+            warnings.warn("remove loop argument", DeprecationWarning)
+
+        ws_server = WebSocketServer(logger=logger)
+
+        secure = kwargs.get("ssl") is not None
+
+        if compression == "deflate":
+            extensions = enable_server_permessage_deflate(extensions)
+        elif compression is not None:
+            raise ValueError(f"unsupported compression: {compression}")
+
+        if subprotocols is not None:
+            validate_subprotocols(subprotocols)
+
+        factory = functools.partial(
+            create_protocol,
+            # For backwards compatibility with 10.0 or earlier. Done here in
+            # addition to WebSocketServerProtocol to trigger the deprecation
+            # warning once per serve() call rather than once per connection.
+            remove_path_argument(ws_handler),
+            ws_server,
+            host=host,
+            port=port,
+            secure=secure,
+            ping_interval=ping_interval,
+            ping_timeout=ping_timeout,
+            close_timeout=close_timeout,
+            max_size=max_size,
+            max_queue=max_queue,
+            read_limit=read_limit,
+            write_limit=write_limit,
+            loop=_loop,
+            legacy_recv=legacy_recv,
+            origins=origins,
+            extensions=extensions,
+            subprotocols=subprotocols,
+            extra_headers=extra_headers,
+            process_request=process_request,
+            select_subprotocol=select_subprotocol,
+            logger=logger,
+        )
+
+        if kwargs.pop("unix", False):
+            path: Optional[str] = kwargs.pop("path", None)
+            # unix_serve(path) must not specify host and port parameters.
+            assert host is None and port is None
+            create_server = functools.partial(
+                loop.create_unix_server, factory, path, **kwargs
+            )
+        else:
+            create_server = functools.partial(
+                loop.create_server, factory, host, port, **kwargs
+            )
+
+        # This is a coroutine function.
+        self._create_server = create_server
+        self.ws_server = ws_server
+
+    # async with serve(...)
+
+    async def __aenter__(self) -> WebSocketServer:
+        return await self
+
+    async def __aexit__(
+        self,
+        exc_type: Optional[Type[BaseException]],
+        exc_value: Optional[BaseException],
+        traceback: Optional[TracebackType],
+    ) -> None:
+        self.ws_server.close()
+        await self.ws_server.wait_closed()
+
+    # await serve(...)
+
+    def __await__(self) -> Generator[Any, None, WebSocketServer]:
+        # Create a suitable iterator by calling __await__ on a coroutine.
+        return self.__await_impl__().__await__()
+
+    async def __await_impl__(self) -> WebSocketServer:
+        server = await self._create_server()
+        self.ws_server.wrap(server)
+        return self.ws_server
+
+    # yield from serve(...) - remove when dropping Python < 3.10
+
+    __iter__ = __await__
+
+
+serve = Serve
+
+
+def unix_serve(
+    ws_handler: Union[
+        Callable[[WebSocketServerProtocol], Awaitable[Any]],
+        Callable[[WebSocketServerProtocol, str], Awaitable[Any]],  # deprecated
+    ],
+    path: Optional[str] = None,
+    **kwargs: Any,
+) -> Serve:
+    """
+    Similar to :func:`serve`, but for listening on Unix sockets.
+
+    This function builds upon the event
+    loop's :meth:`~asyncio.loop.create_unix_server` method.
+
+    It is only available on Unix.
+
+    It's useful for deploying a server behind a reverse proxy such as nginx.
+
+    Args:
+        path: file system path to the Unix socket.
+
+    """
+    return serve(ws_handler, path=path, unix=True, **kwargs)
+
+
+def remove_path_argument(
+    ws_handler: Union[
+        Callable[[WebSocketServerProtocol], Awaitable[Any]],
+        Callable[[WebSocketServerProtocol, str], Awaitable[Any]],
+    ]
+) -> Callable[[WebSocketServerProtocol], Awaitable[Any]]:
+    try:
+        inspect.signature(ws_handler).bind(None)
+    except TypeError:
+        try:
+            inspect.signature(ws_handler).bind(None, "")
+        except TypeError:  # pragma: no cover
+            # ws_handler accepts neither one nor two arguments; leave it alone.
+            pass
+        else:
+            # ws_handler accepts two arguments; activate backwards compatibility.
+
+            # Enable deprecation warning and announce deprecation in 11.0.
+            # warnings.warn("remove second argument of ws_handler", DeprecationWarning)
+
+            async def _ws_handler(websocket: WebSocketServerProtocol) -> Any:
+                return await cast(
+                    Callable[[WebSocketServerProtocol, str], Awaitable[Any]],
+                    ws_handler,
+                )(websocket, websocket.path)
+
+            return _ws_handler
+
+    return cast(
+        Callable[[WebSocketServerProtocol], Awaitable[Any]],
+        ws_handler,
+    )
diff --git a/tests/wpt/tests/tools/third_party/websockets/src/websockets/server.py b/tests/wpt/tests/tools/third_party/websockets/src/websockets/server.py
index 0592083ef76..5dad50b6a12 100644
--- a/tests/wpt/tests/tools/third_party/websockets/src/websockets/server.py
+++ b/tests/wpt/tests/tools/third_party/websockets/src/websockets/server.py
@@ -1,352 +1,296 @@
-"""
-:mod:`websockets.server` defines the WebSocket server APIs.
+from __future__ import annotations
 
-"""
-
-import asyncio
-import collections.abc
+import base64
+import binascii
 import email.utils
-import functools
 import http
-import logging
-import socket
-import sys
-import warnings
-from types import TracebackType
-from typing import (
-    Any,
-    Awaitable,
-    Callable,
-    Generator,
-    List,
-    Optional,
-    Sequence,
-    Set,
-    Tuple,
-    Type,
-    Union,
-    cast,
-)
+from typing import Generator, List, Optional, Sequence, Tuple, cast
 
+from .connection import CONNECTING, OPEN, SERVER, Connection, State
+from .datastructures import Headers, MultipleValuesError
 from .exceptions import (
-    AbortHandshake,
     InvalidHandshake,
     InvalidHeader,
-    InvalidMessage,
+    InvalidHeaderValue,
     InvalidOrigin,
+    InvalidStatus,
     InvalidUpgrade,
     NegotiationError,
 )
-from .extensions.base import Extension, ServerExtensionFactory
-from .extensions.permessage_deflate import ServerPerMessageDeflateFactory
-from .handshake import build_response, check_request
-from .headers import build_extension, parse_extension, parse_subprotocol
-from .http import USER_AGENT, Headers, HeadersLike, MultipleValuesError, read_request
-from .protocol import WebSocketCommonProtocol
-from .typing import ExtensionHeader, Origin, Subprotocol
+from .extensions import Extension, ServerExtensionFactory
+from .headers import (
+    build_extension,
+    parse_connection,
+    parse_extension,
+    parse_subprotocol,
+    parse_upgrade,
+)
+from .http import USER_AGENT
+from .http11 import Request, Response
+from .typing import (
+    ConnectionOption,
+    ExtensionHeader,
+    LoggerLike,
+    Origin,
+    Subprotocol,
+    UpgradeProtocol,
+)
+from .utils import accept_key
 
 
-__all__ = ["serve", "unix_serve", "WebSocketServerProtocol", "WebSocketServer"]
-
-logger = logging.getLogger(__name__)
+# See #940 for why lazy_import isn't used here for backwards compatibility.
+from .legacy.server import *  # isort:skip  # noqa
 
 
-HeadersLikeOrCallable = Union[HeadersLike, Callable[[str, Headers], HeadersLike]]
-
-HTTPResponse = Tuple[http.HTTPStatus, HeadersLike, bytes]
+__all__ = ["ServerConnection"]
 
 
-class WebSocketServerProtocol(WebSocketCommonProtocol):
+class ServerConnection(Connection):
     """
-    :class:`~asyncio.Protocol` subclass implementing a WebSocket server.
+    Sans-I/O implementation of a WebSocket server connection.
 
-    This class inherits most of its methods from
-    :class:`~websockets.protocol.WebSocketCommonProtocol`.
-
-    For the sake of simplicity, it doesn't rely on a full HTTP implementation.
-    Its support for HTTP responses is very limited.
+    Args:
+        origins: acceptable values of the ``Origin`` header; include
+            :obj:`None` in the list if the lack of an origin is acceptable.
+            This is useful for defending against Cross-Site WebSocket
+            Hijacking attacks.
+        extensions: list of supported extensions, in order in which they
+            should be tried.
+        subprotocols: list of supported subprotocols, in order of decreasing
+            preference.
+        state: initial state of the WebSocket connection.
+        max_size: maximum size of incoming messages in bytes;
+            :obj:`None` to disable the limit.
+        logger: logger for this connection;
+            defaults to ``logging.getLogger("websockets.client")``;
+            see the :doc:`logging guide <../topics/logging>` for details.
 
     """
 
-    is_client = False
-    side = "server"
-
     def __init__(
         self,
-        ws_handler: Callable[["WebSocketServerProtocol", str], Awaitable[Any]],
-        ws_server: "WebSocketServer",
-        *,
         origins: Optional[Sequence[Optional[Origin]]] = None,
         extensions: Optional[Sequence[ServerExtensionFactory]] = None,
         subprotocols: Optional[Sequence[Subprotocol]] = None,
-        extra_headers: Optional[HeadersLikeOrCallable] = None,
-        process_request: Optional[
-            Callable[[str, Headers], Awaitable[Optional[HTTPResponse]]]
-        ] = None,
-        select_subprotocol: Optional[
-            Callable[[Sequence[Subprotocol], Sequence[Subprotocol]], Subprotocol]
-        ] = None,
-        **kwargs: Any,
-    ) -> None:
-        # For backwards compatibility with 6.0 or earlier.
-        if origins is not None and "" in origins:
-            warnings.warn("use None instead of '' in origins", DeprecationWarning)
-            origins = [None if origin == "" else origin for origin in origins]
-        self.ws_handler = ws_handler
-        self.ws_server = ws_server
+        state: State = CONNECTING,
+        max_size: Optional[int] = 2**20,
+        logger: Optional[LoggerLike] = None,
+    ):
+        super().__init__(
+            side=SERVER,
+            state=state,
+            max_size=max_size,
+            logger=logger,
+        )
         self.origins = origins
         self.available_extensions = extensions
         self.available_subprotocols = subprotocols
-        self.extra_headers = extra_headers
-        self._process_request = process_request
-        self._select_subprotocol = select_subprotocol
-        super().__init__(**kwargs)
 
-    def connection_made(self, transport: asyncio.BaseTransport) -> None:
+    def accept(self, request: Request) -> Response:
         """
-        Register connection and initialize a task to handle it.
+        Create a handshake response to accept the connection.
 
-        """
-        super().connection_made(transport)
-        # Register the connection with the server before creating the handler
-        # task. Registering at the beginning of the handler coroutine would
-        # create a race condition between the creation of the task, which
-        # schedules its execution, and the moment the handler starts running.
-        self.ws_server.register(self)
-        self.handler_task = self.loop.create_task(self.handler())
+        If the connection cannot be established, the handshake response
+        actually rejects the handshake.
 
-    async def handler(self) -> None:
-        """
-        Handle the lifecycle of a WebSocket connection.
+        You must send the handshake response with :meth:`send_response`.
 
-        Since this method doesn't have a caller able to handle exceptions, it
-        attemps to log relevant ones and guarantees that the TCP connection is
-        closed before exiting.
+        You can modify it before sending it, for example to add HTTP headers.
+
+        Args:
+            request: WebSocket handshake request event received from the client.
+
+        Returns:
+            Response: WebSocket handshake response event to send to the client.
 
         """
         try:
-
-            try:
-                path = await self.handshake(
-                    origins=self.origins,
-                    available_extensions=self.available_extensions,
-                    available_subprotocols=self.available_subprotocols,
-                    extra_headers=self.extra_headers,
-                )
-            except ConnectionError:
-                logger.debug("Connection error in opening handshake", exc_info=True)
-                raise
-            except Exception as exc:
-                if isinstance(exc, AbortHandshake):
-                    status, headers, body = exc.status, exc.headers, exc.body
-                elif isinstance(exc, InvalidOrigin):
-                    logger.debug("Invalid origin", exc_info=True)
-                    status, headers, body = (
-                        http.HTTPStatus.FORBIDDEN,
-                        Headers(),
-                        f"Failed to open a WebSocket connection: {exc}.\n".encode(),
-                    )
-                elif isinstance(exc, InvalidUpgrade):
-                    logger.debug("Invalid upgrade", exc_info=True)
-                    status, headers, body = (
-                        http.HTTPStatus.UPGRADE_REQUIRED,
-                        Headers([("Upgrade", "websocket")]),
-                        (
-                            f"Failed to open a WebSocket connection: {exc}.\n"
-                            f"\n"
-                            f"You cannot access a WebSocket server directly "
-                            f"with a browser. You need a WebSocket client.\n"
-                        ).encode(),
-                    )
-                elif isinstance(exc, InvalidHandshake):
-                    logger.debug("Invalid handshake", exc_info=True)
-                    status, headers, body = (
-                        http.HTTPStatus.BAD_REQUEST,
-                        Headers(),
-                        f"Failed to open a WebSocket connection: {exc}.\n".encode(),
-                    )
-                else:
-                    logger.warning("Error in opening handshake", exc_info=True)
-                    status, headers, body = (
-                        http.HTTPStatus.INTERNAL_SERVER_ERROR,
-                        Headers(),
-                        (
-                            b"Failed to open a WebSocket connection.\n"
-                            b"See server log for more information.\n"
-                        ),
-                    )
-
-                headers.setdefault("Date", email.utils.formatdate(usegmt=True))
-                headers.setdefault("Server", USER_AGENT)
-                headers.setdefault("Content-Length", str(len(body)))
-                headers.setdefault("Content-Type", "text/plain")
-                headers.setdefault("Connection", "close")
-
-                self.write_http_response(status, headers, body)
-                self.fail_connection()
-                await self.wait_closed()
-                return
-
-            try:
-                await self.ws_handler(self, path)
-            except Exception:
-                logger.error("Error in connection handler", exc_info=True)
-                if not self.closed:
-                    self.fail_connection(1011)
-                raise
-
-            try:
-                await self.close()
-            except ConnectionError:
-                logger.debug("Connection error in closing handshake", exc_info=True)
-                raise
-            except Exception:
-                logger.warning("Error in closing handshake", exc_info=True)
-                raise
-
-        except Exception:
-            # Last-ditch attempt to avoid leaking connections on errors.
-            try:
-                self.transport.close()
-            except Exception:  # pragma: no cover
-                pass
-
-        finally:
-            # Unregister the connection with the server when the handler task
-            # terminates. Registration is tied to the lifecycle of the handler
-            # task because the server waits for tasks attached to registered
-            # connections before terminating.
-            self.ws_server.unregister(self)
-
-    async def read_http_request(self) -> Tuple[str, Headers]:
-        """
-        Read request line and headers from the HTTP request.
-
-        If the request contains a body, it may be read from ``self.reader``
-        after this coroutine returns.
-
-        :raises ~websockets.exceptions.InvalidMessage: if the HTTP message is
-            malformed or isn't an HTTP/1.1 GET request
-
-        """
-        try:
-            path, headers = await read_request(self.reader)
+            (
+                accept_header,
+                extensions_header,
+                protocol_header,
+            ) = self.process_request(request)
+        except InvalidOrigin as exc:
+            request._exception = exc
+            self.handshake_exc = exc
+            if self.debug:
+                self.logger.debug("! invalid origin", exc_info=True)
+            return self.reject(
+                http.HTTPStatus.FORBIDDEN,
+                f"Failed to open a WebSocket connection: {exc}.\n",
+            )
+        except InvalidUpgrade as exc:
+            request._exception = exc
+            self.handshake_exc = exc
+            if self.debug:
+                self.logger.debug("! invalid upgrade", exc_info=True)
+            response = self.reject(
+                http.HTTPStatus.UPGRADE_REQUIRED,
+                (
+                    f"Failed to open a WebSocket connection: {exc}.\n"
+                    f"\n"
+                    f"You cannot access a WebSocket server directly "
+                    f"with a browser. You need a WebSocket client.\n"
+                ),
+            )
+            response.headers["Upgrade"] = "websocket"
+            return response
+        except InvalidHandshake as exc:
+            request._exception = exc
+            self.handshake_exc = exc
+            if self.debug:
+                self.logger.debug("! invalid handshake", exc_info=True)
+            return self.reject(
+                http.HTTPStatus.BAD_REQUEST,
+                f"Failed to open a WebSocket connection: {exc}.\n",
+            )
         except Exception as exc:
-            raise InvalidMessage("did not receive a valid HTTP request") from exc
+            request._exception = exc
+            self.handshake_exc = exc
+            self.logger.error("opening handshake failed", exc_info=True)
+            return self.reject(
+                http.HTTPStatus.INTERNAL_SERVER_ERROR,
+                (
+                    "Failed to open a WebSocket connection.\n"
+                    "See server log for more information.\n"
+                ),
+            )
 
-        logger.debug("%s < GET %s HTTP/1.1", self.side, path)
-        logger.debug("%s < %r", self.side, headers)
+        headers = Headers()
 
-        self.path = path
-        self.request_headers = headers
+        headers["Date"] = email.utils.formatdate(usegmt=True)
 
-        return path, headers
+        headers["Upgrade"] = "websocket"
+        headers["Connection"] = "Upgrade"
+        headers["Sec-WebSocket-Accept"] = accept_header
 
-    def write_http_response(
-        self, status: http.HTTPStatus, headers: Headers, body: Optional[bytes] = None
-    ) -> None:
+        if extensions_header is not None:
+            headers["Sec-WebSocket-Extensions"] = extensions_header
+
+        if protocol_header is not None:
+            headers["Sec-WebSocket-Protocol"] = protocol_header
+
+        headers["Server"] = USER_AGENT
+
+        self.logger.info("connection open")
+        return Response(101, "Switching Protocols", headers)
+
+    def process_request(
+        self, request: Request
+    ) -> Tuple[str, Optional[str], Optional[str]]:
         """
-        Write status line and headers to the HTTP response.
+        Check a handshake request and negotiate extensions and subprotocol.
 
-        This coroutine is also able to write a response body.
+        This function doesn't verify that the request is an HTTP/1.1 or higher
+        GET request and doesn't check the ``Host`` header. These controls are
+        usually performed earlier in the HTTP request handling code. They're
+        the responsibility of the caller.
+
+        Args:
+            request: WebSocket handshake request received from the client.
+
+        Returns:
+            Tuple[str, Optional[str], Optional[str]]:
+            ``Sec-WebSocket-Accept``, ``Sec-WebSocket-Extensions``, and
+            ``Sec-WebSocket-Protocol`` headers for the handshake response.
+
+        Raises:
+            InvalidHandshake: if the handshake request is invalid;
+                then the server must return 400 Bad Request error.
 
         """
-        self.response_headers = headers
+        headers = request.headers
 
-        logger.debug("%s > HTTP/1.1 %d %s", self.side, status.value, status.phrase)
-        logger.debug("%s > %r", self.side, headers)
+        connection: List[ConnectionOption] = sum(
+            [parse_connection(value) for value in headers.get_all("Connection")], []
+        )
 
-        # Since the status line and headers only contain ASCII characters,
-        # we can keep this simple.
-        response = f"HTTP/1.1 {status.value} {status.phrase}\r\n"
-        response += str(headers)
+        if not any(value.lower() == "upgrade" for value in connection):
+            raise InvalidUpgrade(
+                "Connection", ", ".join(connection) if connection else None
+            )
 
-        self.transport.write(response.encode())
+        upgrade: List[UpgradeProtocol] = sum(
+            [parse_upgrade(value) for value in headers.get_all("Upgrade")], []
+        )
 
-        if body is not None:
-            logger.debug("%s > body (%d bytes)", self.side, len(body))
-            self.transport.write(body)
+        # For compatibility with non-strict implementations, ignore case when
+        # checking the Upgrade header. The RFC always uses "websocket", except
+        # in section 11.2. (IANA registration) where it uses "WebSocket".
+        if not (len(upgrade) == 1 and upgrade[0].lower() == "websocket"):
+            raise InvalidUpgrade("Upgrade", ", ".join(upgrade) if upgrade else None)
 
-    async def process_request(
-        self, path: str, request_headers: Headers
-    ) -> Optional[HTTPResponse]:
-        """
-        Intercept the HTTP request and return an HTTP response if appropriate.
+        try:
+            key = headers["Sec-WebSocket-Key"]
+        except KeyError as exc:
+            raise InvalidHeader("Sec-WebSocket-Key") from exc
+        except MultipleValuesError as exc:
+            raise InvalidHeader(
+                "Sec-WebSocket-Key", "more than one Sec-WebSocket-Key header found"
+            ) from exc
 
-        If ``process_request`` returns ``None``, the WebSocket handshake
-        continues. If it returns 3-uple containing a status code, response
-        headers and a response body, that HTTP response is sent and the
-        connection is closed. In that case:
+        try:
+            raw_key = base64.b64decode(key.encode(), validate=True)
+        except binascii.Error as exc:
+            raise InvalidHeaderValue("Sec-WebSocket-Key", key) from exc
+        if len(raw_key) != 16:
+            raise InvalidHeaderValue("Sec-WebSocket-Key", key)
 
-        * The HTTP status must be a :class:`~http.HTTPStatus`.
-        * HTTP headers must be a :class:`~websockets.http.Headers` instance, a
-          :class:`~collections.abc.Mapping`, or an iterable of ``(name,
-          value)`` pairs.
-        * The HTTP response body must be :class:`bytes`. It may be empty.
+        try:
+            version = headers["Sec-WebSocket-Version"]
+        except KeyError as exc:
+            raise InvalidHeader("Sec-WebSocket-Version") from exc
+        except MultipleValuesError as exc:
+            raise InvalidHeader(
+                "Sec-WebSocket-Version",
+                "more than one Sec-WebSocket-Version header found",
+            ) from exc
 
-        This coroutine may be overridden in a :class:`WebSocketServerProtocol`
-        subclass, for example:
+        if version != "13":
+            raise InvalidHeaderValue("Sec-WebSocket-Version", version)
 
-        * to return a HTTP 200 OK response on a given path; then a load
-          balancer can use this path for a health check;
-        * to authenticate the request and return a HTTP 401 Unauthorized or a
-          HTTP 403 Forbidden when authentication fails.
+        accept_header = accept_key(key)
 
-        Instead of subclassing, it is possible to override this method by
-        passing a ``process_request`` argument to the :func:`serve` function
-        or the :class:`WebSocketServerProtocol` constructor. This is
-        equivalent, except ``process_request`` won't have access to the
-        protocol instance, so it can't store information for later use.
+        self.origin = self.process_origin(headers)
 
-        ``process_request`` is expected to complete quickly. If it may run for
-        a long time, then it should await :meth:`wait_closed` and exit if
-        :meth:`wait_closed` completes, or else it could prevent the server
-        from shutting down.
+        extensions_header, self.extensions = self.process_extensions(headers)
 
-        :param path: request path, including optional query string
-        :param request_headers: request headers
+        protocol_header = self.subprotocol = self.process_subprotocol(headers)
 
-        """
-        if self._process_request is not None:
-            response = self._process_request(path, request_headers)
-            if isinstance(response, Awaitable):
-                return await response
-            else:
-                # For backwards compatibility with 7.0.
-                warnings.warn(
-                    "declare process_request as a coroutine", DeprecationWarning
-                )
-                return response  # type: ignore
-        return None
+        return (
+            accept_header,
+            extensions_header,
+            protocol_header,
+        )
 
-    @staticmethod
-    def process_origin(
-        headers: Headers, origins: Optional[Sequence[Optional[Origin]]] = None
-    ) -> Optional[Origin]:
+    def process_origin(self, headers: Headers) -> Optional[Origin]:
         """
         Handle the Origin HTTP request header.
 
-        :param headers: request headers
-        :param origins: optional list of acceptable origins
-        :raises ~websockets.exceptions.InvalidOrigin: if the origin isn't
-            acceptable
+        Args:
+            headers: WebSocket handshake request headers.
+
+        Returns:
+           Optional[Origin]: origin, if it is acceptable.
+
+        Raises:
+            InvalidOrigin: if the origin isn't acceptable.
 
         """
         # "The user agent MUST NOT include more than one Origin header field"
-        # per https://tools.ietf.org/html/rfc6454#section-7.3.
+        # per https://www.rfc-editor.org/rfc/rfc6454.html#section-7.3.
         try:
-            origin = cast(Origin, headers.get("Origin"))
-        except MultipleValuesError:
-            raise InvalidHeader("Origin", "more than one Origin header found")
-        if origins is not None:
-            if origin not in origins:
+            origin = cast(Optional[Origin], headers.get("Origin"))
+        except MultipleValuesError as exc:
+            raise InvalidHeader("Origin", "more than one Origin header found") from exc
+        if self.origins is not None:
+            if origin not in self.origins:
                 raise InvalidOrigin(origin)
         return origin
 
-    @staticmethod
     def process_extensions(
+        self,
         headers: Headers,
-        available_extensions: Optional[Sequence[ServerExtensionFactory]],
     ) -> Tuple[Optional[str], List[Extension]]:
         """
         Handle the Sec-WebSocket-Extensions HTTP request header.
@@ -354,9 +298,6 @@ class WebSocketServerProtocol(WebSocketCommonProtocol):
         Accept or reject each extension proposed in the client request.
         Negotiate parameters for accepted extensions.
 
-        Return the Sec-WebSocket-Extensions HTTP response header and the list
-        of accepted extensions.
-
         :rfc:`6455` leaves the rules up to the specification of each
         :extension.
 
@@ -365,7 +306,7 @@ class WebSocketServerProtocol(WebSocketCommonProtocol):
         server configuration. If no match is found, the extension is ignored.
 
         If several variants of the same extension are proposed by the client,
-        it may be accepted severel times, which won't make sense in general.
+        it may be accepted several times, which won't make sense in general.
         Extensions must implement their own requirements. For this purpose,
         the list of previously accepted extensions is provided.
 
@@ -375,10 +316,15 @@ class WebSocketServerProtocol(WebSocketCommonProtocol):
         Other requirements, for example related to mandatory extensions or the
         order of extensions, may be implemented by overriding this method.
 
-        :param headers: request headers
-        :param extensions: optional list of supported extensions
-        :raises ~websockets.exceptions.InvalidHandshake: to abort the
-            handshake with an HTTP 400 error code
+        Args:
+            headers: WebSocket handshake request headers.
+
+        Returns:
+            Tuple[Optional[str], List[Extension]]: ``Sec-WebSocket-Extensions``
+            HTTP response header and list of accepted extensions.
+
+        Raises:
+            InvalidHandshake: to abort the handshake with an HTTP 400 error.
 
         """
         response_header_value: Optional[str] = None
@@ -388,7 +334,7 @@ class WebSocketServerProtocol(WebSocketCommonProtocol):
 
         header_values = headers.get_all("Sec-WebSocket-Extensions")
 
-        if header_values and available_extensions:
+        if header_values and self.available_extensions:
 
             parsed_header_values: List[ExtensionHeader] = sum(
                 [parse_extension(header_value) for header_value in header_values], []
@@ -396,7 +342,7 @@ class WebSocketServerProtocol(WebSocketCommonProtocol):
 
             for name, request_params in parsed_header_values:
 
-                for ext_factory in available_extensions:
+                for ext_factory in self.available_extensions:
 
                     # Skip non-matching extensions based on their name.
                     if ext_factory.name != name:
@@ -426,34 +372,33 @@ class WebSocketServerProtocol(WebSocketCommonProtocol):
 
         return response_header_value, accepted_extensions
 
-    # Not @staticmethod because it calls self.select_subprotocol()
-    def process_subprotocol(
-        self, headers: Headers, available_subprotocols: Optional[Sequence[Subprotocol]]
-    ) -> Optional[Subprotocol]:
+    def process_subprotocol(self, headers: Headers) -> Optional[Subprotocol]:
         """
         Handle the Sec-WebSocket-Protocol HTTP request header.
 
-        Return Sec-WebSocket-Protocol HTTP response header, which is the same
-        as the selected subprotocol.
+        Args:
+            headers: WebSocket handshake request headers.
 
-        :param headers: request headers
-        :param available_subprotocols: optional list of supported subprotocols
-        :raises ~websockets.exceptions.InvalidHandshake: to abort the
-            handshake with an HTTP 400 error code
+        Returns:
+           Optional[Subprotocol]: Subprotocol, if one was selected; this is
+           also the value of the ``Sec-WebSocket-Protocol`` response header.
+
+        Raises:
+            InvalidHandshake: to abort the handshake with an HTTP 400 error.
 
         """
         subprotocol: Optional[Subprotocol] = None
 
         header_values = headers.get_all("Sec-WebSocket-Protocol")
 
-        if header_values and available_subprotocols:
+        if header_values and self.available_subprotocols:
 
             parsed_header_values: List[Subprotocol] = sum(
                 [parse_subprotocol(header_value) for header_value in header_values], []
             )
 
             subprotocol = self.select_subprotocol(
-                parsed_header_values, available_subprotocols
+                parsed_header_values, self.available_subprotocols
             )
 
         return subprotocol
@@ -470,24 +415,22 @@ class WebSocketServerProtocol(WebSocketCommonProtocol):
         the default implementation selects the preferred subprotocols by
         giving equal value to the priorities of the client and the server.
 
-        If no subprotocol is supported by the client and the server, it
+        If no common subprotocol is supported by the client and the server, it
         proceeds without a subprotocol.
 
         This is unlikely to be the most useful implementation in practice, as
         many servers providing a subprotocol will require that the client uses
-        that subprotocol. Such rules can be implemented in a subclass.
+        that subprotocol.
 
-        Instead of subclassing, it is possible to override this method by
-        passing a ``select_subprotocol`` argument to the :func:`serve`
-        function or the :class:`WebSocketServerProtocol` constructor
+        Args:
+            client_subprotocols: list of subprotocols offered by the client.
+            server_subprotocols: list of subprotocols available on the server.
 
-        :param client_subprotocols: list of subprotocols offered by the client
-        :param server_subprotocols: list of subprotocols available on the server
+        Returns:
+            Optional[Subprotocol]: Subprotocol, if a common subprotocol was
+            found.
 
         """
-        if self._select_subprotocol is not None:
-            return self._select_subprotocol(client_subprotocols, server_subprotocols)
-
         subprotocols = set(client_subprotocols) & set(server_subprotocols)
         if not subprotocols:
             return None
@@ -496,501 +439,83 @@ class WebSocketServerProtocol(WebSocketCommonProtocol):
         )
         return sorted(subprotocols, key=priority)[0]
 
-    async def handshake(
+    def reject(
         self,
-        origins: Optional[Sequence[Optional[Origin]]] = None,
-        available_extensions: Optional[Sequence[ServerExtensionFactory]] = None,
-        available_subprotocols: Optional[Sequence[Subprotocol]] = None,
-        extra_headers: Optional[HeadersLikeOrCallable] = None,
-    ) -> str:
+        status: http.HTTPStatus,
+        text: str,
+    ) -> Response:
         """
-        Perform the server side of the opening handshake.
+        Create a handshake response to reject the connection.
 
-        Return the path of the URI of the request.
+        A short plain text response is the best fallback when failing to
+        establish a WebSocket connection.
 
-        :param origins: list of acceptable values of the Origin HTTP header;
-            include ``None`` if the lack of an origin is acceptable
-        :param available_extensions: list of supported extensions in the order
-            in which they should be used
-        :param available_subprotocols: list of supported subprotocols in order
-            of decreasing preference
-        :param extra_headers: sets additional HTTP response headers when the
-            handshake succeeds; it can be a :class:`~websockets.http.Headers`
-            instance, a :class:`~collections.abc.Mapping`, an iterable of
-            ``(name, value)`` pairs, or a callable taking the request path and
-            headers in arguments and returning one of the above.
-        :raises ~websockets.exceptions.InvalidHandshake: if the handshake
-            fails
+        You must send the handshake response with :meth:`send_response`.
+
+        You can modify it before sending it, for example to alter HTTP headers.
+
+        Args:
+            status: HTTP status code.
+            text: HTTP response body; will be encoded to UTF-8.
+
+        Returns:
+            Response: WebSocket handshake response event to send to the client.
 
         """
-        path, request_headers = await self.read_http_request()
-
-        # Hook for customizing request handling, for example checking
-        # authentication or treating some paths as plain HTTP endpoints.
-        early_response_awaitable = self.process_request(path, request_headers)
-        if isinstance(early_response_awaitable, Awaitable):
-            early_response = await early_response_awaitable
-        else:
-            # For backwards compatibility with 7.0.
-            warnings.warn("declare process_request as a coroutine", DeprecationWarning)
-            early_response = early_response_awaitable  # type: ignore
-
-        # Change the response to a 503 error if the server is shutting down.
-        if not self.ws_server.is_serving():
-            early_response = (
-                http.HTTPStatus.SERVICE_UNAVAILABLE,
-                [],
-                b"Server is shutting down.\n",
-            )
-
-        if early_response is not None:
-            raise AbortHandshake(*early_response)
-
-        key = check_request(request_headers)
-
-        self.origin = self.process_origin(request_headers, origins)
-
-        extensions_header, self.extensions = self.process_extensions(
-            request_headers, available_extensions
+        body = text.encode()
+        headers = Headers(
+            [
+                ("Date", email.utils.formatdate(usegmt=True)),
+                ("Connection", "close"),
+                ("Content-Length", str(len(body))),
+                ("Content-Type", "text/plain; charset=utf-8"),
+                ("Server", USER_AGENT),
+            ]
         )
+        response = Response(status.value, status.phrase, headers, body)
+        # When reject() is called from accept(), handshake_exc is already set.
+        # If a user calls reject(), set handshake_exc to guarantee invariant:
+        # "handshake_exc is None if and only if opening handshake succeded."
+        if self.handshake_exc is None:
+            self.handshake_exc = InvalidStatus(response)
+        self.logger.info("connection failed (%d %s)", status.value, status.phrase)
+        return response
 
-        protocol_header = self.subprotocol = self.process_subprotocol(
-            request_headers, available_subprotocols
-        )
-
-        response_headers = Headers()
-
-        build_response(response_headers, key)
-
-        if extensions_header is not None:
-            response_headers["Sec-WebSocket-Extensions"] = extensions_header
-
-        if protocol_header is not None:
-            response_headers["Sec-WebSocket-Protocol"] = protocol_header
-
-        if callable(extra_headers):
-            extra_headers = extra_headers(path, self.request_headers)
-        if extra_headers is not None:
-            if isinstance(extra_headers, Headers):
-                extra_headers = extra_headers.raw_items()
-            elif isinstance(extra_headers, collections.abc.Mapping):
-                extra_headers = extra_headers.items()
-            for name, value in extra_headers:
-                response_headers[name] = value
-
-        response_headers.setdefault("Date", email.utils.formatdate(usegmt=True))
-        response_headers.setdefault("Server", USER_AGENT)
-
-        self.write_http_response(http.HTTPStatus.SWITCHING_PROTOCOLS, response_headers)
-
-        self.connection_open()
-
-        return path
-
-
-class WebSocketServer:
-    """
-    WebSocket server returned by :func:`~websockets.server.serve`.
-
-    This class provides the same interface as
-    :class:`~asyncio.AbstractServer`, namely the
-    :meth:`~asyncio.AbstractServer.close` and
-    :meth:`~asyncio.AbstractServer.wait_closed` methods.
-
-    It keeps track of WebSocket connections in order to close them properly
-    when shutting down.
-
-    Instances of this class store a reference to the :class:`~asyncio.Server`
-    object returned by :meth:`~asyncio.loop.create_server` rather than inherit
-    from :class:`~asyncio.Server` in part because
-    :meth:`~asyncio.loop.create_server` doesn't support passing a custom
-    :class:`~asyncio.Server` class.
-
-    """
-
-    def __init__(self, loop: asyncio.AbstractEventLoop) -> None:
-        # Store a reference to loop to avoid relying on self.server._loop.
-        self.loop = loop
-
-        # Keep track of active connections.
-        self.websockets: Set[WebSocketServerProtocol] = set()
-
-        # Task responsible for closing the server and terminating connections.
-        self.close_task: Optional[asyncio.Task[None]] = None
-
-        # Completed when the server is closed and connections are terminated.
-        self.closed_waiter: asyncio.Future[None] = loop.create_future()
-
-    def wrap(self, server: asyncio.AbstractServer) -> None:
+    def send_response(self, response: Response) -> None:
         """
-        Attach to a given :class:`~asyncio.Server`.
+        Send a handshake response to the client.
 
-        Since :meth:`~asyncio.loop.create_server` doesn't support injecting a
-        custom ``Server`` class, the easiest solution that doesn't rely on
-        private :mod:`asyncio` APIs is to:
-
-        - instantiate a :class:`WebSocketServer`
-        - give the protocol factory a reference to that instance
-        - call :meth:`~asyncio.loop.create_server` with the factory
-        - attach the resulting :class:`~asyncio.Server` with this method
+        Args:
+            response: WebSocket handshake response event to send.
 
         """
-        self.server = server
+        if self.debug:
+            code, phrase = response.status_code, response.reason_phrase
+            self.logger.debug("> HTTP/1.1 %d %s", code, phrase)
+            for key, value in response.headers.raw_items():
+                self.logger.debug("> %s: %s", key, value)
+            if response.body is not None:
+                self.logger.debug("> [body] (%d bytes)", len(response.body))
 
-    def register(self, protocol: WebSocketServerProtocol) -> None:
-        """
-        Register a connection with this server.
+        self.writes.append(response.serialize())
 
-        """
-        self.websockets.add(protocol)
-
-    def unregister(self, protocol: WebSocketServerProtocol) -> None:
-        """
-        Unregister a connection with this server.
-
-        """
-        self.websockets.remove(protocol)
-
-    def is_serving(self) -> bool:
-        """
-        Tell whether the server is accepting new connections or shutting down.
-
-        """
-        try:
-            # Python ≥ 3.7
-            return self.server.is_serving()
-        except AttributeError:  # pragma: no cover
-            # Python < 3.7
-            return self.server.sockets is not None
-
-    def close(self) -> None:
-        """
-        Close the server.
-
-        This method:
-
-        * closes the underlying :class:`~asyncio.Server`;
-        * rejects new WebSocket connections with an HTTP 503 (service
-          unavailable) error; this happens when the server accepted the TCP
-          connection but didn't complete the WebSocket opening handshake prior
-          to closing;
-        * closes open WebSocket connections with close code 1001 (going away).
-
-        :meth:`close` is idempotent.
-
-        """
-        if self.close_task is None:
-            self.close_task = self.loop.create_task(self._close())
-
-    async def _close(self) -> None:
-        """
-        Implementation of :meth:`close`.
-
-        This calls :meth:`~asyncio.Server.close` on the underlying
-        :class:`~asyncio.Server` object to stop accepting new connections and
-        then closes open connections with close code 1001.
-
-        """
-        # Stop accepting new connections.
-        self.server.close()
-
-        # Wait until self.server.close() completes.
-        await self.server.wait_closed()
-
-        # Wait until all accepted connections reach connection_made() and call
-        # register(). See https://bugs.python.org/issue34852 for details.
-        await asyncio.sleep(
-            0,
-            **({"loop": self.loop} if sys.version_info[:2] < (3, 8) else {}),
-        )
-
-        # Close OPEN connections with status code 1001. Since the server was
-        # closed, handshake() closes OPENING conections with a HTTP 503 error.
-        # Wait until all connections are closed.
-
-        # asyncio.wait doesn't accept an empty first argument
-        if self.websockets:
-            await asyncio.wait(
-                [websocket.close(1001) for websocket in self.websockets],
-                **({"loop": self.loop} if sys.version_info[:2] < (3, 8) else {}),
-            )
-
-        # Wait until all connection handlers are complete.
-
-        # asyncio.wait doesn't accept an empty first argument.
-        if self.websockets:
-            await asyncio.wait(
-                [websocket.handler_task for websocket in self.websockets],
-                **({"loop": self.loop} if sys.version_info[:2] < (3, 8) else {}),
-            )
-
-        # Tell wait_closed() to return.
-        self.closed_waiter.set_result(None)
-
-    async def wait_closed(self) -> None:
-        """
-        Wait until the server is closed.
-
-        When :meth:`wait_closed` returns, all TCP connections are closed and
-        all connection handlers have returned.
-
-        """
-        await asyncio.shield(self.closed_waiter)
-
-    @property
-    def sockets(self) -> Optional[List[socket.socket]]:
-        """
-        List of :class:`~socket.socket` objects the server is listening to.
-
-        ``None`` if the server is closed.
-
-        """
-        return self.server.sockets
-
-
-class Serve:
-    """
-
-    Create, start, and return a WebSocket server on ``host`` and ``port``.
-
-    Whenever a client connects, the server accepts the connection, creates a
-    :class:`WebSocketServerProtocol`, performs the opening handshake, and
-    delegates to the connection handler defined by ``ws_handler``. Once the
-    handler completes, either normally or with an exception, the server
-    performs the closing handshake and closes the connection.
-
-    Awaiting :func:`serve` yields a :class:`WebSocketServer`. This instance
-    provides :meth:`~websockets.server.WebSocketServer.close` and
-    :meth:`~websockets.server.WebSocketServer.wait_closed` methods for
-    terminating the server and cleaning up its resources.
-
-    When a server is closed with :meth:`~WebSocketServer.close`, it closes all
-    connections with close code 1001 (going away). Connections handlers, which
-    are running the ``ws_handler`` coroutine, will receive a
-    :exc:`~websockets.exceptions.ConnectionClosedOK` exception on their
-    current or next interaction with the WebSocket connection.
-
-    :func:`serve` can also be used as an asynchronous context manager. In
-    this case, the server is shut down when exiting the context.
-
-    :func:`serve` is a wrapper around the event loop's
-    :meth:`~asyncio.loop.create_server` method. It creates and starts a
-    :class:`~asyncio.Server` with :meth:`~asyncio.loop.create_server`. Then it
-    wraps the :class:`~asyncio.Server` in a :class:`WebSocketServer`  and
-    returns the :class:`WebSocketServer`.
-
-    The ``ws_handler`` argument is the WebSocket handler. It must be a
-    coroutine accepting two arguments: a :class:`WebSocketServerProtocol` and
-    the request URI.
-
-    The ``host`` and ``port`` arguments, as well as unrecognized keyword
-    arguments, are passed along to :meth:`~asyncio.loop.create_server`.
-
-    For example, you can set the ``ssl`` keyword argument to a
-    :class:`~ssl.SSLContext` to enable TLS.
-
-    The ``create_protocol`` parameter allows customizing the
-    :class:`~asyncio.Protocol` that manages the connection. It should be a
-    callable or class accepting the same arguments as
-    :class:`WebSocketServerProtocol` and returning an instance of
-    :class:`WebSocketServerProtocol` or a subclass. It defaults to
-    :class:`WebSocketServerProtocol`.
-
-    The behavior of ``ping_interval``, ``ping_timeout``, ``close_timeout``,
-    ``max_size``, ``max_queue``, ``read_limit``, and ``write_limit`` is
-    described in :class:`~websockets.protocol.WebSocketCommonProtocol`.
-
-    :func:`serve` also accepts the following optional arguments:
-
-    * ``compression`` is a shortcut to configure compression extensions;
-      by default it enables the "permessage-deflate" extension; set it to
-      ``None`` to disable compression
-    * ``origins`` defines acceptable Origin HTTP headers; include ``None`` if
-      the lack of an origin is acceptable
-    * ``extensions`` is a list of supported extensions in order of
-      decreasing preference
-    * ``subprotocols`` is a list of supported subprotocols in order of
-      decreasing preference
-    * ``extra_headers`` sets additional HTTP response headers  when the
-      handshake succeeds; it can be a :class:`~websockets.http.Headers`
-      instance, a :class:`~collections.abc.Mapping`, an iterable of ``(name,
-      value)`` pairs, or a callable taking the request path and headers in
-      arguments and returning one of the above
-    * ``process_request`` allows intercepting the HTTP request; it must be a
-      coroutine taking the request path and headers in argument; see
-      :meth:`~WebSocketServerProtocol.process_request` for details
-    * ``select_subprotocol`` allows customizing the logic for selecting a
-      subprotocol; it must be a callable taking the subprotocols offered by
-      the client and available on the server in argument; see
-      :meth:`~WebSocketServerProtocol.select_subprotocol` for details
-
-    Since there's no useful way to propagate exceptions triggered in handlers,
-    they're sent to the ``'websockets.server'`` logger instead. Debugging is
-    much easier if you configure logging to print them::
-
-        import logging
-        logger = logging.getLogger('websockets.server')
-        logger.setLevel(logging.ERROR)
-        logger.addHandler(logging.StreamHandler())
-
-    """
-
-    def __init__(
-        self,
-        ws_handler: Callable[[WebSocketServerProtocol, str], Awaitable[Any]],
-        host: Optional[Union[str, Sequence[str]]] = None,
-        port: Optional[int] = None,
-        *,
-        path: Optional[str] = None,
-        create_protocol: Optional[Type[WebSocketServerProtocol]] = None,
-        ping_interval: float = 20,
-        ping_timeout: float = 20,
-        close_timeout: Optional[float] = None,
-        max_size: int = 2 ** 20,
-        max_queue: int = 2 ** 5,
-        read_limit: int = 2 ** 16,
-        write_limit: int = 2 ** 16,
-        loop: Optional[asyncio.AbstractEventLoop] = None,
-        legacy_recv: bool = False,
-        klass: Optional[Type[WebSocketServerProtocol]] = None,
-        timeout: Optional[float] = None,
-        compression: Optional[str] = "deflate",
-        origins: Optional[Sequence[Optional[Origin]]] = None,
-        extensions: Optional[Sequence[ServerExtensionFactory]] = None,
-        subprotocols: Optional[Sequence[Subprotocol]] = None,
-        extra_headers: Optional[HeadersLikeOrCallable] = None,
-        process_request: Optional[
-            Callable[[str, Headers], Awaitable[Optional[HTTPResponse]]]
-        ] = None,
-        select_subprotocol: Optional[
-            Callable[[Sequence[Subprotocol], Sequence[Subprotocol]], Subprotocol]
-        ] = None,
-        **kwargs: Any,
-    ) -> None:
-        # Backwards compatibility: close_timeout used to be called timeout.
-        if timeout is None:
-            timeout = 10
+        if response.status_code == 101:
+            assert self.state is CONNECTING
+            self.state = OPEN
         else:
-            warnings.warn("rename timeout to close_timeout", DeprecationWarning)
-        # If both are specified, timeout is ignored.
-        if close_timeout is None:
-            close_timeout = timeout
+            self.send_eof()
+            self.parser = self.discard()
+            next(self.parser)  # start coroutine
 
-        # Backwards compatibility: create_protocol used to be called klass.
-        if klass is None:
-            klass = WebSocketServerProtocol
-        else:
-            warnings.warn("rename klass to create_protocol", DeprecationWarning)
-        # If both are specified, klass is ignored.
-        if create_protocol is None:
-            create_protocol = klass
+    def parse(self) -> Generator[None, None, None]:
+        if self.state is CONNECTING:
+            request = yield from Request.parse(self.reader.read_line)
 
-        if loop is None:
-            loop = asyncio.get_event_loop()
+            if self.debug:
+                self.logger.debug("< GET %s HTTP/1.1", request.path)
+                for key, value in request.headers.raw_items():
+                    self.logger.debug("< %s: %s", key, value)
 
-        ws_server = WebSocketServer(loop)
+            self.events.append(request)
 
-        secure = kwargs.get("ssl") is not None
-
-        if compression == "deflate":
-            if extensions is None:
-                extensions = []
-            if not any(
-                ext_factory.name == ServerPerMessageDeflateFactory.name
-                for ext_factory in extensions
-            ):
-                extensions = list(extensions) + [ServerPerMessageDeflateFactory()]
-        elif compression is not None:
-            raise ValueError(f"unsupported compression: {compression}")
-
-        factory = functools.partial(
-            create_protocol,
-            ws_handler,
-            ws_server,
-            host=host,
-            port=port,
-            secure=secure,
-            ping_interval=ping_interval,
-            ping_timeout=ping_timeout,
-            close_timeout=close_timeout,
-            max_size=max_size,
-            max_queue=max_queue,
-            read_limit=read_limit,
-            write_limit=write_limit,
-            loop=loop,
-            legacy_recv=legacy_recv,
-            origins=origins,
-            extensions=extensions,
-            subprotocols=subprotocols,
-            extra_headers=extra_headers,
-            process_request=process_request,
-            select_subprotocol=select_subprotocol,
-        )
-
-        if path is None:
-            create_server = functools.partial(
-                loop.create_server, factory, host, port, **kwargs
-            )
-        else:
-            # unix_serve(path) must not specify host and port parameters.
-            assert host is None and port is None
-            create_server = functools.partial(
-                loop.create_unix_server, factory, path, **kwargs
-            )
-
-        # This is a coroutine function.
-        self._create_server = create_server
-        self.ws_server = ws_server
-
-    # async with serve(...)
-
-    async def __aenter__(self) -> WebSocketServer:
-        return await self
-
-    async def __aexit__(
-        self,
-        exc_type: Optional[Type[BaseException]],
-        exc_value: Optional[BaseException],
-        traceback: Optional[TracebackType],
-    ) -> None:
-        self.ws_server.close()
-        await self.ws_server.wait_closed()
-
-    # await serve(...)
-
-    def __await__(self) -> Generator[Any, None, WebSocketServer]:
-        # Create a suitable iterator by calling __await__ on a coroutine.
-        return self.__await_impl__().__await__()
-
-    async def __await_impl__(self) -> WebSocketServer:
-        server = await self._create_server()
-        self.ws_server.wrap(server)
-        return self.ws_server
-
-    # yield from serve(...)
-
-    __iter__ = __await__
-
-
-serve = Serve
-
-
-def unix_serve(
-    ws_handler: Callable[[WebSocketServerProtocol, str], Awaitable[Any]],
-    path: str,
-    **kwargs: Any,
-) -> Serve:
-    """
-    Similar to :func:`serve`, but for listening on Unix sockets.
-
-    This function calls the event loop's
-    :meth:`~asyncio.loop.create_unix_server` method.
-
-    It is only available on Unix.
-
-    It's useful for deploying a server behind a reverse proxy such as nginx.
-
-    :param path: file system path to the Unix socket
-
-    """
-    return serve(ws_handler, path=path, **kwargs)
+        yield from super().parse()
diff --git a/tests/wpt/tests/tools/third_party/websockets/src/websockets/speedups.c b/tests/wpt/tests/tools/third_party/websockets/src/websockets/speedups.c
index d1c2b37e60c..a195904198f 100644
--- a/tests/wpt/tests/tools/third_party/websockets/src/websockets/speedups.c
+++ b/tests/wpt/tests/tools/third_party/websockets/src/websockets/speedups.c
@@ -2,9 +2,11 @@
 
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
-#include <stdint.h> /* uint32_t, uint64_t */
+#include <stdint.h> /* uint8_t, uint32_t, uint64_t */
 
-#if __SSE2__
+#if __ARM_NEON
+#include <arm_neon.h>
+#elif __SSE2__
 #include <emmintrin.h>
 #endif
 
@@ -13,39 +15,35 @@ static const Py_ssize_t MASK_LEN = 4;
 /* Similar to PyBytes_AsStringAndSize, but accepts more types */
 
 static int
-_PyBytesLike_AsStringAndSize(PyObject *obj, char **buffer, Py_ssize_t *length)
+_PyBytesLike_AsStringAndSize(PyObject *obj, PyObject **tmp, char **buffer, Py_ssize_t *length)
 {
-    // This supports bytes, bytearrays, and C-contiguous memoryview objects,
-    // which are the most useful data structures for handling byte streams.
-    // websockets.framing.prepare_data() returns only values of these types.
-    // Any object implementing the buffer protocol could be supported, however
-    // that would require allocation or copying memory, which is expensive.
+    // This supports bytes, bytearrays, and memoryview objects,
+    // which are common data structures for handling byte streams.
+    // websockets.framing.prepare_data() returns only these types.
+    // If *tmp isn't NULL, the caller gets a new reference.
     if (PyBytes_Check(obj))
     {
+        *tmp = NULL;
         *buffer = PyBytes_AS_STRING(obj);
         *length = PyBytes_GET_SIZE(obj);
     }
     else if (PyByteArray_Check(obj))
     {
+        *tmp = NULL;
         *buffer = PyByteArray_AS_STRING(obj);
         *length = PyByteArray_GET_SIZE(obj);
     }
     else if (PyMemoryView_Check(obj))
     {
-        Py_buffer *mv_buf;
-        mv_buf = PyMemoryView_GET_BUFFER(obj);
-        if (PyBuffer_IsContiguous(mv_buf, 'C'))
+        *tmp = PyMemoryView_GetContiguous(obj, PyBUF_READ, 'C');
+        if (*tmp == NULL)
         {
-            *buffer = mv_buf->buf;
-            *length = mv_buf->len;
-        }
-        else
-        {
-            PyErr_Format(
-                PyExc_TypeError,
-                "expected a contiguous memoryview");
             return -1;
         }
+        Py_buffer *mv_buf;
+        mv_buf = PyMemoryView_GET_BUFFER(*tmp);
+        *buffer = mv_buf->buf;
+        *length = mv_buf->len;
     }
     else
     {
@@ -74,15 +72,17 @@ apply_mask(PyObject *self, PyObject *args, PyObject *kwds)
     // A pointer to a char * + length will be extracted from the data and mask
     // arguments, possibly via a Py_buffer.
 
+    PyObject *input_tmp = NULL;
     char *input;
     Py_ssize_t input_len;
+    PyObject *mask_tmp = NULL;
     char *mask;
     Py_ssize_t mask_len;
 
     // Initialize a PyBytesObject then get a pointer to the underlying char *
     // in order to avoid an extra memory copy in PyBytes_FromStringAndSize.
 
-    PyObject *result;
+    PyObject *result = NULL;
     char *output;
 
     // Other variables.
@@ -94,23 +94,23 @@ apply_mask(PyObject *self, PyObject *args, PyObject *kwds)
     if (!PyArg_ParseTupleAndKeywords(
             args, kwds, "OO", kwlist, &input_obj, &mask_obj))
     {
-        return NULL;
+        goto exit;
     }
 
-    if (_PyBytesLike_AsStringAndSize(input_obj, &input, &input_len) == -1)
+    if (_PyBytesLike_AsStringAndSize(input_obj, &input_tmp, &input, &input_len) == -1)
     {
-        return NULL;
+        goto exit;
     }
 
-    if (_PyBytesLike_AsStringAndSize(mask_obj, &mask, &mask_len) == -1)
+    if (_PyBytesLike_AsStringAndSize(mask_obj, &mask_tmp, &mask, &mask_len) == -1)
     {
-        return NULL;
+        goto exit;
     }
 
     if (mask_len != MASK_LEN)
     {
         PyErr_SetString(PyExc_ValueError, "mask must contain 4 bytes");
-        return NULL;
+        goto exit;
     }
 
     // Create output.
@@ -118,10 +118,10 @@ apply_mask(PyObject *self, PyObject *args, PyObject *kwds)
     result = PyBytes_FromStringAndSize(NULL, input_len);
     if (result == NULL)
     {
-        return NULL;
+        goto exit;
     }
 
-    // Since we juste created result, we don't need error checks.
+    // Since we just created result, we don't need error checks.
     output = PyBytes_AS_STRING(result);
 
     // Perform the masking operation.
@@ -130,7 +130,21 @@ apply_mask(PyObject *self, PyObject *args, PyObject *kwds)
 
     // We need a new scope for MSVC 2010 (non C99 friendly)
     {
-#if __SSE2__
+#if __ARM_NEON
+
+        // With NEON support, XOR by blocks of 16 bytes = 128 bits.
+
+        Py_ssize_t input_len_128 = input_len & ~15;
+        uint8x16_t mask_128 = vreinterpretq_u8_u32(vdupq_n_u32(*(uint32_t *)mask));
+
+        for (; i < input_len_128; i += 16)
+        {
+            uint8x16_t in_128 = vld1q_u8((uint8_t *)(input + i));
+            uint8x16_t out_128 = veorq_u8(in_128, mask_128);
+            vst1q_u8((uint8_t *)(output + i), out_128);
+        }
+
+#elif __SSE2__
 
         // With SSE2 support, XOR by blocks of 16 bytes = 128 bits.
 
@@ -172,6 +186,9 @@ apply_mask(PyObject *self, PyObject *args, PyObject *kwds)
         output[i] = input[i] ^ mask[i & (MASK_LEN - 1)];
     }
 
+exit:
+    Py_XDECREF(input_tmp);
+    Py_XDECREF(mask_tmp);
     return result;
 
 }
@@ -181,7 +198,7 @@ static PyMethodDef speedups_methods[] = {
         "apply_mask",
         (PyCFunction)apply_mask,
         METH_VARARGS | METH_KEYWORDS,
-        "Apply masking to websocket message.",
+        "Apply masking to the data of a WebSocket message.",
     },
     {NULL, NULL, 0, NULL},      /* Sentinel */
 };
diff --git a/tests/wpt/tests/tools/third_party/websockets/src/websockets/speedups.pyi b/tests/wpt/tests/tools/third_party/websockets/src/websockets/speedups.pyi
deleted file mode 100644
index 821438a064e..00000000000
--- a/tests/wpt/tests/tools/third_party/websockets/src/websockets/speedups.pyi
+++ /dev/null
@@ -1 +0,0 @@
-def apply_mask(data: bytes, mask: bytes) -> bytes: ...
diff --git a/tests/wpt/tests/tools/third_party/websockets/src/websockets/streams.py b/tests/wpt/tests/tools/third_party/websockets/src/websockets/streams.py
new file mode 100644
index 00000000000..f861d4bd25e
--- /dev/null
+++ b/tests/wpt/tests/tools/third_party/websockets/src/websockets/streams.py
@@ -0,0 +1,151 @@
+from __future__ import annotations
+
+from typing import Generator
+
+
+class StreamReader:
+    """
+    Generator-based stream reader.
+
+    This class doesn't support concurrent calls to :meth:`read_line`,
+    :meth:`read_exact`, or :meth:`read_to_eof`. Make sure calls are
+    serialized.
+
+    """
+
+    def __init__(self) -> None:
+        self.buffer = bytearray()
+        self.eof = False
+
+    def read_line(self, m: int) -> Generator[None, None, bytes]:
+        """
+        Read a LF-terminated line from the stream.
+
+        This is a generator-based coroutine.
+
+        The return value includes the LF character.
+
+        Args:
+            m: maximum number bytes to read; this is a security limit.
+
+        Raises:
+            EOFError: if the stream ends without a LF.
+            RuntimeError: if the stream ends in more than ``m`` bytes.
+
+        """
+        n = 0  # number of bytes to read
+        p = 0  # number of bytes without a newline
+        while True:
+            n = self.buffer.find(b"\n", p) + 1
+            if n > 0:
+                break
+            p = len(self.buffer)
+            if p > m:
+                raise RuntimeError(f"read {p} bytes, expected no more than {m} bytes")
+            if self.eof:
+                raise EOFError(f"stream ends after {p} bytes, before end of line")
+            yield
+        if n > m:
+            raise RuntimeError(f"read {n} bytes, expected no more than {m} bytes")
+        r = self.buffer[:n]
+        del self.buffer[:n]
+        return r
+
+    def read_exact(self, n: int) -> Generator[None, None, bytes]:
+        """
+        Read a given number of bytes from the stream.
+
+        This is a generator-based coroutine.
+
+        Args:
+            n: how many bytes to read.
+
+        Raises:
+            EOFError: if the stream ends in less than ``n`` bytes.
+
+        """
+        assert n >= 0
+        while len(self.buffer) < n:
+            if self.eof:
+                p = len(self.buffer)
+                raise EOFError(f"stream ends after {p} bytes, expected {n} bytes")
+            yield
+        r = self.buffer[:n]
+        del self.buffer[:n]
+        return r
+
+    def read_to_eof(self, m: int) -> Generator[None, None, bytes]:
+        """
+        Read all bytes from the stream.
+
+        This is a generator-based coroutine.
+
+        Args:
+            m: maximum number bytes to read; this is a security limit.
+
+        Raises:
+            RuntimeError: if the stream ends in more than ``m`` bytes.
+
+        """
+        while not self.eof:
+            p = len(self.buffer)
+            if p > m:
+                raise RuntimeError(f"read {p} bytes, expected no more than {m} bytes")
+            yield
+        r = self.buffer[:]
+        del self.buffer[:]
+        return r
+
+    def at_eof(self) -> Generator[None, None, bool]:
+        """
+        Tell whether the stream has ended and all data was read.
+
+        This is a generator-based coroutine.
+
+        """
+        while True:
+            if self.buffer:
+                return False
+            if self.eof:
+                return True
+            # When all data was read but the stream hasn't ended, we can't
+            # tell if until either feed_data() or feed_eof() is called.
+            yield
+
+    def feed_data(self, data: bytes) -> None:
+        """
+        Write data to the stream.
+
+        :meth:`feed_data` cannot be called after :meth:`feed_eof`.
+
+        Args:
+            data: data to write.
+
+        Raises:
+            EOFError: if the stream has ended.
+
+        """
+        if self.eof:
+            raise EOFError("stream ended")
+        self.buffer += data
+
+    def feed_eof(self) -> None:
+        """
+        End the stream.
+
+        :meth:`feed_eof` cannot be called more than once.
+
+        Raises:
+            EOFError: if the stream has ended.
+
+        """
+        if self.eof:
+            raise EOFError("stream ended")
+        self.eof = True
+
+    def discard(self) -> None:
+        """
+        Discard all buffered data, but don't end the stream.
+
+        """
+        del self.buffer[:]
diff --git a/tests/wpt/tests/tools/third_party/websockets/src/websockets/typing.py b/tests/wpt/tests/tools/third_party/websockets/src/websockets/typing.py
index 4a60f93f64b..e672ba0069e 100644
--- a/tests/wpt/tests/tools/third_party/websockets/src/websockets/typing.py
+++ b/tests/wpt/tests/tools/third_party/websockets/src/websockets/typing.py
@@ -1,49 +1,60 @@
+from __future__ import annotations
+
+import logging
 from typing import List, NewType, Optional, Tuple, Union
 
 
-__all__ = ["Data", "Origin", "ExtensionHeader", "ExtensionParameter", "Subprotocol"]
+__all__ = [
+    "Data",
+    "LoggerLike",
+    "Origin",
+    "Subprotocol",
+    "ExtensionName",
+    "ExtensionParameter",
+]
+
+
+# Public types used in the signature of public APIs
 
 Data = Union[str, bytes]
+"""Types supported in a WebSocket message:
+:class:`str` for a Text_ frame, :class:`bytes` for a Binary_.
 
-Data__doc__ = """
-Types supported in a WebSocket message:
-
-- :class:`str` for text messages
-- :class:`bytes` for binary messages
+.. _Text: https://www.rfc-editor.org/rfc/rfc6455.html#section-5.6
+.. _Binary : https://www.rfc-editor.org/rfc/rfc6455.html#section-5.6
 
 """
-# Remove try / except when dropping support for Python < 3.7
-try:
-    Data.__doc__ = Data__doc__  # type: ignore
-except AttributeError:  # pragma: no cover
-    pass
+
+
+LoggerLike = Union[logging.Logger, logging.LoggerAdapter]
+"""Types accepted where a :class:`~logging.Logger` is expected."""
 
 
 Origin = NewType("Origin", str)
-Origin.__doc__ = """Value of a Origin header"""
-
-
-ExtensionName = NewType("ExtensionName", str)
-ExtensionName.__doc__ = """Name of a WebSocket extension"""
-
-
-ExtensionParameter = Tuple[str, Optional[str]]
-
-ExtensionParameter__doc__ = """Parameter of a WebSocket extension"""
-try:
-    ExtensionParameter.__doc__ = ExtensionParameter__doc__  # type: ignore
-except AttributeError:  # pragma: no cover
-    pass
-
-
-ExtensionHeader = Tuple[ExtensionName, List[ExtensionParameter]]
-
-ExtensionHeader__doc__ = """Item parsed in a Sec-WebSocket-Extensions header"""
-try:
-    ExtensionHeader.__doc__ = ExtensionHeader__doc__  # type: ignore
-except AttributeError:  # pragma: no cover
-    pass
+"""Value of a ``Origin`` header."""
 
 
 Subprotocol = NewType("Subprotocol", str)
-Subprotocol.__doc__ = """Items parsed in a Sec-WebSocket-Protocol header"""
+"""Subprotocol in a ``Sec-WebSocket-Protocol`` header."""
+
+
+ExtensionName = NewType("ExtensionName", str)
+"""Name of a WebSocket extension."""
+
+
+ExtensionParameter = Tuple[str, Optional[str]]
+"""Parameter of a WebSocket extension."""
+
+
+# Private types
+
+ExtensionHeader = Tuple[ExtensionName, List[ExtensionParameter]]
+"""Extension in a ``Sec-WebSocket-Extensions`` header."""
+
+
+ConnectionOption = NewType("ConnectionOption", str)
+"""Connection option in a ``Connection`` header."""
+
+
+UpgradeProtocol = NewType("UpgradeProtocol", str)
+"""Upgrade protocol in an ``Upgrade`` header."""
diff --git a/tests/wpt/tests/tools/third_party/websockets/src/websockets/uri.py b/tests/wpt/tests/tools/third_party/websockets/src/websockets/uri.py
index 6669e566861..fff0c380645 100644
--- a/tests/wpt/tests/tools/third_party/websockets/src/websockets/uri.py
+++ b/tests/wpt/tests/tools/third_party/websockets/src/websockets/uri.py
@@ -1,81 +1,108 @@
-"""
-:mod:`websockets.uri` parses WebSocket URIs.
-
-See `section 3 of RFC 6455`_.
-
-.. _section 3 of RFC 6455: http://tools.ietf.org/html/rfc6455#section-3
-
-"""
+from __future__ import annotations
 
+import dataclasses
 import urllib.parse
-from typing import NamedTuple, Optional, Tuple
+from typing import Optional, Tuple
 
-from .exceptions import InvalidURI
+from . import exceptions
 
 
 __all__ = ["parse_uri", "WebSocketURI"]
 
 
-# Consider converting to a dataclass when dropping support for Python < 3.7.
-
-
-class WebSocketURI(NamedTuple):
+@dataclasses.dataclass
+class WebSocketURI:
     """
     WebSocket URI.
 
-    :param bool secure: secure flag
-    :param str host: lower-case host
-    :param int port: port, always set even if it's the default
-    :param str resource_name: path and optional query
-    :param str user_info: ``(username, password)`` tuple when the URI contains
-      `User Information`_, else ``None``.
+    Attributes:
+        secure: :obj:`True` for a ``wss`` URI, :obj:`False` for a ``ws`` URI.
+        host: Normalized to lower case.
+        port: Always set even if it's the default.
+        path: May be empty.
+        query: May be empty if the URI doesn't include a query component.
+        username: Available when the URI contains `User Information`_.
+        password: Available when the URI contains `User Information`_.
+
+    .. _User Information: https://www.rfc-editor.org/rfc/rfc3986.html#section-3.2.1
 
-    .. _User Information: https://tools.ietf.org/html/rfc3986#section-3.2.1
     """
 
     secure: bool
     host: str
     port: int
-    resource_name: str
-    user_info: Optional[Tuple[str, str]]
+    path: str
+    query: str
+    username: Optional[str]
+    password: Optional[str]
+
+    @property
+    def resource_name(self) -> str:
+        if self.path:
+            resource_name = self.path
+        else:
+            resource_name = "/"
+        if self.query:
+            resource_name += "?" + self.query
+        return resource_name
+
+    @property
+    def user_info(self) -> Optional[Tuple[str, str]]:
+        if self.username is None:
+            return None
+        assert self.password is not None
+        return (self.username, self.password)
 
 
-# Work around https://bugs.python.org/issue19931
-
-WebSocketURI.secure.__doc__ = ""
-WebSocketURI.host.__doc__ = ""
-WebSocketURI.port.__doc__ = ""
-WebSocketURI.resource_name.__doc__ = ""
-WebSocketURI.user_info.__doc__ = ""
+# All characters from the gen-delims and sub-delims sets in RFC 3987.
+DELIMS = ":/?#[]@!$&'()*+,;="
 
 
 def parse_uri(uri: str) -> WebSocketURI:
     """
     Parse and validate a WebSocket URI.
 
-    :raises ValueError: if ``uri`` isn't a valid WebSocket URI.
+    Args:
+        uri: WebSocket URI.
+
+    Returns:
+        WebSocketURI: Parsed WebSocket URI.
+
+    Raises:
+        InvalidURI: if ``uri`` isn't a valid WebSocket URI.
 
     """
     parsed = urllib.parse.urlparse(uri)
-    try:
-        assert parsed.scheme in ["ws", "wss"]
-        assert parsed.params == ""
-        assert parsed.fragment == ""
-        assert parsed.hostname is not None
-    except AssertionError as exc:
-        raise InvalidURI(uri) from exc
+    if parsed.scheme not in ["ws", "wss"]:
+        raise exceptions.InvalidURI(uri, "scheme isn't ws or wss")
+    if parsed.hostname is None:
+        raise exceptions.InvalidURI(uri, "hostname isn't provided")
+    if parsed.fragment != "":
+        raise exceptions.InvalidURI(uri, "fragment identifier is meaningless")
 
     secure = parsed.scheme == "wss"
     host = parsed.hostname
     port = parsed.port or (443 if secure else 80)
-    resource_name = parsed.path or "/"
-    if parsed.query:
-        resource_name += "?" + parsed.query
-    user_info = None
-    if parsed.username is not None:
-        # urllib.parse.urlparse accepts URLs with a username but without a
-        # password. This doesn't make sense for HTTP Basic Auth credentials.
-        if parsed.password is None:
-            raise InvalidURI(uri)
-        user_info = (parsed.username, parsed.password)
-    return WebSocketURI(secure, host, port, resource_name, user_info)
+    path = parsed.path
+    query = parsed.query
+    username = parsed.username
+    password = parsed.password
+    # urllib.parse.urlparse accepts URLs with a username but without a
+    # password. This doesn't make sense for HTTP Basic Auth credentials.
+    if username is not None and password is None:
+        raise exceptions.InvalidURI(uri, "username provided without password")
+
+    try:
+        uri.encode("ascii")
+    except UnicodeEncodeError:
+        # Input contains non-ASCII characters.
+        # It must be an IRI. Convert it to a URI.
+        host = host.encode("idna").decode()
+        path = urllib.parse.quote(path, safe=DELIMS)
+        query = urllib.parse.quote(query, safe=DELIMS)
+        if username is not None:
+            assert password is not None
+            username = urllib.parse.quote(username, safe=DELIMS)
+            password = urllib.parse.quote(password, safe=DELIMS)
+
+    return WebSocketURI(secure, host, port, path, query, username, password)
diff --git a/tests/wpt/tests/tools/third_party/websockets/src/websockets/utils.py b/tests/wpt/tests/tools/third_party/websockets/src/websockets/utils.py
index 40ac8559ff6..c40404906ed 100644
--- a/tests/wpt/tests/tools/third_party/websockets/src/websockets/utils.py
+++ b/tests/wpt/tests/tools/third_party/websockets/src/websockets/utils.py
@@ -1,18 +1,51 @@
-import itertools
+from __future__ import annotations
+
+import base64
+import hashlib
+import secrets
+import sys
 
 
-__all__ = ["apply_mask"]
+__all__ = ["accept_key", "apply_mask"]
+
+
+GUID = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11"
+
+
+def generate_key() -> str:
+    """
+    Generate a random key for the Sec-WebSocket-Key header.
+
+    """
+    key = secrets.token_bytes(16)
+    return base64.b64encode(key).decode()
+
+
+def accept_key(key: str) -> str:
+    """
+    Compute the value of the Sec-WebSocket-Accept header.
+
+    Args:
+        key: value of the Sec-WebSocket-Key header.
+
+    """
+    sha1 = hashlib.sha1((key + GUID).encode()).digest()
+    return base64.b64encode(sha1).decode()
 
 
 def apply_mask(data: bytes, mask: bytes) -> bytes:
     """
     Apply masking to the data of a WebSocket message.
 
-    :param data: Data to mask
-    :param mask: 4-bytes mask
+    Args:
+        data: data to mask.
+        mask: 4-bytes mask.
 
     """
     if len(mask) != 4:
         raise ValueError("mask must contain 4 bytes")
 
-    return bytes(b ^ m for b, m in zip(data, itertools.cycle(mask)))
+    data_int = int.from_bytes(data, sys.byteorder)
+    mask_repeated = mask * (len(data) // 4) + mask[: len(data) % 4]
+    mask_int = int.from_bytes(mask_repeated, sys.byteorder)
+    return (data_int ^ mask_int).to_bytes(len(data), sys.byteorder)
diff --git a/tests/wpt/tests/tools/third_party/websockets/src/websockets/version.py b/tests/wpt/tests/tools/third_party/websockets/src/websockets/version.py
index 7377332e12e..c30bfd68f31 100644
--- a/tests/wpt/tests/tools/third_party/websockets/src/websockets/version.py
+++ b/tests/wpt/tests/tools/third_party/websockets/src/websockets/version.py
@@ -1 +1,78 @@
-version = "8.1"
+from __future__ import annotations
+
+
+__all__ = ["tag", "version", "commit"]
+
+
+# ========= =========== ===================
+#           release     development
+# ========= =========== ===================
+# tag       X.Y         X.Y (upcoming)
+# version   X.Y         X.Y.dev1+g5678cde
+# commit    X.Y         5678cde
+# ========= =========== ===================
+
+
+# When tagging a release, set `released = True`.
+# After tagging a release, set `released = False` and increment `tag`.
+
+released = True
+
+tag = version = commit = "10.3"
+
+
+if not released:  # pragma: no cover
+    import pathlib
+    import re
+    import subprocess
+
+    def get_version(tag: str) -> str:
+        # Since setup.py executes the contents of src/websockets/version.py,
+        # __file__ can point to either of these two files.
+        file_path = pathlib.Path(__file__)
+        root_dir = file_path.parents[0 if file_path.name == "setup.py" else 2]
+
+        # Read version from git if available. This prevents reading stale
+        # information from src/websockets.egg-info after building a sdist.
+        try:
+            description = subprocess.run(
+                ["git", "describe", "--dirty", "--tags", "--long"],
+                capture_output=True,
+                cwd=root_dir,
+                timeout=1,
+                check=True,
+                text=True,
+            ).stdout.strip()
+        # subprocess.run raises FileNotFoundError if git isn't on $PATH.
+        except (FileNotFoundError, subprocess.CalledProcessError):
+            pass
+        else:
+            description_re = r"[0-9.]+-([0-9]+)-(g[0-9a-f]{7,}(?:-dirty)?)"
+            match = re.fullmatch(description_re, description)
+            assert match is not None
+            distance, remainder = match.groups()
+            remainder = remainder.replace("-", ".")  # required by PEP 440
+            return f"{tag}.dev{distance}+{remainder}"
+
+        # Read version from package metadata if it is installed.
+        try:
+            import importlib.metadata  # move up when dropping Python 3.7
+
+            return importlib.metadata.version("websockets")
+        except ImportError:
+            pass
+
+        # Avoid crashing if the development version cannot be determined.
+        return f"{tag}.dev0+gunknown"
+
+    version = get_version(tag)
+
+    def get_commit(tag: str, version: str) -> str:
+        # Extract commit from version, falling back to tag if not available.
+        version_re = r"[0-9.]+\.dev[0-9]+\+g([0-9a-f]{7,}|unknown)(?:\.dirty)?"
+        match = re.fullmatch(version_re, version)
+        assert match is not None
+        (commit,) = match.groups()
+        return tag if commit == "unknown" else commit
+
+    commit = get_commit(tag, version)
diff --git a/tests/wpt/tests/tools/third_party/websockets/tests/__init__.py b/tests/wpt/tests/tools/third_party/websockets/tests/__init__.py
deleted file mode 100644
index dd78609f5ba..00000000000
--- a/tests/wpt/tests/tools/third_party/websockets/tests/__init__.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import logging
-
-
-# Avoid displaying stack traces at the ERROR logging level.
-logging.basicConfig(level=logging.CRITICAL)
diff --git a/tests/wpt/tests/tools/third_party/websockets/tests/extensions/test_base.py b/tests/wpt/tests/tools/third_party/websockets/tests/extensions/test_base.py
deleted file mode 100644
index ba8657b6541..00000000000
--- a/tests/wpt/tests/tools/third_party/websockets/tests/extensions/test_base.py
+++ /dev/null
@@ -1,4 +0,0 @@
-from websockets.extensions.base import *  # noqa
-
-
-# Abstract classes don't provide any behavior to test.
diff --git a/tests/wpt/tests/tools/third_party/websockets/tests/extensions/test_permessage_deflate.py b/tests/wpt/tests/tools/third_party/websockets/tests/extensions/test_permessage_deflate.py
deleted file mode 100644
index 0ec49c6c02d..00000000000
--- a/tests/wpt/tests/tools/third_party/websockets/tests/extensions/test_permessage_deflate.py
+++ /dev/null
@@ -1,792 +0,0 @@
-import unittest
-import zlib
-
-from websockets.exceptions import (
-    DuplicateParameter,
-    InvalidParameterName,
-    InvalidParameterValue,
-    NegotiationError,
-    PayloadTooBig,
-)
-from websockets.extensions.permessage_deflate import *
-from websockets.framing import (
-    OP_BINARY,
-    OP_CLOSE,
-    OP_CONT,
-    OP_PING,
-    OP_PONG,
-    OP_TEXT,
-    Frame,
-    serialize_close,
-)
-
-
-class ExtensionTestsMixin:
-    def assertExtensionEqual(self, extension1, extension2):
-        self.assertEqual(
-            extension1.remote_no_context_takeover, extension2.remote_no_context_takeover
-        )
-        self.assertEqual(
-            extension1.local_no_context_takeover, extension2.local_no_context_takeover
-        )
-        self.assertEqual(
-            extension1.remote_max_window_bits, extension2.remote_max_window_bits
-        )
-        self.assertEqual(
-            extension1.local_max_window_bits, extension2.local_max_window_bits
-        )
-
-
-class PerMessageDeflateTests(unittest.TestCase, ExtensionTestsMixin):
-    def setUp(self):
-        # Set up an instance of the permessage-deflate extension with the most
-        # common settings. Since the extension is symmetrical, this instance
-        # may be used for testing both encoding and decoding.
-        self.extension = PerMessageDeflate(False, False, 15, 15)
-
-    def test_name(self):
-        assert self.extension.name == "permessage-deflate"
-
-    def test_repr(self):
-        self.assertExtensionEqual(eval(repr(self.extension)), self.extension)
-
-    # Control frames aren't encoded or decoded.
-
-    def test_no_encode_decode_ping_frame(self):
-        frame = Frame(True, OP_PING, b"")
-
-        self.assertEqual(self.extension.encode(frame), frame)
-
-        self.assertEqual(self.extension.decode(frame), frame)
-
-    def test_no_encode_decode_pong_frame(self):
-        frame = Frame(True, OP_PONG, b"")
-
-        self.assertEqual(self.extension.encode(frame), frame)
-
-        self.assertEqual(self.extension.decode(frame), frame)
-
-    def test_no_encode_decode_close_frame(self):
-        frame = Frame(True, OP_CLOSE, serialize_close(1000, ""))
-
-        self.assertEqual(self.extension.encode(frame), frame)
-
-        self.assertEqual(self.extension.decode(frame), frame)
-
-    # Data frames are encoded and decoded.
-
-    def test_encode_decode_text_frame(self):
-        frame = Frame(True, OP_TEXT, "café".encode("utf-8"))
-
-        enc_frame = self.extension.encode(frame)
-
-        self.assertEqual(enc_frame, frame._replace(rsv1=True, data=b"JNL;\xbc\x12\x00"))
-
-        dec_frame = self.extension.decode(enc_frame)
-
-        self.assertEqual(dec_frame, frame)
-
-    def test_encode_decode_binary_frame(self):
-        frame = Frame(True, OP_BINARY, b"tea")
-
-        enc_frame = self.extension.encode(frame)
-
-        self.assertEqual(enc_frame, frame._replace(rsv1=True, data=b"*IM\x04\x00"))
-
-        dec_frame = self.extension.decode(enc_frame)
-
-        self.assertEqual(dec_frame, frame)
-
-    def test_encode_decode_fragmented_text_frame(self):
-        frame1 = Frame(False, OP_TEXT, "café".encode("utf-8"))
-        frame2 = Frame(False, OP_CONT, " & ".encode("utf-8"))
-        frame3 = Frame(True, OP_CONT, "croissants".encode("utf-8"))
-
-        enc_frame1 = self.extension.encode(frame1)
-        enc_frame2 = self.extension.encode(frame2)
-        enc_frame3 = self.extension.encode(frame3)
-
-        self.assertEqual(
-            enc_frame1,
-            frame1._replace(rsv1=True, data=b"JNL;\xbc\x12\x00\x00\x00\xff\xff"),
-        )
-        self.assertEqual(
-            enc_frame2, frame2._replace(rsv1=True, data=b"RPS\x00\x00\x00\x00\xff\xff")
-        )
-        self.assertEqual(
-            enc_frame3, frame3._replace(rsv1=True, data=b"J.\xca\xcf,.N\xcc+)\x06\x00")
-        )
-
-        dec_frame1 = self.extension.decode(enc_frame1)
-        dec_frame2 = self.extension.decode(enc_frame2)
-        dec_frame3 = self.extension.decode(enc_frame3)
-
-        self.assertEqual(dec_frame1, frame1)
-        self.assertEqual(dec_frame2, frame2)
-        self.assertEqual(dec_frame3, frame3)
-
-    def test_encode_decode_fragmented_binary_frame(self):
-        frame1 = Frame(False, OP_TEXT, b"tea ")
-        frame2 = Frame(True, OP_CONT, b"time")
-
-        enc_frame1 = self.extension.encode(frame1)
-        enc_frame2 = self.extension.encode(frame2)
-
-        self.assertEqual(
-            enc_frame1, frame1._replace(rsv1=True, data=b"*IMT\x00\x00\x00\x00\xff\xff")
-        )
-        self.assertEqual(
-            enc_frame2, frame2._replace(rsv1=True, data=b"*\xc9\xccM\x05\x00")
-        )
-
-        dec_frame1 = self.extension.decode(enc_frame1)
-        dec_frame2 = self.extension.decode(enc_frame2)
-
-        self.assertEqual(dec_frame1, frame1)
-        self.assertEqual(dec_frame2, frame2)
-
-    def test_no_decode_text_frame(self):
-        frame = Frame(True, OP_TEXT, "café".encode("utf-8"))
-
-        # Try decoding a frame that wasn't encoded.
-        self.assertEqual(self.extension.decode(frame), frame)
-
-    def test_no_decode_binary_frame(self):
-        frame = Frame(True, OP_TEXT, b"tea")
-
-        # Try decoding a frame that wasn't encoded.
-        self.assertEqual(self.extension.decode(frame), frame)
-
-    def test_no_decode_fragmented_text_frame(self):
-        frame1 = Frame(False, OP_TEXT, "café".encode("utf-8"))
-        frame2 = Frame(False, OP_CONT, " & ".encode("utf-8"))
-        frame3 = Frame(True, OP_CONT, "croissants".encode("utf-8"))
-
-        dec_frame1 = self.extension.decode(frame1)
-        dec_frame2 = self.extension.decode(frame2)
-        dec_frame3 = self.extension.decode(frame3)
-
-        self.assertEqual(dec_frame1, frame1)
-        self.assertEqual(dec_frame2, frame2)
-        self.assertEqual(dec_frame3, frame3)
-
-    def test_no_decode_fragmented_binary_frame(self):
-        frame1 = Frame(False, OP_TEXT, b"tea ")
-        frame2 = Frame(True, OP_CONT, b"time")
-
-        dec_frame1 = self.extension.decode(frame1)
-        dec_frame2 = self.extension.decode(frame2)
-
-        self.assertEqual(dec_frame1, frame1)
-        self.assertEqual(dec_frame2, frame2)
-
-    def test_context_takeover(self):
-        frame = Frame(True, OP_TEXT, "café".encode("utf-8"))
-
-        enc_frame1 = self.extension.encode(frame)
-        enc_frame2 = self.extension.encode(frame)
-
-        self.assertEqual(enc_frame1.data, b"JNL;\xbc\x12\x00")
-        self.assertEqual(enc_frame2.data, b"J\x06\x11\x00\x00")
-
-    def test_remote_no_context_takeover(self):
-        # No context takeover when decoding messages.
-        self.extension = PerMessageDeflate(True, False, 15, 15)
-
-        frame = Frame(True, OP_TEXT, "café".encode("utf-8"))
-
-        enc_frame1 = self.extension.encode(frame)
-        enc_frame2 = self.extension.encode(frame)
-
-        self.assertEqual(enc_frame1.data, b"JNL;\xbc\x12\x00")
-        self.assertEqual(enc_frame2.data, b"J\x06\x11\x00\x00")
-
-        dec_frame1 = self.extension.decode(enc_frame1)
-        self.assertEqual(dec_frame1, frame)
-
-        with self.assertRaises(zlib.error) as exc:
-            self.extension.decode(enc_frame2)
-        self.assertIn("invalid distance too far back", str(exc.exception))
-
-    def test_local_no_context_takeover(self):
-        # No context takeover when encoding and decoding messages.
-        self.extension = PerMessageDeflate(True, True, 15, 15)
-
-        frame = Frame(True, OP_TEXT, "café".encode("utf-8"))
-
-        enc_frame1 = self.extension.encode(frame)
-        enc_frame2 = self.extension.encode(frame)
-
-        self.assertEqual(enc_frame1.data, b"JNL;\xbc\x12\x00")
-        self.assertEqual(enc_frame2.data, b"JNL;\xbc\x12\x00")
-
-        dec_frame1 = self.extension.decode(enc_frame1)
-        dec_frame2 = self.extension.decode(enc_frame2)
-
-        self.assertEqual(dec_frame1, frame)
-        self.assertEqual(dec_frame2, frame)
-
-    # Compression settings can be customized.
-
-    def test_compress_settings(self):
-        # Configure an extension so that no compression actually occurs.
-        extension = PerMessageDeflate(False, False, 15, 15, {"level": 0})
-
-        frame = Frame(True, OP_TEXT, "café".encode("utf-8"))
-
-        enc_frame = extension.encode(frame)
-
-        self.assertEqual(
-            enc_frame,
-            frame._replace(
-                rsv1=True, data=b"\x00\x05\x00\xfa\xffcaf\xc3\xa9\x00"  # not compressed
-            ),
-        )
-
-    # Frames aren't decoded beyond max_length.
-
-    def test_decompress_max_size(self):
-        frame = Frame(True, OP_TEXT, ("a" * 20).encode("utf-8"))
-
-        enc_frame = self.extension.encode(frame)
-
-        self.assertEqual(enc_frame.data, b"JL\xc4\x04\x00\x00")
-
-        with self.assertRaises(PayloadTooBig):
-            self.extension.decode(enc_frame, max_size=10)
-
-
-class ClientPerMessageDeflateFactoryTests(unittest.TestCase, ExtensionTestsMixin):
-    def test_name(self):
-        assert ClientPerMessageDeflateFactory.name == "permessage-deflate"
-
-    def test_init(self):
-        for config in [
-            (False, False, 8, None),  # server_max_window_bits ≥ 8
-            (False, True, 15, None),  # server_max_window_bits ≤ 15
-            (True, False, None, 8),  # client_max_window_bits ≥ 8
-            (True, True, None, 15),  # client_max_window_bits ≤ 15
-            (False, False, None, True),  # client_max_window_bits
-            (False, False, None, None, {"memLevel": 4}),
-        ]:
-            with self.subTest(config=config):
-                # This does not raise an exception.
-                ClientPerMessageDeflateFactory(*config)
-
-    def test_init_error(self):
-        for config in [
-            (False, False, 7, 8),  # server_max_window_bits < 8
-            (False, True, 8, 7),  # client_max_window_bits < 8
-            (True, False, 16, 15),  # server_max_window_bits > 15
-            (True, True, 15, 16),  # client_max_window_bits > 15
-            (False, False, True, None),  # server_max_window_bits
-            (False, False, None, None, {"wbits": 11}),
-        ]:
-            with self.subTest(config=config):
-                with self.assertRaises(ValueError):
-                    ClientPerMessageDeflateFactory(*config)
-
-    def test_get_request_params(self):
-        for config, result in [
-            # Test without any parameter
-            ((False, False, None, None), []),
-            # Test server_no_context_takeover
-            ((True, False, None, None), [("server_no_context_takeover", None)]),
-            # Test client_no_context_takeover
-            ((False, True, None, None), [("client_no_context_takeover", None)]),
-            # Test server_max_window_bits
-            ((False, False, 10, None), [("server_max_window_bits", "10")]),
-            # Test client_max_window_bits
-            ((False, False, None, 10), [("client_max_window_bits", "10")]),
-            ((False, False, None, True), [("client_max_window_bits", None)]),
-            # Test all parameters together
-            (
-                (True, True, 12, 12),
-                [
-                    ("server_no_context_takeover", None),
-                    ("client_no_context_takeover", None),
-                    ("server_max_window_bits", "12"),
-                    ("client_max_window_bits", "12"),
-                ],
-            ),
-        ]:
-            with self.subTest(config=config):
-                factory = ClientPerMessageDeflateFactory(*config)
-                self.assertEqual(factory.get_request_params(), result)
-
-    def test_process_response_params(self):
-        for config, response_params, result in [
-            # Test without any parameter
-            ((False, False, None, None), [], (False, False, 15, 15)),
-            ((False, False, None, None), [("unknown", None)], InvalidParameterName),
-            # Test server_no_context_takeover
-            (
-                (False, False, None, None),
-                [("server_no_context_takeover", None)],
-                (True, False, 15, 15),
-            ),
-            ((True, False, None, None), [], NegotiationError),
-            (
-                (True, False, None, None),
-                [("server_no_context_takeover", None)],
-                (True, False, 15, 15),
-            ),
-            (
-                (True, False, None, None),
-                [("server_no_context_takeover", None)] * 2,
-                DuplicateParameter,
-            ),
-            (
-                (True, False, None, None),
-                [("server_no_context_takeover", "42")],
-                InvalidParameterValue,
-            ),
-            # Test client_no_context_takeover
-            (
-                (False, False, None, None),
-                [("client_no_context_takeover", None)],
-                (False, True, 15, 15),
-            ),
-            ((False, True, None, None), [], (False, True, 15, 15)),
-            (
-                (False, True, None, None),
-                [("client_no_context_takeover", None)],
-                (False, True, 15, 15),
-            ),
-            (
-                (False, True, None, None),
-                [("client_no_context_takeover", None)] * 2,
-                DuplicateParameter,
-            ),
-            (
-                (False, True, None, None),
-                [("client_no_context_takeover", "42")],
-                InvalidParameterValue,
-            ),
-            # Test server_max_window_bits
-            (
-                (False, False, None, None),
-                [("server_max_window_bits", "7")],
-                NegotiationError,
-            ),
-            (
-                (False, False, None, None),
-                [("server_max_window_bits", "10")],
-                (False, False, 10, 15),
-            ),
-            (
-                (False, False, None, None),
-                [("server_max_window_bits", "16")],
-                NegotiationError,
-            ),
-            ((False, False, 12, None), [], NegotiationError),
-            (
-                (False, False, 12, None),
-                [("server_max_window_bits", "10")],
-                (False, False, 10, 15),
-            ),
-            (
-                (False, False, 12, None),
-                [("server_max_window_bits", "12")],
-                (False, False, 12, 15),
-            ),
-            (
-                (False, False, 12, None),
-                [("server_max_window_bits", "13")],
-                NegotiationError,
-            ),
-            (
-                (False, False, 12, None),
-                [("server_max_window_bits", "12")] * 2,
-                DuplicateParameter,
-            ),
-            (
-                (False, False, 12, None),
-                [("server_max_window_bits", "42")],
-                InvalidParameterValue,
-            ),
-            # Test client_max_window_bits
-            (
-                (False, False, None, None),
-                [("client_max_window_bits", "10")],
-                NegotiationError,
-            ),
-            ((False, False, None, True), [], (False, False, 15, 15)),
-            (
-                (False, False, None, True),
-                [("client_max_window_bits", "7")],
-                NegotiationError,
-            ),
-            (
-                (False, False, None, True),
-                [("client_max_window_bits", "10")],
-                (False, False, 15, 10),
-            ),
-            (
-                (False, False, None, True),
-                [("client_max_window_bits", "16")],
-                NegotiationError,
-            ),
-            ((False, False, None, 12), [], (False, False, 15, 12)),
-            (
-                (False, False, None, 12),
-                [("client_max_window_bits", "10")],
-                (False, False, 15, 10),
-            ),
-            (
-                (False, False, None, 12),
-                [("client_max_window_bits", "12")],
-                (False, False, 15, 12),
-            ),
-            (
-                (False, False, None, 12),
-                [("client_max_window_bits", "13")],
-                NegotiationError,
-            ),
-            (
-                (False, False, None, 12),
-                [("client_max_window_bits", "12")] * 2,
-                DuplicateParameter,
-            ),
-            (
-                (False, False, None, 12),
-                [("client_max_window_bits", "42")],
-                InvalidParameterValue,
-            ),
-            # Test all parameters together
-            (
-                (True, True, 12, 12),
-                [
-                    ("server_no_context_takeover", None),
-                    ("client_no_context_takeover", None),
-                    ("server_max_window_bits", "10"),
-                    ("client_max_window_bits", "10"),
-                ],
-                (True, True, 10, 10),
-            ),
-            (
-                (False, False, None, True),
-                [
-                    ("server_no_context_takeover", None),
-                    ("client_no_context_takeover", None),
-                    ("server_max_window_bits", "10"),
-                    ("client_max_window_bits", "10"),
-                ],
-                (True, True, 10, 10),
-            ),
-            (
-                (True, True, 12, 12),
-                [
-                    ("server_no_context_takeover", None),
-                    ("server_max_window_bits", "12"),
-                ],
-                (True, True, 12, 12),
-            ),
-        ]:
-            with self.subTest(config=config, response_params=response_params):
-                factory = ClientPerMessageDeflateFactory(*config)
-                if isinstance(result, type) and issubclass(result, Exception):
-                    with self.assertRaises(result):
-                        factory.process_response_params(response_params, [])
-                else:
-                    extension = factory.process_response_params(response_params, [])
-                    expected = PerMessageDeflate(*result)
-                    self.assertExtensionEqual(extension, expected)
-
-    def test_process_response_params_deduplication(self):
-        factory = ClientPerMessageDeflateFactory(False, False, None, None)
-        with self.assertRaises(NegotiationError):
-            factory.process_response_params(
-                [], [PerMessageDeflate(False, False, 15, 15)]
-            )
-
-
-class ServerPerMessageDeflateFactoryTests(unittest.TestCase, ExtensionTestsMixin):
-    def test_name(self):
-        assert ServerPerMessageDeflateFactory.name == "permessage-deflate"
-
-    def test_init(self):
-        for config in [
-            (False, False, 8, None),  # server_max_window_bits ≥ 8
-            (False, True, 15, None),  # server_max_window_bits ≤ 15
-            (True, False, None, 8),  # client_max_window_bits ≥ 8
-            (True, True, None, 15),  # client_max_window_bits ≤ 15
-            (False, False, None, None, {"memLevel": 4}),
-        ]:
-            with self.subTest(config=config):
-                # This does not raise an exception.
-                ServerPerMessageDeflateFactory(*config)
-
-    def test_init_error(self):
-        for config in [
-            (False, False, 7, 8),  # server_max_window_bits < 8
-            (False, True, 8, 7),  # client_max_window_bits < 8
-            (True, False, 16, 15),  # server_max_window_bits > 15
-            (True, True, 15, 16),  # client_max_window_bits > 15
-            (False, False, None, True),  # client_max_window_bits
-            (False, False, True, None),  # server_max_window_bits
-            (False, False, None, None, {"wbits": 11}),
-        ]:
-            with self.subTest(config=config):
-                with self.assertRaises(ValueError):
-                    ServerPerMessageDeflateFactory(*config)
-
-    def test_process_request_params(self):
-        # Parameters in result appear swapped vs. config because the order is
-        # (remote, local) vs. (server, client).
-        for config, request_params, response_params, result in [
-            # Test without any parameter
-            ((False, False, None, None), [], [], (False, False, 15, 15)),
-            (
-                (False, False, None, None),
-                [("unknown", None)],
-                None,
-                InvalidParameterName,
-            ),
-            # Test server_no_context_takeover
-            (
-                (False, False, None, None),
-                [("server_no_context_takeover", None)],
-                [("server_no_context_takeover", None)],
-                (False, True, 15, 15),
-            ),
-            (
-                (True, False, None, None),
-                [],
-                [("server_no_context_takeover", None)],
-                (False, True, 15, 15),
-            ),
-            (
-                (True, False, None, None),
-                [("server_no_context_takeover", None)],
-                [("server_no_context_takeover", None)],
-                (False, True, 15, 15),
-            ),
-            (
-                (True, False, None, None),
-                [("server_no_context_takeover", None)] * 2,
-                None,
-                DuplicateParameter,
-            ),
-            (
-                (True, False, None, None),
-                [("server_no_context_takeover", "42")],
-                None,
-                InvalidParameterValue,
-            ),
-            # Test client_no_context_takeover
-            (
-                (False, False, None, None),
-                [("client_no_context_takeover", None)],
-                [("client_no_context_takeover", None)],  # doesn't matter
-                (True, False, 15, 15),
-            ),
-            (
-                (False, True, None, None),
-                [],
-                [("client_no_context_takeover", None)],
-                (True, False, 15, 15),
-            ),
-            (
-                (False, True, None, None),
-                [("client_no_context_takeover", None)],
-                [("client_no_context_takeover", None)],  # doesn't matter
-                (True, False, 15, 15),
-            ),
-            (
-                (False, True, None, None),
-                [("client_no_context_takeover", None)] * 2,
-                None,
-                DuplicateParameter,
-            ),
-            (
-                (False, True, None, None),
-                [("client_no_context_takeover", "42")],
-                None,
-                InvalidParameterValue,
-            ),
-            # Test server_max_window_bits
-            (
-                (False, False, None, None),
-                [("server_max_window_bits", "7")],
-                None,
-                NegotiationError,
-            ),
-            (
-                (False, False, None, None),
-                [("server_max_window_bits", "10")],
-                [("server_max_window_bits", "10")],
-                (False, False, 15, 10),
-            ),
-            (
-                (False, False, None, None),
-                [("server_max_window_bits", "16")],
-                None,
-                NegotiationError,
-            ),
-            (
-                (False, False, 12, None),
-                [],
-                [("server_max_window_bits", "12")],
-                (False, False, 15, 12),
-            ),
-            (
-                (False, False, 12, None),
-                [("server_max_window_bits", "10")],
-                [("server_max_window_bits", "10")],
-                (False, False, 15, 10),
-            ),
-            (
-                (False, False, 12, None),
-                [("server_max_window_bits", "12")],
-                [("server_max_window_bits", "12")],
-                (False, False, 15, 12),
-            ),
-            (
-                (False, False, 12, None),
-                [("server_max_window_bits", "13")],
-                [("server_max_window_bits", "12")],
-                (False, False, 15, 12),
-            ),
-            (
-                (False, False, 12, None),
-                [("server_max_window_bits", "12")] * 2,
-                None,
-                DuplicateParameter,
-            ),
-            (
-                (False, False, 12, None),
-                [("server_max_window_bits", "42")],
-                None,
-                InvalidParameterValue,
-            ),
-            # Test client_max_window_bits
-            (
-                (False, False, None, None),
-                [("client_max_window_bits", None)],
-                [],
-                (False, False, 15, 15),
-            ),
-            (
-                (False, False, None, None),
-                [("client_max_window_bits", "7")],
-                None,
-                InvalidParameterValue,
-            ),
-            (
-                (False, False, None, None),
-                [("client_max_window_bits", "10")],
-                [("client_max_window_bits", "10")],  # doesn't matter
-                (False, False, 10, 15),
-            ),
-            (
-                (False, False, None, None),
-                [("client_max_window_bits", "16")],
-                None,
-                InvalidParameterValue,
-            ),
-            ((False, False, None, 12), [], None, NegotiationError),
-            (
-                (False, False, None, 12),
-                [("client_max_window_bits", None)],
-                [("client_max_window_bits", "12")],
-                (False, False, 12, 15),
-            ),
-            (
-                (False, False, None, 12),
-                [("client_max_window_bits", "10")],
-                [("client_max_window_bits", "10")],
-                (False, False, 10, 15),
-            ),
-            (
-                (False, False, None, 12),
-                [("client_max_window_bits", "12")],
-                [("client_max_window_bits", "12")],  # doesn't matter
-                (False, False, 12, 15),
-            ),
-            (
-                (False, False, None, 12),
-                [("client_max_window_bits", "13")],
-                [("client_max_window_bits", "12")],  # doesn't matter
-                (False, False, 12, 15),
-            ),
-            (
-                (False, False, None, 12),
-                [("client_max_window_bits", "12")] * 2,
-                None,
-                DuplicateParameter,
-            ),
-            (
-                (False, False, None, 12),
-                [("client_max_window_bits", "42")],
-                None,
-                InvalidParameterValue,
-            ),
-            # # Test all parameters together
-            (
-                (True, True, 12, 12),
-                [
-                    ("server_no_context_takeover", None),
-                    ("client_no_context_takeover", None),
-                    ("server_max_window_bits", "10"),
-                    ("client_max_window_bits", "10"),
-                ],
-                [
-                    ("server_no_context_takeover", None),
-                    ("client_no_context_takeover", None),
-                    ("server_max_window_bits", "10"),
-                    ("client_max_window_bits", "10"),
-                ],
-                (True, True, 10, 10),
-            ),
-            (
-                (False, False, None, None),
-                [
-                    ("server_no_context_takeover", None),
-                    ("client_no_context_takeover", None),
-                    ("server_max_window_bits", "10"),
-                    ("client_max_window_bits", "10"),
-                ],
-                [
-                    ("server_no_context_takeover", None),
-                    ("client_no_context_takeover", None),
-                    ("server_max_window_bits", "10"),
-                    ("client_max_window_bits", "10"),
-                ],
-                (True, True, 10, 10),
-            ),
-            (
-                (True, True, 12, 12),
-                [("client_max_window_bits", None)],
-                [
-                    ("server_no_context_takeover", None),
-                    ("client_no_context_takeover", None),
-                    ("server_max_window_bits", "12"),
-                    ("client_max_window_bits", "12"),
-                ],
-                (True, True, 12, 12),
-            ),
-        ]:
-            with self.subTest(
-                config=config,
-                request_params=request_params,
-                response_params=response_params,
-            ):
-                factory = ServerPerMessageDeflateFactory(*config)
-                if isinstance(result, type) and issubclass(result, Exception):
-                    with self.assertRaises(result):
-                        factory.process_request_params(request_params, [])
-                else:
-                    params, extension = factory.process_request_params(
-                        request_params, []
-                    )
-                    self.assertEqual(params, response_params)
-                    expected = PerMessageDeflate(*result)
-                    self.assertExtensionEqual(extension, expected)
-
-    def test_process_response_params_deduplication(self):
-        factory = ServerPerMessageDeflateFactory(False, False, None, None)
-        with self.assertRaises(NegotiationError):
-            factory.process_request_params(
-                [], [PerMessageDeflate(False, False, 15, 15)]
-            )
diff --git a/tests/wpt/tests/tools/third_party/websockets/tests/test_auth.py b/tests/wpt/tests/tools/third_party/websockets/tests/test_auth.py
deleted file mode 100644
index 97a4485a0ff..00000000000
--- a/tests/wpt/tests/tools/third_party/websockets/tests/test_auth.py
+++ /dev/null
@@ -1,139 +0,0 @@
-import unittest
-import urllib.error
-
-from websockets.auth import *
-from websockets.auth import is_credentials
-from websockets.exceptions import InvalidStatusCode
-from websockets.headers import build_authorization_basic
-
-from .test_client_server import ClientServerTestsMixin, with_client, with_server
-from .utils import AsyncioTestCase
-
-
-class AuthTests(unittest.TestCase):
-    def test_is_credentials(self):
-        self.assertTrue(is_credentials(("username", "password")))
-
-    def test_is_not_credentials(self):
-        self.assertFalse(is_credentials(None))
-        self.assertFalse(is_credentials("username"))
-
-
-class AuthClientServerTests(ClientServerTestsMixin, AsyncioTestCase):
-
-    create_protocol = basic_auth_protocol_factory(
-        realm="auth-tests", credentials=("hello", "iloveyou")
-    )
-
-    @with_server(create_protocol=create_protocol)
-    @with_client(user_info=("hello", "iloveyou"))
-    def test_basic_auth(self):
-        req_headers = self.client.request_headers
-        resp_headers = self.client.response_headers
-        self.assertEqual(req_headers["Authorization"], "Basic aGVsbG86aWxvdmV5b3U=")
-        self.assertNotIn("WWW-Authenticate", resp_headers)
-
-        self.loop.run_until_complete(self.client.send("Hello!"))
-        self.loop.run_until_complete(self.client.recv())
-
-    def test_basic_auth_server_no_credentials(self):
-        with self.assertRaises(TypeError) as raised:
-            basic_auth_protocol_factory(realm="auth-tests", credentials=None)
-        self.assertEqual(
-            str(raised.exception), "provide either credentials or check_credentials"
-        )
-
-    def test_basic_auth_server_bad_credentials(self):
-        with self.assertRaises(TypeError) as raised:
-            basic_auth_protocol_factory(realm="auth-tests", credentials=42)
-        self.assertEqual(str(raised.exception), "invalid credentials argument: 42")
-
-    create_protocol_multiple_credentials = basic_auth_protocol_factory(
-        realm="auth-tests",
-        credentials=[("hello", "iloveyou"), ("goodbye", "stillloveu")],
-    )
-
-    @with_server(create_protocol=create_protocol_multiple_credentials)
-    @with_client(user_info=("hello", "iloveyou"))
-    def test_basic_auth_server_multiple_credentials(self):
-        self.loop.run_until_complete(self.client.send("Hello!"))
-        self.loop.run_until_complete(self.client.recv())
-
-    def test_basic_auth_bad_multiple_credentials(self):
-        with self.assertRaises(TypeError) as raised:
-            basic_auth_protocol_factory(
-                realm="auth-tests", credentials=[("hello", "iloveyou"), 42]
-            )
-        self.assertEqual(
-            str(raised.exception),
-            "invalid credentials argument: [('hello', 'iloveyou'), 42]",
-        )
-
-    async def check_credentials(username, password):
-        return password == "iloveyou"
-
-    create_protocol_check_credentials = basic_auth_protocol_factory(
-        realm="auth-tests", check_credentials=check_credentials
-    )
-
-    @with_server(create_protocol=create_protocol_check_credentials)
-    @with_client(user_info=("hello", "iloveyou"))
-    def test_basic_auth_check_credentials(self):
-        self.loop.run_until_complete(self.client.send("Hello!"))
-        self.loop.run_until_complete(self.client.recv())
-
-    @with_server(create_protocol=create_protocol)
-    def test_basic_auth_missing_credentials(self):
-        with self.assertRaises(InvalidStatusCode) as raised:
-            self.start_client()
-        self.assertEqual(raised.exception.status_code, 401)
-
-    @with_server(create_protocol=create_protocol)
-    def test_basic_auth_missing_credentials_details(self):
-        with self.assertRaises(urllib.error.HTTPError) as raised:
-            self.loop.run_until_complete(self.make_http_request())
-        self.assertEqual(raised.exception.code, 401)
-        self.assertEqual(
-            raised.exception.headers["WWW-Authenticate"],
-            'Basic realm="auth-tests", charset="UTF-8"',
-        )
-        self.assertEqual(raised.exception.read().decode(), "Missing credentials\n")
-
-    @with_server(create_protocol=create_protocol)
-    def test_basic_auth_unsupported_credentials(self):
-        with self.assertRaises(InvalidStatusCode) as raised:
-            self.start_client(extra_headers={"Authorization": "Digest ..."})
-        self.assertEqual(raised.exception.status_code, 401)
-
-    @with_server(create_protocol=create_protocol)
-    def test_basic_auth_unsupported_credentials_details(self):
-        with self.assertRaises(urllib.error.HTTPError) as raised:
-            self.loop.run_until_complete(
-                self.make_http_request(headers={"Authorization": "Digest ..."})
-            )
-        self.assertEqual(raised.exception.code, 401)
-        self.assertEqual(
-            raised.exception.headers["WWW-Authenticate"],
-            'Basic realm="auth-tests", charset="UTF-8"',
-        )
-        self.assertEqual(raised.exception.read().decode(), "Unsupported credentials\n")
-
-    @with_server(create_protocol=create_protocol)
-    def test_basic_auth_invalid_credentials(self):
-        with self.assertRaises(InvalidStatusCode) as raised:
-            self.start_client(user_info=("hello", "ihateyou"))
-        self.assertEqual(raised.exception.status_code, 401)
-
-    @with_server(create_protocol=create_protocol)
-    def test_basic_auth_invalid_credentials_details(self):
-        with self.assertRaises(urllib.error.HTTPError) as raised:
-            authorization = build_authorization_basic("hello", "ihateyou")
-            self.loop.run_until_complete(
-                self.make_http_request(headers={"Authorization": authorization})
-            )
-        self.assertEqual(raised.exception.code, 401)
-        self.assertEqual(
-            raised.exception.headers["WWW-Authenticate"],
-            'Basic realm="auth-tests", charset="UTF-8"',
-        )
-        self.assertEqual(raised.exception.read().decode(), "Invalid credentials\n")
diff --git a/tests/wpt/tests/tools/third_party/websockets/tests/test_client_server.py b/tests/wpt/tests/tools/third_party/websockets/tests/test_client_server.py
deleted file mode 100644
index 35913666c57..00000000000
--- a/tests/wpt/tests/tools/third_party/websockets/tests/test_client_server.py
+++ /dev/null
@@ -1,1546 +0,0 @@
-import asyncio
-import contextlib
-import functools
-import http
-import pathlib
-import random
-import socket
-import ssl
-import tempfile
-import unittest
-import unittest.mock
-import urllib.error
-import urllib.request
-import warnings
-
-from websockets.client import *
-from websockets.exceptions import (
-    ConnectionClosed,
-    InvalidHandshake,
-    InvalidHeader,
-    InvalidStatusCode,
-    NegotiationError,
-)
-from websockets.extensions.permessage_deflate import (
-    ClientPerMessageDeflateFactory,
-    PerMessageDeflate,
-    ServerPerMessageDeflateFactory,
-)
-from websockets.handshake import build_response
-from websockets.http import USER_AGENT, Headers, read_response
-from websockets.protocol import State
-from websockets.server import *
-from websockets.uri import parse_uri
-
-from .test_protocol import MS
-from .utils import AsyncioTestCase
-
-
-# Generate TLS certificate with:
-# $ openssl req -x509 -config test_localhost.cnf -days 15340 -newkey rsa:2048 \
-#       -out test_localhost.crt -keyout test_localhost.key
-# $ cat test_localhost.key test_localhost.crt > test_localhost.pem
-# $ rm test_localhost.key test_localhost.crt
-
-testcert = bytes(pathlib.Path(__file__).with_name("test_localhost.pem"))
-
-
-async def handler(ws, path):
-    if path == "/deprecated_attributes":
-        await ws.recv()  # delay that allows catching warnings
-        await ws.send(repr((ws.host, ws.port, ws.secure)))
-    elif path == "/close_timeout":
-        await ws.send(repr(ws.close_timeout))
-    elif path == "/path":
-        await ws.send(str(ws.path))
-    elif path == "/headers":
-        await ws.send(repr(ws.request_headers))
-        await ws.send(repr(ws.response_headers))
-    elif path == "/extensions":
-        await ws.send(repr(ws.extensions))
-    elif path == "/subprotocol":
-        await ws.send(repr(ws.subprotocol))
-    elif path == "/slow_stop":
-        await ws.wait_closed()
-        await asyncio.sleep(2 * MS)
-    else:
-        await ws.send((await ws.recv()))
-
-
-@contextlib.contextmanager
-def temp_test_server(test, **kwargs):
-    test.start_server(**kwargs)
-    try:
-        yield
-    finally:
-        test.stop_server()
-
-
-@contextlib.contextmanager
-def temp_test_redirecting_server(
-    test, status, include_location=True, force_insecure=False
-):
-    test.start_redirecting_server(status, include_location, force_insecure)
-    try:
-        yield
-    finally:
-        test.stop_redirecting_server()
-
-
-@contextlib.contextmanager
-def temp_test_client(test, *args, **kwargs):
-    test.start_client(*args, **kwargs)
-    try:
-        yield
-    finally:
-        test.stop_client()
-
-
-def with_manager(manager, *args, **kwargs):
-    """
-    Return a decorator that wraps a function with a context manager.
-
-    """
-
-    def decorate(func):
-        @functools.wraps(func)
-        def _decorate(self, *_args, **_kwargs):
-            with manager(self, *args, **kwargs):
-                return func(self, *_args, **_kwargs)
-
-        return _decorate
-
-    return decorate
-
-
-def with_server(**kwargs):
-    """
-    Return a decorator for TestCase methods that starts and stops a server.
-
-    """
-    return with_manager(temp_test_server, **kwargs)
-
-
-def with_client(*args, **kwargs):
-    """
-    Return a decorator for TestCase methods that starts and stops a client.
-
-    """
-    return with_manager(temp_test_client, *args, **kwargs)
-
-
-def get_server_uri(server, secure=False, resource_name="/", user_info=None):
-    """
-    Return a WebSocket URI for connecting to the given server.
-
-    """
-    proto = "wss" if secure else "ws"
-
-    user_info = ":".join(user_info) + "@" if user_info else ""
-
-    # Pick a random socket in order to test both IPv4 and IPv6 on systems
-    # where both are available. Randomizing tests is usually a bad idea. If
-    # needed, either use the first socket, or test separately IPv4 and IPv6.
-    server_socket = random.choice(server.sockets)
-
-    if server_socket.family == socket.AF_INET6:  # pragma: no cover
-        host, port = server_socket.getsockname()[:2]  # (no IPv6 on CI)
-        host = f"[{host}]"
-    elif server_socket.family == socket.AF_INET:
-        host, port = server_socket.getsockname()
-    else:  # pragma: no cover
-        raise ValueError("expected an IPv6, IPv4, or Unix socket")
-
-    return f"{proto}://{user_info}{host}:{port}{resource_name}"
-
-
-class UnauthorizedServerProtocol(WebSocketServerProtocol):
-    async def process_request(self, path, request_headers):
-        # Test returning headers as a Headers instance (1/3)
-        return http.HTTPStatus.UNAUTHORIZED, Headers([("X-Access", "denied")]), b""
-
-
-class ForbiddenServerProtocol(WebSocketServerProtocol):
-    async def process_request(self, path, request_headers):
-        # Test returning headers as a dict (2/3)
-        return http.HTTPStatus.FORBIDDEN, {"X-Access": "denied"}, b""
-
-
-class HealthCheckServerProtocol(WebSocketServerProtocol):
-    async def process_request(self, path, request_headers):
-        # Test returning headers as a list of pairs (3/3)
-        if path == "/__health__/":
-            return http.HTTPStatus.OK, [("X-Access", "OK")], b"status = green\n"
-
-
-class SlowOpeningHandshakeProtocol(WebSocketServerProtocol):
-    async def process_request(self, path, request_headers):
-        await asyncio.sleep(10 * MS)
-
-
-class FooClientProtocol(WebSocketClientProtocol):
-    pass
-
-
-class BarClientProtocol(WebSocketClientProtocol):
-    pass
-
-
-class ClientNoOpExtensionFactory:
-    name = "x-no-op"
-
-    def get_request_params(self):
-        return []
-
-    def process_response_params(self, params, accepted_extensions):
-        if params:
-            raise NegotiationError()
-        return NoOpExtension()
-
-
-class ServerNoOpExtensionFactory:
-    name = "x-no-op"
-
-    def __init__(self, params=None):
-        self.params = params or []
-
-    def process_request_params(self, params, accepted_extensions):
-        return self.params, NoOpExtension()
-
-
-class NoOpExtension:
-    name = "x-no-op"
-
-    def __repr__(self):
-        return "NoOpExtension()"
-
-    def decode(self, frame, *, max_size=None):
-        return frame
-
-    def encode(self, frame):
-        return frame
-
-
-class ClientServerTestsMixin:
-
-    secure = False
-
-    def setUp(self):
-        super().setUp()
-        self.server = None
-        self.redirecting_server = None
-
-    @property
-    def server_context(self):
-        return None
-
-    def start_server(self, deprecation_warnings=None, **kwargs):
-        # Disable compression by default in tests.
-        kwargs.setdefault("compression", None)
-        # Disable pings by default in tests.
-        kwargs.setdefault("ping_interval", None)
-
-        with warnings.catch_warnings(record=True) as recorded_warnings:
-            start_server = serve(handler, "localhost", 0, **kwargs)
-            self.server = self.loop.run_until_complete(start_server)
-
-        expected_warnings = [] if deprecation_warnings is None else deprecation_warnings
-        self.assertDeprecationWarnings(recorded_warnings, expected_warnings)
-
-    def start_redirecting_server(
-        self, status, include_location=True, force_insecure=False
-    ):
-        async def process_request(path, headers):
-            server_uri = get_server_uri(self.server, self.secure, path)
-            if force_insecure:
-                server_uri = server_uri.replace("wss:", "ws:")
-            headers = {"Location": server_uri} if include_location else []
-            return status, headers, b""
-
-        start_server = serve(
-            handler,
-            "localhost",
-            0,
-            compression=None,
-            ping_interval=None,
-            process_request=process_request,
-            ssl=self.server_context,
-        )
-        self.redirecting_server = self.loop.run_until_complete(start_server)
-
-    def start_client(
-        self, resource_name="/", user_info=None, deprecation_warnings=None, **kwargs
-    ):
-        # Disable compression by default in tests.
-        kwargs.setdefault("compression", None)
-        # Disable pings by default in tests.
-        kwargs.setdefault("ping_interval", None)
-        secure = kwargs.get("ssl") is not None
-        try:
-            server_uri = kwargs.pop("uri")
-        except KeyError:
-            server = self.redirecting_server if self.redirecting_server else self.server
-            server_uri = get_server_uri(server, secure, resource_name, user_info)
-
-        with warnings.catch_warnings(record=True) as recorded_warnings:
-            start_client = connect(server_uri, **kwargs)
-            self.client = self.loop.run_until_complete(start_client)
-
-        expected_warnings = [] if deprecation_warnings is None else deprecation_warnings
-        self.assertDeprecationWarnings(recorded_warnings, expected_warnings)
-
-    def stop_client(self):
-        try:
-            self.loop.run_until_complete(
-                asyncio.wait_for(self.client.close_connection_task, timeout=1)
-            )
-        except asyncio.TimeoutError:  # pragma: no cover
-            self.fail("Client failed to stop")
-
-    def stop_server(self):
-        self.server.close()
-        try:
-            self.loop.run_until_complete(
-                asyncio.wait_for(self.server.wait_closed(), timeout=1)
-            )
-        except asyncio.TimeoutError:  # pragma: no cover
-            self.fail("Server failed to stop")
-
-    def stop_redirecting_server(self):
-        self.redirecting_server.close()
-        try:
-            self.loop.run_until_complete(
-                asyncio.wait_for(self.redirecting_server.wait_closed(), timeout=1)
-            )
-        except asyncio.TimeoutError:  # pragma: no cover
-            self.fail("Redirecting server failed to stop")
-        finally:
-            self.redirecting_server = None
-
-    @contextlib.contextmanager
-    def temp_server(self, **kwargs):
-        with temp_test_server(self, **kwargs):
-            yield
-
-    @contextlib.contextmanager
-    def temp_client(self, *args, **kwargs):
-        with temp_test_client(self, *args, **kwargs):
-            yield
-
-    def make_http_request(self, path="/", headers=None):
-        if headers is None:
-            headers = {}
-
-        # Set url to 'https?://<host>:<port><path>'.
-        url = get_server_uri(
-            self.server, resource_name=path, secure=self.secure
-        ).replace("ws", "http")
-
-        request = urllib.request.Request(url=url, headers=headers)
-
-        if self.secure:
-            open_health_check = functools.partial(
-                urllib.request.urlopen, request, context=self.client_context
-            )
-        else:
-            open_health_check = functools.partial(urllib.request.urlopen, request)
-
-        return self.loop.run_in_executor(None, open_health_check)
-
-
-class SecureClientServerTestsMixin(ClientServerTestsMixin):
-
-    secure = True
-
-    @property
-    def server_context(self):
-        ssl_context = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER)
-        ssl_context.load_cert_chain(testcert)
-        return ssl_context
-
-    @property
-    def client_context(self):
-        ssl_context = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
-        ssl_context.load_verify_locations(testcert)
-        return ssl_context
-
-    def start_server(self, **kwargs):
-        kwargs.setdefault("ssl", self.server_context)
-        super().start_server(**kwargs)
-
-    def start_client(self, path="/", **kwargs):
-        kwargs.setdefault("ssl", self.client_context)
-        super().start_client(path, **kwargs)
-
-
-class CommonClientServerTests:
-    """
-    Mixin that defines most tests but doesn't inherit unittest.TestCase.
-
-    Tests are run by the ClientServerTests and SecureClientServerTests subclasses.
-
-    """
-
-    @with_server()
-    @with_client()
-    def test_basic(self):
-        self.loop.run_until_complete(self.client.send("Hello!"))
-        reply = self.loop.run_until_complete(self.client.recv())
-        self.assertEqual(reply, "Hello!")
-
-    @with_server()
-    def test_redirect(self):
-        redirect_statuses = [
-            http.HTTPStatus.MOVED_PERMANENTLY,
-            http.HTTPStatus.FOUND,
-            http.HTTPStatus.SEE_OTHER,
-            http.HTTPStatus.TEMPORARY_REDIRECT,
-            http.HTTPStatus.PERMANENT_REDIRECT,
-        ]
-        for status in redirect_statuses:
-            with temp_test_redirecting_server(self, status):
-                with temp_test_client(self):
-                    self.loop.run_until_complete(self.client.send("Hello!"))
-                    reply = self.loop.run_until_complete(self.client.recv())
-                    self.assertEqual(reply, "Hello!")
-
-    def test_infinite_redirect(self):
-        with temp_test_redirecting_server(self, http.HTTPStatus.FOUND):
-            self.server = self.redirecting_server
-            with self.assertRaises(InvalidHandshake):
-                with temp_test_client(self):
-                    self.fail("Did not raise")  # pragma: no cover
-
-    @with_server()
-    def test_redirect_missing_location(self):
-        with temp_test_redirecting_server(
-            self, http.HTTPStatus.FOUND, include_location=False
-        ):
-            with self.assertRaises(InvalidHeader):
-                with temp_test_client(self):
-                    self.fail("Did not raise")  # pragma: no cover
-
-    def test_explicit_event_loop(self):
-        with self.temp_server(loop=self.loop):
-            with self.temp_client(loop=self.loop):
-                self.loop.run_until_complete(self.client.send("Hello!"))
-                reply = self.loop.run_until_complete(self.client.recv())
-                self.assertEqual(reply, "Hello!")
-
-    @with_server()
-    def test_explicit_host_port(self):
-        uri = get_server_uri(self.server, self.secure)
-        wsuri = parse_uri(uri)
-
-        # Change host and port to invalid values.
-        changed_uri = uri.replace(wsuri.host, "example.com").replace(
-            str(wsuri.port), str(65535 - wsuri.port)
-        )
-
-        with self.temp_client(uri=changed_uri, host=wsuri.host, port=wsuri.port):
-            self.loop.run_until_complete(self.client.send("Hello!"))
-            reply = self.loop.run_until_complete(self.client.recv())
-            self.assertEqual(reply, "Hello!")
-
-    @with_server()
-    def test_explicit_socket(self):
-        class TrackedSocket(socket.socket):
-            def __init__(self, *args, **kwargs):
-                self.used_for_read = False
-                self.used_for_write = False
-                super().__init__(*args, **kwargs)
-
-            def recv(self, *args, **kwargs):
-                self.used_for_read = True
-                return super().recv(*args, **kwargs)
-
-            def send(self, *args, **kwargs):
-                self.used_for_write = True
-                return super().send(*args, **kwargs)
-
-        server_socket = [
-            sock for sock in self.server.sockets if sock.family == socket.AF_INET
-        ][0]
-        client_socket = TrackedSocket(socket.AF_INET, socket.SOCK_STREAM)
-        client_socket.connect(server_socket.getsockname())
-
-        try:
-            self.assertFalse(client_socket.used_for_read)
-            self.assertFalse(client_socket.used_for_write)
-
-            with self.temp_client(
-                sock=client_socket,
-                # "You must set server_hostname when using ssl without a host"
-                server_hostname="localhost" if self.secure else None,
-            ):
-                self.loop.run_until_complete(self.client.send("Hello!"))
-                reply = self.loop.run_until_complete(self.client.recv())
-                self.assertEqual(reply, "Hello!")
-
-            self.assertTrue(client_socket.used_for_read)
-            self.assertTrue(client_socket.used_for_write)
-
-        finally:
-            client_socket.close()
-
-    @unittest.skipUnless(hasattr(socket, "AF_UNIX"), "this test requires Unix sockets")
-    def test_unix_socket(self):
-        with tempfile.TemporaryDirectory() as temp_dir:
-            path = bytes(pathlib.Path(temp_dir) / "websockets")
-
-            # Like self.start_server() but with unix_serve().
-            unix_server = unix_serve(handler, path)
-            self.server = self.loop.run_until_complete(unix_server)
-            try:
-                # Like self.start_client() but with unix_connect()
-                unix_client = unix_connect(path)
-                self.client = self.loop.run_until_complete(unix_client)
-                try:
-                    self.loop.run_until_complete(self.client.send("Hello!"))
-                    reply = self.loop.run_until_complete(self.client.recv())
-                    self.assertEqual(reply, "Hello!")
-                finally:
-                    self.stop_client()
-            finally:
-                self.stop_server()
-
-    async def process_request_OK(path, request_headers):
-        return http.HTTPStatus.OK, [], b"OK\n"
-
-    @with_server(process_request=process_request_OK)
-    def test_process_request_argument(self):
-        response = self.loop.run_until_complete(self.make_http_request("/"))
-
-        with contextlib.closing(response):
-            self.assertEqual(response.code, 200)
-
-    def legacy_process_request_OK(path, request_headers):
-        return http.HTTPStatus.OK, [], b"OK\n"
-
-    @with_server(process_request=legacy_process_request_OK)
-    def test_process_request_argument_backwards_compatibility(self):
-        with warnings.catch_warnings(record=True) as recorded_warnings:
-            response = self.loop.run_until_complete(self.make_http_request("/"))
-
-        with contextlib.closing(response):
-            self.assertEqual(response.code, 200)
-
-        self.assertDeprecationWarnings(
-            recorded_warnings, ["declare process_request as a coroutine"]
-        )
-
-    class ProcessRequestOKServerProtocol(WebSocketServerProtocol):
-        async def process_request(self, path, request_headers):
-            return http.HTTPStatus.OK, [], b"OK\n"
-
-    @with_server(create_protocol=ProcessRequestOKServerProtocol)
-    def test_process_request_override(self):
-        response = self.loop.run_until_complete(self.make_http_request("/"))
-
-        with contextlib.closing(response):
-            self.assertEqual(response.code, 200)
-
-    class LegacyProcessRequestOKServerProtocol(WebSocketServerProtocol):
-        def process_request(self, path, request_headers):
-            return http.HTTPStatus.OK, [], b"OK\n"
-
-    @with_server(create_protocol=LegacyProcessRequestOKServerProtocol)
-    def test_process_request_override_backwards_compatibility(self):
-        with warnings.catch_warnings(record=True) as recorded_warnings:
-            response = self.loop.run_until_complete(self.make_http_request("/"))
-
-        with contextlib.closing(response):
-            self.assertEqual(response.code, 200)
-
-        self.assertDeprecationWarnings(
-            recorded_warnings, ["declare process_request as a coroutine"]
-        )
-
-    def select_subprotocol_chat(client_subprotocols, server_subprotocols):
-        return "chat"
-
-    @with_server(
-        subprotocols=["superchat", "chat"], select_subprotocol=select_subprotocol_chat
-    )
-    @with_client("/subprotocol", subprotocols=["superchat", "chat"])
-    def test_select_subprotocol_argument(self):
-        server_subprotocol = self.loop.run_until_complete(self.client.recv())
-        self.assertEqual(server_subprotocol, repr("chat"))
-        self.assertEqual(self.client.subprotocol, "chat")
-
-    class SelectSubprotocolChatServerProtocol(WebSocketServerProtocol):
-        def select_subprotocol(self, client_subprotocols, server_subprotocols):
-            return "chat"
-
-    @with_server(
-        subprotocols=["superchat", "chat"],
-        create_protocol=SelectSubprotocolChatServerProtocol,
-    )
-    @with_client("/subprotocol", subprotocols=["superchat", "chat"])
-    def test_select_subprotocol_override(self):
-        server_subprotocol = self.loop.run_until_complete(self.client.recv())
-        self.assertEqual(server_subprotocol, repr("chat"))
-        self.assertEqual(self.client.subprotocol, "chat")
-
-    @with_server()
-    @with_client("/deprecated_attributes")
-    def test_protocol_deprecated_attributes(self):
-        # The test could be connecting with IPv6 or IPv4.
-        expected_client_attrs = [
-            server_socket.getsockname()[:2] + (self.secure,)
-            for server_socket in self.server.sockets
-        ]
-        with warnings.catch_warnings(record=True) as recorded_warnings:
-            client_attrs = (self.client.host, self.client.port, self.client.secure)
-        self.assertDeprecationWarnings(
-            recorded_warnings,
-            [
-                "use remote_address[0] instead of host",
-                "use remote_address[1] instead of port",
-                "don't use secure",
-            ],
-        )
-        self.assertIn(client_attrs, expected_client_attrs)
-
-        expected_server_attrs = ("localhost", 0, self.secure)
-        with warnings.catch_warnings(record=True) as recorded_warnings:
-            self.loop.run_until_complete(self.client.send(""))
-            server_attrs = self.loop.run_until_complete(self.client.recv())
-        self.assertDeprecationWarnings(
-            recorded_warnings,
-            [
-                "use local_address[0] instead of host",
-                "use local_address[1] instead of port",
-                "don't use secure",
-            ],
-        )
-        self.assertEqual(server_attrs, repr(expected_server_attrs))
-
-    @with_server()
-    @with_client("/path")
-    def test_protocol_path(self):
-        client_path = self.client.path
-        self.assertEqual(client_path, "/path")
-        server_path = self.loop.run_until_complete(self.client.recv())
-        self.assertEqual(server_path, "/path")
-
-    @with_server()
-    @with_client("/headers")
-    def test_protocol_headers(self):
-        client_req = self.client.request_headers
-        client_resp = self.client.response_headers
-        self.assertEqual(client_req["User-Agent"], USER_AGENT)
-        self.assertEqual(client_resp["Server"], USER_AGENT)
-        server_req = self.loop.run_until_complete(self.client.recv())
-        server_resp = self.loop.run_until_complete(self.client.recv())
-        self.assertEqual(server_req, repr(client_req))
-        self.assertEqual(server_resp, repr(client_resp))
-
-    @with_server()
-    @with_client("/headers", extra_headers=Headers({"X-Spam": "Eggs"}))
-    def test_protocol_custom_request_headers(self):
-        req_headers = self.loop.run_until_complete(self.client.recv())
-        self.loop.run_until_complete(self.client.recv())
-        self.assertIn("('X-Spam', 'Eggs')", req_headers)
-
-    @with_server()
-    @with_client("/headers", extra_headers={"X-Spam": "Eggs"})
-    def test_protocol_custom_request_headers_dict(self):
-        req_headers = self.loop.run_until_complete(self.client.recv())
-        self.loop.run_until_complete(self.client.recv())
-        self.assertIn("('X-Spam', 'Eggs')", req_headers)
-
-    @with_server()
-    @with_client("/headers", extra_headers=[("X-Spam", "Eggs")])
-    def test_protocol_custom_request_headers_list(self):
-        req_headers = self.loop.run_until_complete(self.client.recv())
-        self.loop.run_until_complete(self.client.recv())
-        self.assertIn("('X-Spam', 'Eggs')", req_headers)
-
-    @with_server()
-    @with_client("/headers", extra_headers=[("User-Agent", "Eggs")])
-    def test_protocol_custom_request_user_agent(self):
-        req_headers = self.loop.run_until_complete(self.client.recv())
-        self.loop.run_until_complete(self.client.recv())
-        self.assertEqual(req_headers.count("User-Agent"), 1)
-        self.assertIn("('User-Agent', 'Eggs')", req_headers)
-
-    @with_server(extra_headers=lambda p, r: Headers({"X-Spam": "Eggs"}))
-    @with_client("/headers")
-    def test_protocol_custom_response_headers_callable(self):
-        self.loop.run_until_complete(self.client.recv())
-        resp_headers = self.loop.run_until_complete(self.client.recv())
-        self.assertIn("('X-Spam', 'Eggs')", resp_headers)
-
-    @with_server(extra_headers=lambda p, r: {"X-Spam": "Eggs"})
-    @with_client("/headers")
-    def test_protocol_custom_response_headers_callable_dict(self):
-        self.loop.run_until_complete(self.client.recv())
-        resp_headers = self.loop.run_until_complete(self.client.recv())
-        self.assertIn("('X-Spam', 'Eggs')", resp_headers)
-
-    @with_server(extra_headers=lambda p, r: [("X-Spam", "Eggs")])
-    @with_client("/headers")
-    def test_protocol_custom_response_headers_callable_list(self):
-        self.loop.run_until_complete(self.client.recv())
-        resp_headers = self.loop.run_until_complete(self.client.recv())
-        self.assertIn("('X-Spam', 'Eggs')", resp_headers)
-
-    @with_server(extra_headers=lambda p, r: None)
-    @with_client("/headers")
-    def test_protocol_custom_response_headers_callable_none(self):
-        self.loop.run_until_complete(self.client.recv())  # doesn't crash
-        self.loop.run_until_complete(self.client.recv())  # nothing to check
-
-    @with_server(extra_headers=Headers({"X-Spam": "Eggs"}))
-    @with_client("/headers")
-    def test_protocol_custom_response_headers(self):
-        self.loop.run_until_complete(self.client.recv())
-        resp_headers = self.loop.run_until_complete(self.client.recv())
-        self.assertIn("('X-Spam', 'Eggs')", resp_headers)
-
-    @with_server(extra_headers={"X-Spam": "Eggs"})
-    @with_client("/headers")
-    def test_protocol_custom_response_headers_dict(self):
-        self.loop.run_until_complete(self.client.recv())
-        resp_headers = self.loop.run_until_complete(self.client.recv())
-        self.assertIn("('X-Spam', 'Eggs')", resp_headers)
-
-    @with_server(extra_headers=[("X-Spam", "Eggs")])
-    @with_client("/headers")
-    def test_protocol_custom_response_headers_list(self):
-        self.loop.run_until_complete(self.client.recv())
-        resp_headers = self.loop.run_until_complete(self.client.recv())
-        self.assertIn("('X-Spam', 'Eggs')", resp_headers)
-
-    @with_server(extra_headers=[("Server", "Eggs")])
-    @with_client("/headers")
-    def test_protocol_custom_response_user_agent(self):
-        self.loop.run_until_complete(self.client.recv())
-        resp_headers = self.loop.run_until_complete(self.client.recv())
-        self.assertEqual(resp_headers.count("Server"), 1)
-        self.assertIn("('Server', 'Eggs')", resp_headers)
-
-    @with_server(create_protocol=HealthCheckServerProtocol)
-    def test_http_request_http_endpoint(self):
-        # Making a HTTP request to a HTTP endpoint succeeds.
-        response = self.loop.run_until_complete(self.make_http_request("/__health__/"))
-
-        with contextlib.closing(response):
-            self.assertEqual(response.code, 200)
-            self.assertEqual(response.read(), b"status = green\n")
-
-    @with_server(create_protocol=HealthCheckServerProtocol)
-    def test_http_request_ws_endpoint(self):
-        # Making a HTTP request to a WS endpoint fails.
-        with self.assertRaises(urllib.error.HTTPError) as raised:
-            self.loop.run_until_complete(self.make_http_request())
-
-        self.assertEqual(raised.exception.code, 426)
-        self.assertEqual(raised.exception.headers["Upgrade"], "websocket")
-
-    @with_server(create_protocol=HealthCheckServerProtocol)
-    def test_ws_connection_http_endpoint(self):
-        # Making a WS connection to a HTTP endpoint fails.
-        with self.assertRaises(InvalidStatusCode) as raised:
-            self.start_client("/__health__/")
-
-        self.assertEqual(raised.exception.status_code, 200)
-
-    @with_server(create_protocol=HealthCheckServerProtocol)
-    def test_ws_connection_ws_endpoint(self):
-        # Making a WS connection to a WS endpoint succeeds.
-        self.start_client()
-        self.loop.run_until_complete(self.client.send("Hello!"))
-        self.loop.run_until_complete(self.client.recv())
-        self.stop_client()
-
-    def assert_client_raises_code(self, status_code):
-        with self.assertRaises(InvalidStatusCode) as raised:
-            self.start_client()
-        self.assertEqual(raised.exception.status_code, status_code)
-
-    @with_server(create_protocol=UnauthorizedServerProtocol)
-    def test_server_create_protocol(self):
-        self.assert_client_raises_code(401)
-
-    def create_unauthorized_server_protocol(*args, **kwargs):
-        return UnauthorizedServerProtocol(*args, **kwargs)
-
-    @with_server(create_protocol=create_unauthorized_server_protocol)
-    def test_server_create_protocol_function(self):
-        self.assert_client_raises_code(401)
-
-    @with_server(
-        klass=UnauthorizedServerProtocol,
-        deprecation_warnings=["rename klass to create_protocol"],
-    )
-    def test_server_klass_backwards_compatibility(self):
-        self.assert_client_raises_code(401)
-
-    @with_server(
-        create_protocol=ForbiddenServerProtocol,
-        klass=UnauthorizedServerProtocol,
-        deprecation_warnings=["rename klass to create_protocol"],
-    )
-    def test_server_create_protocol_over_klass(self):
-        self.assert_client_raises_code(403)
-
-    @with_server()
-    @with_client("/path", create_protocol=FooClientProtocol)
-    def test_client_create_protocol(self):
-        self.assertIsInstance(self.client, FooClientProtocol)
-
-    @with_server()
-    @with_client(
-        "/path",
-        create_protocol=(lambda *args, **kwargs: FooClientProtocol(*args, **kwargs)),
-    )
-    def test_client_create_protocol_function(self):
-        self.assertIsInstance(self.client, FooClientProtocol)
-
-    @with_server()
-    @with_client(
-        "/path",
-        klass=FooClientProtocol,
-        deprecation_warnings=["rename klass to create_protocol"],
-    )
-    def test_client_klass(self):
-        self.assertIsInstance(self.client, FooClientProtocol)
-
-    @with_server()
-    @with_client(
-        "/path",
-        create_protocol=BarClientProtocol,
-        klass=FooClientProtocol,
-        deprecation_warnings=["rename klass to create_protocol"],
-    )
-    def test_client_create_protocol_over_klass(self):
-        self.assertIsInstance(self.client, BarClientProtocol)
-
-    @with_server(close_timeout=7)
-    @with_client("/close_timeout")
-    def test_server_close_timeout(self):
-        close_timeout = self.loop.run_until_complete(self.client.recv())
-        self.assertEqual(eval(close_timeout), 7)
-
-    @with_server(timeout=6, deprecation_warnings=["rename timeout to close_timeout"])
-    @with_client("/close_timeout")
-    def test_server_timeout_backwards_compatibility(self):
-        close_timeout = self.loop.run_until_complete(self.client.recv())
-        self.assertEqual(eval(close_timeout), 6)
-
-    @with_server(
-        close_timeout=7,
-        timeout=6,
-        deprecation_warnings=["rename timeout to close_timeout"],
-    )
-    @with_client("/close_timeout")
-    def test_server_close_timeout_over_timeout(self):
-        close_timeout = self.loop.run_until_complete(self.client.recv())
-        self.assertEqual(eval(close_timeout), 7)
-
-    @with_server()
-    @with_client("/close_timeout", close_timeout=7)
-    def test_client_close_timeout(self):
-        self.assertEqual(self.client.close_timeout, 7)
-
-    @with_server()
-    @with_client(
-        "/close_timeout",
-        timeout=6,
-        deprecation_warnings=["rename timeout to close_timeout"],
-    )
-    def test_client_timeout_backwards_compatibility(self):
-        self.assertEqual(self.client.close_timeout, 6)
-
-    @with_server()
-    @with_client(
-        "/close_timeout",
-        close_timeout=7,
-        timeout=6,
-        deprecation_warnings=["rename timeout to close_timeout"],
-    )
-    def test_client_close_timeout_over_timeout(self):
-        self.assertEqual(self.client.close_timeout, 7)
-
-    @with_server()
-    @with_client("/extensions")
-    def test_no_extension(self):
-        server_extensions = self.loop.run_until_complete(self.client.recv())
-        self.assertEqual(server_extensions, repr([]))
-        self.assertEqual(repr(self.client.extensions), repr([]))
-
-    @with_server(extensions=[ServerNoOpExtensionFactory()])
-    @with_client("/extensions", extensions=[ClientNoOpExtensionFactory()])
-    def test_extension(self):
-        server_extensions = self.loop.run_until_complete(self.client.recv())
-        self.assertEqual(server_extensions, repr([NoOpExtension()]))
-        self.assertEqual(repr(self.client.extensions), repr([NoOpExtension()]))
-
-    @with_server()
-    @with_client("/extensions", extensions=[ClientNoOpExtensionFactory()])
-    def test_extension_not_accepted(self):
-        server_extensions = self.loop.run_until_complete(self.client.recv())
-        self.assertEqual(server_extensions, repr([]))
-        self.assertEqual(repr(self.client.extensions), repr([]))
-
-    @with_server(extensions=[ServerNoOpExtensionFactory()])
-    @with_client("/extensions")
-    def test_extension_not_requested(self):
-        server_extensions = self.loop.run_until_complete(self.client.recv())
-        self.assertEqual(server_extensions, repr([]))
-        self.assertEqual(repr(self.client.extensions), repr([]))
-
-    @with_server(extensions=[ServerNoOpExtensionFactory([("foo", None)])])
-    def test_extension_client_rejection(self):
-        with self.assertRaises(NegotiationError):
-            self.start_client("/extensions", extensions=[ClientNoOpExtensionFactory()])
-
-    @with_server(
-        extensions=[
-            # No match because the client doesn't send client_max_window_bits.
-            ServerPerMessageDeflateFactory(client_max_window_bits=10),
-            ServerPerMessageDeflateFactory(),
-        ]
-    )
-    @with_client("/extensions", extensions=[ClientPerMessageDeflateFactory()])
-    def test_extension_no_match_then_match(self):
-        # The order requested by the client has priority.
-        server_extensions = self.loop.run_until_complete(self.client.recv())
-        self.assertEqual(
-            server_extensions, repr([PerMessageDeflate(False, False, 15, 15)])
-        )
-        self.assertEqual(
-            repr(self.client.extensions),
-            repr([PerMessageDeflate(False, False, 15, 15)]),
-        )
-
-    @with_server(extensions=[ServerPerMessageDeflateFactory()])
-    @with_client("/extensions", extensions=[ClientNoOpExtensionFactory()])
-    def test_extension_mismatch(self):
-        server_extensions = self.loop.run_until_complete(self.client.recv())
-        self.assertEqual(server_extensions, repr([]))
-        self.assertEqual(repr(self.client.extensions), repr([]))
-
-    @with_server(
-        extensions=[ServerNoOpExtensionFactory(), ServerPerMessageDeflateFactory()]
-    )
-    @with_client(
-        "/extensions",
-        extensions=[ClientPerMessageDeflateFactory(), ClientNoOpExtensionFactory()],
-    )
-    def test_extension_order(self):
-        # The order requested by the client has priority.
-        server_extensions = self.loop.run_until_complete(self.client.recv())
-        self.assertEqual(
-            server_extensions,
-            repr([PerMessageDeflate(False, False, 15, 15), NoOpExtension()]),
-        )
-        self.assertEqual(
-            repr(self.client.extensions),
-            repr([PerMessageDeflate(False, False, 15, 15), NoOpExtension()]),
-        )
-
-    @with_server(extensions=[ServerNoOpExtensionFactory()])
-    @unittest.mock.patch.object(WebSocketServerProtocol, "process_extensions")
-    def test_extensions_error(self, _process_extensions):
-        _process_extensions.return_value = "x-no-op", [NoOpExtension()]
-
-        with self.assertRaises(NegotiationError):
-            self.start_client(
-                "/extensions", extensions=[ClientPerMessageDeflateFactory()]
-            )
-
-    @with_server(extensions=[ServerNoOpExtensionFactory()])
-    @unittest.mock.patch.object(WebSocketServerProtocol, "process_extensions")
-    def test_extensions_error_no_extensions(self, _process_extensions):
-        _process_extensions.return_value = "x-no-op", [NoOpExtension()]
-
-        with self.assertRaises(InvalidHandshake):
-            self.start_client("/extensions")
-
-    @with_server(compression="deflate")
-    @with_client("/extensions", compression="deflate")
-    def test_compression_deflate(self):
-        server_extensions = self.loop.run_until_complete(self.client.recv())
-        self.assertEqual(
-            server_extensions, repr([PerMessageDeflate(False, False, 15, 15)])
-        )
-        self.assertEqual(
-            repr(self.client.extensions),
-            repr([PerMessageDeflate(False, False, 15, 15)]),
-        )
-
-    @with_server(
-        extensions=[
-            ServerPerMessageDeflateFactory(
-                client_no_context_takeover=True, server_max_window_bits=10
-            )
-        ],
-        compression="deflate",  # overridden by explicit config
-    )
-    @with_client(
-        "/extensions",
-        extensions=[
-            ClientPerMessageDeflateFactory(
-                server_no_context_takeover=True, client_max_window_bits=12
-            )
-        ],
-        compression="deflate",  # overridden by explicit config
-    )
-    def test_compression_deflate_and_explicit_config(self):
-        server_extensions = self.loop.run_until_complete(self.client.recv())
-        self.assertEqual(
-            server_extensions, repr([PerMessageDeflate(True, True, 12, 10)])
-        )
-        self.assertEqual(
-            repr(self.client.extensions), repr([PerMessageDeflate(True, True, 10, 12)])
-        )
-
-    def test_compression_unsupported_server(self):
-        with self.assertRaises(ValueError):
-            self.start_server(compression="xz")
-
-    @with_server()
-    def test_compression_unsupported_client(self):
-        with self.assertRaises(ValueError):
-            self.start_client(compression="xz")
-
-    @with_server()
-    @with_client("/subprotocol")
-    def test_no_subprotocol(self):
-        server_subprotocol = self.loop.run_until_complete(self.client.recv())
-        self.assertEqual(server_subprotocol, repr(None))
-        self.assertEqual(self.client.subprotocol, None)
-
-    @with_server(subprotocols=["superchat", "chat"])
-    @with_client("/subprotocol", subprotocols=["otherchat", "chat"])
-    def test_subprotocol(self):
-        server_subprotocol = self.loop.run_until_complete(self.client.recv())
-        self.assertEqual(server_subprotocol, repr("chat"))
-        self.assertEqual(self.client.subprotocol, "chat")
-
-    @with_server(subprotocols=["superchat"])
-    @with_client("/subprotocol", subprotocols=["otherchat"])
-    def test_subprotocol_not_accepted(self):
-        server_subprotocol = self.loop.run_until_complete(self.client.recv())
-        self.assertEqual(server_subprotocol, repr(None))
-        self.assertEqual(self.client.subprotocol, None)
-
-    @with_server()
-    @with_client("/subprotocol", subprotocols=["otherchat", "chat"])
-    def test_subprotocol_not_offered(self):
-        server_subprotocol = self.loop.run_until_complete(self.client.recv())
-        self.assertEqual(server_subprotocol, repr(None))
-        self.assertEqual(self.client.subprotocol, None)
-
-    @with_server(subprotocols=["superchat", "chat"])
-    @with_client("/subprotocol")
-    def test_subprotocol_not_requested(self):
-        server_subprotocol = self.loop.run_until_complete(self.client.recv())
-        self.assertEqual(server_subprotocol, repr(None))
-        self.assertEqual(self.client.subprotocol, None)
-
-    @with_server(subprotocols=["superchat"])
-    @unittest.mock.patch.object(WebSocketServerProtocol, "process_subprotocol")
-    def test_subprotocol_error(self, _process_subprotocol):
-        _process_subprotocol.return_value = "superchat"
-
-        with self.assertRaises(NegotiationError):
-            self.start_client("/subprotocol", subprotocols=["otherchat"])
-        self.run_loop_once()
-
-    @with_server(subprotocols=["superchat"])
-    @unittest.mock.patch.object(WebSocketServerProtocol, "process_subprotocol")
-    def test_subprotocol_error_no_subprotocols(self, _process_subprotocol):
-        _process_subprotocol.return_value = "superchat"
-
-        with self.assertRaises(InvalidHandshake):
-            self.start_client("/subprotocol")
-        self.run_loop_once()
-
-    @with_server(subprotocols=["superchat", "chat"])
-    @unittest.mock.patch.object(WebSocketServerProtocol, "process_subprotocol")
-    def test_subprotocol_error_two_subprotocols(self, _process_subprotocol):
-        _process_subprotocol.return_value = "superchat, chat"
-
-        with self.assertRaises(InvalidHandshake):
-            self.start_client("/subprotocol", subprotocols=["superchat", "chat"])
-        self.run_loop_once()
-
-    @with_server()
-    @unittest.mock.patch("websockets.server.read_request")
-    def test_server_receives_malformed_request(self, _read_request):
-        _read_request.side_effect = ValueError("read_request failed")
-
-        with self.assertRaises(InvalidHandshake):
-            self.start_client()
-
-    @with_server()
-    @unittest.mock.patch("websockets.client.read_response")
-    def test_client_receives_malformed_response(self, _read_response):
-        _read_response.side_effect = ValueError("read_response failed")
-
-        with self.assertRaises(InvalidHandshake):
-            self.start_client()
-        self.run_loop_once()
-
-    @with_server()
-    @unittest.mock.patch("websockets.client.build_request")
-    def test_client_sends_invalid_handshake_request(self, _build_request):
-        def wrong_build_request(headers):
-            return "42"
-
-        _build_request.side_effect = wrong_build_request
-
-        with self.assertRaises(InvalidHandshake):
-            self.start_client()
-
-    @with_server()
-    @unittest.mock.patch("websockets.server.build_response")
-    def test_server_sends_invalid_handshake_response(self, _build_response):
-        def wrong_build_response(headers, key):
-            return build_response(headers, "42")
-
-        _build_response.side_effect = wrong_build_response
-
-        with self.assertRaises(InvalidHandshake):
-            self.start_client()
-
-    @with_server()
-    @unittest.mock.patch("websockets.client.read_response")
-    def test_server_does_not_switch_protocols(self, _read_response):
-        async def wrong_read_response(stream):
-            status_code, reason, headers = await read_response(stream)
-            return 400, "Bad Request", headers
-
-        _read_response.side_effect = wrong_read_response
-
-        with self.assertRaises(InvalidStatusCode):
-            self.start_client()
-        self.run_loop_once()
-
-    @with_server()
-    @unittest.mock.patch("websockets.server.WebSocketServerProtocol.process_request")
-    def test_server_error_in_handshake(self, _process_request):
-        _process_request.side_effect = Exception("process_request crashed")
-
-        with self.assertRaises(InvalidHandshake):
-            self.start_client()
-
-    @with_server()
-    @unittest.mock.patch("websockets.server.WebSocketServerProtocol.send")
-    def test_server_handler_crashes(self, send):
-        send.side_effect = ValueError("send failed")
-
-        with self.temp_client():
-            self.loop.run_until_complete(self.client.send("Hello!"))
-            with self.assertRaises(ConnectionClosed):
-                self.loop.run_until_complete(self.client.recv())
-
-        # Connection ends with an unexpected error.
-        self.assertEqual(self.client.close_code, 1011)
-
-    @with_server()
-    @unittest.mock.patch("websockets.server.WebSocketServerProtocol.close")
-    def test_server_close_crashes(self, close):
-        close.side_effect = ValueError("close failed")
-
-        with self.temp_client():
-            self.loop.run_until_complete(self.client.send("Hello!"))
-            reply = self.loop.run_until_complete(self.client.recv())
-            self.assertEqual(reply, "Hello!")
-
-        # Connection ends with an abnormal closure.
-        self.assertEqual(self.client.close_code, 1006)
-
-    @with_server()
-    @with_client()
-    @unittest.mock.patch.object(WebSocketClientProtocol, "handshake")
-    def test_client_closes_connection_before_handshake(self, handshake):
-        # We have mocked the handshake() method to prevent the client from
-        # performing the opening handshake. Force it to close the connection.
-        self.client.transport.close()
-        # The server should stop properly anyway. It used to hang because the
-        # task handling the connection was waiting for the opening handshake.
-
-    @with_server(create_protocol=SlowOpeningHandshakeProtocol)
-    def test_server_shuts_down_during_opening_handshake(self):
-        self.loop.call_later(5 * MS, self.server.close)
-        with self.assertRaises(InvalidStatusCode) as raised:
-            self.start_client()
-        exception = raised.exception
-        self.assertEqual(
-            str(exception), "server rejected WebSocket connection: HTTP 503"
-        )
-        self.assertEqual(exception.status_code, 503)
-
-    @with_server()
-    def test_server_shuts_down_during_connection_handling(self):
-        with self.temp_client():
-            server_ws = next(iter(self.server.websockets))
-            self.server.close()
-            with self.assertRaises(ConnectionClosed):
-                self.loop.run_until_complete(self.client.recv())
-
-        # Websocket connection closes properly with 1001 Going Away.
-        self.assertEqual(self.client.close_code, 1001)
-        self.assertEqual(server_ws.close_code, 1001)
-
-    @with_server()
-    def test_server_shuts_down_waits_until_handlers_terminate(self):
-        # This handler waits a bit after the connection is closed in order
-        # to test that wait_closed() really waits for handlers to complete.
-        self.start_client("/slow_stop")
-        server_ws = next(iter(self.server.websockets))
-
-        # Test that the handler task keeps running after close().
-        self.server.close()
-        self.loop.run_until_complete(asyncio.sleep(MS))
-        self.assertFalse(server_ws.handler_task.done())
-
-        # Test that the handler task terminates before wait_closed() returns.
-        self.loop.run_until_complete(self.server.wait_closed())
-        self.assertTrue(server_ws.handler_task.done())
-
-    @with_server(create_protocol=ForbiddenServerProtocol)
-    def test_invalid_status_error_during_client_connect(self):
-        with self.assertRaises(InvalidStatusCode) as raised:
-            self.start_client()
-        exception = raised.exception
-        self.assertEqual(
-            str(exception), "server rejected WebSocket connection: HTTP 403"
-        )
-        self.assertEqual(exception.status_code, 403)
-
-    @with_server()
-    @unittest.mock.patch(
-        "websockets.server.WebSocketServerProtocol.write_http_response"
-    )
-    @unittest.mock.patch("websockets.server.WebSocketServerProtocol.read_http_request")
-    def test_connection_error_during_opening_handshake(
-        self, _read_http_request, _write_http_response
-    ):
-        _read_http_request.side_effect = ConnectionError
-
-        # This exception is currently platform-dependent. It was observed to
-        # be ConnectionResetError on Linux in the non-TLS case, and
-        # InvalidMessage otherwise (including both Linux and macOS). This
-        # doesn't matter though since this test is primarily for testing a
-        # code path on the server side.
-        with self.assertRaises(Exception):
-            self.start_client()
-
-        # No response must not be written if the network connection is broken.
-        _write_http_response.assert_not_called()
-
-    @with_server()
-    @unittest.mock.patch("websockets.server.WebSocketServerProtocol.close")
-    def test_connection_error_during_closing_handshake(self, close):
-        close.side_effect = ConnectionError
-
-        with self.temp_client():
-            self.loop.run_until_complete(self.client.send("Hello!"))
-            reply = self.loop.run_until_complete(self.client.recv())
-            self.assertEqual(reply, "Hello!")
-
-        # Connection ends with an abnormal closure.
-        self.assertEqual(self.client.close_code, 1006)
-
-
-class ClientServerTests(
-    CommonClientServerTests, ClientServerTestsMixin, AsyncioTestCase
-):
-    pass
-
-
-class SecureClientServerTests(
-    CommonClientServerTests, SecureClientServerTestsMixin, AsyncioTestCase
-):
-
-    # TLS over Unix sockets doesn't make sense.
-    test_unix_socket = None
-
-    @with_server()
-    def test_ws_uri_is_rejected(self):
-        with self.assertRaises(ValueError):
-            connect(get_server_uri(self.server, secure=False), ssl=self.client_context)
-
-    @with_server()
-    def test_redirect_insecure(self):
-        with temp_test_redirecting_server(
-            self, http.HTTPStatus.FOUND, force_insecure=True
-        ):
-            with self.assertRaises(InvalidHandshake):
-                with temp_test_client(self):
-                    self.fail("Did not raise")  # pragma: no cover
-
-
-class ClientServerOriginTests(AsyncioTestCase):
-    def test_checking_origin_succeeds(self):
-        server = self.loop.run_until_complete(
-            serve(handler, "localhost", 0, origins=["http://localhost"])
-        )
-        client = self.loop.run_until_complete(
-            connect(get_server_uri(server), origin="http://localhost")
-        )
-
-        self.loop.run_until_complete(client.send("Hello!"))
-        self.assertEqual(self.loop.run_until_complete(client.recv()), "Hello!")
-
-        self.loop.run_until_complete(client.close())
-        server.close()
-        self.loop.run_until_complete(server.wait_closed())
-
-    def test_checking_origin_fails(self):
-        server = self.loop.run_until_complete(
-            serve(handler, "localhost", 0, origins=["http://localhost"])
-        )
-        with self.assertRaisesRegex(
-            InvalidHandshake, "server rejected WebSocket connection: HTTP 403"
-        ):
-            self.loop.run_until_complete(
-                connect(get_server_uri(server), origin="http://otherhost")
-            )
-
-        server.close()
-        self.loop.run_until_complete(server.wait_closed())
-
-    def test_checking_origins_fails_with_multiple_headers(self):
-        server = self.loop.run_until_complete(
-            serve(handler, "localhost", 0, origins=["http://localhost"])
-        )
-        with self.assertRaisesRegex(
-            InvalidHandshake, "server rejected WebSocket connection: HTTP 400"
-        ):
-            self.loop.run_until_complete(
-                connect(
-                    get_server_uri(server),
-                    origin="http://localhost",
-                    extra_headers=[("Origin", "http://otherhost")],
-                )
-            )
-
-        server.close()
-        self.loop.run_until_complete(server.wait_closed())
-
-    def test_checking_lack_of_origin_succeeds(self):
-        server = self.loop.run_until_complete(
-            serve(handler, "localhost", 0, origins=[None])
-        )
-        client = self.loop.run_until_complete(connect(get_server_uri(server)))
-
-        self.loop.run_until_complete(client.send("Hello!"))
-        self.assertEqual(self.loop.run_until_complete(client.recv()), "Hello!")
-
-        self.loop.run_until_complete(client.close())
-        server.close()
-        self.loop.run_until_complete(server.wait_closed())
-
-    def test_checking_lack_of_origin_succeeds_backwards_compatibility(self):
-        with warnings.catch_warnings(record=True) as recorded_warnings:
-            server = self.loop.run_until_complete(
-                serve(handler, "localhost", 0, origins=[""])
-            )
-            client = self.loop.run_until_complete(connect(get_server_uri(server)))
-
-        self.assertDeprecationWarnings(
-            recorded_warnings, ["use None instead of '' in origins"]
-        )
-
-        self.loop.run_until_complete(client.send("Hello!"))
-        self.assertEqual(self.loop.run_until_complete(client.recv()), "Hello!")
-
-        self.loop.run_until_complete(client.close())
-        server.close()
-        self.loop.run_until_complete(server.wait_closed())
-
-
-class YieldFromTests(AsyncioTestCase):
-    def test_client(self):
-        start_server = serve(handler, "localhost", 0)
-        server = self.loop.run_until_complete(start_server)
-
-        # @asyncio.coroutine is deprecated on Python ≥ 3.8
-        with warnings.catch_warnings(record=True):
-
-            @asyncio.coroutine
-            def run_client():
-                # Yield from connect.
-                client = yield from connect(get_server_uri(server))
-                self.assertEqual(client.state, State.OPEN)
-                yield from client.close()
-                self.assertEqual(client.state, State.CLOSED)
-
-        self.loop.run_until_complete(run_client())
-
-        server.close()
-        self.loop.run_until_complete(server.wait_closed())
-
-    def test_server(self):
-        # @asyncio.coroutine is deprecated on Python ≥ 3.8
-        with warnings.catch_warnings(record=True):
-
-            @asyncio.coroutine
-            def run_server():
-                # Yield from serve.
-                server = yield from serve(handler, "localhost", 0)
-                self.assertTrue(server.sockets)
-                server.close()
-                yield from server.wait_closed()
-                self.assertFalse(server.sockets)
-
-        self.loop.run_until_complete(run_server())
-
-
-class AsyncAwaitTests(AsyncioTestCase):
-    def test_client(self):
-        start_server = serve(handler, "localhost", 0)
-        server = self.loop.run_until_complete(start_server)
-
-        async def run_client():
-            # Await connect.
-            client = await connect(get_server_uri(server))
-            self.assertEqual(client.state, State.OPEN)
-            await client.close()
-            self.assertEqual(client.state, State.CLOSED)
-
-        self.loop.run_until_complete(run_client())
-
-        server.close()
-        self.loop.run_until_complete(server.wait_closed())
-
-    def test_server(self):
-        async def run_server():
-            # Await serve.
-            server = await serve(handler, "localhost", 0)
-            self.assertTrue(server.sockets)
-            server.close()
-            await server.wait_closed()
-            self.assertFalse(server.sockets)
-
-        self.loop.run_until_complete(run_server())
-
-
-class ContextManagerTests(AsyncioTestCase):
-    def test_client(self):
-        start_server = serve(handler, "localhost", 0)
-        server = self.loop.run_until_complete(start_server)
-
-        async def run_client():
-            # Use connect as an asynchronous context manager.
-            async with connect(get_server_uri(server)) as client:
-                self.assertEqual(client.state, State.OPEN)
-
-            # Check that exiting the context manager closed the connection.
-            self.assertEqual(client.state, State.CLOSED)
-
-        self.loop.run_until_complete(run_client())
-
-        server.close()
-        self.loop.run_until_complete(server.wait_closed())
-
-    def test_server(self):
-        async def run_server():
-            # Use serve as an asynchronous context manager.
-            async with serve(handler, "localhost", 0) as server:
-                self.assertTrue(server.sockets)
-
-            # Check that exiting the context manager closed the server.
-            self.assertFalse(server.sockets)
-
-        self.loop.run_until_complete(run_server())
-
-    @unittest.skipUnless(hasattr(socket, "AF_UNIX"), "this test requires Unix sockets")
-    def test_unix_server(self):
-        async def run_server(path):
-            async with unix_serve(handler, path) as server:
-                self.assertTrue(server.sockets)
-
-            # Check that exiting the context manager closed the server.
-            self.assertFalse(server.sockets)
-
-        with tempfile.TemporaryDirectory() as temp_dir:
-            path = bytes(pathlib.Path(temp_dir) / "websockets")
-            self.loop.run_until_complete(run_server(path))
-
-
-class AsyncIteratorTests(AsyncioTestCase):
-
-    # This is a protocol-level feature, but since it's a high-level API, it is
-    # much easier to exercise at the client or server level.
-
-    MESSAGES = ["3", "2", "1", "Fire!"]
-
-    def test_iterate_on_messages(self):
-        async def handler(ws, path):
-            for message in self.MESSAGES:
-                await ws.send(message)
-
-        start_server = serve(handler, "localhost", 0)
-        server = self.loop.run_until_complete(start_server)
-
-        messages = []
-
-        async def run_client():
-            nonlocal messages
-            async with connect(get_server_uri(server)) as ws:
-                async for message in ws:
-                    messages.append(message)
-
-        self.loop.run_until_complete(run_client())
-
-        self.assertEqual(messages, self.MESSAGES)
-
-        server.close()
-        self.loop.run_until_complete(server.wait_closed())
-
-    def test_iterate_on_messages_going_away_exit_ok(self):
-        async def handler(ws, path):
-            for message in self.MESSAGES:
-                await ws.send(message)
-            await ws.close(1001)
-
-        start_server = serve(handler, "localhost", 0)
-        server = self.loop.run_until_complete(start_server)
-
-        messages = []
-
-        async def run_client():
-            nonlocal messages
-            async with connect(get_server_uri(server)) as ws:
-                async for message in ws:
-                    messages.append(message)
-
-        self.loop.run_until_complete(run_client())
-
-        self.assertEqual(messages, self.MESSAGES)
-
-        server.close()
-        self.loop.run_until_complete(server.wait_closed())
-
-    def test_iterate_on_messages_internal_error_exit_not_ok(self):
-        async def handler(ws, path):
-            for message in self.MESSAGES:
-                await ws.send(message)
-            await ws.close(1011)
-
-        start_server = serve(handler, "localhost", 0)
-        server = self.loop.run_until_complete(start_server)
-
-        messages = []
-
-        async def run_client():
-            nonlocal messages
-            async with connect(get_server_uri(server)) as ws:
-                async for message in ws:
-                    messages.append(message)
-
-        with self.assertRaises(ConnectionClosed):
-            self.loop.run_until_complete(run_client())
-
-        self.assertEqual(messages, self.MESSAGES)
-
-        server.close()
-        self.loop.run_until_complete(server.wait_closed())
diff --git a/tests/wpt/tests/tools/third_party/websockets/tests/test_exceptions.py b/tests/wpt/tests/tools/third_party/websockets/tests/test_exceptions.py
deleted file mode 100644
index 7ad5ad83359..00000000000
--- a/tests/wpt/tests/tools/third_party/websockets/tests/test_exceptions.py
+++ /dev/null
@@ -1,145 +0,0 @@
-import unittest
-
-from websockets.exceptions import *
-from websockets.http import Headers
-
-
-class ExceptionsTests(unittest.TestCase):
-    def test_str(self):
-        for exception, exception_str in [
-            # fmt: off
-            (
-                WebSocketException("something went wrong"),
-                "something went wrong",
-            ),
-            (
-                ConnectionClosed(1000, ""),
-                "code = 1000 (OK), no reason",
-            ),
-            (
-                ConnectionClosed(1006, None),
-                "code = 1006 (connection closed abnormally [internal]), no reason"
-            ),
-            (
-                ConnectionClosed(3000, None),
-                "code = 3000 (registered), no reason"
-            ),
-            (
-                ConnectionClosed(4000, None),
-                "code = 4000 (private use), no reason"
-            ),
-            (
-                ConnectionClosedError(1016, None),
-                "code = 1016 (unknown), no reason"
-            ),
-            (
-                ConnectionClosedOK(1001, "bye"),
-                "code = 1001 (going away), reason = bye",
-            ),
-            (
-                InvalidHandshake("invalid request"),
-                "invalid request",
-            ),
-            (
-                SecurityError("redirect from WSS to WS"),
-                "redirect from WSS to WS",
-            ),
-            (
-                InvalidMessage("malformed HTTP message"),
-                "malformed HTTP message",
-            ),
-            (
-                InvalidHeader("Name"),
-                "missing Name header",
-            ),
-            (
-                InvalidHeader("Name", None),
-                "missing Name header",
-            ),
-            (
-                InvalidHeader("Name", ""),
-                "empty Name header",
-            ),
-            (
-                InvalidHeader("Name", "Value"),
-                "invalid Name header: Value",
-            ),
-            (
-                InvalidHeaderFormat(
-                    "Sec-WebSocket-Protocol", "expected token", "a=|", 3
-                ),
-                "invalid Sec-WebSocket-Protocol header: "
-                "expected token at 3 in a=|",
-            ),
-            (
-                InvalidHeaderValue("Sec-WebSocket-Version", "42"),
-                "invalid Sec-WebSocket-Version header: 42",
-            ),
-            (
-                InvalidOrigin("http://bad.origin"),
-                "invalid Origin header: http://bad.origin",
-            ),
-            (
-                InvalidUpgrade("Upgrade"),
-                "missing Upgrade header",
-            ),
-            (
-                InvalidUpgrade("Connection", "websocket"),
-                "invalid Connection header: websocket",
-            ),
-            (
-                InvalidStatusCode(403),
-                "server rejected WebSocket connection: HTTP 403",
-            ),
-            (
-                NegotiationError("unsupported subprotocol: spam"),
-                "unsupported subprotocol: spam",
-            ),
-            (
-                DuplicateParameter("a"),
-                "duplicate parameter: a",
-            ),
-            (
-                InvalidParameterName("|"),
-                "invalid parameter name: |",
-            ),
-            (
-                InvalidParameterValue("a", None),
-                "missing value for parameter a",
-            ),
-            (
-                InvalidParameterValue("a", ""),
-                "empty value for parameter a",
-            ),
-            (
-                InvalidParameterValue("a", "|"),
-                "invalid value for parameter a: |",
-            ),
-            (
-                AbortHandshake(200, Headers(), b"OK\n"),
-                "HTTP 200, 0 headers, 3 bytes",
-            ),
-            (
-                RedirectHandshake("wss://example.com"),
-                "redirect to wss://example.com",
-            ),
-            (
-                InvalidState("WebSocket connection isn't established yet"),
-                "WebSocket connection isn't established yet",
-            ),
-            (
-                InvalidURI("|"),
-                "| isn't a valid URI",
-            ),
-            (
-                PayloadTooBig("payload length exceeds limit: 2 > 1 bytes"),
-                "payload length exceeds limit: 2 > 1 bytes",
-            ),
-            (
-                ProtocolError("invalid opcode: 7"),
-                "invalid opcode: 7",
-            ),
-            # fmt: on
-        ]:
-            with self.subTest(exception=exception):
-                self.assertEqual(str(exception), exception_str)
diff --git a/tests/wpt/tests/tools/third_party/websockets/tests/test_exports.py b/tests/wpt/tests/tools/third_party/websockets/tests/test_exports.py
deleted file mode 100644
index 7fcbc80e389..00000000000
--- a/tests/wpt/tests/tools/third_party/websockets/tests/test_exports.py
+++ /dev/null
@@ -1,22 +0,0 @@
-import unittest
-
-import websockets
-
-
-combined_exports = (
-    websockets.auth.__all__
-    + websockets.client.__all__
-    + websockets.exceptions.__all__
-    + websockets.protocol.__all__
-    + websockets.server.__all__
-    + websockets.typing.__all__
-    + websockets.uri.__all__
-)
-
-
-class TestExportsAllSubmodules(unittest.TestCase):
-    def test_top_level_module_reexports_all_submodule_exports(self):
-        self.assertEqual(set(combined_exports), set(websockets.__all__))
-
-    def test_submodule_exports_are_globally_unique(self):
-        self.assertEqual(len(set(combined_exports)), len(combined_exports))
diff --git a/tests/wpt/tests/tools/third_party/websockets/tests/test_framing.py b/tests/wpt/tests/tools/third_party/websockets/tests/test_framing.py
deleted file mode 100644
index 5def415d289..00000000000
--- a/tests/wpt/tests/tools/third_party/websockets/tests/test_framing.py
+++ /dev/null
@@ -1,242 +0,0 @@
-import asyncio
-import codecs
-import unittest
-import unittest.mock
-
-from websockets.exceptions import PayloadTooBig, ProtocolError
-from websockets.framing import *
-
-from .utils import AsyncioTestCase
-
-
-class FramingTests(AsyncioTestCase):
-    def decode(self, message, mask=False, max_size=None, extensions=None):
-        self.stream = asyncio.StreamReader(loop=self.loop)
-        self.stream.feed_data(message)
-        self.stream.feed_eof()
-        frame = self.loop.run_until_complete(
-            Frame.read(
-                self.stream.readexactly,
-                mask=mask,
-                max_size=max_size,
-                extensions=extensions,
-            )
-        )
-        # Make sure all the data was consumed.
-        self.assertTrue(self.stream.at_eof())
-        return frame
-
-    def encode(self, frame, mask=False, extensions=None):
-        write = unittest.mock.Mock()
-        frame.write(write, mask=mask, extensions=extensions)
-        # Ensure the entire frame is sent with a single call to write().
-        # Multiple calls cause TCP fragmentation and degrade performance.
-        self.assertEqual(write.call_count, 1)
-        # The frame data is the single positional argument of that call.
-        self.assertEqual(len(write.call_args[0]), 1)
-        self.assertEqual(len(write.call_args[1]), 0)
-        return write.call_args[0][0]
-
-    def round_trip(self, message, expected, mask=False, extensions=None):
-        decoded = self.decode(message, mask, extensions=extensions)
-        self.assertEqual(decoded, expected)
-        encoded = self.encode(decoded, mask, extensions=extensions)
-        if mask:  # non-deterministic encoding
-            decoded = self.decode(encoded, mask, extensions=extensions)
-            self.assertEqual(decoded, expected)
-        else:  # deterministic encoding
-            self.assertEqual(encoded, message)
-
-    def round_trip_close(self, data, code, reason):
-        parsed = parse_close(data)
-        self.assertEqual(parsed, (code, reason))
-        serialized = serialize_close(code, reason)
-        self.assertEqual(serialized, data)
-
-    def test_text(self):
-        self.round_trip(b"\x81\x04Spam", Frame(True, OP_TEXT, b"Spam"))
-
-    def test_text_masked(self):
-        self.round_trip(
-            b"\x81\x84\x5b\xfb\xe1\xa8\x08\x8b\x80\xc5",
-            Frame(True, OP_TEXT, b"Spam"),
-            mask=True,
-        )
-
-    def test_binary(self):
-        self.round_trip(b"\x82\x04Eggs", Frame(True, OP_BINARY, b"Eggs"))
-
-    def test_binary_masked(self):
-        self.round_trip(
-            b"\x82\x84\x53\xcd\xe2\x89\x16\xaa\x85\xfa",
-            Frame(True, OP_BINARY, b"Eggs"),
-            mask=True,
-        )
-
-    def test_non_ascii_text(self):
-        self.round_trip(
-            b"\x81\x05caf\xc3\xa9", Frame(True, OP_TEXT, "café".encode("utf-8"))
-        )
-
-    def test_non_ascii_text_masked(self):
-        self.round_trip(
-            b"\x81\x85\x64\xbe\xee\x7e\x07\xdf\x88\xbd\xcd",
-            Frame(True, OP_TEXT, "café".encode("utf-8")),
-            mask=True,
-        )
-
-    def test_close(self):
-        self.round_trip(b"\x88\x00", Frame(True, OP_CLOSE, b""))
-
-    def test_ping(self):
-        self.round_trip(b"\x89\x04ping", Frame(True, OP_PING, b"ping"))
-
-    def test_pong(self):
-        self.round_trip(b"\x8a\x04pong", Frame(True, OP_PONG, b"pong"))
-
-    def test_long(self):
-        self.round_trip(
-            b"\x82\x7e\x00\x7e" + 126 * b"a", Frame(True, OP_BINARY, 126 * b"a")
-        )
-
-    def test_very_long(self):
-        self.round_trip(
-            b"\x82\x7f\x00\x00\x00\x00\x00\x01\x00\x00" + 65536 * b"a",
-            Frame(True, OP_BINARY, 65536 * b"a"),
-        )
-
-    def test_payload_too_big(self):
-        with self.assertRaises(PayloadTooBig):
-            self.decode(b"\x82\x7e\x04\x01" + 1025 * b"a", max_size=1024)
-
-    def test_bad_reserved_bits(self):
-        for encoded in [b"\xc0\x00", b"\xa0\x00", b"\x90\x00"]:
-            with self.subTest(encoded=encoded):
-                with self.assertRaises(ProtocolError):
-                    self.decode(encoded)
-
-    def test_good_opcode(self):
-        for opcode in list(range(0x00, 0x03)) + list(range(0x08, 0x0B)):
-            encoded = bytes([0x80 | opcode, 0])
-            with self.subTest(encoded=encoded):
-                self.decode(encoded)  # does not raise an exception
-
-    def test_bad_opcode(self):
-        for opcode in list(range(0x03, 0x08)) + list(range(0x0B, 0x10)):
-            encoded = bytes([0x80 | opcode, 0])
-            with self.subTest(encoded=encoded):
-                with self.assertRaises(ProtocolError):
-                    self.decode(encoded)
-
-    def test_mask_flag(self):
-        # Mask flag correctly set.
-        self.decode(b"\x80\x80\x00\x00\x00\x00", mask=True)
-        # Mask flag incorrectly unset.
-        with self.assertRaises(ProtocolError):
-            self.decode(b"\x80\x80\x00\x00\x00\x00")
-        # Mask flag correctly unset.
-        self.decode(b"\x80\x00")
-        # Mask flag incorrectly set.
-        with self.assertRaises(ProtocolError):
-            self.decode(b"\x80\x00", mask=True)
-
-    def test_control_frame_max_length(self):
-        # At maximum allowed length.
-        self.decode(b"\x88\x7e\x00\x7d" + 125 * b"a")
-        # Above maximum allowed length.
-        with self.assertRaises(ProtocolError):
-            self.decode(b"\x88\x7e\x00\x7e" + 126 * b"a")
-
-    def test_prepare_data_str(self):
-        self.assertEqual(prepare_data("café"), (OP_TEXT, b"caf\xc3\xa9"))
-
-    def test_prepare_data_bytes(self):
-        self.assertEqual(prepare_data(b"tea"), (OP_BINARY, b"tea"))
-
-    def test_prepare_data_bytearray(self):
-        self.assertEqual(
-            prepare_data(bytearray(b"tea")), (OP_BINARY, bytearray(b"tea"))
-        )
-
-    def test_prepare_data_memoryview(self):
-        self.assertEqual(
-            prepare_data(memoryview(b"tea")), (OP_BINARY, memoryview(b"tea"))
-        )
-
-    def test_prepare_data_non_contiguous_memoryview(self):
-        self.assertEqual(prepare_data(memoryview(b"tteeaa")[::2]), (OP_BINARY, b"tea"))
-
-    def test_prepare_data_list(self):
-        with self.assertRaises(TypeError):
-            prepare_data([])
-
-    def test_prepare_data_none(self):
-        with self.assertRaises(TypeError):
-            prepare_data(None)
-
-    def test_encode_data_str(self):
-        self.assertEqual(encode_data("café"), b"caf\xc3\xa9")
-
-    def test_encode_data_bytes(self):
-        self.assertEqual(encode_data(b"tea"), b"tea")
-
-    def test_encode_data_bytearray(self):
-        self.assertEqual(encode_data(bytearray(b"tea")), b"tea")
-
-    def test_encode_data_memoryview(self):
-        self.assertEqual(encode_data(memoryview(b"tea")), b"tea")
-
-    def test_encode_data_non_contiguous_memoryview(self):
-        self.assertEqual(encode_data(memoryview(b"tteeaa")[::2]), b"tea")
-
-    def test_encode_data_list(self):
-        with self.assertRaises(TypeError):
-            encode_data([])
-
-    def test_encode_data_none(self):
-        with self.assertRaises(TypeError):
-            encode_data(None)
-
-    def test_fragmented_control_frame(self):
-        # Fin bit correctly set.
-        self.decode(b"\x88\x00")
-        # Fin bit incorrectly unset.
-        with self.assertRaises(ProtocolError):
-            self.decode(b"\x08\x00")
-
-    def test_parse_close_and_serialize_close(self):
-        self.round_trip_close(b"\x03\xe8", 1000, "")
-        self.round_trip_close(b"\x03\xe8OK", 1000, "OK")
-
-    def test_parse_close_empty(self):
-        self.assertEqual(parse_close(b""), (1005, ""))
-
-    def test_parse_close_errors(self):
-        with self.assertRaises(ProtocolError):
-            parse_close(b"\x03")
-        with self.assertRaises(ProtocolError):
-            parse_close(b"\x03\xe7")
-        with self.assertRaises(UnicodeDecodeError):
-            parse_close(b"\x03\xe8\xff\xff")
-
-    def test_serialize_close_errors(self):
-        with self.assertRaises(ProtocolError):
-            serialize_close(999, "")
-
-    def test_extensions(self):
-        class Rot13:
-            @staticmethod
-            def encode(frame):
-                assert frame.opcode == OP_TEXT
-                text = frame.data.decode()
-                data = codecs.encode(text, "rot13").encode()
-                return frame._replace(data=data)
-
-            # This extensions is symmetrical.
-            @staticmethod
-            def decode(frame, *, max_size=None):
-                return Rot13.encode(frame)
-
-        self.round_trip(
-            b"\x81\x05uryyb", Frame(True, OP_TEXT, b"hello"), extensions=[Rot13()]
-        )
diff --git a/tests/wpt/tests/tools/third_party/websockets/tests/test_handshake.py b/tests/wpt/tests/tools/third_party/websockets/tests/test_handshake.py
deleted file mode 100644
index 7d04777152b..00000000000
--- a/tests/wpt/tests/tools/third_party/websockets/tests/test_handshake.py
+++ /dev/null
@@ -1,190 +0,0 @@
-import contextlib
-import unittest
-
-from websockets.exceptions import (
-    InvalidHandshake,
-    InvalidHeader,
-    InvalidHeaderValue,
-    InvalidUpgrade,
-)
-from websockets.handshake import *
-from websockets.handshake import accept  # private API
-from websockets.http import Headers
-
-
-class HandshakeTests(unittest.TestCase):
-    def test_accept(self):
-        # Test vector from RFC 6455
-        key = "dGhlIHNhbXBsZSBub25jZQ=="
-        acc = "s3pPLMBiTxaQ9kYGzzhZRbK+xOo="
-        self.assertEqual(accept(key), acc)
-
-    def test_round_trip(self):
-        request_headers = Headers()
-        request_key = build_request(request_headers)
-        response_key = check_request(request_headers)
-        self.assertEqual(request_key, response_key)
-        response_headers = Headers()
-        build_response(response_headers, response_key)
-        check_response(response_headers, request_key)
-
-    @contextlib.contextmanager
-    def assertValidRequestHeaders(self):
-        """
-        Provide request headers for modification.
-
-        Assert that the transformation kept them valid.
-
-        """
-        headers = Headers()
-        build_request(headers)
-        yield headers
-        check_request(headers)
-
-    @contextlib.contextmanager
-    def assertInvalidRequestHeaders(self, exc_type):
-        """
-        Provide request headers for modification.
-
-        Assert that the transformation made them invalid.
-
-        """
-        headers = Headers()
-        build_request(headers)
-        yield headers
-        assert issubclass(exc_type, InvalidHandshake)
-        with self.assertRaises(exc_type):
-            check_request(headers)
-
-    def test_request_invalid_connection(self):
-        with self.assertInvalidRequestHeaders(InvalidUpgrade) as headers:
-            del headers["Connection"]
-            headers["Connection"] = "Downgrade"
-
-    def test_request_missing_connection(self):
-        with self.assertInvalidRequestHeaders(InvalidUpgrade) as headers:
-            del headers["Connection"]
-
-    def test_request_additional_connection(self):
-        with self.assertValidRequestHeaders() as headers:
-            headers["Connection"] = "close"
-
-    def test_request_invalid_upgrade(self):
-        with self.assertInvalidRequestHeaders(InvalidUpgrade) as headers:
-            del headers["Upgrade"]
-            headers["Upgrade"] = "socketweb"
-
-    def test_request_missing_upgrade(self):
-        with self.assertInvalidRequestHeaders(InvalidUpgrade) as headers:
-            del headers["Upgrade"]
-
-    def test_request_additional_upgrade(self):
-        with self.assertInvalidRequestHeaders(InvalidUpgrade) as headers:
-            headers["Upgrade"] = "socketweb"
-
-    def test_request_invalid_key_not_base64(self):
-        with self.assertInvalidRequestHeaders(InvalidHeaderValue) as headers:
-            del headers["Sec-WebSocket-Key"]
-            headers["Sec-WebSocket-Key"] = "!@#$%^&*()"
-
-    def test_request_invalid_key_not_well_padded(self):
-        with self.assertInvalidRequestHeaders(InvalidHeaderValue) as headers:
-            del headers["Sec-WebSocket-Key"]
-            headers["Sec-WebSocket-Key"] = "CSIRmL8dWYxeAdr/XpEHRw"
-
-    def test_request_invalid_key_not_16_bytes_long(self):
-        with self.assertInvalidRequestHeaders(InvalidHeaderValue) as headers:
-            del headers["Sec-WebSocket-Key"]
-            headers["Sec-WebSocket-Key"] = "ZLpprpvK4PE="
-
-    def test_request_missing_key(self):
-        with self.assertInvalidRequestHeaders(InvalidHeader) as headers:
-            del headers["Sec-WebSocket-Key"]
-
-    def test_request_additional_key(self):
-        with self.assertInvalidRequestHeaders(InvalidHeader) as headers:
-            # This duplicates the Sec-WebSocket-Key header.
-            headers["Sec-WebSocket-Key"] = headers["Sec-WebSocket-Key"]
-
-    def test_request_invalid_version(self):
-        with self.assertInvalidRequestHeaders(InvalidHeaderValue) as headers:
-            del headers["Sec-WebSocket-Version"]
-            headers["Sec-WebSocket-Version"] = "42"
-
-    def test_request_missing_version(self):
-        with self.assertInvalidRequestHeaders(InvalidHeader) as headers:
-            del headers["Sec-WebSocket-Version"]
-
-    def test_request_additional_version(self):
-        with self.assertInvalidRequestHeaders(InvalidHeader) as headers:
-            # This duplicates the Sec-WebSocket-Version header.
-            headers["Sec-WebSocket-Version"] = headers["Sec-WebSocket-Version"]
-
-    @contextlib.contextmanager
-    def assertValidResponseHeaders(self, key="CSIRmL8dWYxeAdr/XpEHRw=="):
-        """
-        Provide response headers for modification.
-
-        Assert that the transformation kept them valid.
-
-        """
-        headers = Headers()
-        build_response(headers, key)
-        yield headers
-        check_response(headers, key)
-
-    @contextlib.contextmanager
-    def assertInvalidResponseHeaders(self, exc_type, key="CSIRmL8dWYxeAdr/XpEHRw=="):
-        """
-        Provide response headers for modification.
-
-        Assert that the transformation made them invalid.
-
-        """
-        headers = Headers()
-        build_response(headers, key)
-        yield headers
-        assert issubclass(exc_type, InvalidHandshake)
-        with self.assertRaises(exc_type):
-            check_response(headers, key)
-
-    def test_response_invalid_connection(self):
-        with self.assertInvalidResponseHeaders(InvalidUpgrade) as headers:
-            del headers["Connection"]
-            headers["Connection"] = "Downgrade"
-
-    def test_response_missing_connection(self):
-        with self.assertInvalidResponseHeaders(InvalidUpgrade) as headers:
-            del headers["Connection"]
-
-    def test_response_additional_connection(self):
-        with self.assertValidResponseHeaders() as headers:
-            headers["Connection"] = "close"
-
-    def test_response_invalid_upgrade(self):
-        with self.assertInvalidResponseHeaders(InvalidUpgrade) as headers:
-            del headers["Upgrade"]
-            headers["Upgrade"] = "socketweb"
-
-    def test_response_missing_upgrade(self):
-        with self.assertInvalidResponseHeaders(InvalidUpgrade) as headers:
-            del headers["Upgrade"]
-
-    def test_response_additional_upgrade(self):
-        with self.assertInvalidResponseHeaders(InvalidUpgrade) as headers:
-            headers["Upgrade"] = "socketweb"
-
-    def test_response_invalid_accept(self):
-        with self.assertInvalidResponseHeaders(InvalidHeaderValue) as headers:
-            del headers["Sec-WebSocket-Accept"]
-            other_key = "1Eq4UDEFQYg3YspNgqxv5g=="
-            headers["Sec-WebSocket-Accept"] = accept(other_key)
-
-    def test_response_missing_accept(self):
-        with self.assertInvalidResponseHeaders(InvalidHeader) as headers:
-            del headers["Sec-WebSocket-Accept"]
-
-    def test_response_additional_accept(self):
-        with self.assertInvalidResponseHeaders(InvalidHeader) as headers:
-            # This duplicates the Sec-WebSocket-Accept header.
-            headers["Sec-WebSocket-Accept"] = headers["Sec-WebSocket-Accept"]
diff --git a/tests/wpt/tests/tools/third_party/websockets/tests/test_headers.py b/tests/wpt/tests/tools/third_party/websockets/tests/test_headers.py
deleted file mode 100644
index 26d85fa5eaa..00000000000
--- a/tests/wpt/tests/tools/third_party/websockets/tests/test_headers.py
+++ /dev/null
@@ -1,185 +0,0 @@
-import unittest
-
-from websockets.exceptions import InvalidHeaderFormat, InvalidHeaderValue
-from websockets.headers import *
-
-
-class HeadersTests(unittest.TestCase):
-    def test_parse_connection(self):
-        for header, parsed in [
-            # Realistic use cases
-            ("Upgrade", ["Upgrade"]),  # Safari, Chrome
-            ("keep-alive, Upgrade", ["keep-alive", "Upgrade"]),  # Firefox
-            # Pathological example
-            (",,\t,  , ,Upgrade  ,,", ["Upgrade"]),
-        ]:
-            with self.subTest(header=header):
-                self.assertEqual(parse_connection(header), parsed)
-
-    def test_parse_connection_invalid_header_format(self):
-        for header in ["???", "keep-alive; Upgrade"]:
-            with self.subTest(header=header):
-                with self.assertRaises(InvalidHeaderFormat):
-                    parse_connection(header)
-
-    def test_parse_upgrade(self):
-        for header, parsed in [
-            # Realistic use case
-            ("websocket", ["websocket"]),
-            # Synthetic example
-            ("http/3.0, websocket", ["http/3.0", "websocket"]),
-            # Pathological example
-            (",,  WebSocket,  \t,,", ["WebSocket"]),
-        ]:
-            with self.subTest(header=header):
-                self.assertEqual(parse_upgrade(header), parsed)
-
-    def test_parse_upgrade_invalid_header_format(self):
-        for header in ["???", "websocket 2", "http/3.0; websocket"]:
-            with self.subTest(header=header):
-                with self.assertRaises(InvalidHeaderFormat):
-                    parse_upgrade(header)
-
-    def test_parse_extension(self):
-        for header, parsed in [
-            # Synthetic examples
-            ("foo", [("foo", [])]),
-            ("foo, bar", [("foo", []), ("bar", [])]),
-            (
-                'foo; name; token=token; quoted-string="quoted-string", '
-                "bar; quux; quuux",
-                [
-                    (
-                        "foo",
-                        [
-                            ("name", None),
-                            ("token", "token"),
-                            ("quoted-string", "quoted-string"),
-                        ],
-                    ),
-                    ("bar", [("quux", None), ("quuux", None)]),
-                ],
-            ),
-            # Pathological example
-            (
-                ",\t, ,  ,foo  ;bar = 42,,   baz,,",
-                [("foo", [("bar", "42")]), ("baz", [])],
-            ),
-            # Realistic use cases for permessage-deflate
-            ("permessage-deflate", [("permessage-deflate", [])]),
-            (
-                "permessage-deflate; client_max_window_bits",
-                [("permessage-deflate", [("client_max_window_bits", None)])],
-            ),
-            (
-                "permessage-deflate; server_max_window_bits=10",
-                [("permessage-deflate", [("server_max_window_bits", "10")])],
-            ),
-        ]:
-            with self.subTest(header=header):
-                self.assertEqual(parse_extension(header), parsed)
-                # Also ensure that build_extension round-trips cleanly.
-                unparsed = build_extension(parsed)
-                self.assertEqual(parse_extension(unparsed), parsed)
-
-    def test_parse_extension_invalid_header_format(self):
-        for header in [
-            # Truncated examples
-            "",
-            ",\t,",
-            "foo;",
-            "foo; bar;",
-            "foo; bar=",
-            'foo; bar="baz',
-            # Wrong delimiter
-            "foo, bar, baz=quux; quuux",
-            # Value in quoted string parameter that isn't a token
-            'foo; bar=" "',
-        ]:
-            with self.subTest(header=header):
-                with self.assertRaises(InvalidHeaderFormat):
-                    parse_extension(header)
-
-    def test_parse_subprotocol(self):
-        for header, parsed in [
-            # Synthetic examples
-            ("foo", ["foo"]),
-            ("foo, bar", ["foo", "bar"]),
-            # Pathological example
-            (",\t, ,  ,foo  ,,   bar,baz,,", ["foo", "bar", "baz"]),
-        ]:
-            with self.subTest(header=header):
-                self.assertEqual(parse_subprotocol(header), parsed)
-                # Also ensure that build_subprotocol round-trips cleanly.
-                unparsed = build_subprotocol(parsed)
-                self.assertEqual(parse_subprotocol(unparsed), parsed)
-
-    def test_parse_subprotocol_invalid_header(self):
-        for header in [
-            # Truncated examples
-            "",
-            ",\t,"
-            # Wrong delimiter
-            "foo; bar",
-        ]:
-            with self.subTest(header=header):
-                with self.assertRaises(InvalidHeaderFormat):
-                    parse_subprotocol(header)
-
-    def test_build_www_authenticate_basic(self):
-        # Test vector from RFC 7617
-        self.assertEqual(
-            build_www_authenticate_basic("foo"), 'Basic realm="foo", charset="UTF-8"'
-        )
-
-    def test_build_www_authenticate_basic_invalid_realm(self):
-        # Realm contains a control character forbidden in quoted-string encoding
-        with self.assertRaises(ValueError):
-            build_www_authenticate_basic("\u0007")
-
-    def test_build_authorization_basic(self):
-        # Test vector from RFC 7617
-        self.assertEqual(
-            build_authorization_basic("Aladdin", "open sesame"),
-            "Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ==",
-        )
-
-    def test_build_authorization_basic_utf8(self):
-        # Test vector from RFC 7617
-        self.assertEqual(
-            build_authorization_basic("test", "123£"), "Basic dGVzdDoxMjPCow=="
-        )
-
-    def test_parse_authorization_basic(self):
-        for header, parsed in [
-            ("Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ==", ("Aladdin", "open sesame")),
-            # Password contains non-ASCII character
-            ("Basic dGVzdDoxMjPCow==", ("test", "123£")),
-            # Password contains a colon
-            ("Basic YWxhZGRpbjpvcGVuOnNlc2FtZQ==", ("aladdin", "open:sesame")),
-            # Scheme name must be case insensitive
-            ("basic QWxhZGRpbjpvcGVuIHNlc2FtZQ==", ("Aladdin", "open sesame")),
-        ]:
-            with self.subTest(header=header):
-                self.assertEqual(parse_authorization_basic(header), parsed)
-
-    def test_parse_authorization_basic_invalid_header_format(self):
-        for header in [
-            "// Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ==",
-            "Basic\tQWxhZGRpbjpvcGVuIHNlc2FtZQ==",
-            "Basic ****************************",
-            "Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ== //",
-        ]:
-            with self.subTest(header=header):
-                with self.assertRaises(InvalidHeaderFormat):
-                    parse_authorization_basic(header)
-
-    def test_parse_authorization_basic_invalid_header_value(self):
-        for header in [
-            "Digest ...",
-            "Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ",
-            "Basic QWxhZGNlc2FtZQ==",
-        ]:
-            with self.subTest(header=header):
-                with self.assertRaises(InvalidHeaderValue):
-                    parse_authorization_basic(header)
diff --git a/tests/wpt/tests/tools/third_party/websockets/tests/test_http.py b/tests/wpt/tests/tools/third_party/websockets/tests/test_http.py
deleted file mode 100644
index 41b522c3d57..00000000000
--- a/tests/wpt/tests/tools/third_party/websockets/tests/test_http.py
+++ /dev/null
@@ -1,249 +0,0 @@
-import asyncio
-import unittest
-
-from websockets.exceptions import SecurityError
-from websockets.http import *
-from websockets.http import read_headers
-
-from .utils import AsyncioTestCase
-
-
-class HTTPAsyncTests(AsyncioTestCase):
-    def setUp(self):
-        super().setUp()
-        self.stream = asyncio.StreamReader(loop=self.loop)
-
-    async def test_read_request(self):
-        # Example from the protocol overview in RFC 6455
-        self.stream.feed_data(
-            b"GET /chat HTTP/1.1\r\n"
-            b"Host: server.example.com\r\n"
-            b"Upgrade: websocket\r\n"
-            b"Connection: Upgrade\r\n"
-            b"Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\n"
-            b"Origin: http://example.com\r\n"
-            b"Sec-WebSocket-Protocol: chat, superchat\r\n"
-            b"Sec-WebSocket-Version: 13\r\n"
-            b"\r\n"
-        )
-        path, headers = await read_request(self.stream)
-        self.assertEqual(path, "/chat")
-        self.assertEqual(headers["Upgrade"], "websocket")
-
-    async def test_read_request_empty(self):
-        self.stream.feed_eof()
-        with self.assertRaisesRegex(
-            EOFError, "connection closed while reading HTTP request line"
-        ):
-            await read_request(self.stream)
-
-    async def test_read_request_invalid_request_line(self):
-        self.stream.feed_data(b"GET /\r\n\r\n")
-        with self.assertRaisesRegex(ValueError, "invalid HTTP request line: GET /"):
-            await read_request(self.stream)
-
-    async def test_read_request_unsupported_method(self):
-        self.stream.feed_data(b"OPTIONS * HTTP/1.1\r\n\r\n")
-        with self.assertRaisesRegex(ValueError, "unsupported HTTP method: OPTIONS"):
-            await read_request(self.stream)
-
-    async def test_read_request_unsupported_version(self):
-        self.stream.feed_data(b"GET /chat HTTP/1.0\r\n\r\n")
-        with self.assertRaisesRegex(ValueError, "unsupported HTTP version: HTTP/1.0"):
-            await read_request(self.stream)
-
-    async def test_read_request_invalid_header(self):
-        self.stream.feed_data(b"GET /chat HTTP/1.1\r\nOops\r\n")
-        with self.assertRaisesRegex(ValueError, "invalid HTTP header line: Oops"):
-            await read_request(self.stream)
-
-    async def test_read_response(self):
-        # Example from the protocol overview in RFC 6455
-        self.stream.feed_data(
-            b"HTTP/1.1 101 Switching Protocols\r\n"
-            b"Upgrade: websocket\r\n"
-            b"Connection: Upgrade\r\n"
-            b"Sec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\n"
-            b"Sec-WebSocket-Protocol: chat\r\n"
-            b"\r\n"
-        )
-        status_code, reason, headers = await read_response(self.stream)
-        self.assertEqual(status_code, 101)
-        self.assertEqual(reason, "Switching Protocols")
-        self.assertEqual(headers["Upgrade"], "websocket")
-
-    async def test_read_response_empty(self):
-        self.stream.feed_eof()
-        with self.assertRaisesRegex(
-            EOFError, "connection closed while reading HTTP status line"
-        ):
-            await read_response(self.stream)
-
-    async def test_read_request_invalid_status_line(self):
-        self.stream.feed_data(b"Hello!\r\n")
-        with self.assertRaisesRegex(ValueError, "invalid HTTP status line: Hello!"):
-            await read_response(self.stream)
-
-    async def test_read_response_unsupported_version(self):
-        self.stream.feed_data(b"HTTP/1.0 400 Bad Request\r\n\r\n")
-        with self.assertRaisesRegex(ValueError, "unsupported HTTP version: HTTP/1.0"):
-            await read_response(self.stream)
-
-    async def test_read_response_invalid_status(self):
-        self.stream.feed_data(b"HTTP/1.1 OMG WTF\r\n\r\n")
-        with self.assertRaisesRegex(ValueError, "invalid HTTP status code: OMG"):
-            await read_response(self.stream)
-
-    async def test_read_response_unsupported_status(self):
-        self.stream.feed_data(b"HTTP/1.1 007 My name is Bond\r\n\r\n")
-        with self.assertRaisesRegex(ValueError, "unsupported HTTP status code: 007"):
-            await read_response(self.stream)
-
-    async def test_read_response_invalid_reason(self):
-        self.stream.feed_data(b"HTTP/1.1 200 \x7f\r\n\r\n")
-        with self.assertRaisesRegex(ValueError, "invalid HTTP reason phrase: \\x7f"):
-            await read_response(self.stream)
-
-    async def test_read_response_invalid_header(self):
-        self.stream.feed_data(b"HTTP/1.1 500 Internal Server Error\r\nOops\r\n")
-        with self.assertRaisesRegex(ValueError, "invalid HTTP header line: Oops"):
-            await read_response(self.stream)
-
-    async def test_header_name(self):
-        self.stream.feed_data(b"foo bar: baz qux\r\n\r\n")
-        with self.assertRaises(ValueError):
-            await read_headers(self.stream)
-
-    async def test_header_value(self):
-        self.stream.feed_data(b"foo: \x00\x00\x0f\r\n\r\n")
-        with self.assertRaises(ValueError):
-            await read_headers(self.stream)
-
-    async def test_headers_limit(self):
-        self.stream.feed_data(b"foo: bar\r\n" * 257 + b"\r\n")
-        with self.assertRaises(SecurityError):
-            await read_headers(self.stream)
-
-    async def test_line_limit(self):
-        # Header line contains 5 + 4090 + 2 = 4097 bytes.
-        self.stream.feed_data(b"foo: " + b"a" * 4090 + b"\r\n\r\n")
-        with self.assertRaises(SecurityError):
-            await read_headers(self.stream)
-
-    async def test_line_ending(self):
-        self.stream.feed_data(b"foo: bar\n\n")
-        with self.assertRaises(EOFError):
-            await read_headers(self.stream)
-
-
-class HeadersTests(unittest.TestCase):
-    def setUp(self):
-        self.headers = Headers([("Connection", "Upgrade"), ("Server", USER_AGENT)])
-
-    def test_str(self):
-        self.assertEqual(
-            str(self.headers), f"Connection: Upgrade\r\nServer: {USER_AGENT}\r\n\r\n"
-        )
-
-    def test_repr(self):
-        self.assertEqual(
-            repr(self.headers),
-            f"Headers([('Connection', 'Upgrade'), " f"('Server', '{USER_AGENT}')])",
-        )
-
-    def test_multiple_values_error_str(self):
-        self.assertEqual(str(MultipleValuesError("Connection")), "'Connection'")
-        self.assertEqual(str(MultipleValuesError()), "")
-
-    def test_contains(self):
-        self.assertIn("Server", self.headers)
-
-    def test_contains_case_insensitive(self):
-        self.assertIn("server", self.headers)
-
-    def test_contains_not_found(self):
-        self.assertNotIn("Date", self.headers)
-
-    def test_contains_non_string_key(self):
-        self.assertNotIn(42, self.headers)
-
-    def test_iter(self):
-        self.assertEqual(set(iter(self.headers)), {"connection", "server"})
-
-    def test_len(self):
-        self.assertEqual(len(self.headers), 2)
-
-    def test_getitem(self):
-        self.assertEqual(self.headers["Server"], USER_AGENT)
-
-    def test_getitem_case_insensitive(self):
-        self.assertEqual(self.headers["server"], USER_AGENT)
-
-    def test_getitem_key_error(self):
-        with self.assertRaises(KeyError):
-            self.headers["Upgrade"]
-
-    def test_getitem_multiple_values_error(self):
-        self.headers["Server"] = "2"
-        with self.assertRaises(MultipleValuesError):
-            self.headers["Server"]
-
-    def test_setitem(self):
-        self.headers["Upgrade"] = "websocket"
-        self.assertEqual(self.headers["Upgrade"], "websocket")
-
-    def test_setitem_case_insensitive(self):
-        self.headers["upgrade"] = "websocket"
-        self.assertEqual(self.headers["Upgrade"], "websocket")
-
-    def test_setitem_multiple_values(self):
-        self.headers["Connection"] = "close"
-        with self.assertRaises(MultipleValuesError):
-            self.headers["Connection"]
-
-    def test_delitem(self):
-        del self.headers["Connection"]
-        with self.assertRaises(KeyError):
-            self.headers["Connection"]
-
-    def test_delitem_case_insensitive(self):
-        del self.headers["connection"]
-        with self.assertRaises(KeyError):
-            self.headers["Connection"]
-
-    def test_delitem_multiple_values(self):
-        self.headers["Connection"] = "close"
-        del self.headers["Connection"]
-        with self.assertRaises(KeyError):
-            self.headers["Connection"]
-
-    def test_eq(self):
-        other_headers = self.headers.copy()
-        self.assertEqual(self.headers, other_headers)
-
-    def test_eq_not_equal(self):
-        self.assertNotEqual(self.headers, [])
-
-    def test_clear(self):
-        self.headers.clear()
-        self.assertFalse(self.headers)
-        self.assertEqual(self.headers, Headers())
-
-    def test_get_all(self):
-        self.assertEqual(self.headers.get_all("Connection"), ["Upgrade"])
-
-    def test_get_all_case_insensitive(self):
-        self.assertEqual(self.headers.get_all("connection"), ["Upgrade"])
-
-    def test_get_all_no_values(self):
-        self.assertEqual(self.headers.get_all("Upgrade"), [])
-
-    def test_get_all_multiple_values(self):
-        self.headers["Connection"] = "close"
-        self.assertEqual(self.headers.get_all("Connection"), ["Upgrade", "close"])
-
-    def test_raw_items(self):
-        self.assertEqual(
-            list(self.headers.raw_items()),
-            [("Connection", "Upgrade"), ("Server", USER_AGENT)],
-        )
diff --git a/tests/wpt/tests/tools/third_party/websockets/tests/test_localhost.cnf b/tests/wpt/tests/tools/third_party/websockets/tests/test_localhost.cnf
deleted file mode 100644
index 6dc331ac69a..00000000000
--- a/tests/wpt/tests/tools/third_party/websockets/tests/test_localhost.cnf
+++ /dev/null
@@ -1,26 +0,0 @@
-[ req ]
-
-default_md = sha256
-encrypt_key = no
-
-prompt = no
-
-distinguished_name = dn
-x509_extensions = ext
-
-[ dn ]
-
-C = "FR"
-L = "Paris"
-O = "Aymeric Augustin"
-CN = "localhost"
-
-[ ext ]
-
-subjectAltName = @san
-
-[ san ]
-
-DNS.1 = localhost
-IP.2 = 127.0.0.1
-IP.3 = ::1
diff --git a/tests/wpt/tests/tools/third_party/websockets/tests/test_localhost.pem b/tests/wpt/tests/tools/third_party/websockets/tests/test_localhost.pem
deleted file mode 100644
index b8a9ea9ab3a..00000000000
--- a/tests/wpt/tests/tools/third_party/websockets/tests/test_localhost.pem
+++ /dev/null
@@ -1,48 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCUgrQVkNbAWRlo
-zZUj14Ufz7YEp2MXmvmhdlfOGLwjy+xPO98aJRv5/nYF2eWM3llcmLe8FbBSK+QF
-To4su7ZVnc6qITOHqcSDUw06WarQUMs94bhHUvQp1u8+b2hNiMeGw6+QiBI6OJRO
-iGpLRbkN6Uj3AKwi8SYVoLyMiztuwbNyGf8fF3DDpHZtBitGtMSBCMsQsfB465pl
-2UoyBrWa2lsbLt3VvBZZvHqfEuPjpjjKN5USIXnaf0NizaR6ps3EyfftWy4i7zIQ
-N5uTExvaPDyPn9nH3q/dkT99mSMSU1AvTTpX8PN7DlqE6wZMbQsBPRGW7GElQ+Ox
-IKdKOLk5AgMBAAECggEAd3kqzQqnaTiEs4ZoC9yPUUc1pErQ8iWP27Ar9TZ67MVa
-B2ggFJV0C0sFwbFI9WnPNCn77gj4vzJmD0riH+SnS/tXThDFtscBu7BtvNp0C4Bj
-8RWMvXxjxuENuQnBPFbkRWtZ6wk8uK/Zx9AAyyt9M07Qjz1wPfAIdm/IH7zHBFMA
-gsqjnkLh1r0FvjNEbLiuGqYU/GVxaZYd+xy+JU52IxjHUUL9yD0BPWb+Szar6AM2
-gUpmTX6+BcCZwwZ//DzCoWYZ9JbP8akn6edBeZyuMPqYgLzZkPyQ+hRW46VPPw89
-yg4LR9nzgQiBHlac0laB4NrWa+d9QRRLitl1O3gVAQKBgQDDkptxXu7w9Lpc+HeE
-N/pJfpCzUuF7ZC4vatdoDzvfB5Ky6W88Poq+I7bB9m7StXdFAbDyUBxvisjTBMVA
-OtYqpAk/rhX8MjSAtjoFe2nH+eEiQriuZmtA5CdKEXS4hNbc/HhEPWhk7Zh8OV5v
-y7l4r6l4UHqaN9QyE0vlFdmcmQKBgQDCZZR/trJ2/g2OquaS+Zd2h/3NXw0NBq4z
-4OBEWqNa/R35jdK6WlWJH7+tKOacr+xtswLpPeZHGwMdk64/erbYWBuJWAjpH72J
-DM9+1H5fFHANWpWTNn94enQxwfzZRvdkxq4IWzGhesptYnHIzoAmaqC3lbn/e3u0
-Flng32hFoQKBgQCF3D4K3hib0lYQtnxPgmUMktWF+A+fflViXTWs4uhu4mcVkFNz
-n7clJ5q6reryzAQjtmGfqRedfRex340HRn46V2aBMK2Znd9zzcZu5CbmGnFvGs3/
-iNiWZNNDjike9sV+IkxLIODoW/vH4xhxWrbLFSjg0ezoy5ew4qZK2abF2QKBgQC5
-M5efeQpbjTyTUERtf/aKCZOGZmkDoPq0GCjxVjzNQdqd1z0NJ2TYR/QP36idXIlu
-FZ7PYZaS5aw5MGpQtfOe94n8dm++0et7t0WzunRO1yTNxCA+aSxWNquegAcJZa/q
-RdKlyWPmSRqzzZdDzWCPuQQ3AyF5wkYfUy/7qjwoIQKBgB2v96BV7+lICviIKzzb
-1o3A3VzAX5MGd98uLGjlK4qsBC+s7mk2eQztiNZgbA0W6fhQ5Dz3HcXJ5ppy8Okc
-jeAktrNRzz15hvi/XkWdO+VMqiHW4l+sWYukjhCyod1oO1KGHq0LYYvv076syxGw
-vRKLq7IJ4WIp1VtfaBlrIogq
------END PRIVATE KEY-----
------BEGIN CERTIFICATE-----
-MIIDTTCCAjWgAwIBAgIJAJ6VG2cQlsepMA0GCSqGSIb3DQEBCwUAMEwxCzAJBgNV
-BAYTAkZSMQ4wDAYDVQQHDAVQYXJpczEZMBcGA1UECgwQQXltZXJpYyBBdWd1c3Rp
-bjESMBAGA1UEAwwJbG9jYWxob3N0MCAXDTE4MDUwNTE2NTc1NloYDzIwNjAwNTA0
-MTY1NzU2WjBMMQswCQYDVQQGEwJGUjEOMAwGA1UEBwwFUGFyaXMxGTAXBgNVBAoM
-EEF5bWVyaWMgQXVndXN0aW4xEjAQBgNVBAMMCWxvY2FsaG9zdDCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAJSCtBWQ1sBZGWjNlSPXhR/PtgSnYxea+aF2
-V84YvCPL7E873xolG/n+dgXZ5YzeWVyYt7wVsFIr5AVOjiy7tlWdzqohM4epxINT
-DTpZqtBQyz3huEdS9CnW7z5vaE2Ix4bDr5CIEjo4lE6IaktFuQ3pSPcArCLxJhWg
-vIyLO27Bs3IZ/x8XcMOkdm0GK0a0xIEIyxCx8HjrmmXZSjIGtZraWxsu3dW8Flm8
-ep8S4+OmOMo3lRIhedp/Q2LNpHqmzcTJ9+1bLiLvMhA3m5MTG9o8PI+f2cfer92R
-P32ZIxJTUC9NOlfw83sOWoTrBkxtCwE9EZbsYSVD47Egp0o4uTkCAwEAAaMwMC4w
-LAYDVR0RBCUwI4IJbG9jYWxob3N0hwR/AAABhxAAAAAAAAAAAAAAAAAAAAABMA0G
-CSqGSIb3DQEBCwUAA4IBAQA0imKp/rflfbDCCx78NdsR5rt0jKem2t3YPGT6tbeU
-+FQz62SEdeD2OHWxpvfPf+6h3iTXJbkakr2R4lP3z7GHUe61lt3So9VHAvgbtPTH
-aB1gOdThA83o0fzQtnIv67jCvE9gwPQInViZLEcm2iQEZLj6AuSvBKmluTR7vNRj
-8/f2R4LsDfCWGrzk2W+deGRvSow7irS88NQ8BW8S8otgMiBx4D2UlOmQwqr6X+/r
-jYIDuMb6GDKRXtBUGDokfE94hjj9u2mrNRwt8y4tqu8ZNa//yLEQ0Ow2kP3QJPLY
-941VZpwRi2v/+JvI7OBYlvbOTFwM8nAk79k+Dgviygd9
------END CERTIFICATE-----
diff --git a/tests/wpt/tests/tools/third_party/websockets/tests/test_protocol.py b/tests/wpt/tests/tools/third_party/websockets/tests/test_protocol.py
deleted file mode 100644
index d32c1f72e7c..00000000000
--- a/tests/wpt/tests/tools/third_party/websockets/tests/test_protocol.py
+++ /dev/null
@@ -1,1475 +0,0 @@
-import asyncio
-import contextlib
-import sys
-import unittest
-import unittest.mock
-import warnings
-
-from websockets.exceptions import ConnectionClosed, InvalidState
-from websockets.framing import *
-from websockets.protocol import State, WebSocketCommonProtocol
-
-from .utils import MS, AsyncioTestCase
-
-
-async def async_iterable(iterable):
-    for item in iterable:
-        yield item
-
-
-class TransportMock(unittest.mock.Mock):
-    """
-    Transport mock to control the protocol's inputs and outputs in tests.
-
-    It calls the protocol's connection_made and connection_lost methods like
-    actual transports.
-
-    It also calls the protocol's connection_open method to bypass the
-    WebSocket handshake.
-
-    To simulate incoming data, tests call the protocol's data_received and
-    eof_received methods directly.
-
-    They could also pause_writing and resume_writing to test flow control.
-
-    """
-
-    # This should happen in __init__ but overriding Mock.__init__ is hard.
-    def setup_mock(self, loop, protocol):
-        self.loop = loop
-        self.protocol = protocol
-        self._eof = False
-        self._closing = False
-        # Simulate a successful TCP handshake.
-        self.protocol.connection_made(self)
-        # Simulate a successful WebSocket handshake.
-        self.protocol.connection_open()
-
-    def can_write_eof(self):
-        return True
-
-    def write_eof(self):
-        # When the protocol half-closes the TCP connection, it expects the
-        # other end to close it. Simulate that.
-        if not self._eof:
-            self.loop.call_soon(self.close)
-        self._eof = True
-
-    def close(self):
-        # Simulate how actual transports drop the connection.
-        if not self._closing:
-            self.loop.call_soon(self.protocol.connection_lost, None)
-        self._closing = True
-
-    def abort(self):
-        # Change this to an `if` if tests call abort() multiple times.
-        assert self.protocol.state is not State.CLOSED
-        self.loop.call_soon(self.protocol.connection_lost, None)
-
-
-class CommonTests:
-    """
-    Mixin that defines most tests but doesn't inherit unittest.TestCase.
-
-    Tests are run by the ServerTests and ClientTests subclasses.
-
-    """
-
-    def setUp(self):
-        super().setUp()
-        # Disable pings to make it easier to test what frames are sent exactly.
-        self.protocol = WebSocketCommonProtocol(ping_interval=None)
-        self.transport = TransportMock()
-        self.transport.setup_mock(self.loop, self.protocol)
-
-    def tearDown(self):
-        self.transport.close()
-        self.loop.run_until_complete(self.protocol.close())
-        super().tearDown()
-
-    # Utilities for writing tests.
-
-    def make_drain_slow(self, delay=MS):
-        # Process connection_made in order to initialize self.protocol.transport.
-        self.run_loop_once()
-
-        original_drain = self.protocol._drain
-
-        async def delayed_drain():
-            await asyncio.sleep(
-                delay, loop=self.loop if sys.version_info[:2] < (3, 8) else None
-            )
-            await original_drain()
-
-        self.protocol._drain = delayed_drain
-
-    close_frame = Frame(True, OP_CLOSE, serialize_close(1000, "close"))
-    local_close = Frame(True, OP_CLOSE, serialize_close(1000, "local"))
-    remote_close = Frame(True, OP_CLOSE, serialize_close(1000, "remote"))
-
-    def receive_frame(self, frame):
-        """
-        Make the protocol receive a frame.
-
-        """
-        write = self.protocol.data_received
-        mask = not self.protocol.is_client
-        frame.write(write, mask=mask)
-
-    def receive_eof(self):
-        """
-        Make the protocol receive the end of the data stream.
-
-        Since ``WebSocketCommonProtocol.eof_received`` returns ``None``, an
-        actual transport would close itself after calling it. This function
-        emulates that behavior.
-
-        """
-        self.protocol.eof_received()
-        self.loop.call_soon(self.transport.close)
-
-    def receive_eof_if_client(self):
-        """
-        Like receive_eof, but only if this is the client side.
-
-        Since the server is supposed to initiate the termination of the TCP
-        connection, this method helps making tests work for both sides.
-
-        """
-        if self.protocol.is_client:
-            self.receive_eof()
-
-    def close_connection(self, code=1000, reason="close"):
-        """
-        Execute a closing handshake.
-
-        This puts the connection in the CLOSED state.
-
-        """
-        close_frame_data = serialize_close(code, reason)
-        # Prepare the response to the closing handshake from the remote side.
-        self.receive_frame(Frame(True, OP_CLOSE, close_frame_data))
-        self.receive_eof_if_client()
-        # Trigger the closing handshake from the local side and complete it.
-        self.loop.run_until_complete(self.protocol.close(code, reason))
-        # Empty the outgoing data stream so we can make assertions later on.
-        self.assertOneFrameSent(True, OP_CLOSE, close_frame_data)
-
-        assert self.protocol.state is State.CLOSED
-
-    def half_close_connection_local(self, code=1000, reason="close"):
-        """
-        Start a closing handshake but do not complete it.
-
-        The main difference with `close_connection` is that the connection is
-        left in the CLOSING state until the event loop runs again.
-
-        The current implementation returns a task that must be awaited or
-        canceled, else asyncio complains about destroying a pending task.
-
-        """
-        close_frame_data = serialize_close(code, reason)
-        # Trigger the closing handshake from the local endpoint.
-        close_task = self.loop.create_task(self.protocol.close(code, reason))
-        self.run_loop_once()  # wait_for executes
-        self.run_loop_once()  # write_frame executes
-        # Empty the outgoing data stream so we can make assertions later on.
-        self.assertOneFrameSent(True, OP_CLOSE, close_frame_data)
-
-        assert self.protocol.state is State.CLOSING
-
-        # Complete the closing sequence at 1ms intervals so the test can run
-        # at each point even it goes back to the event loop several times.
-        self.loop.call_later(
-            MS, self.receive_frame, Frame(True, OP_CLOSE, close_frame_data)
-        )
-        self.loop.call_later(2 * MS, self.receive_eof_if_client)
-
-        # This task must be awaited or canceled by the caller.
-        return close_task
-
-    def half_close_connection_remote(self, code=1000, reason="close"):
-        """
-        Receive a closing handshake but do not complete it.
-
-        The main difference with `close_connection` is that the connection is
-        left in the CLOSING state until the event loop runs again.
-
-        """
-        # On the server side, websockets completes the closing handshake and
-        # closes the TCP connection immediately. Yield to the event loop after
-        # sending the close frame to run the test while the connection is in
-        # the CLOSING state.
-        if not self.protocol.is_client:
-            self.make_drain_slow()
-
-        close_frame_data = serialize_close(code, reason)
-        # Trigger the closing handshake from the remote endpoint.
-        self.receive_frame(Frame(True, OP_CLOSE, close_frame_data))
-        self.run_loop_once()  # read_frame executes
-        # Empty the outgoing data stream so we can make assertions later on.
-        self.assertOneFrameSent(True, OP_CLOSE, close_frame_data)
-
-        assert self.protocol.state is State.CLOSING
-
-        # Complete the closing sequence at 1ms intervals so the test can run
-        # at each point even it goes back to the event loop several times.
-        self.loop.call_later(2 * MS, self.receive_eof_if_client)
-
-    def process_invalid_frames(self):
-        """
-        Make the protocol fail quickly after simulating invalid data.
-
-        To achieve this, this function triggers the protocol's eof_received,
-        which interrupts pending reads waiting for more data.
-
-        """
-        self.run_loop_once()
-        self.receive_eof()
-        self.loop.run_until_complete(self.protocol.close_connection_task)
-
-    def sent_frames(self):
-        """
-        Read all frames sent to the transport.
-
-        """
-        stream = asyncio.StreamReader(loop=self.loop)
-
-        for (data,), kw in self.transport.write.call_args_list:
-            stream.feed_data(data)
-        self.transport.write.call_args_list = []
-        stream.feed_eof()
-
-        frames = []
-        while not stream.at_eof():
-            frames.append(
-                self.loop.run_until_complete(
-                    Frame.read(stream.readexactly, mask=self.protocol.is_client)
-                )
-            )
-        return frames
-
-    def last_sent_frame(self):
-        """
-        Read the last frame sent to the transport.
-
-        This method assumes that at most one frame was sent. It raises an
-        AssertionError otherwise.
-
-        """
-        frames = self.sent_frames()
-        if frames:
-            assert len(frames) == 1
-            return frames[0]
-
-    def assertFramesSent(self, *frames):
-        self.assertEqual(self.sent_frames(), [Frame(*args) for args in frames])
-
-    def assertOneFrameSent(self, *args):
-        self.assertEqual(self.last_sent_frame(), Frame(*args))
-
-    def assertNoFrameSent(self):
-        self.assertIsNone(self.last_sent_frame())
-
-    def assertConnectionClosed(self, code, message):
-        # The following line guarantees that connection_lost was called.
-        self.assertEqual(self.protocol.state, State.CLOSED)
-        # A close frame was received.
-        self.assertEqual(self.protocol.close_code, code)
-        self.assertEqual(self.protocol.close_reason, message)
-
-    def assertConnectionFailed(self, code, message):
-        # The following line guarantees that connection_lost was called.
-        self.assertEqual(self.protocol.state, State.CLOSED)
-        # No close frame was received.
-        self.assertEqual(self.protocol.close_code, 1006)
-        self.assertEqual(self.protocol.close_reason, "")
-        # A close frame was sent -- unless the connection was already lost.
-        if code == 1006:
-            self.assertNoFrameSent()
-        else:
-            self.assertOneFrameSent(True, OP_CLOSE, serialize_close(code, message))
-
-    @contextlib.contextmanager
-    def assertCompletesWithin(self, min_time, max_time):
-        t0 = self.loop.time()
-        yield
-        t1 = self.loop.time()
-        dt = t1 - t0
-        self.assertGreaterEqual(dt, min_time, f"Too fast: {dt} < {min_time}")
-        self.assertLess(dt, max_time, f"Too slow: {dt} >= {max_time}")
-
-    # Test constructor.
-
-    def test_timeout_backwards_compatibility(self):
-        with warnings.catch_warnings(record=True) as recorded_warnings:
-            protocol = WebSocketCommonProtocol(timeout=5)
-
-        self.assertEqual(protocol.close_timeout, 5)
-
-        self.assertEqual(len(recorded_warnings), 1)
-        warning = recorded_warnings[0].message
-        self.assertEqual(str(warning), "rename timeout to close_timeout")
-        self.assertEqual(type(warning), DeprecationWarning)
-
-    # Test public attributes.
-
-    def test_local_address(self):
-        get_extra_info = unittest.mock.Mock(return_value=("host", 4312))
-        self.transport.get_extra_info = get_extra_info
-
-        self.assertEqual(self.protocol.local_address, ("host", 4312))
-        get_extra_info.assert_called_with("sockname")
-
-    def test_local_address_before_connection(self):
-        # Emulate the situation before connection_open() runs.
-        _transport = self.protocol.transport
-        del self.protocol.transport
-        try:
-            self.assertEqual(self.protocol.local_address, None)
-        finally:
-            self.protocol.transport = _transport
-
-    def test_remote_address(self):
-        get_extra_info = unittest.mock.Mock(return_value=("host", 4312))
-        self.transport.get_extra_info = get_extra_info
-
-        self.assertEqual(self.protocol.remote_address, ("host", 4312))
-        get_extra_info.assert_called_with("peername")
-
-    def test_remote_address_before_connection(self):
-        # Emulate the situation before connection_open() runs.
-        _transport = self.protocol.transport
-        del self.protocol.transport
-        try:
-            self.assertEqual(self.protocol.remote_address, None)
-        finally:
-            self.protocol.transport = _transport
-
-    def test_open(self):
-        self.assertTrue(self.protocol.open)
-        self.close_connection()
-        self.assertFalse(self.protocol.open)
-
-    def test_closed(self):
-        self.assertFalse(self.protocol.closed)
-        self.close_connection()
-        self.assertTrue(self.protocol.closed)
-
-    def test_wait_closed(self):
-        wait_closed = self.loop.create_task(self.protocol.wait_closed())
-        self.assertFalse(wait_closed.done())
-        self.close_connection()
-        self.assertTrue(wait_closed.done())
-
-    # Test the recv coroutine.
-
-    def test_recv_text(self):
-        self.receive_frame(Frame(True, OP_TEXT, "café".encode("utf-8")))
-        data = self.loop.run_until_complete(self.protocol.recv())
-        self.assertEqual(data, "café")
-
-    def test_recv_binary(self):
-        self.receive_frame(Frame(True, OP_BINARY, b"tea"))
-        data = self.loop.run_until_complete(self.protocol.recv())
-        self.assertEqual(data, b"tea")
-
-    def test_recv_on_closing_connection_local(self):
-        close_task = self.half_close_connection_local()
-
-        with self.assertRaises(ConnectionClosed):
-            self.loop.run_until_complete(self.protocol.recv())
-
-        self.loop.run_until_complete(close_task)  # cleanup
-
-    def test_recv_on_closing_connection_remote(self):
-        self.half_close_connection_remote()
-
-        with self.assertRaises(ConnectionClosed):
-            self.loop.run_until_complete(self.protocol.recv())
-
-    def test_recv_on_closed_connection(self):
-        self.close_connection()
-
-        with self.assertRaises(ConnectionClosed):
-            self.loop.run_until_complete(self.protocol.recv())
-
-    def test_recv_protocol_error(self):
-        self.receive_frame(Frame(True, OP_CONT, "café".encode("utf-8")))
-        self.process_invalid_frames()
-        self.assertConnectionFailed(1002, "")
-
-    def test_recv_unicode_error(self):
-        self.receive_frame(Frame(True, OP_TEXT, "café".encode("latin-1")))
-        self.process_invalid_frames()
-        self.assertConnectionFailed(1007, "")
-
-    def test_recv_text_payload_too_big(self):
-        self.protocol.max_size = 1024
-        self.receive_frame(Frame(True, OP_TEXT, "café".encode("utf-8") * 205))
-        self.process_invalid_frames()
-        self.assertConnectionFailed(1009, "")
-
-    def test_recv_binary_payload_too_big(self):
-        self.protocol.max_size = 1024
-        self.receive_frame(Frame(True, OP_BINARY, b"tea" * 342))
-        self.process_invalid_frames()
-        self.assertConnectionFailed(1009, "")
-
-    def test_recv_text_no_max_size(self):
-        self.protocol.max_size = None  # for test coverage
-        self.receive_frame(Frame(True, OP_TEXT, "café".encode("utf-8") * 205))
-        data = self.loop.run_until_complete(self.protocol.recv())
-        self.assertEqual(data, "café" * 205)
-
-    def test_recv_binary_no_max_size(self):
-        self.protocol.max_size = None  # for test coverage
-        self.receive_frame(Frame(True, OP_BINARY, b"tea" * 342))
-        data = self.loop.run_until_complete(self.protocol.recv())
-        self.assertEqual(data, b"tea" * 342)
-
-    def test_recv_queue_empty(self):
-        recv = self.loop.create_task(self.protocol.recv())
-        with self.assertRaises(asyncio.TimeoutError):
-            self.loop.run_until_complete(
-                asyncio.wait_for(asyncio.shield(recv), timeout=MS)
-            )
-
-        self.receive_frame(Frame(True, OP_TEXT, "café".encode("utf-8")))
-        data = self.loop.run_until_complete(recv)
-        self.assertEqual(data, "café")
-
-    def test_recv_queue_full(self):
-        self.protocol.max_queue = 2
-        # Test internals because it's hard to verify buffers from the outside.
-        self.assertEqual(list(self.protocol.messages), [])
-
-        self.receive_frame(Frame(True, OP_TEXT, "café".encode("utf-8")))
-        self.run_loop_once()
-        self.assertEqual(list(self.protocol.messages), ["café"])
-
-        self.receive_frame(Frame(True, OP_BINARY, b"tea"))
-        self.run_loop_once()
-        self.assertEqual(list(self.protocol.messages), ["café", b"tea"])
-
-        self.receive_frame(Frame(True, OP_BINARY, b"milk"))
-        self.run_loop_once()
-        self.assertEqual(list(self.protocol.messages), ["café", b"tea"])
-
-        self.loop.run_until_complete(self.protocol.recv())
-        self.run_loop_once()
-        self.assertEqual(list(self.protocol.messages), [b"tea", b"milk"])
-
-        self.loop.run_until_complete(self.protocol.recv())
-        self.run_loop_once()
-        self.assertEqual(list(self.protocol.messages), [b"milk"])
-
-        self.loop.run_until_complete(self.protocol.recv())
-        self.run_loop_once()
-        self.assertEqual(list(self.protocol.messages), [])
-
-    def test_recv_queue_no_limit(self):
-        self.protocol.max_queue = None
-
-        for _ in range(100):
-            self.receive_frame(Frame(True, OP_TEXT, "café".encode("utf-8")))
-            self.run_loop_once()
-
-        # Incoming message queue can contain at least 100 messages.
-        self.assertEqual(list(self.protocol.messages), ["café"] * 100)
-
-        for _ in range(100):
-            self.loop.run_until_complete(self.protocol.recv())
-
-        self.assertEqual(list(self.protocol.messages), [])
-
-    def test_recv_other_error(self):
-        async def read_message():
-            raise Exception("BOOM")
-
-        self.protocol.read_message = read_message
-        self.process_invalid_frames()
-        self.assertConnectionFailed(1011, "")
-
-    def test_recv_canceled(self):
-        recv = self.loop.create_task(self.protocol.recv())
-        self.loop.call_soon(recv.cancel)
-
-        with self.assertRaises(asyncio.CancelledError):
-            self.loop.run_until_complete(recv)
-
-        # The next frame doesn't disappear in a vacuum (it used to).
-        self.receive_frame(Frame(True, OP_TEXT, "café".encode("utf-8")))
-        data = self.loop.run_until_complete(self.protocol.recv())
-        self.assertEqual(data, "café")
-
-    def test_recv_canceled_race_condition(self):
-        recv = self.loop.create_task(
-            asyncio.wait_for(self.protocol.recv(), timeout=0.000_001)
-        )
-        self.loop.call_soon(
-            self.receive_frame, Frame(True, OP_TEXT, "café".encode("utf-8"))
-        )
-
-        with self.assertRaises(asyncio.TimeoutError):
-            self.loop.run_until_complete(recv)
-
-        # The previous frame doesn't disappear in a vacuum (it used to).
-        self.receive_frame(Frame(True, OP_TEXT, "tea".encode("utf-8")))
-        data = self.loop.run_until_complete(self.protocol.recv())
-        # If we're getting "tea" there, it means "café" was swallowed (ha, ha).
-        self.assertEqual(data, "café")
-
-    def test_recv_when_transfer_data_cancelled(self):
-        # Clog incoming queue.
-        self.protocol.max_queue = 1
-        self.receive_frame(Frame(True, OP_TEXT, "café".encode("utf-8")))
-        self.receive_frame(Frame(True, OP_BINARY, b"tea"))
-        self.run_loop_once()
-
-        # Flow control kicks in (check with an implementation detail).
-        self.assertFalse(self.protocol._put_message_waiter.done())
-
-        # Schedule recv().
-        recv = self.loop.create_task(self.protocol.recv())
-
-        # Cancel transfer_data_task (again, implementation detail).
-        self.protocol.fail_connection()
-        self.run_loop_once()
-        self.assertTrue(self.protocol.transfer_data_task.cancelled())
-
-        # recv() completes properly.
-        self.assertEqual(self.loop.run_until_complete(recv), "café")
-
-    def test_recv_prevents_concurrent_calls(self):
-        recv = self.loop.create_task(self.protocol.recv())
-
-        with self.assertRaisesRegex(
-            RuntimeError,
-            "cannot call recv while another coroutine "
-            "is already waiting for the next message",
-        ):
-            self.loop.run_until_complete(self.protocol.recv())
-
-        recv.cancel()
-
-    # Test the send coroutine.
-
-    def test_send_text(self):
-        self.loop.run_until_complete(self.protocol.send("café"))
-        self.assertOneFrameSent(True, OP_TEXT, "café".encode("utf-8"))
-
-    def test_send_binary(self):
-        self.loop.run_until_complete(self.protocol.send(b"tea"))
-        self.assertOneFrameSent(True, OP_BINARY, b"tea")
-
-    def test_send_binary_from_bytearray(self):
-        self.loop.run_until_complete(self.protocol.send(bytearray(b"tea")))
-        self.assertOneFrameSent(True, OP_BINARY, b"tea")
-
-    def test_send_binary_from_memoryview(self):
-        self.loop.run_until_complete(self.protocol.send(memoryview(b"tea")))
-        self.assertOneFrameSent(True, OP_BINARY, b"tea")
-
-    def test_send_binary_from_non_contiguous_memoryview(self):
-        self.loop.run_until_complete(self.protocol.send(memoryview(b"tteeaa")[::2]))
-        self.assertOneFrameSent(True, OP_BINARY, b"tea")
-
-    def test_send_type_error(self):
-        with self.assertRaises(TypeError):
-            self.loop.run_until_complete(self.protocol.send(42))
-        self.assertNoFrameSent()
-
-    def test_send_iterable_text(self):
-        self.loop.run_until_complete(self.protocol.send(["ca", "fé"]))
-        self.assertFramesSent(
-            (False, OP_TEXT, "ca".encode("utf-8")),
-            (False, OP_CONT, "fé".encode("utf-8")),
-            (True, OP_CONT, "".encode("utf-8")),
-        )
-
-    def test_send_iterable_binary(self):
-        self.loop.run_until_complete(self.protocol.send([b"te", b"a"]))
-        self.assertFramesSent(
-            (False, OP_BINARY, b"te"), (False, OP_CONT, b"a"), (True, OP_CONT, b"")
-        )
-
-    def test_send_iterable_binary_from_bytearray(self):
-        self.loop.run_until_complete(
-            self.protocol.send([bytearray(b"te"), bytearray(b"a")])
-        )
-        self.assertFramesSent(
-            (False, OP_BINARY, b"te"), (False, OP_CONT, b"a"), (True, OP_CONT, b"")
-        )
-
-    def test_send_iterable_binary_from_memoryview(self):
-        self.loop.run_until_complete(
-            self.protocol.send([memoryview(b"te"), memoryview(b"a")])
-        )
-        self.assertFramesSent(
-            (False, OP_BINARY, b"te"), (False, OP_CONT, b"a"), (True, OP_CONT, b"")
-        )
-
-    def test_send_iterable_binary_from_non_contiguous_memoryview(self):
-        self.loop.run_until_complete(
-            self.protocol.send([memoryview(b"ttee")[::2], memoryview(b"aa")[::2]])
-        )
-        self.assertFramesSent(
-            (False, OP_BINARY, b"te"), (False, OP_CONT, b"a"), (True, OP_CONT, b"")
-        )
-
-    def test_send_empty_iterable(self):
-        self.loop.run_until_complete(self.protocol.send([]))
-        self.assertNoFrameSent()
-
-    def test_send_iterable_type_error(self):
-        with self.assertRaises(TypeError):
-            self.loop.run_until_complete(self.protocol.send([42]))
-        self.assertNoFrameSent()
-
-    def test_send_iterable_mixed_type_error(self):
-        with self.assertRaises(TypeError):
-            self.loop.run_until_complete(self.protocol.send(["café", b"tea"]))
-        self.assertFramesSent(
-            (False, OP_TEXT, "café".encode("utf-8")),
-            (True, OP_CLOSE, serialize_close(1011, "")),
-        )
-
-    def test_send_iterable_prevents_concurrent_send(self):
-        self.make_drain_slow(2 * MS)
-
-        async def send_iterable():
-            await self.protocol.send(["ca", "fé"])
-
-        async def send_concurrent():
-            await asyncio.sleep(MS)
-            await self.protocol.send(b"tea")
-
-        self.loop.run_until_complete(asyncio.gather(send_iterable(), send_concurrent()))
-        self.assertFramesSent(
-            (False, OP_TEXT, "ca".encode("utf-8")),
-            (False, OP_CONT, "fé".encode("utf-8")),
-            (True, OP_CONT, "".encode("utf-8")),
-            (True, OP_BINARY, b"tea"),
-        )
-
-    def test_send_async_iterable_text(self):
-        self.loop.run_until_complete(self.protocol.send(async_iterable(["ca", "fé"])))
-        self.assertFramesSent(
-            (False, OP_TEXT, "ca".encode("utf-8")),
-            (False, OP_CONT, "fé".encode("utf-8")),
-            (True, OP_CONT, "".encode("utf-8")),
-        )
-
-    def test_send_async_iterable_binary(self):
-        self.loop.run_until_complete(self.protocol.send(async_iterable([b"te", b"a"])))
-        self.assertFramesSent(
-            (False, OP_BINARY, b"te"), (False, OP_CONT, b"a"), (True, OP_CONT, b"")
-        )
-
-    def test_send_async_iterable_binary_from_bytearray(self):
-        self.loop.run_until_complete(
-            self.protocol.send(async_iterable([bytearray(b"te"), bytearray(b"a")]))
-        )
-        self.assertFramesSent(
-            (False, OP_BINARY, b"te"), (False, OP_CONT, b"a"), (True, OP_CONT, b"")
-        )
-
-    def test_send_async_iterable_binary_from_memoryview(self):
-        self.loop.run_until_complete(
-            self.protocol.send(async_iterable([memoryview(b"te"), memoryview(b"a")]))
-        )
-        self.assertFramesSent(
-            (False, OP_BINARY, b"te"), (False, OP_CONT, b"a"), (True, OP_CONT, b"")
-        )
-
-    def test_send_async_iterable_binary_from_non_contiguous_memoryview(self):
-        self.loop.run_until_complete(
-            self.protocol.send(
-                async_iterable([memoryview(b"ttee")[::2], memoryview(b"aa")[::2]])
-            )
-        )
-        self.assertFramesSent(
-            (False, OP_BINARY, b"te"), (False, OP_CONT, b"a"), (True, OP_CONT, b"")
-        )
-
-    def test_send_empty_async_iterable(self):
-        self.loop.run_until_complete(self.protocol.send(async_iterable([])))
-        self.assertNoFrameSent()
-
-    def test_send_async_iterable_type_error(self):
-        with self.assertRaises(TypeError):
-            self.loop.run_until_complete(self.protocol.send(async_iterable([42])))
-        self.assertNoFrameSent()
-
-    def test_send_async_iterable_mixed_type_error(self):
-        with self.assertRaises(TypeError):
-            self.loop.run_until_complete(
-                self.protocol.send(async_iterable(["café", b"tea"]))
-            )
-        self.assertFramesSent(
-            (False, OP_TEXT, "café".encode("utf-8")),
-            (True, OP_CLOSE, serialize_close(1011, "")),
-        )
-
-    def test_send_async_iterable_prevents_concurrent_send(self):
-        self.make_drain_slow(2 * MS)
-
-        async def send_async_iterable():
-            await self.protocol.send(async_iterable(["ca", "fé"]))
-
-        async def send_concurrent():
-            await asyncio.sleep(MS)
-            await self.protocol.send(b"tea")
-
-        self.loop.run_until_complete(
-            asyncio.gather(send_async_iterable(), send_concurrent())
-        )
-        self.assertFramesSent(
-            (False, OP_TEXT, "ca".encode("utf-8")),
-            (False, OP_CONT, "fé".encode("utf-8")),
-            (True, OP_CONT, "".encode("utf-8")),
-            (True, OP_BINARY, b"tea"),
-        )
-
-    def test_send_on_closing_connection_local(self):
-        close_task = self.half_close_connection_local()
-
-        with self.assertRaises(ConnectionClosed):
-            self.loop.run_until_complete(self.protocol.send("foobar"))
-
-        self.assertNoFrameSent()
-
-        self.loop.run_until_complete(close_task)  # cleanup
-
-    def test_send_on_closing_connection_remote(self):
-        self.half_close_connection_remote()
-
-        with self.assertRaises(ConnectionClosed):
-            self.loop.run_until_complete(self.protocol.send("foobar"))
-
-        self.assertNoFrameSent()
-
-    def test_send_on_closed_connection(self):
-        self.close_connection()
-
-        with self.assertRaises(ConnectionClosed):
-            self.loop.run_until_complete(self.protocol.send("foobar"))
-
-        self.assertNoFrameSent()
-
-    # Test the ping coroutine.
-
-    def test_ping_default(self):
-        self.loop.run_until_complete(self.protocol.ping())
-        # With our testing tools, it's more convenient to extract the expected
-        # ping data from the library's internals than from the frame sent.
-        ping_data = next(iter(self.protocol.pings))
-        self.assertIsInstance(ping_data, bytes)
-        self.assertEqual(len(ping_data), 4)
-        self.assertOneFrameSent(True, OP_PING, ping_data)
-
-    def test_ping_text(self):
-        self.loop.run_until_complete(self.protocol.ping("café"))
-        self.assertOneFrameSent(True, OP_PING, "café".encode("utf-8"))
-
-    def test_ping_binary(self):
-        self.loop.run_until_complete(self.protocol.ping(b"tea"))
-        self.assertOneFrameSent(True, OP_PING, b"tea")
-
-    def test_ping_binary_from_bytearray(self):
-        self.loop.run_until_complete(self.protocol.ping(bytearray(b"tea")))
-        self.assertOneFrameSent(True, OP_PING, b"tea")
-
-    def test_ping_binary_from_memoryview(self):
-        self.loop.run_until_complete(self.protocol.ping(memoryview(b"tea")))
-        self.assertOneFrameSent(True, OP_PING, b"tea")
-
-    def test_ping_binary_from_non_contiguous_memoryview(self):
-        self.loop.run_until_complete(self.protocol.ping(memoryview(b"tteeaa")[::2]))
-        self.assertOneFrameSent(True, OP_PING, b"tea")
-
-    def test_ping_type_error(self):
-        with self.assertRaises(TypeError):
-            self.loop.run_until_complete(self.protocol.ping(42))
-        self.assertNoFrameSent()
-
-    def test_ping_on_closing_connection_local(self):
-        close_task = self.half_close_connection_local()
-
-        with self.assertRaises(ConnectionClosed):
-            self.loop.run_until_complete(self.protocol.ping())
-
-        self.assertNoFrameSent()
-
-        self.loop.run_until_complete(close_task)  # cleanup
-
-    def test_ping_on_closing_connection_remote(self):
-        self.half_close_connection_remote()
-
-        with self.assertRaises(ConnectionClosed):
-            self.loop.run_until_complete(self.protocol.ping())
-
-        self.assertNoFrameSent()
-
-    def test_ping_on_closed_connection(self):
-        self.close_connection()
-
-        with self.assertRaises(ConnectionClosed):
-            self.loop.run_until_complete(self.protocol.ping())
-
-        self.assertNoFrameSent()
-
-    # Test the pong coroutine.
-
-    def test_pong_default(self):
-        self.loop.run_until_complete(self.protocol.pong())
-        self.assertOneFrameSent(True, OP_PONG, b"")
-
-    def test_pong_text(self):
-        self.loop.run_until_complete(self.protocol.pong("café"))
-        self.assertOneFrameSent(True, OP_PONG, "café".encode("utf-8"))
-
-    def test_pong_binary(self):
-        self.loop.run_until_complete(self.protocol.pong(b"tea"))
-        self.assertOneFrameSent(True, OP_PONG, b"tea")
-
-    def test_pong_binary_from_bytearray(self):
-        self.loop.run_until_complete(self.protocol.pong(bytearray(b"tea")))
-        self.assertOneFrameSent(True, OP_PONG, b"tea")
-
-    def test_pong_binary_from_memoryview(self):
-        self.loop.run_until_complete(self.protocol.pong(memoryview(b"tea")))
-        self.assertOneFrameSent(True, OP_PONG, b"tea")
-
-    def test_pong_binary_from_non_contiguous_memoryview(self):
-        self.loop.run_until_complete(self.protocol.pong(memoryview(b"tteeaa")[::2]))
-        self.assertOneFrameSent(True, OP_PONG, b"tea")
-
-    def test_pong_type_error(self):
-        with self.assertRaises(TypeError):
-            self.loop.run_until_complete(self.protocol.pong(42))
-        self.assertNoFrameSent()
-
-    def test_pong_on_closing_connection_local(self):
-        close_task = self.half_close_connection_local()
-
-        with self.assertRaises(ConnectionClosed):
-            self.loop.run_until_complete(self.protocol.pong())
-
-        self.assertNoFrameSent()
-
-        self.loop.run_until_complete(close_task)  # cleanup
-
-    def test_pong_on_closing_connection_remote(self):
-        self.half_close_connection_remote()
-
-        with self.assertRaises(ConnectionClosed):
-            self.loop.run_until_complete(self.protocol.pong())
-
-        self.assertNoFrameSent()
-
-    def test_pong_on_closed_connection(self):
-        self.close_connection()
-
-        with self.assertRaises(ConnectionClosed):
-            self.loop.run_until_complete(self.protocol.pong())
-
-        self.assertNoFrameSent()
-
-    # Test the protocol's logic for acknowledging pings with pongs.
-
-    def test_answer_ping(self):
-        self.receive_frame(Frame(True, OP_PING, b"test"))
-        self.run_loop_once()
-        self.assertOneFrameSent(True, OP_PONG, b"test")
-
-    def test_ignore_pong(self):
-        self.receive_frame(Frame(True, OP_PONG, b"test"))
-        self.run_loop_once()
-        self.assertNoFrameSent()
-
-    def test_acknowledge_ping(self):
-        ping = self.loop.run_until_complete(self.protocol.ping())
-        self.assertFalse(ping.done())
-        ping_frame = self.last_sent_frame()
-        pong_frame = Frame(True, OP_PONG, ping_frame.data)
-        self.receive_frame(pong_frame)
-        self.run_loop_once()
-        self.run_loop_once()
-        self.assertTrue(ping.done())
-
-    def test_abort_ping(self):
-        ping = self.loop.run_until_complete(self.protocol.ping())
-        # Remove the frame from the buffer, else close_connection() complains.
-        self.last_sent_frame()
-        self.assertFalse(ping.done())
-        self.close_connection()
-        self.assertTrue(ping.done())
-        self.assertIsInstance(ping.exception(), ConnectionClosed)
-
-    def test_abort_ping_does_not_log_exception_if_not_retreived(self):
-        self.loop.run_until_complete(self.protocol.ping())
-        # Get the internal Future, which isn't directly returned by ping().
-        (ping,) = self.protocol.pings.values()
-        # Remove the frame from the buffer, else close_connection() complains.
-        self.last_sent_frame()
-        self.close_connection()
-        # Check a private attribute, for lack of a better solution.
-        self.assertFalse(ping._log_traceback)
-
-    def test_acknowledge_previous_pings(self):
-        pings = [
-            (self.loop.run_until_complete(self.protocol.ping()), self.last_sent_frame())
-            for i in range(3)
-        ]
-        # Unsolicited pong doesn't acknowledge pings
-        self.receive_frame(Frame(True, OP_PONG, b""))
-        self.run_loop_once()
-        self.run_loop_once()
-        self.assertFalse(pings[0][0].done())
-        self.assertFalse(pings[1][0].done())
-        self.assertFalse(pings[2][0].done())
-        # Pong acknowledges all previous pings
-        self.receive_frame(Frame(True, OP_PONG, pings[1][1].data))
-        self.run_loop_once()
-        self.run_loop_once()
-        self.assertTrue(pings[0][0].done())
-        self.assertTrue(pings[1][0].done())
-        self.assertFalse(pings[2][0].done())
-
-    def test_acknowledge_aborted_ping(self):
-        ping = self.loop.run_until_complete(self.protocol.ping())
-        ping_frame = self.last_sent_frame()
-        # Clog incoming queue. This lets connection_lost() abort pending pings
-        # with a ConnectionClosed exception before transfer_data_task
-        # terminates and close_connection cancels keepalive_ping_task.
-        self.protocol.max_queue = 1
-        self.receive_frame(Frame(True, OP_TEXT, b"1"))
-        self.receive_frame(Frame(True, OP_TEXT, b"2"))
-        # Add pong frame to the queue.
-        pong_frame = Frame(True, OP_PONG, ping_frame.data)
-        self.receive_frame(pong_frame)
-        # Connection drops.
-        self.receive_eof()
-        self.loop.run_until_complete(self.protocol.wait_closed())
-        # Ping receives a ConnectionClosed exception.
-        with self.assertRaises(ConnectionClosed):
-            ping.result()
-
-        # transfer_data doesn't crash, which would be logged.
-        with self.assertNoLogs():
-            # Unclog incoming queue.
-            self.loop.run_until_complete(self.protocol.recv())
-            self.loop.run_until_complete(self.protocol.recv())
-
-    def test_canceled_ping(self):
-        ping = self.loop.run_until_complete(self.protocol.ping())
-        ping_frame = self.last_sent_frame()
-        ping.cancel()
-        pong_frame = Frame(True, OP_PONG, ping_frame.data)
-        self.receive_frame(pong_frame)
-        self.run_loop_once()
-        self.run_loop_once()
-        self.assertTrue(ping.cancelled())
-
-    def test_duplicate_ping(self):
-        self.loop.run_until_complete(self.protocol.ping(b"foobar"))
-        self.assertOneFrameSent(True, OP_PING, b"foobar")
-        with self.assertRaises(ValueError):
-            self.loop.run_until_complete(self.protocol.ping(b"foobar"))
-        self.assertNoFrameSent()
-
-    # Test the protocol's logic for rebuilding fragmented messages.
-
-    def test_fragmented_text(self):
-        self.receive_frame(Frame(False, OP_TEXT, "ca".encode("utf-8")))
-        self.receive_frame(Frame(True, OP_CONT, "fé".encode("utf-8")))
-        data = self.loop.run_until_complete(self.protocol.recv())
-        self.assertEqual(data, "café")
-
-    def test_fragmented_binary(self):
-        self.receive_frame(Frame(False, OP_BINARY, b"t"))
-        self.receive_frame(Frame(False, OP_CONT, b"e"))
-        self.receive_frame(Frame(True, OP_CONT, b"a"))
-        data = self.loop.run_until_complete(self.protocol.recv())
-        self.assertEqual(data, b"tea")
-
-    def test_fragmented_text_payload_too_big(self):
-        self.protocol.max_size = 1024
-        self.receive_frame(Frame(False, OP_TEXT, "café".encode("utf-8") * 100))
-        self.receive_frame(Frame(True, OP_CONT, "café".encode("utf-8") * 105))
-        self.process_invalid_frames()
-        self.assertConnectionFailed(1009, "")
-
-    def test_fragmented_binary_payload_too_big(self):
-        self.protocol.max_size = 1024
-        self.receive_frame(Frame(False, OP_BINARY, b"tea" * 171))
-        self.receive_frame(Frame(True, OP_CONT, b"tea" * 171))
-        self.process_invalid_frames()
-        self.assertConnectionFailed(1009, "")
-
-    def test_fragmented_text_no_max_size(self):
-        self.protocol.max_size = None  # for test coverage
-        self.receive_frame(Frame(False, OP_TEXT, "café".encode("utf-8") * 100))
-        self.receive_frame(Frame(True, OP_CONT, "café".encode("utf-8") * 105))
-        data = self.loop.run_until_complete(self.protocol.recv())
-        self.assertEqual(data, "café" * 205)
-
-    def test_fragmented_binary_no_max_size(self):
-        self.protocol.max_size = None  # for test coverage
-        self.receive_frame(Frame(False, OP_BINARY, b"tea" * 171))
-        self.receive_frame(Frame(True, OP_CONT, b"tea" * 171))
-        data = self.loop.run_until_complete(self.protocol.recv())
-        self.assertEqual(data, b"tea" * 342)
-
-    def test_control_frame_within_fragmented_text(self):
-        self.receive_frame(Frame(False, OP_TEXT, "ca".encode("utf-8")))
-        self.receive_frame(Frame(True, OP_PING, b""))
-        self.receive_frame(Frame(True, OP_CONT, "fé".encode("utf-8")))
-        data = self.loop.run_until_complete(self.protocol.recv())
-        self.assertEqual(data, "café")
-        self.assertOneFrameSent(True, OP_PONG, b"")
-
-    def test_unterminated_fragmented_text(self):
-        self.receive_frame(Frame(False, OP_TEXT, "ca".encode("utf-8")))
-        # Missing the second part of the fragmented frame.
-        self.receive_frame(Frame(True, OP_BINARY, b"tea"))
-        self.process_invalid_frames()
-        self.assertConnectionFailed(1002, "")
-
-    def test_close_handshake_in_fragmented_text(self):
-        self.receive_frame(Frame(False, OP_TEXT, "ca".encode("utf-8")))
-        self.receive_frame(Frame(True, OP_CLOSE, b""))
-        self.process_invalid_frames()
-        # The RFC may have overlooked this case: it says that control frames
-        # can be interjected in the middle of a fragmented message and that a
-        # close frame must be echoed. Even though there's an unterminated
-        # message, technically, the closing handshake was successful.
-        self.assertConnectionClosed(1005, "")
-
-    def test_connection_close_in_fragmented_text(self):
-        self.receive_frame(Frame(False, OP_TEXT, "ca".encode("utf-8")))
-        self.process_invalid_frames()
-        self.assertConnectionFailed(1006, "")
-
-    # Test miscellaneous code paths to ensure full coverage.
-
-    def test_connection_lost(self):
-        # Test calling connection_lost without going through close_connection.
-        self.protocol.connection_lost(None)
-
-        self.assertConnectionFailed(1006, "")
-
-    def test_ensure_open_before_opening_handshake(self):
-        # Simulate a bug by forcibly reverting the protocol state.
-        self.protocol.state = State.CONNECTING
-
-        with self.assertRaises(InvalidState):
-            self.loop.run_until_complete(self.protocol.ensure_open())
-
-    def test_ensure_open_during_unclean_close(self):
-        # Process connection_made in order to start transfer_data_task.
-        self.run_loop_once()
-
-        # Ensure the test terminates quickly.
-        self.loop.call_later(MS, self.receive_eof_if_client)
-
-        # Simulate the case when close() times out sending a close frame.
-        self.protocol.fail_connection()
-
-        with self.assertRaises(ConnectionClosed):
-            self.loop.run_until_complete(self.protocol.ensure_open())
-
-    def test_legacy_recv(self):
-        # By default legacy_recv in disabled.
-        self.assertEqual(self.protocol.legacy_recv, False)
-
-        self.close_connection()
-
-        # Enable legacy_recv.
-        self.protocol.legacy_recv = True
-
-        # Now recv() returns None instead of raising ConnectionClosed.
-        self.assertIsNone(self.loop.run_until_complete(self.protocol.recv()))
-
-    def test_connection_closed_attributes(self):
-        self.close_connection()
-
-        with self.assertRaises(ConnectionClosed) as context:
-            self.loop.run_until_complete(self.protocol.recv())
-
-        connection_closed_exc = context.exception
-        self.assertEqual(connection_closed_exc.code, 1000)
-        self.assertEqual(connection_closed_exc.reason, "close")
-
-    # Test the protocol logic for sending keepalive pings.
-
-    def restart_protocol_with_keepalive_ping(
-        self, ping_interval=3 * MS, ping_timeout=3 * MS
-    ):
-        initial_protocol = self.protocol
-        # copied from tearDown
-        self.transport.close()
-        self.loop.run_until_complete(self.protocol.close())
-        # copied from setUp, but enables keepalive pings
-        self.protocol = WebSocketCommonProtocol(
-            ping_interval=ping_interval, ping_timeout=ping_timeout
-        )
-        self.transport = TransportMock()
-        self.transport.setup_mock(self.loop, self.protocol)
-        self.protocol.is_client = initial_protocol.is_client
-        self.protocol.side = initial_protocol.side
-
-    def test_keepalive_ping(self):
-        self.restart_protocol_with_keepalive_ping()
-
-        # Ping is sent at 3ms and acknowledged at 4ms.
-        self.loop.run_until_complete(asyncio.sleep(4 * MS))
-        (ping_1,) = tuple(self.protocol.pings)
-        self.assertOneFrameSent(True, OP_PING, ping_1)
-        self.receive_frame(Frame(True, OP_PONG, ping_1))
-
-        # Next ping is sent at 7ms.
-        self.loop.run_until_complete(asyncio.sleep(4 * MS))
-        (ping_2,) = tuple(self.protocol.pings)
-        self.assertOneFrameSent(True, OP_PING, ping_2)
-
-        # The keepalive ping task goes on.
-        self.assertFalse(self.protocol.keepalive_ping_task.done())
-
-    def test_keepalive_ping_not_acknowledged_closes_connection(self):
-        self.restart_protocol_with_keepalive_ping()
-
-        # Ping is sent at 3ms and not acknowleged.
-        self.loop.run_until_complete(asyncio.sleep(4 * MS))
-        (ping_1,) = tuple(self.protocol.pings)
-        self.assertOneFrameSent(True, OP_PING, ping_1)
-
-        # Connection is closed at 6ms.
-        self.loop.run_until_complete(asyncio.sleep(4 * MS))
-        self.assertOneFrameSent(True, OP_CLOSE, serialize_close(1011, ""))
-
-        # The keepalive ping task is complete.
-        self.assertEqual(self.protocol.keepalive_ping_task.result(), None)
-
-    def test_keepalive_ping_stops_when_connection_closing(self):
-        self.restart_protocol_with_keepalive_ping()
-        close_task = self.half_close_connection_local()
-
-        # No ping sent at 3ms because the closing handshake is in progress.
-        self.loop.run_until_complete(asyncio.sleep(4 * MS))
-        self.assertNoFrameSent()
-
-        # The keepalive ping task terminated.
-        self.assertTrue(self.protocol.keepalive_ping_task.cancelled())
-
-        self.loop.run_until_complete(close_task)  # cleanup
-
-    def test_keepalive_ping_stops_when_connection_closed(self):
-        self.restart_protocol_with_keepalive_ping()
-        self.close_connection()
-
-        # The keepalive ping task terminated.
-        self.assertTrue(self.protocol.keepalive_ping_task.cancelled())
-
-    def test_keepalive_ping_does_not_crash_when_connection_lost(self):
-        self.restart_protocol_with_keepalive_ping()
-        # Clog incoming queue. This lets connection_lost() abort pending pings
-        # with a ConnectionClosed exception before transfer_data_task
-        # terminates and close_connection cancels keepalive_ping_task.
-        self.protocol.max_queue = 1
-        self.receive_frame(Frame(True, OP_TEXT, b"1"))
-        self.receive_frame(Frame(True, OP_TEXT, b"2"))
-        # Ping is sent at 3ms.
-        self.loop.run_until_complete(asyncio.sleep(4 * MS))
-        (ping_waiter,) = tuple(self.protocol.pings.values())
-        # Connection drops.
-        self.receive_eof()
-        self.loop.run_until_complete(self.protocol.wait_closed())
-
-        # The ping waiter receives a ConnectionClosed exception.
-        with self.assertRaises(ConnectionClosed):
-            ping_waiter.result()
-        # The keepalive ping task terminated properly.
-        self.assertIsNone(self.protocol.keepalive_ping_task.result())
-
-        # Unclog incoming queue to terminate the test quickly.
-        self.loop.run_until_complete(self.protocol.recv())
-        self.loop.run_until_complete(self.protocol.recv())
-
-    def test_keepalive_ping_with_no_ping_interval(self):
-        self.restart_protocol_with_keepalive_ping(ping_interval=None)
-
-        # No ping is sent at 3ms.
-        self.loop.run_until_complete(asyncio.sleep(4 * MS))
-        self.assertNoFrameSent()
-
-    def test_keepalive_ping_with_no_ping_timeout(self):
-        self.restart_protocol_with_keepalive_ping(ping_timeout=None)
-
-        # Ping is sent at 3ms and not acknowleged.
-        self.loop.run_until_complete(asyncio.sleep(4 * MS))
-        (ping_1,) = tuple(self.protocol.pings)
-        self.assertOneFrameSent(True, OP_PING, ping_1)
-
-        # Next ping is sent at 7ms anyway.
-        self.loop.run_until_complete(asyncio.sleep(4 * MS))
-        ping_1_again, ping_2 = tuple(self.protocol.pings)
-        self.assertEqual(ping_1, ping_1_again)
-        self.assertOneFrameSent(True, OP_PING, ping_2)
-
-        # The keepalive ping task goes on.
-        self.assertFalse(self.protocol.keepalive_ping_task.done())
-
-    def test_keepalive_ping_unexpected_error(self):
-        self.restart_protocol_with_keepalive_ping()
-
-        async def ping():
-            raise Exception("BOOM")
-
-        self.protocol.ping = ping
-
-        # The keepalive ping task fails when sending a ping at 3ms.
-        self.loop.run_until_complete(asyncio.sleep(4 * MS))
-
-        # The keepalive ping task is complete.
-        # It logs and swallows the exception.
-        self.assertEqual(self.protocol.keepalive_ping_task.result(), None)
-
-    # Test the protocol logic for closing the connection.
-
-    def test_local_close(self):
-        # Emulate how the remote endpoint answers the closing handshake.
-        self.loop.call_later(MS, self.receive_frame, self.close_frame)
-        self.loop.call_later(MS, self.receive_eof_if_client)
-
-        # Run the closing handshake.
-        self.loop.run_until_complete(self.protocol.close(reason="close"))
-
-        self.assertConnectionClosed(1000, "close")
-        self.assertOneFrameSent(*self.close_frame)
-
-        # Closing the connection again is a no-op.
-        self.loop.run_until_complete(self.protocol.close(reason="oh noes!"))
-
-        self.assertConnectionClosed(1000, "close")
-        self.assertNoFrameSent()
-
-    def test_remote_close(self):
-        # Emulate how the remote endpoint initiates the closing handshake.
-        self.loop.call_later(MS, self.receive_frame, self.close_frame)
-        self.loop.call_later(MS, self.receive_eof_if_client)
-
-        # Wait for some data in order to process the handshake.
-        # After recv() raises ConnectionClosed, the connection is closed.
-        with self.assertRaises(ConnectionClosed):
-            self.loop.run_until_complete(self.protocol.recv())
-
-        self.assertConnectionClosed(1000, "close")
-        self.assertOneFrameSent(*self.close_frame)
-
-        # Closing the connection again is a no-op.
-        self.loop.run_until_complete(self.protocol.close(reason="oh noes!"))
-
-        self.assertConnectionClosed(1000, "close")
-        self.assertNoFrameSent()
-
-    def test_remote_close_and_connection_lost(self):
-        self.make_drain_slow()
-        # Drop the connection right after receiving a close frame,
-        # which prevents echoing the close frame properly.
-        self.receive_frame(self.close_frame)
-        self.receive_eof()
-
-        with self.assertNoLogs():
-            self.loop.run_until_complete(self.protocol.close(reason="oh noes!"))
-
-        self.assertConnectionClosed(1000, "close")
-        self.assertOneFrameSent(*self.close_frame)
-
-    def test_simultaneous_close(self):
-        # Receive the incoming close frame right after self.protocol.close()
-        # starts executing. This reproduces the error described in:
-        # https://github.com/aaugustin/websockets/issues/339
-        self.loop.call_soon(self.receive_frame, self.remote_close)
-        self.loop.call_soon(self.receive_eof_if_client)
-
-        self.loop.run_until_complete(self.protocol.close(reason="local"))
-
-        self.assertConnectionClosed(1000, "remote")
-        # The current implementation sends a close frame in response to the
-        # close frame received from the remote end. It skips the close frame
-        # that should be sent as a result of calling close().
-        self.assertOneFrameSent(*self.remote_close)
-
-    def test_close_preserves_incoming_frames(self):
-        self.receive_frame(Frame(True, OP_TEXT, b"hello"))
-
-        self.loop.call_later(MS, self.receive_frame, self.close_frame)
-        self.loop.call_later(MS, self.receive_eof_if_client)
-        self.loop.run_until_complete(self.protocol.close(reason="close"))
-
-        self.assertConnectionClosed(1000, "close")
-        self.assertOneFrameSent(*self.close_frame)
-
-        next_message = self.loop.run_until_complete(self.protocol.recv())
-        self.assertEqual(next_message, "hello")
-
-    def test_close_protocol_error(self):
-        invalid_close_frame = Frame(True, OP_CLOSE, b"\x00")
-        self.receive_frame(invalid_close_frame)
-        self.receive_eof_if_client()
-        self.run_loop_once()
-        self.loop.run_until_complete(self.protocol.close(reason="close"))
-
-        self.assertConnectionFailed(1002, "")
-
-    def test_close_connection_lost(self):
-        self.receive_eof()
-        self.run_loop_once()
-        self.loop.run_until_complete(self.protocol.close(reason="close"))
-
-        self.assertConnectionFailed(1006, "")
-
-    def test_local_close_during_recv(self):
-        recv = self.loop.create_task(self.protocol.recv())
-
-        self.loop.call_later(MS, self.receive_frame, self.close_frame)
-        self.loop.call_later(MS, self.receive_eof_if_client)
-
-        self.loop.run_until_complete(self.protocol.close(reason="close"))
-
-        with self.assertRaises(ConnectionClosed):
-            self.loop.run_until_complete(recv)
-
-        self.assertConnectionClosed(1000, "close")
-
-    # There is no test_remote_close_during_recv because it would be identical
-    # to test_remote_close.
-
-    def test_remote_close_during_send(self):
-        self.make_drain_slow()
-        send = self.loop.create_task(self.protocol.send("hello"))
-
-        self.receive_frame(self.close_frame)
-        self.receive_eof()
-
-        with self.assertRaises(ConnectionClosed):
-            self.loop.run_until_complete(send)
-
-        self.assertConnectionClosed(1000, "close")
-
-    # There is no test_local_close_during_send because this cannot really
-    # happen, considering that writes are serialized.
-
-
-class ServerTests(CommonTests, AsyncioTestCase):
-    def setUp(self):
-        super().setUp()
-        self.protocol.is_client = False
-        self.protocol.side = "server"
-
-    def test_local_close_send_close_frame_timeout(self):
-        self.protocol.close_timeout = 10 * MS
-        self.make_drain_slow(50 * MS)
-        # If we can't send a close frame, time out in 10ms.
-        # Check the timing within -1/+9ms for robustness.
-        with self.assertCompletesWithin(9 * MS, 19 * MS):
-            self.loop.run_until_complete(self.protocol.close(reason="close"))
-        self.assertConnectionClosed(1006, "")
-
-    def test_local_close_receive_close_frame_timeout(self):
-        self.protocol.close_timeout = 10 * MS
-        # If the client doesn't send a close frame, time out in 10ms.
-        # Check the timing within -1/+9ms for robustness.
-        with self.assertCompletesWithin(9 * MS, 19 * MS):
-            self.loop.run_until_complete(self.protocol.close(reason="close"))
-        self.assertConnectionClosed(1006, "")
-
-    def test_local_close_connection_lost_timeout_after_write_eof(self):
-        self.protocol.close_timeout = 10 * MS
-        # If the client doesn't close its side of the TCP connection after we
-        # half-close our side with write_eof(), time out in 10ms.
-        # Check the timing within -1/+9ms for robustness.
-        with self.assertCompletesWithin(9 * MS, 19 * MS):
-            # HACK: disable write_eof => other end drops connection emulation.
-            self.transport._eof = True
-            self.receive_frame(self.close_frame)
-            self.loop.run_until_complete(self.protocol.close(reason="close"))
-        self.assertConnectionClosed(1000, "close")
-
-    def test_local_close_connection_lost_timeout_after_close(self):
-        self.protocol.close_timeout = 10 * MS
-        # If the client doesn't close its side of the TCP connection after we
-        # half-close our side with write_eof() and close it with close(), time
-        # out in 20ms.
-        # Check the timing within -1/+9ms for robustness.
-        with self.assertCompletesWithin(19 * MS, 29 * MS):
-            # HACK: disable write_eof => other end drops connection emulation.
-            self.transport._eof = True
-            # HACK: disable close => other end drops connection emulation.
-            self.transport._closing = True
-            self.receive_frame(self.close_frame)
-            self.loop.run_until_complete(self.protocol.close(reason="close"))
-        self.assertConnectionClosed(1000, "close")
-
-
-class ClientTests(CommonTests, AsyncioTestCase):
-    def setUp(self):
-        super().setUp()
-        self.protocol.is_client = True
-        self.protocol.side = "client"
-
-    def test_local_close_send_close_frame_timeout(self):
-        self.protocol.close_timeout = 10 * MS
-        self.make_drain_slow(50 * MS)
-        # If we can't send a close frame, time out in 20ms.
-        # - 10ms waiting for sending a close frame
-        # - 10ms waiting for receiving a half-close
-        # Check the timing within -1/+9ms for robustness.
-        with self.assertCompletesWithin(19 * MS, 29 * MS):
-            self.loop.run_until_complete(self.protocol.close(reason="close"))
-        self.assertConnectionClosed(1006, "")
-
-    def test_local_close_receive_close_frame_timeout(self):
-        self.protocol.close_timeout = 10 * MS
-        # If the server doesn't send a close frame, time out in 20ms:
-        # - 10ms waiting for receiving a close frame
-        # - 10ms waiting for receiving a half-close
-        # Check the timing within -1/+9ms for robustness.
-        with self.assertCompletesWithin(19 * MS, 29 * MS):
-            self.loop.run_until_complete(self.protocol.close(reason="close"))
-        self.assertConnectionClosed(1006, "")
-
-    def test_local_close_connection_lost_timeout_after_write_eof(self):
-        self.protocol.close_timeout = 10 * MS
-        # If the server doesn't half-close its side of the TCP connection
-        # after we send a close frame, time out in 20ms:
-        # - 10ms waiting for receiving a half-close
-        # - 10ms waiting for receiving a close after write_eof
-        # Check the timing within -1/+9ms for robustness.
-        with self.assertCompletesWithin(19 * MS, 29 * MS):
-            # HACK: disable write_eof => other end drops connection emulation.
-            self.transport._eof = True
-            self.receive_frame(self.close_frame)
-            self.loop.run_until_complete(self.protocol.close(reason="close"))
-        self.assertConnectionClosed(1000, "close")
-
-    def test_local_close_connection_lost_timeout_after_close(self):
-        self.protocol.close_timeout = 10 * MS
-        # If the client doesn't close its side of the TCP connection after we
-        # half-close our side with write_eof() and close it with close(), time
-        # out in 20ms.
-        # - 10ms waiting for receiving a half-close
-        # - 10ms waiting for receiving a close after write_eof
-        # - 10ms waiting for receiving a close after close
-        # Check the timing within -1/+9ms for robustness.
-        with self.assertCompletesWithin(29 * MS, 39 * MS):
-            # HACK: disable write_eof => other end drops connection emulation.
-            self.transport._eof = True
-            # HACK: disable close => other end drops connection emulation.
-            self.transport._closing = True
-            self.receive_frame(self.close_frame)
-            self.loop.run_until_complete(self.protocol.close(reason="close"))
-        self.assertConnectionClosed(1000, "close")
diff --git a/tests/wpt/tests/tools/third_party/websockets/tests/test_uri.py b/tests/wpt/tests/tools/third_party/websockets/tests/test_uri.py
deleted file mode 100644
index e41860b8e4c..00000000000
--- a/tests/wpt/tests/tools/third_party/websockets/tests/test_uri.py
+++ /dev/null
@@ -1,33 +0,0 @@
-import unittest
-
-from websockets.exceptions import InvalidURI
-from websockets.uri import *
-
-
-VALID_URIS = [
-    ("ws://localhost/", (False, "localhost", 80, "/", None)),
-    ("wss://localhost/", (True, "localhost", 443, "/", None)),
-    ("ws://localhost/path?query", (False, "localhost", 80, "/path?query", None)),
-    ("WS://LOCALHOST/PATH?QUERY", (False, "localhost", 80, "/PATH?QUERY", None)),
-    ("ws://user:pass@localhost/", (False, "localhost", 80, "/", ("user", "pass"))),
-]
-
-INVALID_URIS = [
-    "http://localhost/",
-    "https://localhost/",
-    "ws://localhost/path#fragment",
-    "ws://user@localhost/",
-]
-
-
-class URITests(unittest.TestCase):
-    def test_success(self):
-        for uri, parsed in VALID_URIS:
-            with self.subTest(uri=uri):
-                self.assertEqual(parse_uri(uri), parsed)
-
-    def test_error(self):
-        for uri in INVALID_URIS:
-            with self.subTest(uri=uri):
-                with self.assertRaises(InvalidURI):
-                    parse_uri(uri)
diff --git a/tests/wpt/tests/tools/third_party/websockets/tests/test_utils.py b/tests/wpt/tests/tools/third_party/websockets/tests/test_utils.py
deleted file mode 100644
index e5570f098ba..00000000000
--- a/tests/wpt/tests/tools/third_party/websockets/tests/test_utils.py
+++ /dev/null
@@ -1,92 +0,0 @@
-import itertools
-import unittest
-
-from websockets.utils import apply_mask as py_apply_mask
-
-
-class UtilsTests(unittest.TestCase):
-    @staticmethod
-    def apply_mask(*args, **kwargs):
-        return py_apply_mask(*args, **kwargs)
-
-    apply_mask_type_combos = list(itertools.product([bytes, bytearray], repeat=2))
-
-    apply_mask_test_values = [
-        (b"", b"1234", b""),
-        (b"aBcDe", b"\x00\x00\x00\x00", b"aBcDe"),
-        (b"abcdABCD", b"1234", b"PPPPpppp"),
-        (b"abcdABCD" * 10, b"1234", b"PPPPpppp" * 10),
-    ]
-
-    def test_apply_mask(self):
-        for data_type, mask_type in self.apply_mask_type_combos:
-            for data_in, mask, data_out in self.apply_mask_test_values:
-                data_in, mask = data_type(data_in), mask_type(mask)
-
-                with self.subTest(data_in=data_in, mask=mask):
-                    result = self.apply_mask(data_in, mask)
-                    self.assertEqual(result, data_out)
-
-    def test_apply_mask_memoryview(self):
-        for data_type, mask_type in self.apply_mask_type_combos:
-            for data_in, mask, data_out in self.apply_mask_test_values:
-                data_in, mask = data_type(data_in), mask_type(mask)
-                data_in, mask = memoryview(data_in), memoryview(mask)
-
-                with self.subTest(data_in=data_in, mask=mask):
-                    result = self.apply_mask(data_in, mask)
-                    self.assertEqual(result, data_out)
-
-    def test_apply_mask_non_contiguous_memoryview(self):
-        for data_type, mask_type in self.apply_mask_type_combos:
-            for data_in, mask, data_out in self.apply_mask_test_values:
-                data_in, mask = data_type(data_in), mask_type(mask)
-                data_in, mask = memoryview(data_in), memoryview(mask)
-                data_in, mask = data_in[::-1], mask[::-1]
-                data_out = data_out[::-1]
-
-                with self.subTest(data_in=data_in, mask=mask):
-                    result = self.apply_mask(data_in, mask)
-                    self.assertEqual(result, data_out)
-
-    def test_apply_mask_check_input_types(self):
-        for data_in, mask in [(None, None), (b"abcd", None), (None, b"abcd")]:
-            with self.subTest(data_in=data_in, mask=mask):
-                with self.assertRaises(TypeError):
-                    self.apply_mask(data_in, mask)
-
-    def test_apply_mask_check_mask_length(self):
-        for data_in, mask in [
-            (b"", b""),
-            (b"abcd", b"123"),
-            (b"", b"aBcDe"),
-            (b"12345678", b"12345678"),
-        ]:
-            with self.subTest(data_in=data_in, mask=mask):
-                with self.assertRaises(ValueError):
-                    self.apply_mask(data_in, mask)
-
-
-try:
-    from websockets.speedups import apply_mask as c_apply_mask
-except ImportError:  # pragma: no cover
-    pass
-else:
-
-    class SpeedupsTests(UtilsTests):
-        @staticmethod
-        def apply_mask(*args, **kwargs):
-            return c_apply_mask(*args, **kwargs)
-
-        def test_apply_mask_non_contiguous_memoryview(self):
-            for data_type, mask_type in self.apply_mask_type_combos:
-                for data_in, mask, data_out in self.apply_mask_test_values:
-                    data_in, mask = data_type(data_in), mask_type(mask)
-                    data_in, mask = memoryview(data_in), memoryview(mask)
-                    data_in, mask = data_in[::-1], mask[::-1]
-                    data_out = data_out[::-1]
-
-                    with self.subTest(data_in=data_in, mask=mask):
-                        # The C extension only supports contiguous memoryviews.
-                        with self.assertRaises(TypeError):
-                            self.apply_mask(data_in, mask)
diff --git a/tests/wpt/tests/tools/third_party/websockets/tests/utils.py b/tests/wpt/tests/tools/third_party/websockets/tests/utils.py
deleted file mode 100644
index 983a91edf06..00000000000
--- a/tests/wpt/tests/tools/third_party/websockets/tests/utils.py
+++ /dev/null
@@ -1,93 +0,0 @@
-import asyncio
-import contextlib
-import functools
-import logging
-import os
-import time
-import unittest
-
-
-class AsyncioTestCase(unittest.TestCase):
-    """
-    Base class for tests that sets up an isolated event loop for each test.
-
-    """
-
-    def __init_subclass__(cls, **kwargs):
-        """
-        Convert test coroutines to test functions.
-
-        This supports asychronous tests transparently.
-
-        """
-        super().__init_subclass__(**kwargs)
-        for name in unittest.defaultTestLoader.getTestCaseNames(cls):
-            test = getattr(cls, name)
-            if asyncio.iscoroutinefunction(test):
-                setattr(cls, name, cls.convert_async_to_sync(test))
-
-    @staticmethod
-    def convert_async_to_sync(test):
-        """
-        Convert a test coroutine to a test function.
-
-        """
-
-        @functools.wraps(test)
-        def test_func(self, *args, **kwargs):
-            return self.loop.run_until_complete(test(self, *args, **kwargs))
-
-        return test_func
-
-    def setUp(self):
-        super().setUp()
-        self.loop = asyncio.new_event_loop()
-        asyncio.set_event_loop(self.loop)
-
-    def tearDown(self):
-        self.loop.close()
-        super().tearDown()
-
-    def run_loop_once(self):
-        # Process callbacks scheduled with call_soon by appending a callback
-        # to stop the event loop then running it until it hits that callback.
-        self.loop.call_soon(self.loop.stop)
-        self.loop.run_forever()
-
-    @contextlib.contextmanager
-    def assertNoLogs(self, logger="websockets", level=logging.ERROR):
-        """
-        No message is logged on the given logger with at least the given level.
-
-        """
-        with self.assertLogs(logger, level) as logs:
-            # We want to test that no log message is emitted
-            # but assertLogs expects at least one log message.
-            logging.getLogger(logger).log(level, "dummy")
-            yield
-
-        level_name = logging.getLevelName(level)
-        self.assertEqual(logs.output, [f"{level_name}:{logger}:dummy"])
-
-    def assertDeprecationWarnings(self, recorded_warnings, expected_warnings):
-        """
-        Check recorded deprecation warnings match a list of expected messages.
-
-        """
-        self.assertEqual(len(recorded_warnings), len(expected_warnings))
-        for recorded, expected in zip(recorded_warnings, expected_warnings):
-            actual = recorded.message
-            self.assertEqual(str(actual), expected)
-            self.assertEqual(type(actual), DeprecationWarning)
-
-
-# Unit for timeouts. May be increased on slow machines by setting the
-# WEBSOCKETS_TESTS_TIMEOUT_FACTOR environment variable.
-MS = 0.001 * int(os.environ.get("WEBSOCKETS_TESTS_TIMEOUT_FACTOR", 1))
-
-# asyncio's debug mode has a 10x performance penalty for this test suite.
-if os.environ.get("PYTHONASYNCIODEBUG"):  # pragma: no cover
-    MS *= 10
-
-# Ensure that timeouts are larger than the clock's resolution (for Windows).
-MS = max(MS, 2.5 * time.get_clock_info("monotonic").resolution)
diff --git a/tests/wpt/tests/tools/third_party/websockets/tox.ini b/tests/wpt/tests/tools/third_party/websockets/tox.ini
deleted file mode 100644
index 825e34061ff..00000000000
--- a/tests/wpt/tests/tools/third_party/websockets/tox.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-[tox]
-envlist = py36,py37,py38,coverage,black,flake8,isort,mypy
-
-[testenv]
-commands = python -W default -m unittest {posargs}
-
-[testenv:coverage]
-commands =
-    python -m coverage erase
-    python -W default -m coverage run -m unittest {posargs}
-    python -m coverage report --show-missing --fail-under=100
-deps = coverage
-
-[testenv:black]
-commands = black --check src tests
-deps = black
-
-[testenv:flake8]
-commands = flake8 src tests
-deps = flake8
-
-[testenv:isort]
-commands = isort --check-only --recursive src tests
-deps = isort
-
-[testenv:mypy]
-commands = mypy --strict src
-deps = mypy
diff --git a/tests/wpt/tests/tools/wpt/browser.py b/tests/wpt/tests/tools/wpt/browser.py
index a8c0d169587..3c5f060c4ed 100644
--- a/tests/wpt/tests/tools/wpt/browser.py
+++ b/tests/wpt/tests/tools/wpt/browser.py
@@ -1596,25 +1596,53 @@ class Opera(Browser):
 
 
 class EdgeChromium(Browser):
-    """MicrosoftEdge-specific interface."""
+    """Microsoft Edge Chromium Browser class."""
+
+    product = "edgechromium"
+    requirements = "requirements_chromium.txt"
     platform = {
         "Linux": "linux",
         "Windows": "win",
         "Darwin": "macos"
     }.get(uname[0])
-    product = "edgechromium"
-    edgedriver_name = "msedgedriver"
-    requirements = "requirements_chromium.txt"
+
+    def _get_build_version(self, version):
+        """Convert a Edge/MSEdgeDriver version into MAJOR.MINOR.BUILD format."""
+        version_parts = version.split(".")
+        if len(version_parts) < 3:
+            self.logger.info(f"Version {version} could not be formatted for build matching.")
+            return None
+        return ".".join(version_parts[0:3])
+
+    def _remove_existing_edgedriver_binary(self, path):
+        """Remove an existing MSEdgeDriver for this product if it exists
+        in the virtual environment.
+        """
+        # There may be an existing MSEdgeDriver binary from a previous install.
+        # To provide a clean install experience, remove the old binary - this
+        # avoids tricky issues like unzipping over a read-only file.
+        existing_edgedriver_path = which("MSEdgeDriver", path=path)
+        if existing_edgedriver_path:
+            self.logger.info(f"Removing existing MSEdgeDriver binary: {existing_edgedriver_path}")
+            os.chmod(existing_edgedriver_path, stat.S_IWUSR)
+            os.remove(existing_edgedriver_path)
+        existing_driver_notes_path = os.path.join(path, "Driver_notes")
+        if os.path.isdir(existing_driver_notes_path):
+            self.logger.info(f"Removing existing MSEdgeDriver binary: {existing_driver_notes_path}")
+            print(f"Delete {existing_driver_notes_path} folder")
+            rmtree(existing_driver_notes_path)
 
     def download(self, dest=None, channel=None, rename=None):
         raise NotImplementedError
 
-    def install(self, dest=None, channel=None):
-        raise NotImplementedError
+    def install_mojojs(self, dest, browser_binary):
+        # TODO: Install MojoJS web framework.
+        # MojoJS is platform agnostic, but the version number must be an
+        # exact match of the Edge version to be compatible.
+        return None
 
     def find_binary(self, venv_path=None, channel=None):
-        self.logger.info(f'Finding Edge binary for channel {channel}')
-
+        # TODO: Check for binary in virtual environment first
         if self.platform == "linux":
             name = "microsoft-edge"
             if channel == "stable":
@@ -1631,117 +1659,100 @@ class EdgeChromium(Browser):
                 suffix = " " + channel.capitalize()
             return f"/Applications/Microsoft Edge{suffix}.app/Contents/MacOS/Microsoft Edge{suffix}"
         if self.platform == "win":
-            binaryname = "msedge"
-            if channel == "beta":
-                winpaths = [os.path.expandvars("$SYSTEMDRIVE\\Program Files\\Microsoft\\Edge Beta\\Application"),
-                            os.path.expandvars("$SYSTEMDRIVE\\Program Files (x86)\\Microsoft\\Edge Beta\\Application")]
-                return which(binaryname, path=os.pathsep.join(winpaths))
-            elif channel == "dev":
-                winpaths = [os.path.expandvars("$SYSTEMDRIVE\\Program Files\\Microsoft\\Edge Dev\\Application"),
-                            os.path.expandvars("$SYSTEMDRIVE\\Program Files (x86)\\Microsoft\\Edge Dev\\Application")]
-                return which(binaryname, path=os.pathsep.join(winpaths))
-            elif channel == "canary":
-                winpaths = [os.path.expanduser("~\\AppData\\Local\\Microsoft\\Edge\\Application"),
-                            os.path.expanduser("~\\AppData\\Local\\Microsoft\\Edge SxS\\Application")]
-                return which(binaryname, path=os.pathsep.join(winpaths))
-            else:
-                winpaths = [os.path.expandvars("$SYSTEMDRIVE\\Program Files\\Microsoft\\Edge\\Application"),
-                            os.path.expandvars("$SYSTEMDRIVE\\Program Files (x86)\\Microsoft\\Edge\\Application")]
-                return which(binaryname, path=os.pathsep.join(winpaths))
-
+            suffix = ""
+            if channel in ("beta", "dev"):
+                suffix = " " + channel.capitalize()
+            winpaths = [os.path.expandvars(fr"%PROGRAMFILES%\Microsoft\Edge{suffix}\Application"),
+                        os.path.expandvars(fr"%programfiles(x86)%\Microsoft\Edge{suffix}\Application")]
+            path = which("msedge.exe", path=os.pathsep.join(winpaths))
+            if channel == "canary":
+                path = os.path.expandvars(r"%LOCALAPPDATA%\Microsoft\Edge SxS\Application\msedge.exe")
+            return path
         self.logger.warning("Unable to find the browser binary.")
         return None
 
     def find_webdriver(self, venv_path=None, channel=None):
         return which("msedgedriver")
 
-    def webdriver_supports_browser(self, webdriver_binary, browser_binary):
-        edgedriver_version = self.webdriver_version(webdriver_binary)
-        if not edgedriver_version:
-            self.logger.warning(
-                f"Unable to get version for EdgeDriver {webdriver_binary}, rejecting it")
-            return False
+    def install(self, dest=None, channel=None):
+        raise NotImplementedError
 
-        browser_version = self.version(browser_binary)
-        if not browser_version:
-            # If we can't get the browser version, we just have to assume the
-            # EdgeDriver is good.
-            return True
-
-        # Check that the EdgeDriver version matches the Edge version.
-        edgedriver_major = int(edgedriver_version.split('.')[0])
-        browser_major = int(browser_version.split('.')[0])
-        if edgedriver_major != browser_major:
-            self.logger.warning(
-                f"EdgeDriver {edgedriver_version} does not match Edge {browser_version}")
-            return False
-        return True
-
-    def install_webdriver_by_version(self, version, dest=None):
+    def install_webdriver(self, dest=None, channel=None, browser_binary=None):
         if dest is None:
             dest = os.pwd
 
-        if self.platform == "linux":
-            bits = "linux64"
-            edgedriver_path = os.path.join(dest, self.edgedriver_name)
-        elif self.platform == "macos":
-            bits = "mac64"
-            edgedriver_path = os.path.join(dest, self.edgedriver_name)
-        else:
-            bits = "win64" if uname[4] == "x86_64" else "win32"
-            edgedriver_path = os.path.join(dest, f"{self.edgedriver_name}.exe")
-        url = f"https://msedgedriver.azureedge.net/{version}/edgedriver_{bits}.zip"
-
-        # cleanup existing Edge driver files to avoid access_denied errors when unzipping
-        if os.path.isfile(edgedriver_path):
-            # remove read-only attribute
-            os.chmod(edgedriver_path, stat.S_IRWXU | stat.S_IRWXG | stat.S_IRWXO)  # 0777
-            print(f"Delete {edgedriver_path} file")
-            os.remove(edgedriver_path)
-        driver_notes_path = os.path.join(dest, "Driver_notes")
-        if os.path.isdir(driver_notes_path):
-            print(f"Delete {driver_notes_path} folder")
-            rmtree(driver_notes_path)
-
-        self.logger.info(f"Downloading MSEdgeDriver from {url}")
-        unzip(get(url).raw, dest)
-        if os.path.isfile(edgedriver_path):
-            self.logger.info(f"Successfully downloaded MSEdgeDriver to {edgedriver_path}")
-        return which(self.edgedriver_name, path=dest)
-
-    def install_webdriver(self, dest=None, channel=None, browser_binary=None):
-        self.logger.info(f"Installing MSEdgeDriver for channel {channel}")
-
+        # Detect the browser version.
+        # The MSEdgeDriver that is installed will match this version.
         if browser_binary is None:
+            # If a browser binary path was not given, detect a valid path.
             browser_binary = self.find_binary(channel=channel)
-        else:
-            self.logger.info(f"Installing matching MSEdgeDriver for Edge binary at {browser_binary}")
+            # We need a browser to version match, so if a browser binary path
+            # was not given and cannot be detected, raise an error.
+            if browser_binary is None:
+                raise FileNotFoundError("No browser binary detected. "
+                                        "Cannot install MSEdgeDriver without a browser version.")
 
         version = self.version(browser_binary)
-
-        # If an exact version can't be found, use a suitable fallback based on
-        # the browser channel, if available.
         if version is None:
-            platforms = {
-                "linux": "LINUX",
-                "macos": "MACOS",
-                "win": "WINDOWS"
-            }
-            if channel is None:
-                channel = "dev"
-            platform = platforms[self.platform]
-            suffix = f"{channel.upper()}_{platform}"
-            version_url = f"https://msedgedriver.azureedge.net/LATEST_{suffix}"
-            version = get(version_url).text.strip()
+            raise ValueError(f"Unable to detect browser version from binary at {browser_binary}. "
+                             "Cannot install MSEdgeDriver without a valid version to match.")
 
-        return self.install_webdriver_by_version(version, dest)
+        edgedriver_path = self.install_webdriver_by_version(version, dest, channel)
+
+        return edgedriver_path
+
+    def install_webdriver_by_version(self, version, dest, channel):
+        self._remove_existing_edgedriver_binary(dest)
+
+        if self.platform == "linux":
+            bits = "linux64"
+        elif self.platform == "macos":
+            bits = "mac64"
+        elif self.platform == "win":
+            bits = "win64" if uname[4] == "x86_64" else "win32"
+
+        url = f"https://msedgedriver.azureedge.net/{version}/edgedriver_{bits}.zip"
+        self.logger.info(f"Downloading MSEdgeDriver from {url}")
+        unzip(get(url).raw, dest)
+        edgedriver_path = which("msedgedriver", path=dest)
+        assert edgedriver_path is not None
+        return edgedriver_path
+
+    def webdriver_supports_browser(self, webdriver_binary, browser_binary, browser_channel):
+        """Check that the browser binary and MSEdgeDriver versions are a valid match."""
+        browser_version = self.version(browser_binary)
+        edgedriver_version = self.webdriver_version(webdriver_binary)
+
+        if not edgedriver_version:
+            self.logger.warning("Unable to get version for MSEdgeDriver "
+                                f"{webdriver_binary}, rejecting it")
+            return False
+
+        if not browser_version:
+            # If we can't get the browser version, we just have to assume the
+            # MSEdgeDriver is good.
+            self.logger.warning("Unable to get version for the browser "
+                                f"{browser_binary}, assuming MSEdgeDriver is good.")
+            return True
+
+        # Check that the EdgeDriver version matches the Edge version.
+        browser_version = self._get_build_version(browser_version)
+        edgedriver_version = self._get_build_version(edgedriver_version)
+
+        # Edge and MSEdgeDriver versions should match on the same MAJOR.MINOR.BUILD version.
+        if browser_version is not None and browser_version != edgedriver_version:
+            self.logger.warning(
+                f"MSEdgeDriver {edgedriver_version} does not match Edge {browser_version}")
+            return False
+        return True
 
     def version(self, binary=None, webdriver_binary=None):
+        """Get version string from browser binary."""
         if not binary:
             self.logger.warning("No browser binary provided.")
             return None
 
-        if self.platform == "win":
+        if uname[0] == "Windows":
             return _get_fileversion(binary, self.logger)
 
         try:
@@ -1756,11 +1767,10 @@ class EdgeChromium(Browser):
         return m.group(1)
 
     def webdriver_version(self, webdriver_binary):
+        """Get version string from MSEdgeDriver binary."""
         if webdriver_binary is None:
             self.logger.warning("No valid webdriver supplied to detect version.")
             return None
-        if self.platform == "win":
-            return _get_fileversion(webdriver_binary, self.logger)
 
         try:
             version_string = call(webdriver_binary, "--version").strip()
@@ -2199,6 +2209,27 @@ class WebKit(Browser):
     def version(self, binary=None, webdriver_binary=None):
         return None
 
+class Ladybird(Browser):
+    product = "ladybird"
+    requirements = None
+
+    def download(self, dest=None, channel=None, rename=None):
+        raise NotImplementedError
+
+    def install(self, dest=None, channel=None):
+        raise NotImplementedError
+
+    def find_binary(self, venv_path=None, channel=None):
+        return which("ladybird")
+
+    def find_webdriver(self, venv_path=None, channel=None):
+        return which("WebDriver")
+
+    def install_webdriver(self, dest=None, channel=None, browser_binary=None):
+        raise NotImplementedError
+
+    def version(self, binary=None, webdriver_binary=None):
+        return None
 
 class WebKitTestRunner(Browser):
     """Interface for WebKitTestRunner.
diff --git a/tests/wpt/tests/tools/wpt/run.py b/tests/wpt/tests/tools/wpt/run.py
index c737c057966..efc90d1debd 100644
--- a/tests/wpt/tests/tools/wpt/run.py
+++ b/tests/wpt/tests/tools/wpt/run.py
@@ -110,7 +110,8 @@ otherwise install OpenSSL and ensure that it's on your $PATH.""")
 def check_environ(product):
     if product not in ("android_weblayer", "android_webview", "chrome",
                        "chrome_android", "chrome_ios", "content_shell",
-                       "firefox", "firefox_android", "servo", "wktr"):
+                       "edgechromium", "firefox", "firefox_android", "ladybird", "servo",
+                       "wktr"):
         config_builder = serve.build_config(os.path.join(wpt_root, "config.json"))
         # Override the ports to avoid looking for free ports
         config_builder.ssl = {"type": "none"}
@@ -542,43 +543,69 @@ class Opera(BrowserSetup):
 class EdgeChromium(BrowserSetup):
     name = "MicrosoftEdge"
     browser_cls = browser.EdgeChromium
+    experimental_channels: ClassVar[Tuple[str, ...]] = ("dev", "canary")
 
     def setup_kwargs(self, kwargs):
         browser_channel = kwargs["browser_channel"]
         if kwargs["binary"] is None:
-            binary = self.browser.find_binary(channel=browser_channel)
+            binary = self.browser.find_binary(venv_path=self.venv.path, channel=browser_channel)
             if binary:
-                logger.info("Using Edge binary %s" % binary)
                 kwargs["binary"] = binary
             else:
-                raise WptrunError("Unable to locate Edge binary")
+                raise WptrunError(f"Unable to locate {self.name.capitalize()} binary")
+
+        if kwargs["mojojs_path"]:
+            kwargs["enable_mojojs"] = True
+            logger.info("--mojojs-path is provided, enabling MojoJS")
+        else:
+            path = self.browser.install_mojojs(dest=self.venv.path,
+                                               browser_binary=kwargs["binary"])
+            if path:
+                kwargs["mojojs_path"] = path
+                kwargs["enable_mojojs"] = True
+                logger.info(f"MojoJS enabled automatically (mojojs_path: {path})")
+            else:
+                kwargs["enable_mojojs"] = False
+                logger.info("MojoJS is disabled for this run.")
 
         if kwargs["webdriver_binary"] is None:
             webdriver_binary = None
             if not kwargs["install_webdriver"]:
-                webdriver_binary = self.browser.find_webdriver()
-                if (webdriver_binary and not self.browser.webdriver_supports_browser(
-                    webdriver_binary, kwargs["binary"])):
+                webdriver_binary = self.browser.find_webdriver(self.venv.bin_path)
+                if webdriver_binary and not self.browser.webdriver_supports_browser(
+                        webdriver_binary, kwargs["binary"], browser_channel):
                     webdriver_binary = None
 
             if webdriver_binary is None:
                 install = self.prompt_install("msedgedriver")
 
                 if install:
-                    logger.info("Downloading msedgedriver")
                     webdriver_binary = self.browser.install_webdriver(
                         dest=self.venv.bin_path,
-                        channel=browser_channel)
+                        channel=browser_channel,
+                        browser_binary=kwargs["binary"],
+                    )
             else:
                 logger.info("Using webdriver binary %s" % webdriver_binary)
 
             if webdriver_binary:
                 kwargs["webdriver_binary"] = webdriver_binary
             else:
-                raise WptrunError("Unable to locate or install msedgedriver binary")
-        if browser_channel in ("dev", "canary") and kwargs["enable_experimental"] is None:
-            logger.info("Automatically turning on experimental features for Edge Dev/Canary")
-            kwargs["enable_experimental"] = True
+                raise WptrunError("Unable to locate or install matching msedgedriver binary")
+        if browser_channel in self.experimental_channels:
+            # HACK(Hexcles): work around https://github.com/web-platform-tests/wpt/issues/16448
+            kwargs["webdriver_args"].append("--disable-build-check")
+            if kwargs["enable_experimental"] is None:
+                logger.info(
+                    "Automatically turning on experimental features for Microsoft Edge Dev/Canary")
+                kwargs["enable_experimental"] = True
+            if kwargs["enable_webtransport_h3"] is None:
+                # To start the WebTransport over HTTP/3 test server.
+                kwargs["enable_webtransport_h3"] = True
+        if os.getenv("TASKCLUSTER_ROOT_URL"):
+            # We are on Taskcluster, where our Docker container does not have
+            # enough capabilities to run Microsoft Edge with sandboxing. (gh-20133)
+            kwargs["binary_args"].append("--no-sandbox")
 
 
 class Edge(BrowserSetup):
@@ -692,6 +719,15 @@ class WebKit(BrowserSetup):
     def setup_kwargs(self, kwargs):
         pass
 
+class Ladybird(BrowserSetup):
+    name = "ladybird"
+    browser_cls = browser.Ladybird
+
+    def install(self, channel=None):
+        raise NotImplementedError
+
+    def setup_kwargs(self, kwargs):
+        pass
 
 class WebKitTestRunner(BrowserSetup):
     name = "wktr"
@@ -782,6 +818,7 @@ product_setup = {
     "wktr": WebKitTestRunner,
     "webkitgtk_minibrowser": WebKitGTKMiniBrowser,
     "epiphany": Epiphany,
+    "ladybird": Ladybird,
 }
 
 
diff --git a/tests/wpt/tests/tools/wpt/tests/test_browser.py b/tests/wpt/tests/tools/wpt/tests/test_browser.py
index bbaaaae996e..979531fb463 100644
--- a/tests/wpt/tests/tools/wpt/tests/test_browser.py
+++ b/tests/wpt/tests/tools/wpt/tests/test_browser.py
@@ -31,29 +31,38 @@ def test_all_browser_abc():
 
 
 def test_edgechromium_webdriver_supports_browser():
-    # EdgeDriver binary cannot be called.
+    # MSEdgeDriver binary cannot be called.
     edge = browser.EdgeChromium(logger)
     edge.webdriver_version = mock.MagicMock(return_value=None)
-    assert not edge.webdriver_supports_browser('/usr/bin/edgedriver', '/usr/bin/edge')
+    assert not edge.webdriver_supports_browser('/usr/bin/edgedriver', '/usr/bin/edge', 'stable')
 
     # Browser binary cannot be called.
     edge = browser.EdgeChromium(logger)
     edge.webdriver_version = mock.MagicMock(return_value='70.0.1')
     edge.version = mock.MagicMock(return_value=None)
-    assert edge.webdriver_supports_browser('/usr/bin/edgedriver', '/usr/bin/edge')
+    assert edge.webdriver_supports_browser('/usr/bin/edgedriver', '/usr/bin/edge', 'stable')
 
     # Browser version matches.
     edge = browser.EdgeChromium(logger)
-    edge.webdriver_version = mock.MagicMock(return_value='70.0.1')
+    # Versions should be an exact match to be compatible.
+    edge.webdriver_version = mock.MagicMock(return_value='70.1.5')
     edge.version = mock.MagicMock(return_value='70.1.5')
-    assert edge.webdriver_supports_browser('/usr/bin/edgedriver', '/usr/bin/edge')
+    assert edge.webdriver_supports_browser('/usr/bin/edgedriver', '/usr/bin/edge', 'stable')
 
     # Browser version doesn't match.
     edge = browser.EdgeChromium(logger)
     edge.webdriver_version = mock.MagicMock(return_value='70.0.1')
     edge.version = mock.MagicMock(return_value='69.0.1')
-    assert not edge.webdriver_supports_browser('/usr/bin/edgedriver', '/usr/bin/edge')
+    assert not edge.webdriver_supports_browser('/usr/bin/edgedriver', '/usr/bin/edge', 'stable')
 
+    # MSEdgeDriver version should match for MAJOR.MINOR.BUILD version.
+    edge = browser.EdgeChromium(logger)
+    edge.webdriver_version = mock.MagicMock(return_value='70.0.1.0')
+    edge.version = mock.MagicMock(return_value='70.0.1.1 dev')
+    assert edge.webdriver_supports_browser('/usr/bin/edgedriver', '/usr/bin/edge', 'dev')
+    # Mismatching minor version should not match.
+    edge.webdriver_version = mock.MagicMock(return_value='70.9.1')
+    assert not edge.webdriver_supports_browser('/usr/bin/edgedriver', '/usr/bin/edge', 'dev')
 
 # On Windows, webdriver_version directly calls _get_fileversion, so there is no
 # logic to test there.
diff --git a/tests/wpt/tests/tools/wpt/tests/test_wpt.py b/tests/wpt/tests/tools/wpt/tests/test_wpt.py
index d123faec2e7..c977b9a873f 100644
--- a/tests/wpt/tests/tools/wpt/tests/test_wpt.py
+++ b/tests/wpt/tests/tools/wpt/tests/test_wpt.py
@@ -111,6 +111,8 @@ def test_list_tests(manifest_dir):
     with pytest.raises(SystemExit) as excinfo:
         wpt.main(argv=["run", "--metadata", manifest_dir, "--list-tests",
                        "--channel", "dev", "--yes",
+                       # WebTransport server is not needed (web-platform-tests/wpt#41675).
+                       "--no-enable-webtransport-h3",
                        # Taskcluster machines do not have GPUs, so use software rendering via --enable-swiftshader.
                        "--enable-swiftshader",
                        "chrome", "/dom/nodes/Element-tagName.html"])
@@ -135,6 +137,8 @@ def test_list_tests_missing_manifest(manifest_dir):
                        "--metadata", manifest_dir,
                        "--list-tests",
                        "--yes",
+                       # WebTransport server is not needed (web-platform-tests/wpt#41675).
+                       "--no-enable-webtransport-h3",
                        "firefox", "/dom/nodes/Element-tagName.html"])
 
     assert excinfo.value.code == 0
@@ -163,6 +167,8 @@ def test_list_tests_invalid_manifest(manifest_dir):
                        "--metadata", manifest_dir,
                        "--list-tests",
                        "--yes",
+                       # WebTransport server is not needed (web-platform-tests/wpt#41675).
+                       "--no-enable-webtransport-h3",
                        "firefox", "/dom/nodes/Element-tagName.html"])
 
     assert excinfo.value.code == 0
@@ -180,6 +186,8 @@ def test_run_zero_tests():
 
     with pytest.raises(SystemExit) as excinfo:
         wpt.main(argv=["run", "--yes", "--no-pause", "--channel", "dev",
+                       # WebTransport server is not needed (web-platform-tests/wpt#41675).
+                       "--no-enable-webtransport-h3",
                        # Taskcluster machines do not have GPUs, so use software rendering via --enable-swiftshader.
                        "--enable-swiftshader",
                        "chrome", "/non-existent-dir/non-existent-file.html"])
@@ -188,6 +196,8 @@ def test_run_zero_tests():
     with pytest.raises(SystemExit) as excinfo:
         wpt.main(argv=["run", "--yes", "--no-pause", "--no-fail-on-unexpected",
                        "--channel", "dev",
+                       # WebTransport server is not needed (web-platform-tests/wpt#41675).
+                       "--no-enable-webtransport-h3",
                        # Taskcluster machines do not have GPUs, so use software rendering via --enable-swiftshader.
                        "--enable-swiftshader",
                        "chrome", "/non-existent-dir/non-existent-file.html"])
@@ -209,6 +219,8 @@ def test_run_failing_test():
 
     with pytest.raises(SystemExit) as excinfo:
         wpt.main(argv=["run", "--yes", "--no-pause", "--channel", "dev",
+                       # WebTransport server is not needed (web-platform-tests/wpt#41675).
+                       "--no-enable-webtransport-h3",
                        # Taskcluster machines do not have GPUs, so use software rendering via --enable-swiftshader.
                        "--enable-swiftshader",
                        "chrome", failing_test])
@@ -217,6 +229,8 @@ def test_run_failing_test():
     with pytest.raises(SystemExit) as excinfo:
         wpt.main(argv=["run", "--yes", "--no-pause", "--no-fail-on-unexpected",
                        "--channel", "dev",
+                       # WebTransport server is not needed (web-platform-tests/wpt#41675).
+                       "--no-enable-webtransport-h3",
                        # Taskcluster machines do not have GPUs, so use software rendering via --enable-swiftshader.
                        "--enable-swiftshader",
                        "chrome", failing_test])
@@ -244,6 +258,8 @@ def test_run_verify_unstable(temp_test):
 
     with pytest.raises(SystemExit) as excinfo:
         wpt.main(argv=["run", "--yes", "--verify", "--channel", "dev",
+                       # WebTransport server is not needed (web-platform-tests/wpt#41675).
+                       "--no-enable-webtransport-h3",
                        # Taskcluster machines do not have GPUs, so use software rendering via --enable-swiftshader.
                        "--enable-swiftshader",
                        "chrome", unstable_test])
@@ -253,6 +269,8 @@ def test_run_verify_unstable(temp_test):
 
     with pytest.raises(SystemExit) as excinfo:
         wpt.main(argv=["run", "--yes", "--verify", "--channel", "dev",
+                       # WebTransport server is not needed (web-platform-tests/wpt#41675).
+                       "--no-enable-webtransport-h3",
                        # Taskcluster machines do not have GPUs, so use software rendering via --enable-swiftshader.
                        "--enable-swiftshader",
                        "chrome", stable_test])
diff --git a/tests/wpt/tests/tools/wptrunner/requirements.txt b/tests/wpt/tests/tools/wptrunner/requirements.txt
index 0b7ccba4fb8..ffb46dea79a 100644
--- a/tests/wpt/tests/tools/wptrunner/requirements.txt
+++ b/tests/wpt/tests/tools/wptrunner/requirements.txt
@@ -7,4 +7,4 @@ packaging==23.1
 pillow==9.5.0
 requests==2.31.0
 six==1.16.0
-urllib3==2.0.4
+urllib3==2.0.5
diff --git a/tests/wpt/tests/tools/wptrunner/requirements_edge.txt b/tests/wpt/tests/tools/wptrunner/requirements_edge.txt
index 0ce4d76f8af..f5c4e20a2ce 100644
--- a/tests/wpt/tests/tools/wptrunner/requirements_edge.txt
+++ b/tests/wpt/tests/tools/wptrunner/requirements_edge.txt
@@ -1 +1 @@
-selenium==4.11.0
+selenium==4.12.0
diff --git a/tests/wpt/tests/tools/wptrunner/requirements_firefox.txt b/tests/wpt/tests/tools/wptrunner/requirements_firefox.txt
index 0bb6812e6e4..3ba4731494a 100644
--- a/tests/wpt/tests/tools/wptrunner/requirements_firefox.txt
+++ b/tests/wpt/tests/tools/wptrunner/requirements_firefox.txt
@@ -3,7 +3,7 @@ mozcrash==2.2.0
 mozdevice==4.1.1
 mozinstall==2.1.0
 mozleak==0.2
-mozprofile==2.6.0
+mozprofile==2.6.1
 mozrunner==8.3.0
 mozversion==2.4.0
 psutil==5.9.5
diff --git a/tests/wpt/tests/tools/wptrunner/requirements_ie.txt b/tests/wpt/tests/tools/wptrunner/requirements_ie.txt
index 90a5512c79f..1630585dae5 100644
--- a/tests/wpt/tests/tools/wptrunner/requirements_ie.txt
+++ b/tests/wpt/tests/tools/wptrunner/requirements_ie.txt
@@ -1,2 +1,2 @@
 mozprocess==1.3.1
-selenium==4.11.0
+selenium==4.12.0
diff --git a/tests/wpt/tests/tools/wptrunner/requirements_opera.txt b/tests/wpt/tests/tools/wptrunner/requirements_opera.txt
index 90a5512c79f..1630585dae5 100644
--- a/tests/wpt/tests/tools/wptrunner/requirements_opera.txt
+++ b/tests/wpt/tests/tools/wptrunner/requirements_opera.txt
@@ -1,2 +1,2 @@
 mozprocess==1.3.1
-selenium==4.11.0
+selenium==4.12.0
diff --git a/tests/wpt/tests/tools/wptrunner/requirements_sauce.txt b/tests/wpt/tests/tools/wptrunner/requirements_sauce.txt
index 8cf3f1d32c8..2be155d9f57 100644
--- a/tests/wpt/tests/tools/wptrunner/requirements_sauce.txt
+++ b/tests/wpt/tests/tools/wptrunner/requirements_sauce.txt
@@ -1,2 +1,2 @@
-selenium==4.11.0
+selenium==4.12.0
 requests==2.31.0
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/__init__.py b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/__init__.py
index 9724bb957b5..4d10457699d 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/__init__.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/__init__.py
@@ -43,4 +43,5 @@ product_list = ["android_weblayer",
                 "webkit",
                 "webkitgtk_minibrowser",
                 "wktr",
-                "epiphany"]
+                "epiphany",
+                "ladybird"]
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/base.py b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/base.py
index adf665c1992..bebdf29b642 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/base.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/base.py
@@ -342,7 +342,7 @@ class WebDriverBrowser(Browser):
         except OSError as e:
             if e.errno == errno.ENOENT:
                 raise OSError(
-                    "WebDriver executable not found: %s" % self.webdriver_binary)
+                    "WebDriver executable not found: %s" % self.webdriver_binary) from e
             raise
         self._output_handler.after_process_start(self._proc.pid)
 
@@ -404,7 +404,8 @@ class WebDriverBrowser(Browser):
         return ExecutorBrowser, {"webdriver_url": self.url,
                                  "host": self.host,
                                  "port": self.port,
-                                 "pac": self.pac}
+                                 "pac": self.pac,
+                                 "env": self.env}
 
     def settings(self, test):
         self._pac = test.environment.get("pac", None) if self._supports_pac else None
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/chrome.py b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/chrome.py
index 047bfa02451..5e954912544 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/chrome.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/chrome.py
@@ -31,6 +31,18 @@ __wptrunner__ = {"product": "chrome",
                  "timeout_multiplier": "get_timeout_multiplier",}
 
 
+def debug_args(debug_info):
+    if debug_info.interactive:
+        # Keep in sync with:
+        # https://chromium.googlesource.com/chromium/src/+/main/third_party/blink/tools/debug_renderer
+        return [
+            "--no-sandbox",
+            "--disable-hang-monitor",
+            "--wait-for-debugger-on-navigation",
+        ]
+    return []
+
+
 def check_args(**kwargs):
     require_arg(kwargs, "webdriver_binary")
 
@@ -88,7 +100,7 @@ def executor_kwargs(logger, test_type, test_environment, run_info_data,
     # Shorten delay for Reporting <https://w3c.github.io/reporting/>.
     chrome_options["args"].append("--short-reporting-delay")
     # Point all .test domains to localhost for Chrome
-    chrome_options["args"].append("--host-resolver-rules=MAP nonexistent.*.test ~NOTFOUND, MAP *.test 127.0.0.1")
+    chrome_options["args"].append("--host-resolver-rules=MAP nonexistent.*.test ^NOTFOUND, MAP *.test 127.0.0.1")
     # Enable Secure Payment Confirmation for Chrome. This is normally disabled
     # on Linux as it hasn't shipped there yet, but in WPT we enable virtual
     # authenticator devices anyway for testing and so SPC works.
@@ -148,6 +160,8 @@ def env_extras(**kwargs):
 
 
 def env_options():
+    # TODO(crbug.com/1440021): Support text-based debuggers for `chrome` through
+    # `chromedriver`.
     return {"server_host": "127.0.0.1"}
 
 
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/chrome_spki_certs.py b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/chrome_spki_certs.py
index 380f0848a73..0f7825c80ff 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/chrome_spki_certs.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/chrome_spki_certs.py
@@ -2,7 +2,7 @@
 # DO NOT EDIT MANUALLY.
 
 # tools/certs/web-platform.test.pem
-WPT_FINGERPRINT = 'Be2q39hn/OSyGxIOIDwkKYzGmG+Z82YfIX9bvqg0lwY='
+WPT_FINGERPRINT = 'sCJ8962Wxqgz44IKoPQLcDT7YRRAxO2w1iYIqpMYHhg='
 
 # signed-exchange/resources/127.0.0.1.sxg.pem
 SXG_WPT_FINGERPRINT = '0Rt4mT6SJXojEMHTnKnlJ/hBKMBcI4kteBlhR1eTTdk='
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/content_shell.py b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/content_shell.py
index 45fb48a6272..14956eeb786 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/content_shell.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/content_shell.py
@@ -1,5 +1,6 @@
 # mypy: allow-untyped-defs
 
+import contextlib
 import os
 import subprocess
 from multiprocessing import Queue, Event
@@ -10,8 +11,10 @@ from .base import (
     Browser,
     ExecutorBrowser,
     OutputHandler,
+    browser_command,
 )
 from .base import get_timeout_multiplier   # noqa: F401
+from .chrome import debug_args
 from ..executors import executor_kwargs as base_executor_kwargs
 from ..executors.executorcontentshell import (  # noqa: F401
     ContentShellCrashtestExecutor,
@@ -20,6 +23,10 @@ from ..executors.executorcontentshell import (  # noqa: F401
     ContentShellTestharnessExecutor,
 )
 
+ENABLE_THREADED_COMPOSITING_FLAG = '--enable-threaded-compositing'
+DISABLE_THREADED_COMPOSITING_FLAG = '--disable-threaded-compositing'
+DISABLE_THREADED_ANIMATION_FLAG = '--disable-threaded-animation'
+
 
 __wptrunner__ = {"product": "content_shell",
                  "check_args": "check_args",
@@ -42,7 +49,7 @@ def check_args(**kwargs):
     pass
 
 
-def browser_kwargs(logger, test_type, run_info_data, config, **kwargs):
+def browser_kwargs(logger, test_type, run_info_data, config, subsuite, **kwargs):
     args = []
     args.append("--ignore-certificate-errors-spki-list=%s" %
         ','.join(chrome_spki_certs.IGNORE_CERTIFICATE_ERRORS_SPKI_LIST))
@@ -52,16 +59,30 @@ def browser_kwargs(logger, test_type, run_info_data, config, **kwargs):
     if not kwargs["headless"]:
         args.append("--disable-headless-mode")
 
+    if kwargs["debug_info"]:
+        args.extend(debug_args(kwargs["debug_info"]))
+
     # `--run-web-tests -` are specific to content_shell - they activate web
     # test protocol mode.
     args.append("--run-web-tests")
     for arg in kwargs.get("binary_args", []):
         if arg not in args:
             args.append(arg)
+
+    # Temporary workaround to align with RWT behavior. Unless a vts explicitly
+    # enables threaded compositing, we should use single threaded compositing
+    if ENABLE_THREADED_COMPOSITING_FLAG not in subsuite.config.get("binary_args", []):
+        args.extend([DISABLE_THREADED_COMPOSITING_FLAG,
+                     DISABLE_THREADED_ANIMATION_FLAG])
+
+    for arg in subsuite.config.get("binary_args", []):
+        if arg not in args:
+            args.append(arg)
     args.append("-")
 
     return {"binary": kwargs["binary"],
-            "binary_args": args}
+            "binary_args": args,
+            "debug_info": kwargs["debug_info"]}
 
 
 def executor_kwargs(logger, test_type, test_environment, run_info_data,
@@ -81,7 +102,8 @@ def env_extras(**kwargs):
 
 def env_options():
     return {"server_host": "127.0.0.1",
-            "testharnessreport": "testharnessreport-content-shell.js"}
+            "testharnessreport": "testharnessreport-content-shell.js",
+            "supports_debugger": True}
 
 
 def update_properties():
@@ -94,15 +116,21 @@ class ContentShellBrowser(Browser):
     Upon startup, the stdout, stderr, and stdin pipes of the underlying content_shell
     process are connected to multiprocessing Queues so that the runner process can
     interact with content_shell through its protocol mode.
+
+    See Also:
+        Protocol Mode: https://chromium.googlesource.com/chromium/src.git/+/HEAD/content/web_test/browser/test_info_extractor.h
     """
-    # Seconds to wait for the process to stop after it was sent `SIGTERM` or
-    # `TerminateProcess()`. The value is inherited from:
+    # Seconds to wait for the process to stop after it was sent a `QUIT`
+    # command, after which `SIGTERM` or `TerminateProcess()` forces termination.
+    # The timeout is ported from:
     # https://chromium.googlesource.com/chromium/src/+/b175d48d3ea4ea66eea35c88c11aa80d233f3bee/third_party/blink/tools/blinkpy/web_tests/port/base.py#476
     termination_timeout: float = 3
 
-    def __init__(self, logger, binary="content_shell", binary_args=[], **kwargs):
+    def __init__(self, logger, binary="content_shell", binary_args=None,
+                 debug_info=None, **kwargs):
         super().__init__(logger)
-        self._args = [binary] + binary_args
+        debug_cmd_prefix, browser_cmd = browser_command(binary, binary_args or [], debug_info)
+        self._args = [*debug_cmd_prefix, *browser_cmd]
         self._output_handler = None
         self._proc = None
 
@@ -126,13 +154,17 @@ class ContentShellBrowser(Browser):
         self._stdin_queue = Queue()
         self._io_stopped = Event()
 
-        self._stdout_reader = self._create_reader_thread(self._proc.stdout,
+        self._stdout_reader = self._create_reader_thread("stdout-reader",
+                                                         self._proc.stdout,
                                                          self._stdout_queue,
                                                          prefix=b"OUT: ")
-        self._stderr_reader = self._create_reader_thread(self._proc.stderr,
+        self._stderr_reader = self._create_reader_thread("stderr-reader",
+                                                         self._proc.stderr,
                                                          self._stderr_queue,
                                                          prefix=b"ERR: ")
-        self._stdin_writer = self._create_writer_thread(self._proc.stdin, self._stdin_queue)
+        self._stdin_writer = self._create_writer_thread("stdin-writer",
+                                                        self._proc.stdin,
+                                                        self._stdin_queue)
 
         # Content shell is likely still in the process of initializing. The actual waiting
         # for the startup to finish is done in the ContentShellProtocol.
@@ -142,41 +174,51 @@ class ContentShellBrowser(Browser):
     def stop(self, force=False):
         self.logger.debug("Stopping content shell...")
 
-        clean_shutdown = True
+        clean_shutdown = stopped = True
         if self.is_alive():
-            self._proc.terminate()
-            try:
-                self._proc.wait(timeout=self.termination_timeout)
-            except subprocess.TimeoutExpired:
-                clean_shutdown = False
-                self.logger.warning(
-                    "Content shell failed to stop gracefully (PID: "
-                    f"{self._proc.pid}, timeout: {self.termination_timeout}s)")
-                if force:
-                    self._proc.kill()
-
-        # We need to shut down these queues cleanly to avoid broken pipe error spam in the logs.
-        self._stdout_reader.join(2)
-        self._stderr_reader.join(2)
+            clean_shutdown = self._terminate_process(force=force)
 
+        # Close these queues cleanly to avoid broken pipe error spam in the logs.
         self._stdin_queue.put(None)
-        self._stdin_writer.join(2)
-
         for thread in [self._stdout_reader, self._stderr_reader, self._stdin_writer]:
+            thread.join(2)
             if thread.is_alive():
-                self.logger.warning("Content shell IO threads did not shut down gracefully.")
-                return False
+                self.logger.warning(f"Content shell IO thread {thread.name} did not shut down gracefully.")
+                stopped = False
 
-        stopped = not self.is_alive()
-        if stopped:
-            self.logger.debug("Content shell has been stopped.")
+        if not self.is_alive():
+            self.logger.debug(
+                "Content shell has been stopped "
+                f"(PID: {self._proc.pid}, exit code: {self._proc.returncode})")
         else:
-            self.logger.warning("Content shell failed to stop.")
+            stopped = False
+            self.logger.warning(f"Content shell failed to stop (PID: {self._proc.pid})")
         if stopped and self._output_handler is not None:
             self._output_handler.after_process_stop(clean_shutdown)
             self._output_handler = None
         return stopped
 
+    def _terminate_process(self, force: bool = False) -> bool:
+        self._stdin_queue.put(b"QUIT\n")
+        with contextlib.suppress(subprocess.TimeoutExpired):
+            self._proc.wait(timeout=self.termination_timeout)
+            return True
+        self.logger.warning(
+            "Content shell failed to respond to QUIT command "
+            f"(PID: {self._proc.pid}, timeout: {self.termination_timeout}s)")
+        # Skip `terminate()` on Windows, which is an alias for `kill()`, and
+        # only `kill()` for `force=True`.
+        #
+        # [1]: https://docs.python.org/3/library/subprocess.html#subprocess.Popen.kill
+        if os.name == "posix":
+            self._proc.terminate()
+            with contextlib.suppress(subprocess.TimeoutExpired):
+                self._proc.wait(timeout=1)
+                return False
+        if force:
+            self._proc.kill()
+        return False
+
     def is_alive(self):
         return self._proc is not None and self._proc.poll() is None
 
@@ -197,7 +239,7 @@ class ContentShellBrowser(Browser):
     def check_crash(self, process, test):
         return not self.is_alive()
 
-    def _create_reader_thread(self, stream, queue, prefix=b""):
+    def _create_reader_thread(self, name, stream, queue, prefix=b""):
         """This creates (and starts) a background thread which reads lines from `stream` and
         puts them into `queue` until `stream` reports EOF.
         """
@@ -213,11 +255,14 @@ class ContentShellBrowser(Browser):
             queue.close()
             queue.join_thread()
 
-        result = Thread(target=reader_thread, args=(stream, queue, self._io_stopped), daemon=True)
+        result = Thread(name=name,
+                        target=reader_thread,
+                        args=(stream, queue, self._io_stopped),
+                        daemon=True)
         result.start()
         return result
 
-    def _create_writer_thread(self, stream, queue):
+    def _create_writer_thread(self, name, stream, queue):
         """This creates (and starts) a background thread which gets items from `queue` and
         writes them into `stream` until it encounters a None item in the queue.
         """
@@ -230,6 +275,9 @@ class ContentShellBrowser(Browser):
                 stream.write(line)
                 stream.flush()
 
-        result = Thread(target=writer_thread, args=(stream, queue), daemon=True)
+        result = Thread(name=name,
+                        target=writer_thread,
+                        args=(stream, queue),
+                        daemon=True)
         result.start()
         return result
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/edgechromium.py b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/edgechromium.py
index df7c41a9dd0..4f5bffa06c4 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/edgechromium.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/edgechromium.py
@@ -1,24 +1,30 @@
 # mypy: allow-untyped-defs
-
-from .base import cmd_arg, require_arg
-from .base import WebDriverBrowser
+from .base import WebDriverBrowser, require_arg
 from .base import get_timeout_multiplier   # noqa: F401
+from .base import cmd_arg
+from .chrome import executor_kwargs as chrome_executor_kwargs
+from ..executors.executorwebdriver import WebDriverCrashtestExecutor  # noqa: F401
 from ..executors.base import WdspecExecutor  # noqa: F401
-from ..executors import executor_kwargs as base_executor_kwargs
-from ..executors.executorwebdriver import (WebDriverTestharnessExecutor,  # noqa: F401
-                                           WebDriverRefTestExecutor)  # noqa: F401
+from ..executors.executoredge import (  # noqa: F401
+    EdgeChromiumDriverPrintRefTestExecutor,
+    EdgeChromiumDriverRefTestExecutor,
+    EdgeChromiumDriverTestharnessExecutor,
+)
 
 
 __wptrunner__ = {"product": "edgechromium",
                  "check_args": "check_args",
                  "browser": "EdgeChromiumBrowser",
-                 "executor": {"testharness": "WebDriverTestharnessExecutor",
-                              "reftest": "WebDriverRefTestExecutor",
-                              "wdspec": "WdspecExecutor"},
+                 "executor": {"testharness": "EdgeChromiumDriverTestharnessExecutor",
+                              "reftest": "EdgeChromiumDriverRefTestExecutor",
+                              "print-reftest": "EdgeChromiumDriverPrintRefTestExecutor",
+                              "wdspec": "WdspecExecutor",
+                              "crashtest": "WebDriverCrashtestExecutor"},
                  "browser_kwargs": "browser_kwargs",
                  "executor_kwargs": "executor_kwargs",
                  "env_extras": "env_extras",
                  "env_options": "env_options",
+                 "update_properties": "update_properties",
                  "timeout_multiplier": "get_timeout_multiplier",}
 
 
@@ -34,44 +40,9 @@ def browser_kwargs(logger, test_type, run_info_data, config, **kwargs):
 
 def executor_kwargs(logger, test_type, test_environment, run_info_data,
                     **kwargs):
-    executor_kwargs = base_executor_kwargs(test_type,
-                                           test_environment,
-                                           run_info_data,
-                                           **kwargs)
-    executor_kwargs["close_after_done"] = True
-
-    capabilities = {
-        "ms:edgeOptions": {
-            "prefs": {
-                "profile": {
-                    "default_content_setting_values": {
-                        "popups": 1
-                    }
-                }
-            },
-            "useAutomationExtension": False,
-            "excludeSwitches": ["enable-automation"],
-            "w3c": True
-        }
-    }
-
-    for (kwarg, capability) in [("binary", "binary"), ("binary_args", "args")]:
-        if kwargs[kwarg] is not None:
-            capabilities["ms:edgeOptions"][capability] = kwargs[kwarg]
-
-    if kwargs["headless"]:
-        if "args" not in capabilities["ms:edgeOptions"]:
-            capabilities["ms:edgeOptions"]["args"] = []
-        if "--headless" not in capabilities["ms:edgeOptions"]["args"]:
-            capabilities["ms:edgeOptions"]["args"].append("--headless")
-        capabilities["ms:edgeOptions"]["args"].append("--use-fake-device-for-media-stream")
-        capabilities["ms:edgeOptions"]["args"].append("--use-fake-ui-for-fedcm")
-
-    if kwargs["enable_experimental"]:
-        capabilities["ms:edgeOptions"]["args"].append("--enable-experimental-web-platform-features")
-
-    executor_kwargs["capabilities"] = capabilities
-
+    executor_kwargs = chrome_executor_kwargs(logger, test_type, test_environment, run_info_data, **kwargs)
+    capabilities = executor_kwargs["capabilities"]
+    capabilities["ms:edgeOptions"] = capabilities.pop("goog:chromeOptions")
     return executor_kwargs
 
 
@@ -80,7 +51,11 @@ def env_extras(**kwargs):
 
 
 def env_options():
-    return {}
+    return {"server_host": "127.0.0.1"}
+
+
+def update_properties():
+    return (["debug", "os", "processor"], {"os": ["version"], "processor": ["bits"]})
 
 
 class EdgeChromiumBrowser(WebDriverBrowser):
@@ -91,4 +66,5 @@ class EdgeChromiumBrowser(WebDriverBrowser):
     def make_command(self):
         return [self.webdriver_binary,
                 cmd_arg("port", str(self.port)),
-                cmd_arg("url-base", self.base_path)] + self.webdriver_args
+                cmd_arg("url-base", self.base_path),
+                cmd_arg("enable-edge-logs")] + self.webdriver_args
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/firefox.py b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/firefox.py
index 096f851f9d0..d91703f42dd 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/firefox.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/firefox.py
@@ -104,12 +104,12 @@ def check_args(**kwargs):
     require_arg(kwargs, "binary")
 
 
-def browser_kwargs(logger, test_type, run_info_data, config, **kwargs):
+def browser_kwargs(logger, test_type, run_info_data, config, subsuite, **kwargs):
     browser_kwargs = {"binary": kwargs["binary"],
                       "webdriver_binary": kwargs["webdriver_binary"],
-                      "webdriver_args": kwargs["webdriver_args"],
+                      "webdriver_args": kwargs["webdriver_args"].copy(),
                       "prefs_root": kwargs["prefs_root"],
-                      "extra_prefs": kwargs["extra_prefs"],
+                      "extra_prefs": kwargs["extra_prefs"].copy(),
                       "test_type": test_type,
                       "debug_info": kwargs["debug_info"],
                       "symbols_path": kwargs["symbols_path"],
@@ -119,7 +119,7 @@ def browser_kwargs(logger, test_type, run_info_data, config, **kwargs):
                       "e10s": kwargs["gecko_e10s"],
                       "enable_fission": run_info_data["fission"],
                       "stackfix_dir": kwargs["stackfix_dir"],
-                      "binary_args": kwargs["binary_args"],
+                      "binary_args": kwargs["binary_args"].copy(),
                       "timeout_multiplier": get_timeout_multiplier(test_type,
                                                                    run_info_data,
                                                                    **kwargs),
@@ -134,6 +134,8 @@ def browser_kwargs(logger, test_type, run_info_data, config, **kwargs):
                       "debug_test": kwargs["debug_test"]}
     if test_type == "wdspec" and kwargs["binary"]:
         browser_kwargs["webdriver_args"].extend(["--binary", kwargs["binary"]])
+    browser_kwargs["binary_args"].extend(subsuite.config.get("binary_args", []))
+    browser_kwargs["extra_prefs"].extend(subsuite.config.get("prefs", []))
     return browser_kwargs
 
 
@@ -214,8 +216,7 @@ def run_info_extras(**kwargs):
           "fission": enable_fission,
           "sessionHistoryInParent": (enable_fission or
                                      not get_bool_pref("fission.disableSessionHistoryInParent")),
-          "swgl": get_bool_pref("gfx.webrender.software"),
-          "editorLegacyDirectionMode": get_bool_pref_if_exists("editor.join_split_direction.compatible_with_the_other_browsers") is False}
+          "swgl": get_bool_pref("gfx.webrender.software")}
 
     rv.update(run_info_browser_version(**kwargs))
 
@@ -237,8 +238,17 @@ def run_info_browser_version(**kwargs):
 
 
 def update_properties():
-    return (["os", "debug", "fission", "processor", "swgl", "asan", "tsan", "editorLegacyDirectionMode"],
-            {"os": ["version"], "processor": ["bits"]})
+    return ([
+        "os",
+        "debug",
+        "fission",
+        "processor",
+        "swgl",
+        "asan",
+        "tsan",
+        "subsuite"], {
+        "os": ["version"],
+        "processor": ["bits"]})
 
 
 def log_gecko_crashes(logger, process, test, profile_dir, symbols_path, stackwalk_binary):
@@ -903,11 +913,6 @@ class FirefoxWdSpecBrowser(WebDriverBrowser):
                           headless,
                           chaos_mode_flags)
         env["RUST_BACKTRACE"] = "1"
-        # This doesn't work with wdspec tests
-        # In particular tests can create a session without passing in the capabilites
-        # and in those cases we get the default geckodriver profile which doesn't
-        # guarantee zero network access
-        del env["MOZ_DISABLE_NONLOCAL_CONNECTIONS"]
         return env
 
     def create_output_handler(self, cmd):
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/firefox_android.py b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/firefox_android.py
index 298b5f27407..8437dd20059 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/firefox_android.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/firefox_android.py
@@ -45,11 +45,11 @@ def check_args(**kwargs):
 def browser_kwargs(logger, test_type, run_info_data, config, **kwargs):
     return {"adb_binary": kwargs["adb_binary"],
             "webdriver_binary": kwargs["webdriver_binary"],
-            "webdriver_args": kwargs["webdriver_args"],
+            "webdriver_args": kwargs["webdriver_args"].copy(),
             "package_name": kwargs["package_name"],
             "device_serial": kwargs["device_serial"],
             "prefs_root": kwargs["prefs_root"],
-            "extra_prefs": kwargs["extra_prefs"],
+            "extra_prefs": kwargs["extra_prefs"].copy(),
             "test_type": test_type,
             "debug_info": kwargs["debug_info"],
             "symbols_path": kwargs["symbols_path"],
@@ -57,7 +57,7 @@ def browser_kwargs(logger, test_type, run_info_data, config, **kwargs):
             "certutil_binary": kwargs["certutil_binary"],
             "ca_certificate_path": config.ssl_config["ca_cert_path"],
             "stackfix_dir": kwargs["stackfix_dir"],
-            "binary_args": kwargs["binary_args"],
+            "binary_args": kwargs["binary_args"].copy(),
             "timeout_multiplier": get_timeout_multiplier(test_type,
                                                          run_info_data,
                                                          **kwargs),
@@ -349,7 +349,6 @@ class FirefoxAndroidWdSpecBrowser(FirefoxWdSpecBrowser):
     def get_env(self, binary, debug_info, headless, chaos_mode_flags):
         env = get_environ(chaos_mode_flags)
         env["RUST_BACKTRACE"] = "1"
-        del env["MOZ_DISABLE_NONLOCAL_CONNECTIONS"]
         return env
 
     def executor_browser(self):
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/ladybird.py b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/ladybird.py
new file mode 100644
index 00000000000..4738a71f194
--- /dev/null
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/ladybird.py
@@ -0,0 +1,56 @@
+# mypy: allow-untyped-defs
+
+from .base import (WebDriverBrowser,  # noqa: F401
+                   get_timeout_multiplier,  # noqa: F401
+                   require_arg)
+from ..executors import executor_kwargs as base_executor_kwargs
+from ..executors.base import WdspecExecutor  # noqa: F401
+from ..executors.executorwebdriver import (WebDriverTestharnessExecutor,  # noqa: F401
+                                           WebDriverRefTestExecutor,  # noqa: F401
+                                           WebDriverCrashtestExecutor)  # noqa: F401
+
+__wptrunner__ = {
+    "product": "ladybird",
+    "check_args": "check_args",
+    "browser": "LadybirdBrowser",
+    "browser_kwargs": "browser_kwargs",
+    "executor_kwargs": "executor_kwargs",
+    "env_options": "env_options",
+    "env_extras": "env_extras",
+    "timeout_multiplier": "get_timeout_multiplier",
+    "executor": {
+        "testharness": "WebDriverTestharnessExecutor",
+        "reftest": "WebDriverRefTestExecutor",
+        "wdspec": "WdspecExecutor",
+        "crashtest": "WebDriverCrashtestExecutor"
+    }
+}
+
+def check_args(**kwargs):
+    require_arg(kwargs, "webdriver_binary")
+
+
+def browser_kwargs(logger, test_type, run_info_data, config, **kwargs):
+    return {"binary": kwargs["binary"],
+            "webdriver_binary": kwargs["webdriver_binary"],
+            "webdriver_args": kwargs.get("webdriver_args")}
+
+
+def executor_kwargs(logger, test_type, test_environment, run_info_data,
+                    **kwargs):
+    executor_kwargs = base_executor_kwargs(test_type, test_environment, run_info_data, **kwargs)
+    executor_kwargs["capabilities"] = {}
+    return executor_kwargs
+
+
+def env_options():
+    return {}
+
+
+def env_extras(**kwargs):
+    return []
+
+
+class LadybirdBrowser(WebDriverBrowser):
+    def make_command(self):
+        return [self.webdriver_binary, "--port", str(self.port)] + self.webdriver_args
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/safari.py b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/safari.py
index f7dcd55d628..40f5f54859f 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/safari.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/safari.py
@@ -212,3 +212,7 @@ class SafariBrowser(WebDriverBrowser):
                         proc.wait(10)
                 except psutil.NoSuchProcess:
                     pass
+                except Exception:
+                    # Safari is a singleton, so treat failure here as a critical error.
+                    self.logger.critical("Failed to stop Safari")
+                    raise
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/webkitgtk_minibrowser.py b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/webkitgtk_minibrowser.py
index 4b247dd36e3..355ffe35979 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/webkitgtk_minibrowser.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/webkitgtk_minibrowser.py
@@ -64,7 +64,7 @@ def executor_kwargs(logger, test_type, test_environment, run_info_data,
     executor_kwargs["close_after_done"] = True
     executor_kwargs["capabilities"] = capabilities(test_environment.config, **kwargs)
     if test_type == "wdspec":
-        executor_kwargs["binary_args"] = capabilities["webkitgtk:browserOptions"]["args"]
+        executor_kwargs["binary_args"] = executor_kwargs["capabilities"]["webkitgtk:browserOptions"]["args"]
     return executor_kwargs
 
 
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/environment.py b/tests/wpt/tests/tools/wptrunner/wptrunner/environment.py
index 9e217eda482..de96f799ba3 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/environment.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/environment.py
@@ -247,13 +247,7 @@ class TestEnvironment:
             route_builder.add_static(path, format_args, content_type, route,
                                      headers=headers)
 
-        data = b""
-        with open(os.path.join(repo_root, "resources", "testdriver.js"), "rb") as fp:
-            data += fp.read()
-        with open(os.path.join(here, "testdriver-extra.js"), "rb") as fp:
-            data += fp.read()
-        route_builder.add_handler("GET", "/resources/testdriver.js",
-                                  StringHandler(data, "text/javascript"))
+        route_builder.add_handler("GET", "/resources/testdriver.js", TestdriverLoader())
 
         for url_base, paths in self.test_paths.items():
             if url_base == "/":
@@ -270,7 +264,7 @@ class TestEnvironment:
 
     def ensure_started(self):
         # Pause for a while to ensure that the server has a chance to start
-        total_sleep_secs = 30
+        total_sleep_secs = 60
         each_sleep_secs = 0.5
         end_time = time.time() + total_sleep_secs
         while time.time() < end_time:
@@ -280,8 +274,13 @@ class TestEnvironment:
             if not pending:
                 return
             time.sleep(each_sleep_secs)
-        raise OSError("Servers failed to start: %s" %
-                      ", ".join("%s:%s" % item for item in failed))
+        if failed:
+            failures = ", ".join(f"{scheme}:{port}" for scheme, port in failed)
+            msg = f"Servers failed to start: {failures}"
+        else:
+            pending = ", ".join(f"{scheme}:{port}" for scheme, port in pending)
+            msg = f"Timed out wait for servers to start: {pending}"
+        raise OSError(msg)
 
     def test_servers(self):
         failed = []
@@ -304,13 +303,34 @@ class TestEnvironment:
                     try:
                         s.connect((host, port))
                     except OSError:
-                        pending.append((host, port))
+                        pending.append((scheme, port))
                     finally:
                         s.close()
 
         return failed, pending
 
 
+class TestdriverLoader:
+    """A special static handler for serving `/resources/testdriver.js`.
+
+    This handler lazily reads `testdriver{,-extra}.js` so that wptrunner doesn't
+    need to pass the entire file contents to child `wptserve` processes, which
+    can slow `wptserve` startup by several seconds (crbug.com/1479850).
+    """
+    def __init__(self):
+        self._handler = None
+
+    def __call__(self, request, response):
+        if not self._handler:
+            data = b""
+            with open(os.path.join(repo_root, "resources", "testdriver.js"), "rb") as fp:
+                data += fp.read()
+            with open(os.path.join(here, "testdriver-extra.js"), "rb") as fp:
+                data += fp.read()
+            self._handler = StringHandler(data, "text/javascript")
+        return self._handler(request, response)
+
+
 def wait_for_service(logger, host, port, timeout=60, server_process=None):
     """Waits until network service given as a tuple of (host, port) becomes
     available, `timeout` duration is reached, or the `server_process` exits at
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/executors/actions.py b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/actions.py
index f3fe970484e..e622c6c67d9 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/executors/actions.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/actions.py
@@ -288,6 +288,17 @@ class CancelFedCMDialogAction:
         self.logger.debug("Canceling FedCM dialog")
         return self.protocol.fedcm.cancel_fedcm_dialog()
 
+class ConfirmIDPLoginAction:
+    name = "confirm_idp_login"
+
+    def __init__(self, logger, protocol):
+        self.logger = logger
+        self.protocol = protocol
+
+    def __call__(self, payload):
+        self.logger.debug("Confirming IDP login")
+        return self.protocol.fedcm.confirm_idp_login()
+
 class SelectFedCMAccountAction:
     name = "select_fedcm_account"
 
@@ -377,6 +388,7 @@ actions = [ClickAction,
            SetUserVerifiedAction,
            SetSPCTransactionModeAction,
            CancelFedCMDialogAction,
+           ConfirmIDPLoginAction,
            SelectFedCMAccountAction,
            GetFedCMAccountListAction,
            GetFedCMDialogTitleAction,
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/executors/base.py b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/base.py
index b148365780b..a4d658eaeb2 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/executors/base.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/base.py
@@ -21,14 +21,15 @@ from .protocol import Protocol, WdspecProtocol
 here = os.path.dirname(__file__)
 
 
-def executor_kwargs(test_type, test_environment, run_info_data, **kwargs):
+def executor_kwargs(test_type, test_environment, run_info_data, subsuite, **kwargs):
     timeout_multiplier = kwargs["timeout_multiplier"]
     if timeout_multiplier is None:
         timeout_multiplier = 1
 
     executor_kwargs = {"server_config": test_environment.config,
                        "timeout_multiplier": timeout_multiplier,
-                       "debug_info": kwargs["debug_info"]}
+                       "debug_info": kwargs["debug_info"],
+                       "subsuite": subsuite.name}
 
     if test_type in ("reftest", "print-reftest"):
         executor_kwargs["screenshot_cache"] = test_environment.cache_manager.dict()
@@ -262,13 +263,14 @@ class TestExecutor:
 
 
     def __init__(self, logger, browser, server_config, timeout_multiplier=1,
-                 debug_info=None, **kwargs):
+                 debug_info=None, subsuite=None, **kwargs):
         self.logger = logger
         self.runner = None
         self.browser = browser
         self.server_config = server_config
         self.timeout_multiplier = timeout_multiplier
         self.debug_info = debug_info
+        self.subsuite = subsuite
         self.last_environment = {"protocol": "http",
                                  "prefs": {}}
         self.protocol = None  # This must be set in subclasses
@@ -302,7 +304,8 @@ class TestExecutor:
             result = self.do_test(test)
         except Exception as e:
             exception_string = traceback.format_exc()
-            self.logger.warning(exception_string)
+            message = f"Exception in TextExecutor.run:\n{exception_string}"
+            self.logger.warning(message)
             result = self.result_from_exception(test, e, exception_string)
 
         # log result of parent test
@@ -383,6 +386,7 @@ class RefTestImplementation:
     def __init__(self, executor):
         self.timeout_multiplier = executor.timeout_multiplier
         self.executor = executor
+        self.subsuite = executor.subsuite
         # Cache of url:(screenshot hash, screenshot). Typically the
         # screenshot is None, but we set this value if a test fails
         # and the screenshot was taken from the cache so that we may
@@ -402,7 +406,7 @@ class RefTestImplementation:
         return self.executor.logger
 
     def get_hash(self, test, viewport_size, dpi, page_ranges):
-        key = (test.url, viewport_size, dpi)
+        key = (self.subsuite, test.url, viewport_size, dpi)
 
         if key not in self.screenshot_cache:
             success, data = self.get_screenshot_list(test, viewport_size, dpi, page_ranges)
@@ -650,7 +654,8 @@ class WdspecExecutor(TestExecutor):
                           "timeout_multiplier": self.timeout_multiplier,
                           "browser": {
                               "binary": self.binary,
-                              "args": self.binary_args
+                              "args": self.binary_args,
+                              "env": self.browser.env,
                           },
                           "webdriver": {
                               "binary": self.webdriver_binary,
@@ -728,8 +733,8 @@ class CallbackHandler:
         self.logger.debug("Got async callback: %s" % result[1])
         try:
             callback = self.callbacks[command]
-        except KeyError:
-            raise ValueError("Unknown callback type %r" % result[1])
+        except KeyError as e:
+            raise ValueError("Unknown callback type %r" % result[1]) from e
         return callback(url, payload)
 
     def process_complete(self, url, payload):
@@ -742,8 +747,8 @@ class CallbackHandler:
         self.logger.debug(f"Got action: {action}")
         try:
             action_handler = self.actions[action]
-        except KeyError:
-            raise ValueError(f"Unknown action {action}")
+        except KeyError as e:
+            raise ValueError(f"Unknown action {action}") from e
         try:
             with ActionContext(self.logger, self.protocol, payload.get("context")):
                 result = action_handler(payload)
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executorchrome.py b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executorchrome.py
index 5df9de5f7e3..7a54eb097f9 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executorchrome.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executorchrome.py
@@ -15,6 +15,7 @@ from .base import (
 )
 from .executorwebdriver import (
     WebDriverCrashtestExecutor,
+    WebDriverFedCMProtocolPart,
     WebDriverProtocol,
     WebDriverRefTestExecutor,
     WebDriverRun,
@@ -79,6 +80,8 @@ class ChromeDriverTestharnessProtocolPart(WebDriverTestharnessProtocolPart):
         # exposed to the base WebDriver testharness executor.
         self.test_window = None
         self.reuse_window = self.parent.reuse_window
+        # Company prefix to apply to vendor-specific WebDriver extension commands.
+        self.cdp_company_prefix = "goog"
 
     def close_test_window(self):
         if self.test_window:
@@ -107,7 +110,8 @@ class ChromeDriverTestharnessProtocolPart(WebDriverTestharnessProtocolPart):
                     "cmd": "Page.resetNavigationHistory",
                     "params": {},
                 }
-                self.webdriver.send_session_command("POST", "goog/cdp/execute",
+                self.webdriver.send_session_command("POST",
+                                                    self.cdp_company_prefix + "/cdp/execute",
                                                     body=body)
                 self.webdriver.url = "about:blank"
                 return
@@ -135,6 +139,8 @@ class ChromeDriverPrintProtocolPart(PrintProtocolPart):
     def setup(self):
         self.webdriver = self.parent.webdriver
         self.runner_handle = None
+        # Company prefix to apply to vendor-specific WebDriver extension commands.
+        self.cdp_company_prefix = "goog"
 
     def load_runner(self):
         url = urljoin(self.parent.executor.server_url("http"), "/print_pdf_runner.html")
@@ -166,7 +172,9 @@ class ChromeDriverPrintProtocolPart(PrintProtocolPart):
                 "printBackground": True,
             }
         }
-        return self.webdriver.send_session_command("POST", "goog/cdp/execute", body=body)["data"]
+        return self.webdriver.send_session_command("POST",
+                                                   self.cdp_company_prefix + "/cdp/execute",
+                                                   body=body)["data"]
 
     def pdf_to_png(self, pdf_base64, ranges):
         handle = self.webdriver.window_handle
@@ -182,12 +190,26 @@ render('%s').then(result => callback(result))""" % pdf_base64)
             self.webdriver.window_handle = handle
 
 
+class ChromeDriverFedCMProtocolPart(WebDriverFedCMProtocolPart):
+    def setup(self):
+        self.webdriver = self.parent.webdriver
+        # Company prefix to apply to vendor-specific WebDriver extension commands.
+        self.fedcm_company_prefix = "goog"
+
+
+    def confirm_idp_login(self):
+        return self.webdriver.send_session_command("POST",
+                                                   self.fedcm_company_prefix + "/fedcm/confirmidplogin")
+
+
 class ChromeDriverProtocol(WebDriverProtocol):
     implements = [
+        ChromeDriverFedCMProtocolPart,
         ChromeDriverPrintProtocolPart,
         ChromeDriverTestharnessProtocolPart,
         *(part for part in WebDriverProtocol.implements
-          if part.name != ChromeDriverTestharnessProtocolPart.name)
+          if part.name != ChromeDriverTestharnessProtocolPart.name and
+            part.name != ChromeDriverFedCMProtocolPart.name)
     ]
     reuse_window = False
 
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executorcontentshell.py b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executorcontentshell.py
index 8a183bafcbd..5c4068c7acf 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executorcontentshell.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executorcontentshell.py
@@ -33,8 +33,8 @@ def _read_line(io_queue, deadline=None, encoding=None, errors="strict", raise_cr
             raise CrashError()
         if raise_crash_leak and line.startswith(b"#LEAK"):
             raise LeakError()
-    except Empty:
-        raise TimeoutError()
+    except Empty as e:
+        raise TimeoutError() from e
 
     return line.decode(encoding, errors) if encoding else line
 
@@ -224,6 +224,12 @@ def _convert_exception(test, exception, errors):
     raise exception
 
 
+def timeout_for_test(executor, test):
+    if executor.debug_info and executor.debug_info.interactive:
+        return None
+    return test.timeout * executor.timeout_multiplier
+
+
 class ContentShellCrashtestExecutor(CrashtestExecutor):
     def __init__(self, logger, browser, server_config, timeout_multiplier=1, debug_info=None,
             **kwargs):
@@ -232,7 +238,8 @@ class ContentShellCrashtestExecutor(CrashtestExecutor):
 
     def do_test(self, test):
         try:
-            _ = self.protocol.content_shell_test.do_test(self.test_url(test), test.timeout * self.timeout_multiplier)
+            _ = self.protocol.content_shell_test.do_test(self.test_url(test),
+                                                         timeout_for_test(self, test))
             self.protocol.content_shell_errors.read_errors()
             return self.convert_result(test, {"status": "PASS", "message": None})
         except BaseException as exception:
@@ -275,12 +282,11 @@ class ContentShellRefTestExecutor(RefTestExecutor, _SanitizerMixin):  # type: ig
             # source tree (i.e., without looking at a reference). This is not
             # possible in `wpt`, so pass an empty hash here to force a dump.
             command += "''print"
-        _, image = self.protocol.content_shell_test.do_test(
-            command, test.timeout * self.timeout_multiplier)
 
+        _, image = self.protocol.content_shell_test.do_test(command,
+                                                            timeout_for_test(self, test))
         if not image:
             return False, ("ERROR", self.protocol.content_shell_errors.read_errors())
-
         return True, b64encode(image).decode()
 
 
@@ -303,8 +309,7 @@ class ContentShellTestharnessExecutor(TestharnessExecutor, _SanitizerMixin):  #
     def do_test(self, test):
         try:
             text, _ = self.protocol.content_shell_test.do_test(self.test_url(test),
-                    test.timeout * self.timeout_multiplier)
-
+                                                               timeout_for_test(self, test))
             errors = self.protocol.content_shell_errors.read_errors()
             if not text:
                 return (test.result_cls("ERROR", errors), [])
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executoredge.py b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executoredge.py
new file mode 100644
index 00000000000..cbe5eadf9a6
--- /dev/null
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executoredge.py
@@ -0,0 +1,101 @@
+# mypy: allow-untyped-defs
+
+import os
+
+from .executorwebdriver import (
+    WebDriverCrashtestExecutor,
+    WebDriverProtocol,
+    WebDriverRefTestExecutor,
+    WebDriverRun,
+    WebDriverTestharnessExecutor,
+)
+
+from .executorchrome import (
+    ChromeDriverPrintProtocolPart,
+    ChromeDriverTestharnessProtocolPart,
+    make_sanitizer_mixin,
+)
+
+here = os.path.dirname(__file__)
+
+_SanitizerMixin = make_sanitizer_mixin(WebDriverCrashtestExecutor)
+
+class EdgeChromiumDriverTestharnessProtocolPart(ChromeDriverTestharnessProtocolPart):
+    def setup(self):
+        super().setup()
+        self.cdp_company_prefix = "ms"
+
+
+class EdgeChromiumDriverPrintProtocolPart(ChromeDriverPrintProtocolPart):
+    def setup(self):
+        super().setup()
+        self.cdp_company_prefix = "ms"
+
+
+class EdgeChromiumDriverProtocol(WebDriverProtocol):
+    implements = [
+        EdgeChromiumDriverPrintProtocolPart,
+        EdgeChromiumDriverTestharnessProtocolPart,
+        *(part for part in WebDriverProtocol.implements
+          if part.name != EdgeChromiumDriverTestharnessProtocolPart.name)
+    ]
+    reuse_window = False
+
+
+class EdgeChromiumDriverRefTestExecutor(WebDriverRefTestExecutor, _SanitizerMixin):  # type: ignore
+    protocol_cls = EdgeChromiumDriverProtocol
+
+
+class EdgeChromiumDriverTestharnessExecutor(WebDriverTestharnessExecutor, _SanitizerMixin):  # type: ignore
+    protocol_cls = EdgeChromiumDriverProtocol
+
+    def __init__(self, *args, reuse_window=False, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.protocol.reuse_window = reuse_window
+
+
+class EdgeChromiumDriverPrintRefTestExecutor(EdgeChromiumDriverRefTestExecutor):
+    protocol_cls = EdgeChromiumDriverProtocol
+
+    def setup(self, runner):
+        super().setup(runner)
+        self.protocol.pdf_print.load_runner()
+        self.has_window = False
+        with open(os.path.join(here, "reftest.js")) as f:
+            self.script = f.read()
+
+    def screenshot(self, test, viewport_size, dpi, page_ranges):
+        # https://github.com/web-platform-tests/wpt/issues/7140
+        assert dpi is None
+
+        if not self.has_window:
+            self.protocol.base.execute_script(self.script)
+            self.protocol.base.set_window(self.protocol.webdriver.handles[-1])
+            self.has_window = True
+
+        self.viewport_size = viewport_size
+        self.page_ranges = page_ranges.get(test.url)
+        timeout = self.timeout_multiplier * test.timeout if self.debug_info is None else None
+
+        test_url = self.test_url(test)
+
+        return WebDriverRun(self.logger,
+                            self._render,
+                            self.protocol,
+                            test_url,
+                            timeout,
+                            self.extra_timeout).run()
+
+    def _render(self, protocol, url, timeout):
+        protocol.webdriver.url = url
+
+        protocol.base.execute_script(self.wait_script, asynchronous=True)
+
+        pdf = protocol.pdf_print.render_as_pdf(*self.viewport_size)
+        screenshots = protocol.pdf_print.pdf_to_png(pdf, self.page_ranges)
+        for i, screenshot in enumerate(screenshots):
+            # strip off the data:img/png, part of the url
+            if screenshot.startswith("data:image/png;base64,"):
+                screenshots[i] = screenshot.split(",", 1)[1]
+
+        return screenshots
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executormarionette.py b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executormarionette.py
index 95f18608204..eaeaddf4123 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executormarionette.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executormarionette.py
@@ -48,10 +48,11 @@ from .protocol import (AccessibilityProtocolPart,
 
 
 def do_delayed_imports():
-    global errors, marionette, Addons
+    global errors, marionette, Addons, WebAuthn
 
     from marionette_driver import marionette, errors
     from marionette_driver.addons import Addons
+    from marionette_driver.webauthn import WebAuthn
 
 
 def _switch_to_window(marionette, handle):
@@ -386,7 +387,7 @@ class MarionetteStorageProtocolPart(StorageProtocolPart):
             let principal = ssm.createContentPrincipal(uri, {});
             let qms = Components.classes["@mozilla.org/dom/quota-manager-service;1"]
                                 .getService(Components.interfaces.nsIQuotaManagerService);
-            qms.clearStoragesForPrincipal(principal, "default", null, true);
+            qms.clearStoragesForOriginPrefix(principal, "default");
             """ % url
         with self.marionette.using_context(self.marionette.CONTEXT_CHROME):
             self.marionette.execute_script(script)
@@ -590,28 +591,28 @@ class MarionetteGenerateTestReportProtocolPart(GenerateTestReportProtocolPart):
 
 class MarionetteVirtualAuthenticatorProtocolPart(VirtualAuthenticatorProtocolPart):
     def setup(self):
-        self.marionette = self.parent.marionette
+        self.webauthn = WebAuthn(self.parent.marionette)
 
     def add_virtual_authenticator(self, config):
-        raise NotImplementedError("add_virtual_authenticator not yet implemented")
+        return self.webauthn.add_virtual_authenticator(config)
 
     def remove_virtual_authenticator(self, authenticator_id):
-        raise NotImplementedError("remove_virtual_authenticator not yet implemented")
+        self.webauthn.remove_virtual_authenticator(authenticator_id)
 
     def add_credential(self, authenticator_id, credential):
-        raise NotImplementedError("add_credential not yet implemented")
+        self.webauthn.add_credential(authenticator_id, credential)
 
     def get_credentials(self, authenticator_id):
-        raise NotImplementedError("get_credentials not yet implemented")
+        return self.webauthn.get_credentials(authenticator_id)
 
     def remove_credential(self, authenticator_id, credential_id):
-        raise NotImplementedError("remove_credential not yet implemented")
+        self.webauthn.remove_credential(authenticator_id, credential_id)
 
     def remove_all_credentials(self, authenticator_id):
-        raise NotImplementedError("remove_all_credentials not yet implemented")
+        self.webauthn.remove_all_credentials(authenticator_id)
 
     def set_user_verified(self, authenticator_id, uv):
-        raise NotImplementedError("set_user_verified not yet implemented")
+        self.webauthn.set_user_verified(authenticator_id, uv)
 
 
 class MarionetteSetPermissionProtocolPart(SetPermissionProtocolPart):
@@ -625,8 +626,8 @@ class MarionetteSetPermissionProtocolPart(SetPermissionProtocolPart):
         }
         try:
             self.marionette._send_message("WebDriver:SetPermission", body)
-        except errors.UnsupportedOperationException:
-            raise NotImplementedError("set_permission not yet implemented")
+        except errors.UnsupportedOperationException as e:
+            raise NotImplementedError("set_permission not yet implemented") from e
 
 
 class MarionettePrintProtocolPart(PrintProtocolPart):
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executorwebdriver.py b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executorwebdriver.py
index b31c84d8e88..ff174a4e0ca 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executorwebdriver.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executorwebdriver.py
@@ -91,7 +91,9 @@ addEventListener("__test_restart", e => {e.preventDefault(); callback(true)})"""
             except (socket.timeout, error.NoSuchWindowException, error.UnknownErrorException, OSError):
                 break
             except Exception:
-                self.logger.error(traceback.format_exc())
+                message = "Uncaught exception in WebDriverBaseProtocolPart.wait:\n"
+                message += traceback.format_exc()
+                self.logger.error(message)
                 break
         return False
 
@@ -685,7 +687,7 @@ class WebDriverCrashtestExecutor(CrashtestExecutor):
     def __init__(self, logger, browser, server_config, timeout_multiplier=1,
                  screenshot_cache=None, close_after_done=True,
                  debug_info=None, capabilities=None, **kwargs):
-        """WebDriver-based executor for reftests"""
+        """WebDriver-based executor for crashtests"""
         CrashtestExecutor.__init__(self,
                                    logger,
                                    browser,
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executorwktr.py b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executorwktr.py
index ab94000fa20..b240bca556a 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executorwktr.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executorwktr.py
@@ -27,9 +27,9 @@ def _read_line(io_queue, deadline=None, encoding=None, errors="strict", raise_cr
         line = io_queue.get(True, deadline - current_time if deadline else None)
         if raise_crash and line.startswith(b"#CRASHED"):
             raise CrashError()
-    except Empty:
+    except Empty as e:
         logger.debug(f"got empty line with {time() - deadline} remaining")
-        raise TimeoutError()
+        raise TimeoutError() from e
 
     return line.decode(encoding, errors) if encoding else line
 
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/executors/protocol.py b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/protocol.py
index 170c27cd687..abf3191cd2f 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/executors/protocol.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/protocol.py
@@ -70,9 +70,10 @@ class Protocol:
             msg = "Post-connection steps failed"
             self.after_connect()
         except Exception:
-            if msg is not None:
-                self.logger.warning(msg)
-            self.logger.warning(traceback.format_exc())
+            message = "Protocol.setup caught an exception:\n"
+            message += f"{msg}\n" if msg is not None else ""
+            message += traceback.format_exc()
+            self.logger.warning(message)
             raise
 
     @abstractmethod
@@ -627,6 +628,11 @@ class FedCMProtocolPart(ProtocolPart):
         """Cancel the FedCM dialog"""
         pass
 
+    @abstractmethod
+    def confirm_idp_login(self):
+        """Confirm IDP login"""
+        pass
+
     @abstractmethod
     def select_fedcm_account(self, account_index):
         """Select a FedCM account
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/executors/pytestrunner/runner.py b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/pytestrunner/runner.py
index f520e095e81..df7b7c40132 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/executors/pytestrunner/runner.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/pytestrunner/runner.py
@@ -27,7 +27,7 @@ def do_delayed_imports():
     import pytest
 
 
-def run(path, server_config, session_config, timeout=0, environ=None):
+def run(path, server_config, session_config, timeout=0):
     """
     Run Python test at ``path`` in pytest.  The provided ``session``
     is exposed as a fixture available in the scope of the test functions.
@@ -56,24 +56,29 @@ def run(path, server_config, session_config, timeout=0, environ=None):
             with open(config_path, "w") as f:
                 json.dump(config, f)
 
-            if environ:
-                os.environ.update(environ)
-
             harness = HarnessResultRecorder()
             subtests = SubtestResultRecorder()
 
             try:
                 basetemp = os.path.join(cache, "pytest")
-                pytest.main(["--strict-markers",  # turn function marker warnings into errors
-                             "-vv",  # show each individual subtest and full failure logs
-                             "--capture", "no",  # enable stdout/stderr from tests
-                             "--basetemp", basetemp,  # temporary directory
-                             "--showlocals",  # display contents of variables in local scope
-                             "-p", "no:mozlog",  # use the WPT result recorder
-                             "-p", "no:cacheprovider",  # disable state preservation across invocations
-                             "-o=console_output_style=classic",  # disable test progress bar
-                             path],
-                            plugins=[harness, subtests])
+                pytest.main(
+                    [
+                        "--strict-markers",  # turn function marker warnings into errors
+                        "-vv",  # show each individual subtest and full failure logs
+                        "--capture",
+                        "no",  # enable stdout/stderr from tests
+                        "--basetemp",
+                        basetemp,  # temporary directory
+                        "--showlocals",  # display contents of variables in local scope
+                        "-p",
+                        "no:mozlog",  # use the WPT result recorder
+                        "-p",
+                        "no:cacheprovider",  # disable state preservation across invocations
+                        "-o=console_output_style=classic",  # disable test progress bar
+                        path,
+                    ],
+                    plugins=[harness, subtests],
+                )
             except Exception as e:
                 harness.outcome = ("INTERNAL-ERROR", str(e))
 
@@ -139,9 +144,12 @@ class SubtestResultRecorder:
         self.record(report.nodeid, "ERROR", message, report.longrepr)
 
     def record_skip(self, report):
-        self.record(report.nodeid, "ERROR",
-                    "In-test skip decorators are disallowed, "
-                    "please use WPT metadata to ignore tests.")
+        self.record(
+            report.nodeid,
+            "ERROR",
+            "In-test skip decorators are disallowed, "
+            "please use WPT metadata to ignore tests.",
+        )
 
     def record(self, test, status, message=None, stack=None):
         if stack is not None:
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/formatters/wptreport.py b/tests/wpt/tests/tools/wptrunner/wptrunner/formatters/wptreport.py
index 21c12115801..5919631ab71 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/formatters/wptreport.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/formatters/wptreport.py
@@ -26,28 +26,30 @@ class WptreportFormatter(BaseFormatter):  # type: ignore
         self.results = {}
 
     def suite_start(self, data):
-        if 'run_info' in data:
-            self.results['run_info'] = data['run_info']
+        self.results['run_info'] = data.get('run_info', {})
         self.results['time_start'] = data['time']
         self.results["results"] = []
+        self.results["subsuites"] = {}
+
+    def add_subsuite(self, data):
+        self.results["subsuites"][data["name"]] = data.get("run_info", {})
 
     def suite_end(self, data):
         self.results['time_end'] = data['time']
-        for test_name in self.raw_results:
-            result = {"test": test_name}
-            result.update(self.raw_results[test_name])
-            self.results["results"].append(result)
+        for subsuite, results in self.raw_results.items():
+            for test_name, result in results.items():
+                result["test"] = test_name
+                result["subsuite"] = subsuite
+                self.results["results"].append(result)
         return json.dumps(self.results) + "\n"
 
     def find_or_create_test(self, data):
+        subsuite = data.get("subsuite", "")
         test_name = data["test"]
-        if test_name not in self.raw_results:
-            self.raw_results[test_name] = {
-                "subtests": [],
-                "status": "",
-                "message": None
-            }
-        return self.raw_results[test_name]
+        subsuite_results = self.raw_results.setdefault(subsuite, {})
+        return subsuite_results.setdefault(test_name, {"subtests": [],
+                                                      "status": "",
+                                                      "message": None})
 
     def test_start(self, data):
         test = self.find_or_create_test(data)
@@ -94,10 +96,12 @@ class WptreportFormatter(BaseFormatter):  # type: ignore
                 if isinstance(item, dict)
             }
         test_name = data["test"]
-        result = {"test": data["test"]}
-        result.update(self.raw_results[test_name])
+        subsuite = data.get("subsuite", "")
+        result = {"test": test_name,
+                  "subsuite": subsuite}
+        result.update(self.raw_results[subsuite][test_name])
         self.results["results"].append(result)
-        self.raw_results.pop(test_name)
+        self.raw_results[subsuite].pop(test_name)
 
     def assertion_count(self, data):
         test = self.find_or_create_test(data)
@@ -113,7 +117,8 @@ class WptreportFormatter(BaseFormatter):  # type: ignore
         lsan_leaks = self.results["lsan_leaks"]
         lsan_leaks.append({"frames": data["frames"],
                            "scope": data["scope"],
-                           "allowed_match": data.get("allowed_match")})
+                           "allowed_match": data.get("allowed_match"),
+                           "subsuite": data.get("subsuite", "")})
 
     def find_or_create_mozleak(self, data):
         if "mozleak" not in self.results:
@@ -128,10 +133,12 @@ class WptreportFormatter(BaseFormatter):  # type: ignore
         scope_data["objects"].append({"process": data["process"],
                                       "name": data["name"],
                                       "allowed": data.get("allowed", False),
-                                      "bytes": data["bytes"]})
+                                      "bytes": data["bytes"],
+                                      "subsuite": data.get("subsuite", "")})
 
     def mozleak_total(self, data):
         scope_data = self.find_or_create_mozleak(data)
         scope_data["total"].append({"bytes": data["bytes"],
                                     "threshold": data.get("threshold", 0),
-                                    "process": data["process"]})
+                                    "process": data["process"],
+                                    "subsuite": data.get("subsuite", "")})
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/manifestupdate.py b/tests/wpt/tests/tools/wptrunner/wptrunner/manifestupdate.py
index a919d6df7e0..ebab2493a71 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/manifestupdate.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/manifestupdate.py
@@ -2,7 +2,7 @@
 
 import os
 from urllib.parse import urljoin, urlsplit
-from collections import namedtuple, defaultdict, deque
+from collections import Counter, namedtuple, defaultdict, deque
 from math import ceil
 from typing import Any, Callable, ClassVar, Dict, List, Optional
 
@@ -617,8 +617,6 @@ class PropertyUpdate:
         conditions = []
         errors = []
 
-        value_count = defaultdict(int)
-
         def to_count_value(v):
             if v is None:
                 return v
@@ -658,19 +656,23 @@ class PropertyUpdate:
                         # default value
                         if prev_default:
                             conditions.append((None, prev_default))
-                if error is None:
-                    count_value = to_count_value(value)
-                    value_count[count_value] += len(node.run_info)
-
                 if error is None:
                     conditions.append((expr, value))
                 else:
                     errors.append(error)
 
-            for child in node.children:
+            try:
+                # Attempt to stably order the next group of conditions by their
+                # values, which are typically string/numeric types that have an
+                # order defined.
+                children = sorted(node.children, key=lambda child: child.value)
+            except TypeError:
+                children = node.children
+            for child in children:
                 queue.append((child, parents_and_self))
 
         conditions = conditions[::-1]
+        value_count = Counter(to_count_value(value) for _, value in conditions)
 
         # If we haven't set a default condition, add one and remove all the conditions
         # with the same value
@@ -679,9 +681,9 @@ class PropertyUpdate:
             # or the previous default
             cls_default = to_count_value(self.default_value)
             prev_default = to_count_value(prev_default)
-            commonest_value = max(value_count, key=lambda x:(value_count.get(x),
-                                                             x == cls_default,
-                                                             x == prev_default))
+            commonest_value = max(value_count, key=lambda x: (value_count[x],
+                                                              x == cls_default,
+                                                              x == prev_default))
             if isinstance(commonest_value, tuple):
                 commonest_value = list(commonest_value)
             commonest_value = self.from_ini_value(commonest_value)
@@ -944,6 +946,8 @@ def make_node(value):
         node = ListNode()
         for item in value:
             node.append(make_node(item))
+    else:
+        raise ValueError(f"Unrecoginsed data type {type(value)}")
     return node
 
 
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/metadata.py b/tests/wpt/tests/tools/wptrunner/wptrunner/metadata.py
index d026fdf574e..b9cb61eb07f 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/metadata.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/metadata.py
@@ -244,7 +244,7 @@ class RunInfoInterned(InternedData):
 
 
 prop_intern = InternedData(4)
-run_info_intern = InternedData(8)
+run_info_intern = InternedData(16)
 status_intern = InternedData(4)
 
 
@@ -373,8 +373,10 @@ def write_new_expected(metadata_path, expected):
 class ExpectedUpdater:
     def __init__(self, id_test_map):
         self.id_test_map = id_test_map
-        self.run_info = None
+        self.base_run_info = None
+        self.run_info_by_subsuite = {}
         self.action_map = {"suite_start": self.suite_start,
+                           "add_subsuite": self.add_subsuite,
                            "test_start": self.test_start,
                            "test_status": self.test_status,
                            "test_end": self.test_end,
@@ -391,7 +393,8 @@ class ExpectedUpdater:
         # * raw log format
 
         # Try reading a single json object in wptreport format
-        self.run_info = None
+        self.base_run_info = None
+        self.run_info_by_subsuite = {}
         success = self.get_wptreport_data(log_file.read())
 
         if success:
@@ -436,21 +439,27 @@ class ExpectedUpdater:
     def update_from_wptreport_log(self, data):
         action_map = self.action_map
         action_map["suite_start"]({"run_info": data["run_info"]})
+        for subsuite, run_info in data.get("subsuites", {}).items():
+            action_map["add_subsuite"]({"name": subsuite, "run_info": run_info})
         for test in data["results"]:
-            action_map["test_start"]({"test": test["test"]})
+            action_map["test_start"]({"test": test["test"],
+                                      "subsuite": test.get("subsuite", "")})
             for subtest in test["subtests"]:
                 action_map["test_status"]({"test": test["test"],
+                                           "subsuite": test.get("subsuite", ""),
                                            "subtest": subtest["name"],
                                            "status": subtest["status"],
                                            "expected": subtest.get("expected"),
                                            "known_intermittent": subtest.get("known_intermittent", [])})
             action_map["test_end"]({"test": test["test"],
+                                    "subsuite": test.get("subsuite", ""),
                                     "status": test["status"],
                                     "expected": test.get("expected"),
                                     "known_intermittent": test.get("known_intermittent", [])})
             if "asserts" in test:
                 asserts = test["asserts"]
                 action_map["assertion_count"]({"test": test["test"],
+                                               "subsuite": data.get("subsuite", ""),
                                                "count": asserts["count"],
                                                "min_expected": asserts["min"],
                                                "max_expected": asserts["max"]})
@@ -467,7 +476,16 @@ class ExpectedUpdater:
                     action_map[action](item_data)
 
     def suite_start(self, data):
-        self.run_info = run_info_intern.store(RunInfo(data["run_info"]))
+        self.base_run_info = data["run_info"]
+        run_info = RunInfo(data["run_info"])
+        self.run_info_by_subsuite[""] = run_info_intern.store(run_info)
+
+    def add_subsuite(self, data):
+        run_info_data = self.base_run_info.copy()
+        run_info_data.update(data["run_info"])
+        run_info = RunInfo(run_info_data)
+        name = data["name"]
+        self.run_info_by_subsuite[name] = run_info_intern.store(run_info)
 
     def test_start(self, data):
         test_id = intern(ensure_str(data["test"]))
@@ -490,7 +508,7 @@ class ExpectedUpdater:
 
         result = pack_result(data)
 
-        test_data.set(test_id, subtest, "status", self.run_info, result)
+        test_data.set(test_id, subtest, "status", self.run_info_by_subsuite[data.get("subsuite", "")], result)
         status = data["status"]
         expected = data.get("expected")
         if expected and expected != status and status not in data.get("known_intermittent", []):
@@ -507,7 +525,7 @@ class ExpectedUpdater:
 
         result = pack_result(data)
 
-        test_data.set(test_id, None, "status", self.run_info, result)
+        test_data.set(test_id, None, "status", self.run_info_by_subsuite[data.get("subsuite", "")], result)
         status = data["status"]
         expected = data.get("expected")
         if expected and expected != status and status not in data.get("known_intermittent", []):
@@ -520,7 +538,7 @@ class ExpectedUpdater:
         if test_data is None:
             return
 
-        test_data.set(test_id, None, "asserts", self.run_info, data["count"])
+        test_data.set(test_id, None, "asserts", self.run_info_by_subsuite[data.get("subsuite", "")], data["count"])
         if data["count"] < data["min_expected"] or data["count"] > data["max_expected"]:
             test_data.set_requires_update()
 
@@ -537,7 +555,7 @@ class ExpectedUpdater:
             return
         dir_id, test_data = self.test_for_scope(data)
         test_data.set(dir_id, None, "lsan",
-                      self.run_info, (data["frames"], data.get("allowed_match")))
+                      self.run_info_by_subsuite[data.get("subsuite", "")], (data["frames"], data.get("allowed_match")))
         if not data.get("allowed_match"):
             test_data.set_requires_update()
 
@@ -547,7 +565,7 @@ class ExpectedUpdater:
             return
         dir_id, test_data = self.test_for_scope(data)
         test_data.set(dir_id, None, "leak-object",
-                      self.run_info, ("%s:%s", (data["process"], data["name"]),
+                      self.run_info_by_subsuite[data.get("subsuite", "")], ("%s:%s", (data["process"], data["name"]),
                                       data.get("allowed")))
         if not data.get("allowed"):
             test_data.set_requires_update()
@@ -559,7 +577,7 @@ class ExpectedUpdater:
         if data["bytes"]:
             dir_id, test_data = self.test_for_scope(data)
             test_data.set(dir_id, None, "leak-threshold",
-                          self.run_info, (data["process"], data["bytes"], data["threshold"]))
+                          self.run_info_by_subsuite[data.get("subsuite", "")], (data["process"], data["bytes"], data["threshold"]))
             if data["bytes"] > data["threshold"] or data["bytes"] < 0:
                 test_data.set_requires_update()
 
@@ -605,10 +623,11 @@ def create_test_tree(metadata_path, test_manifest):
 class PackedResultList:
     """Class for storing test results.
 
-    Results are stored as an array of 2-byte integers for compactness.
-    The first 4 bits represent the property name, the second 4 bits
+    Results are stored as an array of 4-byte integers for compactness
+    with the first 8 bits reserved. In the remaining 24 bits,
+    the first 4 bits represent the property name, the second 4 bits
     represent the test status (if it's a result with a status code), and
-    the final 8 bits represent the run_info. If the result doesn't have a
+    the final 16 bits represent the run_info. If the result doesn't have a
     simple status code but instead a richer type, we place that richer type
     in a dictionary and set the status part of the result type to 0.
 
@@ -617,14 +636,14 @@ class PackedResultList:
     and corresponding Python objects."""
 
     def __init__(self):
-        self.data = array.array("H")
+        self.data = array.array("L")
 
     __slots__ = ("data", "raw_data")
 
     def append(self, prop, run_info, value):
-        out_val = (prop << 12) + run_info
+        out_val = (prop << 20) + run_info
         if prop == prop_intern.store("status") and isinstance(value, int):
-            out_val += value << 8
+            out_val += value << 16
         else:
             if not hasattr(self, "raw_data"):
                 self.raw_data = {}
@@ -632,15 +651,15 @@ class PackedResultList:
         self.data.append(out_val)
 
     def unpack(self, idx, packed):
-        prop = prop_intern.get((packed & 0xF000) >> 12)
+        prop = prop_intern.get((packed & 0xF00000) >> 20)
 
-        value_idx = (packed & 0x0F00) >> 8
+        value_idx = (packed & 0x0F0000) >> 16
         if value_idx == 0:
             value = self.raw_data[idx]
         else:
             value = status_intern.get(value_idx)
 
-        run_info = run_info_intern.get(packed & 0x00FF)
+        run_info = run_info_intern.get(packed & 0x00FFFF)
 
         return prop, run_info, value
 
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/testdriver-extra.js b/tests/wpt/tests/tools/wptrunner/wptrunner/testdriver-extra.js
index b5cc9cdbbbf..8e44800d6cb 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/testdriver-extra.js
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/testdriver-extra.js
@@ -273,6 +273,10 @@
         return create_action("cancel_fedcm_dialog", {context});
     };
     
+    window.test_driver_internal.confirm_idp_login = function(context = null) {
+        return create_action("confirm_idp_login", {context});
+    };
+
     window.test_driver_internal.select_fedcm_account = function(account_index, context = null) {
         return create_action("select_fedcm_account", {account_index, context});
     };
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/testloader.py b/tests/wpt/tests/tools/wptrunner/wptrunner/testloader.py
index 86004b83387..6cb2110301f 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/testloader.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/testloader.py
@@ -1,20 +1,21 @@
 # mypy: allow-untyped-defs
+from __future__ import annotations
 
 import abc
 import hashlib
 import itertools
 import json
 import os
+import queue
 from urllib.parse import urlsplit
 from abc import ABCMeta, abstractmethod
 from queue import Empty
 from collections import defaultdict, deque, namedtuple
-from typing import Any, cast
+from typing import cast, Any, Dict, List, Optional, Set
 
 from . import manifestinclude
 from . import manifestexpected
 from . import manifestupdate
-from . import mpcontext
 from . import wpttest
 from mozlog import structured
 
@@ -31,29 +32,108 @@ def do_delayed_imports():
     from manifest.download import download_from_github  # type: ignore
 
 
-class TestGroupsFile:
-    """
-    Mapping object representing {group name: [test ids]}
-    """
-
-    def __init__(self, logger, path):
+class TestGroups:
+    def __init__(self, logger, path, subsuites):
         try:
             with open(path) as f:
-                self._data = json.load(f)
+                data = json.load(f)
         except ValueError:
             logger.critical("test groups file %s not valid json" % path)
             raise
 
+        self.tests_by_group = defaultdict(set)
         self.group_by_test = {}
-        for group, test_ids in self._data.items():
+        for group, test_ids in data.items():
+            id_parts = group.split(":", 1)
+            if len(id_parts) == 1:
+                group_name = id_parts[0]
+                subsuite = ""
+            else:
+                subsuite, group_name = id_parts
+                if subsuite not in subsuites:
+                    raise ValueError(f"Unknown subsuite {subsuite} in group data {group}")
             for test_id in test_ids:
-                self.group_by_test[test_id] = group
+                self.group_by_test[(subsuite, test_id)] = group_name
+                self.tests_by_group[group_name].add(test_id)
 
-    def __contains__(self, key):
-        return key in self._data
 
-    def __getitem__(self, key):
-        return self._data[key]
+def load_subsuites(logger: Any,
+                   base_run_info: wpttest.RunInfo,
+                   path: Optional[str],
+                   include_subsuites: Set[str]) -> Dict[str, Subsuite]:
+    subsuites: Dict[str, Subsuite] = {}
+    run_all_subsuites = not include_subsuites
+    include_subsuites.add("")
+
+    def maybe_add_subsuite(name: str, data: Dict[str, Any]) -> None:
+        if run_all_subsuites or name in include_subsuites:
+            subsuites[name] = Subsuite(name,
+                                       data.get("config", {}),
+                                       base_run_info,
+                                       run_info_extras=data.get("run_info", {}),
+                                       include=data.get("include"),
+                                       tags=set(data["tags"]) if "tags" in data else None)
+            if name in include_subsuites:
+                include_subsuites.remove(name)
+
+    maybe_add_subsuite("", {})
+
+    if path is None:
+        if include_subsuites:
+            raise ValueError("Unrecognised subsuites {','.join(include_subsuites)}, missing --subsuite-file?")
+        return subsuites
+
+    try:
+        with open(path) as f:
+            data = json.load(f)
+    except ValueError:
+        logger.critical("subsuites file %s not valid json" % path)
+        raise
+
+    for key, subsuite in data.items():
+        if key == "":
+            raise ValueError("Subsuites must have a non-empty name")
+        maybe_add_subsuite(key, subsuite)
+
+    if include_subsuites:
+        raise ValueError(f"Unrecognised subsuites {','.join(include_subsuites)}")
+
+    return subsuites
+
+
+class Subsuite:
+    def __init__(self,
+                 name: str,
+                 config: Dict[str, Any],
+                 base_run_info: Optional[wpttest.RunInfo] = None,
+                 run_info_extras: Optional[Dict[str, Any]] = None,
+                 include: Optional[List[str]] = None,
+                 tags: Optional[Set[str]] = None):
+        self.name = name
+        self.config = config
+        self.run_info_extras = run_info_extras or {}
+        self.run_info_extras["subsuite"] = name
+        self.include = include
+        self.tags = tags
+
+        run_info = base_run_info.copy() if base_run_info is not None else {}
+        run_info.update(self.run_info_extras)
+        self.run_info = run_info
+
+    def manifest_filters(self, manifests):
+        if self.name:
+            manifest_filters = [TestFilter(manifests,
+                                           include=self.include,
+                                           explicit=True)]
+            return manifest_filters
+
+        # use base manifest_filters for default subsuite
+        return []
+
+    def __repr__(self):
+        return "Subsuite('%s', config:%s, run_info:%s)" % (self.name or 'default',
+                                                           str(self.config),
+                                                           str(self.run_info))
 
 
 def read_include_from_file(file):
@@ -69,15 +149,17 @@ def read_include_from_file(file):
 
 
 def update_include_for_groups(test_groups, include):
+    new_include = []
     if include is None:
         # We're just running everything
-        return
-    new_include = []
-    for item in include:
-        if item in test_groups:
-            new_include.extend(test_groups[item])
-        else:
-            new_include.append(item)
+        for tests in test_groups.tests_by_group.values():
+            new_include.extend(tests)
+    else:
+        for item in include:
+            if item in test_groups.tests_by_group:
+                new_include.extend(test_groups.tests_by_group[item])
+            else:
+                new_include.append(item)
     return new_include
 
 
@@ -240,7 +322,8 @@ class TestLoader:
     def __init__(self,
                  test_manifests,
                  test_types,
-                 run_info,
+                 base_run_info,
+                 subsuites=None,
                  manifest_filters=None,
                  test_filters=None,
                  chunk_type="none",
@@ -250,11 +333,13 @@ class TestLoader:
                  include_h2=True,
                  include_webtransport_h3=False,
                  skip_timeout=False,
+                 skip_crash=False,
                  skip_implementation_status=None,
                  chunker_kwargs=None):
 
         self.test_types = test_types
-        self.run_info = run_info
+        self.base_run_info = base_run_info
+        self.subsuites = subsuites or {}
 
         self.manifest_filters = manifest_filters if manifest_filters is not None else []
         self.test_filters = test_filters if test_filters is not None else []
@@ -266,6 +351,7 @@ class TestLoader:
         self.include_h2 = include_h2
         self.include_webtransport_h3 = include_webtransport_h3
         self.skip_timeout = skip_timeout
+        self.skip_crash = skip_crash
         self.skip_implementation_status = skip_implementation_status
 
         self.chunk_type = chunk_type
@@ -284,7 +370,6 @@ class TestLoader:
         self._test_ids = None
 
         self.directory_manifests = {}
-
         self._load_tests()
 
     @property
@@ -292,8 +377,9 @@ class TestLoader:
         if self._test_ids is None:
             self._test_ids = []
             for test_dict in [self.disabled_tests, self.tests]:
-                for test_type in self.test_types:
-                    self._test_ids += [item.id for item in test_dict[test_type]]
+                for subsuite in self.subsuites:
+                    for test_type in self.test_types:
+                        self._test_ids += [item.id for item in test_dict[subsuite][test_type]]
         return self._test_ids
 
     def get_test(self, manifest_file, manifest_test, inherit_metadata, test_metadata):
@@ -303,31 +389,31 @@ class TestLoader:
 
         return wpttest.from_manifest(manifest_file, manifest_test, inherit_metadata, test_metadata)
 
-    def load_dir_metadata(self, test_manifest, metadata_path, test_path):
+    def load_dir_metadata(self, run_info, test_manifest, metadata_path, test_path):
         rv = []
         path_parts = os.path.dirname(test_path).split(os.path.sep)
         for i in range(len(path_parts) + 1):
             path = os.path.join(metadata_path, os.path.sep.join(path_parts[:i]), "__dir__.ini")
             if path not in self.directory_manifests:
                 self.directory_manifests[path] = manifestexpected.get_dir_manifest(path,
-                                                                                   self.run_info)
+                                                                                   run_info)
             manifest = self.directory_manifests[path]
             if manifest is not None:
                 rv.append(manifest)
         return rv
 
-    def load_metadata(self, test_manifest, metadata_path, test_path):
-        inherit_metadata = self.load_dir_metadata(test_manifest, metadata_path, test_path)
+    def load_metadata(self, run_info, test_manifest, metadata_path, test_path):
+        inherit_metadata = self.load_dir_metadata(run_info, test_manifest, metadata_path, test_path)
         test_metadata = manifestexpected.get_manifest(
-            metadata_path, test_path, self.run_info)
+            metadata_path, test_path, run_info)
         return inherit_metadata, test_metadata
 
-    def iter_tests(self):
+    def iter_tests(self, run_info, manifest_filters):
         manifest_items = []
         manifests_by_url_base = {}
 
         for manifest in sorted(self.manifests.keys(), key=lambda x:x.url_base):
-            manifest_iter = iterfilter(self.manifest_filters,
+            manifest_iter = iterfilter(manifest_filters,
                                        manifest.itertypes(*self.test_types))
             manifest_items.extend(manifest_iter)
             manifests_by_url_base[manifest.url_base] = manifest
@@ -339,32 +425,44 @@ class TestLoader:
             manifest_file = manifests_by_url_base[next(iter(tests)).url_base]
             metadata_path = self.manifests[manifest_file]["metadata_path"]
 
-            inherit_metadata, test_metadata = self.load_metadata(manifest_file, metadata_path, test_path)
+            inherit_metadata, test_metadata = self.load_metadata(run_info, manifest_file, metadata_path, test_path)
             for test in tests:
                 wpt_test = self.get_test(manifest_file, test, inherit_metadata, test_metadata)
                 if all(f(wpt_test) for f in self.test_filters):
                     yield test_path, test_type, wpt_test
 
     def _load_tests(self):
-        """Read in the tests from the manifest file and add them to a queue"""
-        tests = {"enabled":defaultdict(list),
-                 "disabled":defaultdict(list)}
+        """Read in the tests from the manifest file"""
+        tests_enabled = {}
+        tests_disabled = {}
 
-        for test_path, test_type, test in self.iter_tests():
-            enabled = not test.disabled()
-            if not self.include_https and test.environment["protocol"] == "https":
-                enabled = False
-            if not self.include_h2 and test.environment["protocol"] == "h2":
-                enabled = False
-            if self.skip_timeout and test.expected() == "TIMEOUT":
-                enabled = False
-            if self.skip_implementation_status and test.implementation_status() in self.skip_implementation_status:
-                enabled = False
-            key = "enabled" if enabled else "disabled"
-            tests[key][test_type].append(test)
+        for subsuite_name, subsuite in self.subsuites.items():
+            tests_enabled[subsuite_name] = defaultdict(list)
+            tests_disabled[subsuite_name] = defaultdict(list)
+            run_info = subsuite.run_info
+            if not subsuite_name:
+                manifest_filters = self.manifest_filters
+            else:
+                manifest_filters = subsuite.manifest_filters(self.manifests)
+            for test_path, test_type, test in self.iter_tests(run_info, manifest_filters):
+                enabled = not test.disabled()
+                if not self.include_https and test.environment["protocol"] == "https":
+                    enabled = False
+                if not self.include_h2 and test.environment["protocol"] == "h2":
+                    enabled = False
+                if self.skip_timeout and test.expected() == "TIMEOUT":
+                    enabled = False
+                if self.skip_crash and test.expected() == "CRASH":
+                    enabled = False
+                if self.skip_implementation_status and test.implementation_status() in self.skip_implementation_status:
+                    # for backlog, we want to run timeout/crash:
+                    if not (test.implementation_status() == "implementing" and test.expected() in ["TIMEOUT", "CRASH"]):
+                        enabled = False
+                target = tests_enabled if enabled else tests_disabled
+                target[subsuite_name][test_type].append(test)
 
-        self.tests = tests["enabled"]
-        self.disabled_tests = tests["disabled"]
+        self.tests = tests_enabled
+        self.disabled_tests = tests_disabled
 
     def groups(self, test_types, chunk_type="none", total_chunks=1, chunk_number=1):
         groups = set()
@@ -377,11 +475,16 @@ class TestLoader:
         return groups
 
 
+TestSourceData = namedtuple("TestSourceData", ["cls", "kwargs"])
+
+
 def get_test_src(**kwargs):
     test_source_kwargs = {"processes": kwargs["processes"],
                           "logger": kwargs["logger"]}
     chunker_kwargs = {}
-    if kwargs["run_by_dir"] is not False:
+    if kwargs["fully_parallel"]:
+        test_source_cls = FullyParallelGroupedSource
+    elif kwargs["run_by_dir"] is not False:
         # A value of None indicates infinite depth
         test_source_cls = PathGroupedSource
         test_source_kwargs["depth"] = kwargs["run_by_dir"]
@@ -391,10 +494,10 @@ def get_test_src(**kwargs):
         test_source_kwargs["test_groups"] = kwargs["test_groups"]
     else:
         test_source_cls = SingleTestSource
-    return test_source_cls, test_source_kwargs, chunker_kwargs
+    return TestSourceData(test_source_cls, test_source_kwargs), chunker_kwargs
 
 
-TestGroup = namedtuple("TestGroup", ["group", "test_type", "metadata"])
+TestGroup = namedtuple("TestGroup", ["group", "subsuite", "test_type", "metadata"])
 
 
 class TestSource:
@@ -402,15 +505,14 @@ class TestSource:
 
     def __init__(self, test_queue):
         self.test_queue = test_queue
-        self.current_group = TestGroup(None, None, None)
+        self.current_group = TestGroup(None, None, None, None)
         self.logger = structured.get_default_logger()
         if self.logger is None:
             self.logger = structured.structuredlog.StructuredLogger("TestSource")
 
     @classmethod
     def make_queue(cls, tests_by_type, **kwargs):
-        mp = mpcontext.get_context()
-        test_queue = mp.Queue()
+        test_queue = queue.SimpleQueue()
         groups = cls.make_groups(tests_by_type, **kwargs)
         processes = cls.process_count(kwargs["processes"], len(groups))
         if processes > 1:
@@ -427,11 +529,12 @@ class TestSource:
         cls.add_sentinal(test_queue, processes)
         return test_queue, processes
 
+    @classmethod
     @abstractmethod
-    #@classmethod (doesn't compose with @abstractmethod in < 3.3)
     def make_groups(cls, tests_by_type, **kwargs):  # noqa: N805
         pass
 
+    @classmethod
     @abstractmethod
     def tests_by_group(cls, tests_by_type, **kwargs):  # noqa: N805
         pass
@@ -446,14 +549,14 @@ class TestSource:
                 self.current_group = self.test_queue.get(block=True, timeout=5)
             except Empty:
                 self.logger.warning("Timed out getting test group from queue")
-                return TestGroup(None, None, None)
+                return TestGroup(None, None, None, None)
         return self.current_group
 
     @classmethod
     def add_sentinal(cls, test_queue, num_of_workers):
         # add one sentinal for each worker
         for _ in range(num_of_workers):
-            test_queue.put(TestGroup(None, None, None))
+            test_queue.put(TestGroup(None, None, None, None))
 
     @classmethod
     def process_count(cls, requested_processes, num_test_groups):
@@ -463,42 +566,11 @@ class TestSource:
         return max(1, min(requested_processes, num_test_groups))
 
 
-class GroupedSource(TestSource):
-    @classmethod
-    def new_group(cls, state, test_type, test, **kwargs):
-        raise NotImplementedError
-
-    @classmethod
-    def make_groups(cls, tests_by_type, **kwargs):
-        groups, state = [], {}
-        for test_type, tests in tests_by_type.items():
-            for test in tests:
-                if cls.new_group(state, test_type, test, **kwargs):
-                    group_metadata = cls.group_metadata(state)
-                    groups.append(TestGroup(deque(), test_type, group_metadata))
-                group, _, metadata = groups[-1]
-                group.append(test)
-                test.update_metadata(metadata)
-        return groups
-
-    @classmethod
-    def tests_by_group(cls, tests_by_type, **kwargs):
-        groups = defaultdict(list)
-        state = {}
-        current = None
-        for test_type, tests in tests_by_type.items():
-            for test in tests:
-                if cls.new_group(state, test_type, test, **kwargs):
-                    current = cls.group_metadata(state)['scope']
-                groups[current].append(test.id)
-        return groups
-
-
 class SingleTestSource(TestSource):
     @classmethod
     def make_groups(cls, tests_by_type, **kwargs):
         groups = []
-        for test_type, tests in tests_by_type.items():
+        for (subsuite, test_type), tests in tests_by_type.items():
             processes = kwargs["processes"]
             queues = [deque([]) for _ in range(processes)]
             metadatas = [cls.group_metadata(None) for _ in range(processes)]
@@ -509,41 +581,84 @@ class SingleTestSource(TestSource):
                 group.append(test)
                 test.update_metadata(metadata)
 
-            for item in zip(queues, itertools.repeat(test_type), metadatas):
+            for item in zip(queues,
+                            itertools.repeat(subsuite),
+                            itertools.repeat(test_type),
+                            metadatas):
                 if len(item[0]) > 0:
                     groups.append(TestGroup(*item))
         return groups
 
     @classmethod
     def tests_by_group(cls, tests_by_type, **kwargs):
-        return {cls.group_metadata(None)['scope']:
-                [t.id for t in itertools.chain.from_iterable(tests_by_type.values())]}
+        groups = defaultdict(list)
+        for (subsuite, test_type), tests in tests_by_type.items():
+            group_name = f"{subsuite}:{cls.group_metadata(None)['scope']}"
+            groups[group_name].extend(test.id for test in tests)
+        return groups
 
 
-class PathGroupedSource(GroupedSource):
+class PathGroupedSource(TestSource):
     @classmethod
-    def new_group(cls, state, test_type, test, **kwargs):
+    def new_group(cls, state, subsuite, test_type, test, **kwargs):
         depth = kwargs.get("depth")
         if depth is True or depth == 0:
             depth = None
         path = urlsplit(test.url).path.split("/")[1:-1][:depth]
-        rv = (test_type != state.get("prev_test_type") or
-              path != state.get("prev_path"))
-        state["prev_test_type"] = test_type
-        state["prev_path"] = path
+        rv = (subsuite, test_type, path) != state.get("prev_group_key")
+        state["prev_group_key"] = (subsuite, test_type, path)
         return rv
 
+    @classmethod
+    def make_groups(cls, tests_by_type, **kwargs):
+        groups, state = [], {}
+        for (subsuite, test_type), tests in tests_by_type.items():
+            for test in tests:
+                if cls.new_group(state, subsuite, test_type, test, **kwargs):
+                    group_metadata = cls.group_metadata(state)
+                    groups.append(TestGroup(deque(), subsuite, test_type, group_metadata))
+                group, _, _, metadata = groups[-1]
+                group.append(test)
+                test.update_metadata(metadata)
+        return groups
+
+    @classmethod
+    def tests_by_group(cls, tests_by_type, **kwargs):
+        groups = defaultdict(list)
+        state = {}
+        for (subsuite, test_type), tests in tests_by_type.items():
+            for test in tests:
+                if cls.new_group(state, subsuite, test_type, test, **kwargs):
+                    group = cls.group_metadata(state)['scope']
+                if subsuite is not None:
+                    group_name = f"{subsuite}:{group}"
+                else:
+                    group_name = group
+                groups[group_name].append(test.id)
+        return groups
+
     @classmethod
     def group_metadata(cls, state):
-        return {"scope": "/%s" % "/".join(state["prev_path"])}
+        return {"scope": "/%s" % "/".join(state["prev_group_key"][2])}
+
+
+class FullyParallelGroupedSource(PathGroupedSource):
+    # Chuck every test into a different group, so that they can run
+    # fully parallel with each other. Useful to run a lot of tests
+    # clustered in a few directories.
+    @classmethod
+    def new_group(cls, state, subsuite, test_type, test, **kwargs):
+        path = urlsplit(test.url).path.split("/")[1:-1]
+        state["prev_group_key"] = (subsuite, test_type, path)
+        return True
 
 
 class GroupFileTestSource(TestSource):
     @classmethod
     def make_groups(cls, tests_by_type, **kwargs):
         groups = []
-        for test_type, tests in tests_by_type.items():
-            tests_by_group = cls.tests_by_group({test_type: tests},
+        for (subsuite, test_type), tests in tests_by_type.items():
+            tests_by_group = cls.tests_by_group({(subsuite, test_type): tests},
                                                 **kwargs)
             ids_to_tests = {test.id: test for test in tests}
             for group_name, test_ids in tests_by_group.items():
@@ -553,21 +668,25 @@ class GroupFileTestSource(TestSource):
                     test = ids_to_tests[test_id]
                     group.append(test)
                     test.update_metadata(group_metadata)
-                groups.append(TestGroup(group, test_type, group_metadata))
+                groups.append(TestGroup(group, subsuite, test_type, group_metadata))
         return groups
 
     @classmethod
     def tests_by_group(cls, tests_by_type, **kwargs):
-        logger = kwargs["logger"]
         test_groups = kwargs["test_groups"]
 
         tests_by_group = defaultdict(list)
-        for test in itertools.chain.from_iterable(tests_by_type.values()):
-            try:
-                group = test_groups.group_by_test[test.id]
-            except KeyError:
-                logger.error("%s is missing from test groups file" % test.id)
-                raise
-            tests_by_group[group].append(test.id)
+        for (subsuite, test_type), tests in tests_by_type.items():
+            for test in tests:
+                try:
+                    group = test_groups.group_by_test[(subsuite, test.id)]
+                except KeyError:
+                    print(f"{test.id} is missing from test groups file")
+                    raise
+                if subsuite:
+                    group_name = f"{subsuite}:{group}"
+                else:
+                    group_name = group
+                tests_by_group[group_name].append(test.id)
 
         return tests_by_group
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/testrunner.py b/tests/wpt/tests/tools/wptrunner/wptrunner/testrunner.py
index f29aebac4b9..05e0436899c 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/testrunner.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/testrunner.py
@@ -4,8 +4,8 @@ import threading
 import time
 import traceback
 from queue import Empty
-from collections import namedtuple
-from typing import Optional
+from collections import namedtuple, defaultdict
+from typing import Any, Mapping, Optional
 
 from mozlog import structuredlog, capture
 
@@ -46,9 +46,9 @@ class TestRunner:
     that is passed in.
 
     :param logger: Structured logger
-    :param command_queue: subprocess.Queue used to send commands to the
+    :param command_queue: multiprocessing.Queue used to send commands to the
                           process
-    :param result_queue: subprocess.Queue used to send results to the
+    :param result_queue: multiprocessing.Queue used to send results to the
                          parent TestRunnerManager process
     :param executor: TestExecutor object that will actually run a test.
     """
@@ -120,7 +120,9 @@ class TestRunner:
         try:
             return self.executor.run_test(test)
         except Exception:
-            self.logger.error(traceback.format_exc())
+            message = "TestRunner.run_test caught an exception:\n"
+            message += traceback.format_exc()
+            self.logger.error(message)
             raise
 
     def wait(self):
@@ -211,10 +213,9 @@ class BrowserManager:
             self.browser.start(group_metadata=group_metadata, **self.browser_settings)
             self.browser_pid = self.browser.pid
         except Exception:
-            self.logger.warning("Failure during init %s" % traceback.format_exc())
+            self.logger.error(f"Failure during init:\n{traceback.format_exc()}")
             if self.init_timer is not None:
                 self.init_timer.cancel()
-            self.logger.error(traceback.format_exc())
             succeeded = False
         else:
             succeeded = True
@@ -255,10 +256,10 @@ class BrowserManager:
 class _RunnerManagerState:
     before_init = namedtuple("before_init", [])
     initializing = namedtuple("initializing",
-                              ["test_type", "test", "test_group",
+                              ["subsuite", "test_type", "test", "test_group",
                                "group_metadata", "failure_count"])
-    running = namedtuple("running", ["test_type", "test", "test_group", "group_metadata"])
-    restarting = namedtuple("restarting", ["test_type", "test", "test_group",
+    running = namedtuple("running", ["subsuite", "test_type", "test", "test_group", "group_metadata"])
+    restarting = namedtuple("restarting", ["subsuite", "test_type", "test", "test_group",
                                            "group_metadata", "force_stop"])
     error = namedtuple("error", [])
     stop = namedtuple("stop", ["force_stop"])
@@ -269,7 +270,7 @@ RunnerManagerState = _RunnerManagerState()
 
 class TestRunnerManager(threading.Thread):
     def __init__(self, suite_name, index, test_queue, test_source_cls,
-                 test_implementation_by_type, stop_flag, rerun=1,
+                 test_implementations, stop_flag, retry_index=0, rerun=1,
                  pause_after_test=False, pause_on_unexpected=False,
                  restart_on_unexpected=True, debug_info=None,
                  capture_stdio=True, restart_on_new_group=True, recording=None, max_restarts=5):
@@ -293,22 +294,22 @@ class TestRunnerManager(threading.Thread):
         self.test_source = test_source_cls(test_queue)
 
         self.manager_number = index
-        self.test_type = None
+        self.test_implementation_key = None
 
-        self.test_implementation_by_type = {}
-        for test_type, test_implementation in test_implementation_by_type.items():
+        self.test_implementations = {}
+        for key, test_implementation in test_implementations.items():
             browser_kwargs = test_implementation.browser_kwargs
             if browser_kwargs.get("device_serial"):
                 browser_kwargs = browser_kwargs.copy()
                 # Assign Android device to runner according to current manager index
                 browser_kwargs["device_serial"] = browser_kwargs["device_serial"][index]
-                self.test_implementation_by_type[test_type] = TestImplementation(
+                self.test_implementations[key] = TestImplementation(
                     test_implementation.executor_cls,
                     test_implementation.executor_kwargs,
                     test_implementation.browser_cls,
                     browser_kwargs)
             else:
-                self.test_implementation_by_type[test_type] = test_implementation
+                self.test_implementations[key] = test_implementation
 
         mp = mpcontext.get_context()
 
@@ -316,6 +317,9 @@ class TestRunnerManager(threading.Thread):
         self.parent_stop_flag = stop_flag
         self.child_stop_flag = mp.Event()
 
+        # Keep track of the current retry index. The retries are meant to handle
+        # flakiness, so at retry round we should restart the browser after each test.
+        self.retry_index = retry_index
         self.rerun = rerun
         self.run_count = 0
         self.pause_after_test = pause_after_test
@@ -336,8 +340,8 @@ class TestRunnerManager(threading.Thread):
         self.logger = None
 
         self.test_count = 0
-        self.unexpected_tests = set()
-        self.unexpected_pass_tests = set()
+        self.unexpected_fail_tests = defaultdict(list)
+        self.unexpected_pass_tests = defaultdict(list)
 
         # This may not really be what we want
         self.daemon = True
@@ -396,10 +400,28 @@ class TestRunnerManager(threading.Thread):
                 self.state = new_state
                 self.logger.debug(f"new state: {self.state.__class__.__name__}")
         except Exception:
-            self.logger.error(traceback.format_exc())
+            message = "Uncaught exception in TestRunnerManager.run:\n"
+            message += traceback.format_exc()
+            self.logger.critical(message)
             raise
         finally:
             self.logger.debug("TestRunnerManager main loop terminating, starting cleanup")
+
+            skipped_tests = []
+            while True:
+                _, _, test, _, _ = self.get_next_test()
+                if test is None:
+                    break
+                skipped_tests.append(test)
+
+            if skipped_tests:
+                self.logger.critical(
+                    f"Tests left in the queue: {skipped_tests[0].id!r} "
+                    f"and {len(skipped_tests) - 1} others"
+                )
+                for test in skipped_tests[1:]:
+                    self.logger.debug("Test left in the queue: {test[0].id!r}")
+
             force_stop = (not isinstance(self.state, RunnerManagerState.stop) or
                           self.state.force_stop)
             self.stop_runner(force=force_stop)
@@ -436,7 +458,8 @@ class TestRunnerManager(threading.Thread):
             self.logger.debug("Got command: %r" % command)
         except OSError:
             self.logger.error("Got IOError from poll")
-            return RunnerManagerState.restarting(self.state.test_type,
+            return RunnerManagerState.restarting(self.state.subsuite,
+                                                 self.state.test_type,
                                                  self.state.test,
                                                  self.state.test_group,
                                                  self.state.group_metadata,
@@ -483,12 +506,12 @@ class TestRunnerManager(threading.Thread):
         return self.child_stop_flag.is_set() or self.parent_stop_flag.is_set()
 
     def start_init(self):
-        test_type, test, test_group, group_metadata = self.get_next_test()
+        subsuite, test_type, test, test_group, group_metadata = self.get_next_test()
         self.recording.set(["testrunner", "init"])
         if test is None:
             return RunnerManagerState.stop(True)
         else:
-            return RunnerManagerState.initializing(test_type, test, test_group, group_metadata, 0)
+            return RunnerManagerState.initializing(subsuite, test_type, test, test_group, group_metadata, 0)
 
     def init(self):
         assert isinstance(self.state, RunnerManagerState.initializing)
@@ -496,11 +519,11 @@ class TestRunnerManager(threading.Thread):
             self.logger.critical("Max restarts exceeded")
             return RunnerManagerState.error()
 
-        if self.state.test_type != self.test_type:
+        if (self.state.subsuite, self.state.test_type) != self.test_implementation_key:
             if self.browser is not None:
                 assert self.browser.browser is not None
                 self.browser.browser.cleanup()
-            impl = self.test_implementation_by_type[self.state.test_type]
+            impl = self.test_implementations[(self.state.subsuite, self.state.test_type)]
             browser = impl.browser_cls(self.logger, remote_queue=self.command_queue,
                                        **impl.browser_kwargs)
             browser.setup()
@@ -508,7 +531,7 @@ class TestRunnerManager(threading.Thread):
                                           browser,
                                           self.command_queue,
                                           no_timeout=self.debug_info is not None)
-            self.test_type = self.state.test_type
+            self.test_implementation_key = (self.state.subsuite, self.state.test_type)
 
         assert self.browser is not None
         self.browser.update_settings(self.state.test)
@@ -527,7 +550,7 @@ class TestRunnerManager(threading.Thread):
         assert self.command_queue is not None
         assert self.remote_queue is not None
         self.logger.info("Starting runner")
-        impl = self.test_implementation_by_type[self.state.test_type]
+        impl = self.test_implementations[(self.state.subsuite, self.state.test_type)]
         self.executor_cls = impl.executor_cls
         self.executor_kwargs = impl.executor_kwargs
         self.executor_kwargs["group_metadata"] = self.state.group_metadata
@@ -547,8 +570,7 @@ class TestRunnerManager(threading.Thread):
         mp = mpcontext.get_context()
         self.test_runner_proc = mp.Process(target=start_runner,
                                            args=args,
-                                           name="TestRunner-%s-%i" % (
-                                               self.test_type, self.manager_number))
+                                           name="TestRunner-%i" % self.manager_number)
         self.test_runner_proc.start()
         self.logger.debug("Test runner started")
         # Now we wait for either an init_succeeded event or an init_failed event
@@ -556,7 +578,8 @@ class TestRunnerManager(threading.Thread):
     def init_succeeded(self):
         assert isinstance(self.state, RunnerManagerState.initializing)
         self.browser.after_init()
-        return RunnerManagerState.running(self.state.test_type,
+        return RunnerManagerState.running(self.state.subsuite,
+                                          self.state.test_type,
                                           self.state.test,
                                           self.state.test_group,
                                           self.state.group_metadata)
@@ -566,7 +589,8 @@ class TestRunnerManager(threading.Thread):
         self.browser.check_crash(None)
         self.browser.after_init()
         self.stop_runner(force=True)
-        return RunnerManagerState.initializing(self.state.test_type,
+        return RunnerManagerState.initializing(self.state.subsuite,
+                                               self.state.test_type,
                                                self.state.test,
                                                self.state.test_group,
                                                self.state.group_metadata,
@@ -578,13 +602,13 @@ class TestRunnerManager(threading.Thread):
         test_group = None
         while test is None:
             while test_group is None or len(test_group) == 0:
-                test_group, test_type, group_metadata = self.test_source.group()
+                test_group, subsuite, test_type, group_metadata = self.test_source.group()
                 if test_group is None:
                     self.logger.info("No more tests")
-                    return None, None, None, None
+                    return None, None, None, None, None
             test = test_group.popleft()
         self.run_count = 0
-        return test_type, test, test_group, group_metadata
+        return subsuite, test_type, test, test_group, group_metadata
 
     def run_test(self):
         assert isinstance(self.state, RunnerManagerState.running)
@@ -592,14 +616,15 @@ class TestRunnerManager(threading.Thread):
 
         if self.browser.update_settings(self.state.test):
             self.logger.info("Restarting browser for new test environment")
-            return RunnerManagerState.restarting(self.state.test_type,
+            return RunnerManagerState.restarting(self.state.subsuite,
+                                                 self.state.test_type,
                                                  self.state.test,
                                                  self.state.test_group,
                                                  self.state.group_metadata,
                                                  False)
 
         self.recording.set(["testrunner", "test"] + self.state.test.id.split("/")[1:])
-        self.logger.test_start(self.state.test.id)
+        self.logger.test_start(self.state.test.id, subsuite=self.state.subsuite)
         if self.rerun > 1:
             self.logger.info("Run %d/%d" % (self.run_count, self.rerun))
             self.send_message("reset")
@@ -611,6 +636,7 @@ class TestRunnerManager(threading.Thread):
             wait_timeout = (self.state.test.timeout * self.executor_kwargs['timeout_multiplier'] +
                             3 * self.executor_cls.extra_timeout)
             self.timer = threading.Timer(wait_timeout, self._timeout)
+            self.timer.name = f"{self.name}-timeout"
 
         self.send_message("run_test", self.state.test)
         if self.timer:
@@ -670,14 +696,15 @@ class TestRunnerManager(threading.Thread):
                                     message=result.message,
                                     expected=expected,
                                     known_intermittent=known_intermittent,
-                                    stack=result.stack)
+                                    stack=result.stack,
+                                    subsuite=self.state.subsuite)
 
         expected = test.expected()
         known_intermittent = test.known_intermittent()
         status = file_result.status
 
         if self.browser.check_crash(test.id) and status != "CRASH":
-            if test.test_type == "crashtest" or status == "EXTERNAL-TIMEOUT":
+            if test.test_type in ["crashtest", "wdspec"] or status == "EXTERNAL-TIMEOUT":
                 self.logger.info("Found a crash dump file; changing status to CRASH")
                 status = "CRASH"
             else:
@@ -697,9 +724,6 @@ class TestRunnerManager(threading.Thread):
         is_unexpected = expected != status and status not in known_intermittent
         is_pass_or_expected = status in ["OK", "PASS"] or (not is_unexpected)
 
-        if is_unexpected or subtest_unexpected:
-            self.unexpected_tests.add(test.id)
-
         # A result is unexpected pass if the test or any subtest run
         # unexpectedly, and the overall status is expected or passing (OK for test
         # harness test, or PASS for reftest), and all unexpected results for
@@ -707,7 +731,9 @@ class TestRunnerManager(threading.Thread):
         is_unexpected_pass = ((is_unexpected or subtest_unexpected) and
                               is_pass_or_expected and subtest_all_pass_or_expected)
         if is_unexpected_pass:
-            self.unexpected_pass_tests.add(test.id)
+            self.unexpected_pass_tests[self.state.subsuite, test.test_type].append(test)
+        elif is_unexpected or subtest_unexpected:
+            self.unexpected_fail_tests[self.state.subsuite, test.test_type].append(test)
 
         if "assertion_count" in file_result.extra:
             assertion_count = file_result.extra["assertion_count"]
@@ -725,9 +751,10 @@ class TestRunnerManager(threading.Thread):
                              expected=expected,
                              known_intermittent=known_intermittent,
                              extra=file_result.extra,
-                             stack=file_result.stack)
+                             stack=file_result.stack,
+                             subsuite=self.state.subsuite)
 
-        restart_before_next = (test.restart_after or
+        restart_before_next = (self.retry_index > 0 or test.restart_after or
                                file_result.status in ("CRASH", "EXTERNAL-TIMEOUT", "INTERNAL-ERROR") or
                                ((subtest_unexpected or is_unexpected) and
                                 self.restart_on_unexpected))
@@ -756,36 +783,40 @@ class TestRunnerManager(threading.Thread):
         # that as long as we've done at least the automatic run count in total we can
         # continue with the next test.
         if not force_rerun and self.run_count >= self.rerun:
-            test_type, test, test_group, group_metadata = self.get_next_test()
+            subsuite, test_type, test, test_group, group_metadata = self.get_next_test()
             if test is None:
                 return RunnerManagerState.stop(force_stop)
-            if test_type != self.state.test_type:
+            if subsuite != self.state.subsuite:
+                self.logger.info(f"Restarting browser for new subsuite:{subsuite}")
+                restart = True
+            elif test_type != self.state.test_type:
                 self.logger.info(f"Restarting browser for new test type:{test_type}")
                 restart = True
             elif self.restart_on_new_group and test_group is not self.state.test_group:
                 self.logger.info("Restarting browser for new test group")
                 restart = True
         else:
+            subsuite = self.state.subsuite
             test_type = self.state.test_type
             test_group = self.state.test_group
             group_metadata = self.state.group_metadata
 
         if restart:
             return RunnerManagerState.restarting(
-                test_type, test, test_group, group_metadata, force_stop)
+                subsuite, test_type, test, test_group, group_metadata, force_stop)
         else:
             return RunnerManagerState.running(
-                test_type, test, test_group, group_metadata)
+                subsuite, test_type, test, test_group, group_metadata)
 
     def restart_runner(self):
         """Stop and restart the TestRunner"""
         assert isinstance(self.state, RunnerManagerState.restarting)
         self.stop_runner(force=self.state.force_stop)
         return RunnerManagerState.initializing(
-            self.state.test_type, self.state.test,
+            self.state.subsuite, self.state.test_type, self.state.test,
             self.state.test_group, self.state.group_metadata, 0)
 
-    def log(self, data):
+    def log(self, data: Mapping[str, Any]) -> None:
         self.logger.log_raw(data)
 
     def error(self, message):
@@ -821,9 +852,7 @@ class TestRunnerManager(threading.Thread):
             return
 
         self.browser.stop(force=True)
-        self.logger.debug("waiting for runner process to end")
         self.test_runner_proc.join(10)
-        self.logger.debug("After join")
         mp = mpcontext.get_context()
         if self.test_runner_proc.is_alive():
             # This might leak a file handle from the queue
@@ -863,6 +892,8 @@ class TestRunnerManager(threading.Thread):
         self.logger.debug("TestRunnerManager cleanup")
         if self.browser:
             self.browser.cleanup()
+        if self.timer:
+            self.timer.cancel()
         while True:
             try:
                 cmd, data = self.command_queue.get_nowait()
@@ -886,21 +917,10 @@ class TestRunnerManager(threading.Thread):
                 break
 
 
-def make_test_queue(tests, test_source_cls, **test_source_kwargs):
-    queue, num_of_workers = test_source_cls.make_queue(tests, **test_source_kwargs)
-
-    # There is a race condition that means sometimes we continue
-    # before the tests have been written to the underlying pipe.
-    # Polling the pipe for data here avoids that
-    queue._reader.poll(10)
-    assert not queue.empty()
-    return queue, num_of_workers
-
-
 class ManagerGroup:
     """Main thread object that owns all the TestRunnerManager threads."""
-    def __init__(self, suite_name, test_source_cls, test_source_kwargs,
-                 test_implementation_by_type,
+    def __init__(self, suite_name, test_source, test_implementations,
+                 retry_index=0,
                  rerun=1,
                  pause_after_test=False,
                  pause_on_unexpected=False,
@@ -911,13 +931,13 @@ class ManagerGroup:
                  recording=None,
                  max_restarts=5):
         self.suite_name = suite_name
-        self.test_source_cls = test_source_cls
-        self.test_source_kwargs = test_source_kwargs
-        self.test_implementation_by_type = test_implementation_by_type
+        self.test_source = test_source
+        self.test_implementations = test_implementations
         self.pause_after_test = pause_after_test
         self.pause_on_unexpected = pause_on_unexpected
         self.restart_on_unexpected = restart_on_unexpected
         self.debug_info = debug_info
+        self.retry_index = retry_index
         self.rerun = rerun
         self.capture_stdio = capture_stdio
         self.restart_on_new_group = restart_on_new_group
@@ -939,17 +959,18 @@ class ManagerGroup:
 
     def run(self, tests):
         """Start all managers in the group"""
-
-        test_queue, size = make_test_queue(tests, self.test_source_cls, **self.test_source_kwargs)
+        test_queue, size = self.test_source.cls.make_queue(
+            tests, **self.test_source.kwargs)
         self.logger.info("Using %i child processes" % size)
 
         for idx in range(size):
             manager = TestRunnerManager(self.suite_name,
                                         idx,
                                         test_queue,
-                                        self.test_source_cls,
-                                        self.test_implementation_by_type,
+                                        self.test_source.cls,
+                                        self.test_implementations,
                                         self.stop_flag,
+                                        self.retry_index,
                                         self.rerun,
                                         self.pause_after_test,
                                         self.pause_on_unexpected,
@@ -986,8 +1007,16 @@ class ManagerGroup:
     def test_count(self):
         return sum(manager.test_count for manager in self.pool)
 
-    def unexpected_tests(self):
-        return set().union(*(manager.unexpected_tests for manager in self.pool))
+    def unexpected_fail_tests(self):
+        rv = defaultdict(list)
+        for manager in self.pool:
+            for (subsuite, test_type), tests in manager.unexpected_fail_tests.items():
+                rv[(subsuite, test_type)].extend(tests)
+        return rv
 
     def unexpected_pass_tests(self):
-        return set().union(*(manager.unexpected_pass_tests for manager in self.pool))
+        rv = defaultdict(list)
+        for manager in self.pool:
+            for (subsuite, test_type), tests in manager.unexpected_pass_tests.items():
+                rv[(subsuite, test_type)].extend(tests)
+        return rv
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/tests/browsers/test_webkitgtk.py b/tests/wpt/tests/tools/wptrunner/wptrunner/tests/browsers/test_webkitgtk.py
index 5b751e94562..324142c0add 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/tests/browsers/test_webkitgtk.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/tests/browsers/test_webkitgtk.py
@@ -7,7 +7,7 @@ import pytest
 
 from wptserve.config import ConfigBuilder
 from ..base import active_products
-from wptrunner import environment, products
+from wptrunner import environment, products, testloader
 
 test_paths = {"/": {"tests_path": join(dirname(__file__), "..", "..", "..", "..", "..")}}  # repo root
 environment.do_delayed_imports(None, test_paths)
@@ -44,6 +44,7 @@ def test_webkitgtk_certificate_domain_list(product):
     kwargs["pause_after_test"] = False
     kwargs["pause_on_unexpected"] = False
     kwargs["debug_test"] = False
+    kwargs["subsuite"] = testloader.Subsuite("", config={})
     with ConfigBuilder(logger,
                        browser_host="example.net",
                        alternate_hosts={"alt": "example.org"},
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/tests/test_manifestupdate.py b/tests/wpt/tests/tools/wptrunner/wptrunner/tests/test_manifestupdate.py
new file mode 100644
index 00000000000..12e379615d5
--- /dev/null
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/tests/test_manifestupdate.py
@@ -0,0 +1,58 @@
+# mypy: allow-untyped-defs
+
+import io
+import textwrap
+
+from .. import metadata
+from .. import manifestupdate
+from .. import wptmanifest
+
+
+def test_unconditional_default_promotion():
+    contents_before = io.BytesIO(
+        textwrap.dedent(
+            """\
+            [b.html]
+            """).encode())
+    manifest = manifestupdate.compile(
+        contents_before,
+        test_path='a/b.html',
+        url_base='/',
+        run_info_properties=(['os'], {'os': ['version']}),
+        update_intermittent=True,
+        remove_intermittent=False)
+    test = manifest.get_test('/a/b.html')
+    test.set_result(
+        metadata.RunInfo({'os': 'linux', 'version': 'jammy'}),
+        metadata.Result('TIMEOUT', [], 'PASS'))
+    test.set_result(
+        metadata.RunInfo({'os': 'win', 'version': '10'}),
+        metadata.Result('TIMEOUT', [], 'PASS'))
+    test.set_result(
+        metadata.RunInfo({'os': 'mac', 'version': '11'}),
+        metadata.Result('FAIL', [], 'PASS'))
+    test.set_result(
+        metadata.RunInfo({'os': 'mac', 'version': '12'}),
+        metadata.Result('FAIL', [], 'PASS'))
+    test.set_result(
+        metadata.RunInfo({'os': 'mac', 'version': '13'}),
+        metadata.Result('FAIL', [], 'PASS'))
+    test.update(full_update=True, disable_intermittent=False)
+
+    # The conditions before the default is created will look like:
+    #   expected:
+    #     if os == "linux": TIMEOUT
+    #     if os == "win": TIMEOUT
+    #     if os == "mac": FAIL
+    #
+    # The update should prefer promoting `TIMEOUT` over `FAIL`, since the former
+    # eliminates more conditions (both non-mac ones).
+    contents_after = io.BytesIO(
+        textwrap.dedent(
+            """\
+            [b.html]
+              expected:
+                if os == "mac": FAIL
+                TIMEOUT
+            """).encode())
+    assert manifest.node == wptmanifest.parse(contents_after)
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/tests/test_testloader.py b/tests/wpt/tests/tools/wptrunner/wptrunner/tests/test_testloader.py
index 6e93a20e02e..0915f42381e 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/tests/test_testloader.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/tests/test_testloader.py
@@ -11,6 +11,7 @@ from ..testloader import (
     DirectoryHashChunker,
     IDHashChunker,
     PathHashChunker,
+    Subsuite,
     TestFilter,
     TestLoader,
     TagFilter,
@@ -79,20 +80,22 @@ def test_loader_h2_tests():
         "version": 8,
     }
     manifest = WPTManifest.from_json("/", manifest_json)
+    subsuites = {}
+    subsuites[""] = Subsuite("", config={})
 
     # By default, the loader should include the h2 test.
-    loader = TestLoader({manifest: {"metadata_path": ""}}, ["testharness"], None)
-    assert "testharness" in loader.tests
-    assert len(loader.tests["testharness"]) == 2
-    assert len(loader.disabled_tests) == 0
+    loader = TestLoader({manifest: {"metadata_path": ""}}, ["testharness"], None, subsuites)
+    assert "testharness" in loader.tests[""]
+    assert len(loader.tests[""]["testharness"]) == 2
+    assert len(loader.disabled_tests[""]) == 0
 
     # We can also instruct it to skip them.
-    loader = TestLoader({manifest: {"metadata_path": ""}}, ["testharness"], None, include_h2=False)
-    assert "testharness" in loader.tests
-    assert len(loader.tests["testharness"]) == 1
-    assert "testharness" in loader.disabled_tests
-    assert len(loader.disabled_tests["testharness"]) == 1
-    assert loader.disabled_tests["testharness"][0].url == "/a/bar.h2.html"
+    loader = TestLoader({manifest: {"metadata_path": ""}}, ["testharness"], None, subsuites, include_h2=False)
+    assert "testharness" in loader.tests[""]
+    assert len(loader.tests[""]["testharness"]) == 1
+    assert "testharness" in loader.disabled_tests[""]
+    assert len(loader.disabled_tests[""]["testharness"]) == 1
+    assert loader.disabled_tests[""]["testharness"][0].url == "/a/bar.h2.html"
 
 
 @pytest.mark.xfail(sys.platform == "win32",
@@ -238,6 +241,9 @@ def test_loader_filter_tags():
         with open(os.path.join(a_path, "bar.html.ini"), "w") as f:
             f.write("tags: [test-include]\n")
 
+        subsuites = {}
+        subsuites[""] = Subsuite("", config={})
+
         b_path = os.path.join(metadata_path, "b")
         os.makedirs(b_path)
         with open(os.path.join(b_path, "baz.html.ini"), "w") as f:
@@ -245,40 +251,40 @@ def test_loader_filter_tags():
 
 
         # Check: no filter loads all tests
-        loader = TestLoader({manifest: {"metadata_path": metadata_path}}, ["testharness"], None)
-        assert len(loader.tests["testharness"]) == 4
+        loader = TestLoader({manifest: {"metadata_path": metadata_path}}, ["testharness"], None, subsuites)
+        assert len(loader.tests[""]["testharness"]) == 4
 
         # Check: specifying a single `test-include` inclusion yields `/a/bar` and `/b/baz`
-        loader = TestLoader({manifest: {"metadata_path": metadata_path}}, ["testharness"], None,
+        loader = TestLoader({manifest: {"metadata_path": metadata_path}}, ["testharness"], None, subsuites,
                             test_filters=[TagFilter({"test-include"}, {})])
-        assert len(loader.tests["testharness"]) == 2
-        assert loader.tests["testharness"][0].id == "/a/bar.html"
-        assert loader.tests["testharness"][0].tags == {"dir:a", "test-include"}
-        assert loader.tests["testharness"][1].id == "/b/baz.html"
-        assert loader.tests["testharness"][1].tags == {"dir:b", "test-include", "test-exclude"}
+        assert len(loader.tests[""]["testharness"]) == 2
+        assert loader.tests[""]["testharness"][0].id == "/a/bar.html"
+        assert loader.tests[""]["testharness"][0].tags == {"dir:a", "test-include"}
+        assert loader.tests[""]["testharness"][1].id == "/b/baz.html"
+        assert loader.tests[""]["testharness"][1].tags == {"dir:b", "test-include", "test-exclude"}
 
         # Check: specifying a single `test-exclude` exclusion rejects only `/b/baz`
-        loader = TestLoader({manifest: {"metadata_path": metadata_path}}, ["testharness"], None,
+        loader = TestLoader({manifest: {"metadata_path": metadata_path}}, ["testharness"], None, subsuites,
                             test_filters=[TagFilter({}, {"test-exclude"})])
-        assert len(loader.tests["testharness"]) == 3
-        assert all(test.id != "/b/baz.html" for test in loader.tests["testharness"])
+        assert len(loader.tests[""]["testharness"]) == 3
+        assert all(test.id != "/b/baz.html" for test in loader.tests[""]["testharness"])
 
         # Check: including `test-include` and excluding `test-exclude` yields only `/a/bar`
-        loader = TestLoader({manifest: {"metadata_path": metadata_path}}, ["testharness"], None,
+        loader = TestLoader({manifest: {"metadata_path": metadata_path}}, ["testharness"], None, subsuites,
                             test_filters=[TagFilter({"test-include"}, {"test-exclude"})])
-        assert len(loader.tests["testharness"]) == 1
-        assert loader.tests["testharness"][0].id == "/a/bar.html"
-        assert loader.tests["testharness"][0].tags == {"dir:a", "test-include"}
+        assert len(loader.tests[""]["testharness"]) == 1
+        assert loader.tests[""]["testharness"][0].id == "/a/bar.html"
+        assert loader.tests[""]["testharness"][0].tags == {"dir:a", "test-include"}
 
         # Check: non-empty intersection of inclusion and exclusion yield zero tests
 
-        loader = TestLoader({manifest: {"metadata_path": metadata_path}}, ["testharness"], None,
+        loader = TestLoader({manifest: {"metadata_path": metadata_path}}, ["testharness"], None, subsuites,
                             test_filters=[TagFilter({"test-include"}, {"test-include"})])
-        assert len(loader.tests["testharness"]) == 0
+        assert len(loader.tests[""]["testharness"]) == 0
 
-        loader = TestLoader({manifest: {"metadata_path": metadata_path}}, ["testharness"], None,
+        loader = TestLoader({manifest: {"metadata_path": metadata_path}}, ["testharness"], None, subsuites,
                             test_filters=[TagFilter({"test-include", "test-exclude"}, {"test-include"})])
-        assert len(loader.tests["testharness"]) == 0
+        assert len(loader.tests[""]["testharness"]) == 0
 
 
 def test_chunk_hash(manifest):
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/update/metadata.py b/tests/wpt/tests/tools/wptrunner/wptrunner/update/metadata.py
index 388b569bcc3..48519900e7d 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/update/metadata.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/update/metadata.py
@@ -11,7 +11,7 @@ class GetUpdatePropertyList(Step):
     provides = ["update_properties"]
 
     def create(self, state):
-        state.update_properties = products.load_product_update(state.config, state.product)
+        state.update_properties = products.load_product_update(state.config, state.product.name)
 
 
 class UpdateExpected(Step):
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/update/state.py b/tests/wpt/tests/tools/wptrunner/wptrunner/update/state.py
index 2c23ad66c21..e187d411a2c 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/update/state.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/update/state.py
@@ -63,8 +63,8 @@ class BaseState:
             raise AttributeError
         try:
             return self._data[self._index][key]
-        except KeyError:
-            raise AttributeError
+        except KeyError as e:
+            raise AttributeError from e
 
     def __contains__(self, key):
         return key in self._data[self._index]
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/wptcommandline.py b/tests/wpt/tests/tools/wptrunner/wptrunner/wptcommandline.py
index bc664b08ca0..58c726fe379 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/wptcommandline.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/wptcommandline.py
@@ -8,6 +8,7 @@ from shutil import which
 from datetime import timedelta
 
 from . import config
+from . import products
 from . import wpttest
 from .formatters import chromium, wptreport, wptscreenshot
 
@@ -37,8 +38,6 @@ def require_arg(kwargs, name, value_func=None):
 def create_parser(product_choices=None):
     from mozlog import commandline
 
-    from . import products
-
     if product_choices is None:
         product_choices = products.product_list
 
@@ -62,6 +61,8 @@ scheme host and port.""")
                         help="Split run into groups by directories. With a parameter,"
                         "limit the depth of splits e.g. --run-by-dir=1 to split by top-level"
                         "directory")
+    parser.add_argument("-f", "--fully-parallel", action='store_true',
+                        help='Run every test in a separate group for fully parallelism.')
     parser.add_argument("--processes", action="store", type=int, default=None,
                         help="Number of simultaneous processes to use")
     parser.add_argument("--max-restarts", action="store", type=int, default=5,
@@ -142,6 +143,11 @@ scheme host and port.""")
                                       nargs="*", default=wpttest.enabled_tests,
                                       choices=wpttest.enabled_tests,
                                       help="Test types to run")
+    test_selection_group.add_argument("--subsuite-file", action="store",
+                                      help="Path to JSON file containing subsuite configuration")
+    # TODO use an empty string argument for the default subsuite
+    test_selection_group.add_argument("--subsuite", action="append", dest="subsuites",
+                                      help="Subsuite names to run. Runs all subsuites when omitted.")
     test_selection_group.add_argument("--include", action="append",
                                       help="URL prefix to include")
     test_selection_group.add_argument("--include-file", action="store",
@@ -154,6 +160,8 @@ scheme host and port.""")
                                       help="Path to json file containing a mapping {group_name: [test_ids]}")
     test_selection_group.add_argument("--skip-timeout", action="store_true",
                                       help="Skip tests that are expected to time out")
+    test_selection_group.add_argument("--skip-crash", action="store_true",
+                                      help="Skip tests that are expected to crash")
     test_selection_group.add_argument("--skip-implementation-status",
                                       action="append",
                                       choices=["not-implementing", "backlog", "implementing"],
@@ -456,6 +464,8 @@ def set_from_config(kwargs):
 
     kwargs["config"] = config.read(kwargs["config_path"])
 
+    kwargs["product"] = products.Product(kwargs["config"], kwargs["product"])
+
     keys = {"paths": [("prefs", "prefs_root", True),
                       ("run_info", "run_info", True)],
             "web-platform-tests": [("remote_url", "remote_url", False),
@@ -553,13 +563,10 @@ def check_paths(kwargs):
 def check_args(kwargs):
     set_from_config(kwargs)
 
-    if kwargs["product"] is None:
-        kwargs["product"] = "firefox"
-
     if kwargs["manifest_update"] is None:
         kwargs["manifest_update"] = True
 
-    if "sauce" in kwargs["product"]:
+    if "sauce" in kwargs["product"].name:
         kwargs["pause_after_test"] = False
 
     if kwargs["test_list"]:
@@ -580,13 +587,18 @@ def check_args(kwargs):
         else:
             kwargs["chunk_type"] = "none"
 
-    if kwargs["test_groups_file"] is not None:
-        if kwargs["run_by_dir"] is not False:
-            print("Can't pass --test-groups and --run-by-dir")
-            sys.exit(1)
-        if not os.path.exists(kwargs["test_groups_file"]):
-            print("--test-groups file %s not found" % kwargs["test_groups_file"])
-            sys.exit(1)
+    if sum([
+        kwargs["test_groups_file"] is not None,
+        kwargs["run_by_dir"] is not False,
+        kwargs["fully_parallel"],
+    ]) > 1:
+        print('Must pass up to one of: --test-groups, --run-by-dir, --fully-parallel')
+        sys.exit(1)
+
+    if (kwargs["test_groups_file"] is not None and
+        not os.path.exists(kwargs["test_groups_file"])):
+        print("--test-groups file %s not found" % kwargs["test_groups_file"])
+        sys.exit(1)
 
     # When running on Android, the number of workers is decided by the number of
     # emulators. Each worker will use one emulator to run the Android browser.
@@ -601,7 +613,8 @@ def check_args(kwargs):
             sys.exit(1)
 
     if kwargs["processes"] is None:
-        kwargs["processes"] = 1
+        from manifest import mputil  # type: ignore
+        kwargs["processes"] = mputil.max_parallelism() if kwargs["fully_parallel"] else 1
 
     if kwargs["debugger"] is not None:
         import mozdebug
@@ -642,7 +655,7 @@ def check_args(kwargs):
             sys.exit(1)
         kwargs["openssl_binary"] = path
 
-    if kwargs["ssl_type"] != "none" and kwargs["product"] == "firefox" and kwargs["certutil_binary"]:
+    if kwargs["ssl_type"] != "none" and kwargs["product"].name == "firefox" and kwargs["certutil_binary"]:
         path = exe_path(kwargs["certutil_binary"])
         if path is None:
             print("certutil-binary argument missing or not a valid executable", file=sys.stderr)
@@ -678,9 +691,6 @@ def check_args(kwargs):
 def check_args_metadata_update(kwargs):
     set_from_config(kwargs)
 
-    if kwargs["product"] is None:
-        kwargs["product"] = "firefox"
-
     for item in kwargs["run_log"]:
         if os.path.isdir(item):
             print("Log file %s is a directory" % item, file=sys.stderr)
@@ -716,7 +726,7 @@ def create_parser_metadata_update(product_choices=None):
                                      description="Update script for web-platform-tests tests.")
     # This will be removed once all consumers are updated to the properties-file based system
     parser.add_argument("--product", action="store", choices=product_choices,
-                        default=None, help=argparse.SUPPRESS)
+                        default="firefox", help=argparse.SUPPRESS)
     parser.add_argument("--config", action="store", type=abs_path, help="Path to config file")
     parser.add_argument("--metadata", action="store", type=abs_path, dest="metadata_root",
                         help="Path to the folder containing test metadata"),
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/wptrunner.py b/tests/wpt/tests/tools/wptrunner/wptrunner/wptrunner.py
index 4bfb4158d13..8badb131639 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/wptrunner.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/wptrunner.py
@@ -13,7 +13,6 @@ from wptserve import sslutils
 from . import environment as env
 from . import instruments
 from . import mpcontext
-from . import products
 from . import testloader
 from . import wptcommandline
 from . import wptlogging
@@ -48,19 +47,29 @@ def setup_logging(*args, **kwargs):
     return logger
 
 
-def get_loader(test_paths, product, debug=None, run_info_extras=None, chunker_kwargs=None,
-               test_groups=None, **kwargs):
-    if run_info_extras is None:
-        run_info_extras = {}
+def get_loader(test_paths, product, **kwargs):
+    run_info_extras = product.run_info_extras(**kwargs)
+    base_run_info = wpttest.get_run_info(kwargs["run_info"],
+                                         product.name,
+                                         browser_version=kwargs.get("browser_version"),
+                                         browser_channel=kwargs.get("browser_channel"),
+                                         verify=kwargs.get("verify"),
+                                         debug=kwargs["debug"],
+                                         extras=run_info_extras,
+                                         device_serials=kwargs.get("device_serial"),
+                                         adb_binary=kwargs.get("adb_binary"))
 
-    run_info = wpttest.get_run_info(kwargs["run_info"], product,
-                                    browser_version=kwargs.get("browser_version"),
-                                    browser_channel=kwargs.get("browser_channel"),
-                                    verify=kwargs.get("verify"),
-                                    debug=debug,
-                                    extras=run_info_extras,
-                                    device_serials=kwargs.get("device_serial"),
-                                    adb_binary=kwargs.get("adb_binary"))
+    subsuites = testloader.load_subsuites(logger,
+                                          base_run_info,
+                                          kwargs["subsuite_file"],
+                                          set(kwargs["subsuites"] or []))
+
+    if kwargs["test_groups_file"] is not None:
+        test_groups = testloader.TestGroups(logger,
+                                            kwargs["test_groups_file"],
+                                            subsuites)
+    else:
+        test_groups = None
 
     test_manifests = testloader.ManifestLoader(test_paths,
                                                force_manifest_update=kwargs["manifest_update"],
@@ -88,9 +97,15 @@ def get_loader(test_paths, product, debug=None, run_info_extras=None, chunker_kw
 
     ssl_enabled = sslutils.get_cls(kwargs["ssl_type"]).ssl_enabled
     h2_enabled = wptserve.utils.http2_compatible()
-    test_loader = testloader.TestLoader(test_manifests,
-                                        kwargs["test_types"],
-                                        run_info,
+
+    test_source, chunker_kwargs = testloader.get_test_src(logger=logger,
+                                                          test_groups=test_groups,
+                                                          **kwargs)
+
+    test_loader = testloader.TestLoader(test_manifests=test_manifests,
+                                        test_types=kwargs["test_types"],
+                                        base_run_info=base_run_info,
+                                        subsuites=subsuites,
                                         manifest_filters=manifest_filters,
                                         test_filters=test_filters,
                                         chunk_type=kwargs["chunk_type"],
@@ -100,18 +115,18 @@ def get_loader(test_paths, product, debug=None, run_info_extras=None, chunker_kw
                                         include_h2=h2_enabled,
                                         include_webtransport_h3=kwargs["enable_webtransport_h3"],
                                         skip_timeout=kwargs["skip_timeout"],
+                                        skip_crash=kwargs["skip_crash"],
                                         skip_implementation_status=kwargs["skip_implementation_status"],
                                         chunker_kwargs=chunker_kwargs)
-    return run_info, test_loader
+    return test_source, test_loader
 
 
 def list_test_groups(test_paths, product, **kwargs):
     env.do_delayed_imports(logger, test_paths)
 
-    run_info_extras = products.Product(kwargs["config"], product).run_info_extras(**kwargs)
-
-    run_info, test_loader = get_loader(test_paths, product,
-                                       run_info_extras=run_info_extras, **kwargs)
+    _, test_loader = get_loader(test_paths,
+                                product,
+                                **kwargs)
 
     for item in sorted(test_loader.groups(kwargs["test_types"])):
         print(item)
@@ -122,10 +137,7 @@ def list_disabled(test_paths, product, **kwargs):
 
     rv = []
 
-    run_info_extras = products.Product(kwargs["config"], product).run_info_extras(**kwargs)
-
-    run_info, test_loader = get_loader(test_paths, product,
-                                       run_info_extras=run_info_extras, **kwargs)
+    _, test_loader = get_loader(test_paths, product, **kwargs)
 
     for test_type, tests in test_loader.disabled_tests.items():
         for test in tests:
@@ -136,10 +148,7 @@ def list_disabled(test_paths, product, **kwargs):
 def list_tests(test_paths, product, **kwargs):
     env.do_delayed_imports(logger, test_paths)
 
-    run_info_extras = products.Product(kwargs["config"], product).run_info_extras(**kwargs)
-
-    run_info, test_loader = get_loader(test_paths, product,
-                                       run_info_extras=run_info_extras, **kwargs)
+    _, test_loader = get_loader(test_paths, product, **kwargs)
 
     for test in test_loader.test_ids:
         print(test)
@@ -162,107 +171,119 @@ def get_pause_after_test(test_loader, **kwargs):
     return kwargs["pause_after_test"]
 
 
-def run_test_iteration(test_status, test_loader, test_source_kwargs, test_source_cls, run_info,
+def log_suite_start(tests_by_group, base_run_info, subsuites, run_by_dir):
+    logger.suite_start(tests_by_group,
+                       name='web-platform-test',
+                       run_info=base_run_info,
+                       extra={"run_by_dir": run_by_dir})
+
+    for name, subsuite in subsuites.items():
+        logger.add_subsuite(name=name, run_info=subsuite.run_info_extras)
+
+
+def run_test_iteration(test_status, test_loader, test_source,
                        recording, test_environment, product, kwargs):
     """Runs the entire test suite.
     This is called for each repeat run requested."""
     tests_by_type = defaultdict(list)
+
     for test_type in test_loader.test_types:
-        type_tests_active = test_loader.tests[test_type]
-        type_tests_disabled = test_loader.disabled_tests[test_type]
-        if type_tests_active or type_tests_disabled:
-            tests_by_type[test_type].extend(type_tests_active)
-            tests_by_type[test_type].extend(type_tests_disabled)
+        for subsuite_name, subsuite in test_loader.subsuites.items():
+            type_tests_active = test_loader.tests[subsuite_name][test_type]
+            type_tests_disabled = test_loader.disabled_tests[subsuite_name][test_type]
+            if type_tests_active or type_tests_disabled:
+                tests_by_type[(subsuite_name, test_type)].extend(type_tests_active)
+                tests_by_type[(subsuite_name, test_type)].extend(type_tests_disabled)
 
-    try:
-        test_groups = test_source_cls.tests_by_group(tests_by_type, **test_source_kwargs)
-    except Exception:
-        logger.critical("Loading tests failed")
-        return False
+    tests_by_group = test_source.cls.tests_by_group(tests_by_type, **test_source.kwargs)
 
-    logger.suite_start(tests_by_type,
-                       name='web-platform-test',
-                       run_info=run_info,
-                       extra={"run_by_dir": kwargs["run_by_dir"]})
+    log_suite_start(tests_by_group,
+                    test_loader.base_run_info,
+                    test_loader.subsuites,
+                    kwargs["run_by_dir"])
 
-    test_implementation_by_type = {}
+    test_implementations = {}
+    tests_to_run = defaultdict(list)
 
-    for test_type in kwargs["test_types"]:
-        if test_type not in tests_by_type:
-            continue
+    for test_type in test_loader.test_types:
         executor_cls = product.executor_classes.get(test_type)
         if executor_cls is None:
             logger.warning(f"Unsupported test type {test_type} for product {product.name}")
             continue
-        executor_kwargs = product.get_executor_kwargs(logger,
-                                                      test_type,
-                                                      test_environment,
-                                                      run_info,
-                                                      **kwargs)
         browser_cls = product.get_browser_cls(test_type)
-        browser_kwargs = product.get_browser_kwargs(logger,
-                                                    test_type,
-                                                    run_info,
-                                                    config=test_environment.config,
-                                                    num_test_groups=len(test_groups),
-                                                    **kwargs)
-        test_implementation_by_type[test_type] = TestImplementation(executor_cls,
-                                                                    executor_kwargs,
-                                                                    browser_cls,
-                                                                    browser_kwargs)
 
-    tests_to_run = {}
-    for test_type, test_implementation in test_implementation_by_type.items():
-        executor_cls = test_implementation.executor_cls
+        for subsuite_name, subsuite in test_loader.subsuites.items():
+            if (subsuite_name, test_type) not in tests_by_type:
+                continue
+            run_info = subsuite.run_info
+            executor_kwargs = product.get_executor_kwargs(logger,
+                                                          test_type,
+                                                          test_environment,
+                                                          run_info,
+                                                          subsuite=subsuite,
+                                                          **kwargs)
+            browser_kwargs = product.get_browser_kwargs(logger,
+                                                        test_type,
+                                                        run_info,
+                                                        config=test_environment.config,
+                                                        num_test_groups=len(tests_by_group),
+                                                        subsuite=subsuite,
+                                                        **kwargs)
 
-        for test in test_loader.disabled_tests[test_type]:
-            logger.test_start(test.id)
-            logger.test_end(test.id, status="SKIP")
-            test_status.skipped += 1
+            test_implementations[(subsuite_name, test_type)] = TestImplementation(executor_cls,
+                                                                                  executor_kwargs,
+                                                                                  browser_cls,
+                                                                                  browser_kwargs)
 
-        if test_type == "testharness":
-            tests_to_run[test_type] = []
-            for test in test_loader.tests[test_type]:
-                skip_reason = None
-                if test.testdriver and not executor_cls.supports_testdriver:
-                    skip_reason = "Executor does not support testdriver.js"
-                elif test.jsshell and not executor_cls.supports_jsshell:
-                    skip_reason = "Executor does not support jsshell"
-                if skip_reason:
-                    logger.test_start(test.id)
-                    logger.test_end(test.id, status="SKIP", message=skip_reason)
-                    test_status.skipped += 1
-                else:
-                    tests_to_run[test_type].append(test)
-        else:
-            tests_to_run[test_type] = test_loader.tests[test_type]
+            for test in test_loader.disabled_tests[subsuite_name][test_type]:
+                logger.test_start(test.id, subsuite=subsuite_name)
+                logger.test_end(test.id, status="SKIP", subsuite=subsuite_name)
+                test_status.skipped += 1
 
-    unexpected_tests = set()
-    unexpected_pass_tests = set()
+            if test_type == "testharness":
+                for test in test_loader.tests[subsuite_name][test_type]:
+                    skip_reason = None
+                    if test.testdriver and not executor_cls.supports_testdriver:
+                        skip_reason = "Executor does not support testdriver.js"
+                    elif test.jsshell and not executor_cls.supports_jsshell:
+                        skip_reason = "Executor does not support jsshell"
+                    if skip_reason:
+                        logger.test_start(test.id, subsuite=subsuite_name)
+                        logger.test_end(test.id,
+                                        status="SKIP",
+                                        subsuite=subsuite_name,
+                                        message=skip_reason)
+                        test_status.skipped += 1
+                    else:
+                        tests_to_run[(subsuite_name, test_type)].append(test)
+            else:
+                tests_to_run[(subsuite_name, test_type)] = test_loader.tests[subsuite_name][test_type]
+
+    unexpected_fail_tests = defaultdict(list)
+    unexpected_pass_tests = defaultdict(list)
     recording.pause()
     retry_counts = kwargs["retry_unexpected"]
-    for i in range(retry_counts + 1):
-        if i > 0:
-            if not kwargs["fail_on_unexpected_pass"]:
-                unexpected_fail_tests = unexpected_tests - unexpected_pass_tests
-            else:
-                unexpected_fail_tests = unexpected_tests
-            if len(unexpected_fail_tests) == 0:
+    for retry_index in range(retry_counts + 1):
+        if retry_index > 0:
+            if kwargs["fail_on_unexpected_pass"]:
+                for (subtests, test_type), tests in unexpected_pass_tests.items():
+                    unexpected_fail_tests[(subtests, test_type)].extend(tests)
+            tests_to_run = unexpected_fail_tests
+            if sum(len(tests) for tests in tests_to_run.values()) == 0:
                 break
-            for test_type, tests in tests_to_run.items():
-                tests_to_run[test_type] = [test for test in tests
-                                           if test.id in unexpected_fail_tests]
+            tests_by_group = test_source.cls.tests_by_group(tests_to_run, **kwargs)
 
             logger.suite_end()
-            logger.suite_start(tests_to_run,
-                               name='web-platform-test',
-                               run_info=run_info,
-                               extra={"run_by_dir": kwargs["run_by_dir"]})
+
+            log_suite_start(tests_by_group,
+                            test_loader.base_run_info,
+                            test_loader.subsuites,
+                            kwargs["run_by_dir"])
 
         with ManagerGroup("web-platform-tests",
-                          test_source_cls,
-                          test_source_kwargs,
-                          test_implementation_by_type,
+                          test_source,
+                          test_implementations,
+                          retry_index,
                           kwargs["rerun"],
                           kwargs["pause_after_test"],
                           kwargs["pause_on_unexpected"],
@@ -285,11 +306,12 @@ def run_test_iteration(test_status, test_loader, test_source_kwargs, test_source
                 raise
 
             test_status.total_tests += manager_group.test_count()
-            unexpected_tests = manager_group.unexpected_tests()
+            unexpected_fail_tests = manager_group.unexpected_fail_tests()
             unexpected_pass_tests = manager_group.unexpected_pass_tests()
 
-    test_status.unexpected += len(unexpected_tests)
-    test_status.unexpected_pass += len(unexpected_pass_tests)
+    test_status.unexpected_pass += sum(len(tests) for tests in unexpected_pass_tests.values())
+    test_status.unexpected += sum(len(tests) for tests in unexpected_pass_tests.values())
+    test_status.unexpected += sum(len(tests) for tests in unexpected_fail_tests.values())
     logger.suite_end()
     return True
 
@@ -342,7 +364,7 @@ class TestStatus:
         self.all_skipped = False
 
 
-def run_tests(config, test_paths, product, **kwargs):
+def run_tests(config, product, test_paths, **kwargs):
     """Set up the test environment, load the list of tests to be executed, and
     invoke the remainder of the code to execute tests"""
     mp = mpcontext.get_context()
@@ -356,8 +378,6 @@ def run_tests(config, test_paths, product, **kwargs):
         recording.set(["startup"])
         env.do_delayed_imports(logger, test_paths)
 
-        product = products.Product(config, product)
-
         env_extras = product.get_env_extras(**kwargs)
 
         product.check_args(**kwargs)
@@ -371,20 +391,9 @@ def run_tests(config, test_paths, product, **kwargs):
 
         recording.set(["startup", "load_tests"])
 
-        test_groups = (testloader.TestGroupsFile(logger, kwargs["test_groups_file"])
-                       if kwargs["test_groups_file"] else None)
-
-        (test_source_cls,
-         test_source_kwargs,
-         chunker_kwargs) = testloader.get_test_src(logger=logger,
-                                                   test_groups=test_groups,
-                                                   **kwargs)
-        run_info, test_loader = get_loader(test_paths,
-                                           product.name,
-                                           run_info_extras=product.run_info_extras(**kwargs),
-                                           chunker_kwargs=chunker_kwargs,
-                                           test_groups=test_groups,
-                                           **kwargs)
+        test_source, test_loader = get_loader(test_paths,
+                                              product,
+                                              **kwargs)
 
         test_status = TestStatus()
         repeat = kwargs["repeat"]
@@ -404,8 +413,9 @@ def run_tests(config, test_paths, product, **kwargs):
                                        "host_cert_path": kwargs["host_cert_path"],
                                        "ca_cert_path": kwargs["ca_cert_path"]}}
 
+        # testharness.js is global so we can't set the timeout multiplier in that file by subsuite
         testharness_timeout_multipler = product.get_timeout_multiplier("testharness",
-                                                                       run_info,
+                                                                       test_loader.base_run_info,
                                                                        **kwargs)
 
         mojojs_path = kwargs["mojojs_path"] if kwargs["enable_mojojs"] else None
@@ -462,8 +472,8 @@ def run_tests(config, test_paths, product, **kwargs):
                 elif repeat > 1:
                     logger.info(f"Repetition {test_status.repeated_runs} / {repeat}")
 
-                iter_success = run_test_iteration(test_status, test_loader, test_source_kwargs,
-                                                  test_source_cls, run_info, recording,
+                iter_success = run_test_iteration(test_status, test_loader, test_source,
+                                                  recording,
                                                   test_environment, product, kwargs)
                 # if there were issues with the suite run(tests not loaded, etc.) return
                 if not iter_success:
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/wpttest.py b/tests/wpt/tests/tools/wptrunner/wptrunner/wpttest.py
index 492549d4e7f..ba038a25ae3 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/wpttest.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/wpttest.py
@@ -86,7 +86,7 @@ def get_run_info(metadata_root, product, **kwargs):
 
 
 class RunInfo(Dict[str, Any]):
-    def __init__(self, metadata_root, product, debug,
+    def __init__(self, metadata_root, product_name, debug,
                  browser_version=None,
                  browser_channel=None,
                  verify=None,
@@ -107,7 +107,7 @@ class RunInfo(Dict[str, Any]):
             self["revision"] = rev.decode("utf-8")
 
         self["python_version"] = sys.version_info.major
-        self["product"] = product
+        self["product"] = product_name
         if debug is not None:
             self["debug"] = debug
         elif "debug" not in self:
diff --git a/tests/wpt/tests/tools/wptserve/wptserve/handlers.py b/tests/wpt/tests/tools/wptserve/wptserve/handlers.py
index 00ba06789c8..6d79230a324 100644
--- a/tests/wpt/tests/tools/wptserve/wptserve/handlers.py
+++ b/tests/wpt/tests/tools/wptserve/wptserve/handlers.py
@@ -491,7 +491,7 @@ class StringHandler:
         return rv
 
 
-class StaticHandler(StringHandler):
+class StaticHandler:
     def __init__(self, path, format_args, content_type, **headers):
         """Handler that reads a file from a path and substitutes some fixed data
 
@@ -501,10 +501,26 @@ class StaticHandler(StringHandler):
         :param format_args: Dictionary of values to substitute into the template file
         :param content_type: Content type header to server the response with
         :param headers: List of headers to send with responses"""
+        self._path = path
+        self._format_args = format_args
+        self._content_type = content_type
+        self._headers = headers
+        self._handler = None
 
-        with open(path) as f:
-            data = f.read()
-            if format_args:
-                data = data % format_args
+    def __getnewargs_ex__(self):
+        # Do not pickle `self._handler`, which can be arbitrarily large.
+        args = self._path, self._format_args, self._content_type
+        return args, self._headers
 
-        return super().__init__(data, content_type, **headers)
+    def __call__(self, request, response):
+        # Load the static file contents lazily so that this handler can be
+        # pickled and sent to child processes efficiently. Transporting file
+        # contents across processes can slow `wptserve` startup by several
+        # seconds (crbug.com/1479850).
+        if not self._handler:
+            with open(self._path) as f:
+                data = f.read()
+            if self._format_args:
+                data = data % self._format_args
+            self._handler = StringHandler(data, self._content_type, **self._headers)
+        return self._handler(request, response)
diff --git a/tests/wpt/tests/touch-events/META.yml b/tests/wpt/tests/touch-events/META.yml
index 3dcab9a534b..e9b7a8915e0 100644
--- a/tests/wpt/tests/touch-events/META.yml
+++ b/tests/wpt/tests/touch-events/META.yml
@@ -1,5 +1,4 @@
 spec: https://w3c.github.io/touch-events/
 suggested_reviewers:
   - jtangelder
-  - zqzhang
   - cynthia
diff --git a/tests/wpt/tests/uievents/META.yml b/tests/wpt/tests/uievents/META.yml
index 2f1ec58efec..3c490cdc55f 100644
--- a/tests/wpt/tests/uievents/META.yml
+++ b/tests/wpt/tests/uievents/META.yml
@@ -2,4 +2,3 @@ spec: https://w3c.github.io/uievents/
 suggested_reviewers:
   - jdm
   - NavidZ
-  - zqzhang
diff --git a/tests/wpt/tests/url/failure.html b/tests/wpt/tests/url/failure.html
index 8a408412668..e61f462f974 100644
--- a/tests/wpt/tests/url/failure.html
+++ b/tests/wpt/tests/url/failure.html
@@ -10,6 +10,8 @@ promise_test(() => fetch("resources/urltestdata.json").then(res => res.json()).t
 
 function runTests(testData) {
   for (const test of testData) {
+
+    // skip comments, inputs we expect to pass and relative URLs
     if (typeof test === "string" || !test.failure || test.base !== null) {
       continue;
     }
diff --git a/tests/wpt/tests/url/resources/a-element-origin.js b/tests/wpt/tests/url/resources/a-element-origin.js
index de72988ea93..c1c24c8986b 100644
--- a/tests/wpt/tests/url/resources/a-element-origin.js
+++ b/tests/wpt/tests/url/resources/a-element-origin.js
@@ -21,6 +21,10 @@ function runURLTests(urlTests) {
     if (expected.base === null && expected.input.startsWith("#"))
       continue;
 
+    // HTML special cases data: and javascript: URLs in <base>
+    if (expected.base !== null && (expected.base.startsWith("data:") || expected.base.startsWith("javascript:")))
+      continue;
+
     // We cannot use a null base for HTML tests
     const base = expected.base === null ? "about:blank" : expected.base;
 
diff --git a/tests/wpt/tests/url/resources/a-element.js b/tests/wpt/tests/url/resources/a-element.js
index d87937d002b..cff4160d328 100644
--- a/tests/wpt/tests/url/resources/a-element.js
+++ b/tests/wpt/tests/url/resources/a-element.js
@@ -21,6 +21,10 @@ function runURLTests(urlTests) {
     if (expected.relativeTo === "any-base")
       continue;
 
+    // HTML special cases data: and javascript: URLs in <base>
+    if (expected.base !== null && (expected.base.startsWith("data:") || expected.base.startsWith("javascript:")))
+      continue;
+
     // We cannot use a null base for HTML tests
     const base = expected.base === null ? "about:blank" : expected.base;
 
diff --git a/tests/wpt/tests/url/urlsearchparams-delete.any.js b/tests/wpt/tests/url/urlsearchparams-delete.any.js
index f9c623b90b1..c597142c51d 100644
--- a/tests/wpt/tests/url/urlsearchparams-delete.any.js
+++ b/tests/wpt/tests/url/urlsearchparams-delete.any.js
@@ -70,3 +70,14 @@ test(() => {
   params.delete('a', 'c');
   assert_equals(params.toString(), 'a=b&a=d');
 }, "Two-argument delete()");
+
+test(() => {
+  const params = new URLSearchParams();
+  params.append('a', 'b');
+  params.append('a', 'c');
+  params.append('b', 'c');
+  params.append('b', 'd');
+  params.delete('b', 'c');
+  params.delete('a', undefined);
+  assert_equals(params.toString(), 'b=d');
+}, "Two-argument delete() respects undefined as second arg");
diff --git a/tests/wpt/tests/url/urlsearchparams-has.any.js b/tests/wpt/tests/url/urlsearchparams-has.any.js
index 54cbf286db4..2133a5da2f8 100644
--- a/tests/wpt/tests/url/urlsearchparams-has.any.js
+++ b/tests/wpt/tests/url/urlsearchparams-has.any.js
@@ -35,3 +35,11 @@ test(() => {
   params.delete('a', 'b');
   assert_true(params.has('a', 'd'));
 }, "Two-argument has()");
+
+test(() => {
+  const params = new URLSearchParams("a=b&a=d&c&e&");
+  assert_true(params.has('a', 'b'));
+  assert_false(params.has('a', 'c'));
+  assert_true(params.has('a', 'd'));
+  assert_true(params.has('a', undefined));
+}, "Two-argument has() respects undefined as second arg");
\ No newline at end of file
diff --git a/tests/wpt/tests/wai-aria/role/button-roles.html b/tests/wpt/tests/wai-aria/role/button-roles.html
new file mode 100644
index 00000000000..23d0cd22d61
--- /dev/null
+++ b/tests/wpt/tests/wai-aria/role/button-roles.html
@@ -0,0 +1,32 @@
+<!doctype html>
+<html>
+<head>
+  <title>Button-related Role Verification Tests</title>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <script src="/resources/testdriver.js"></script>
+  <script src="/resources/testdriver-vendor.js"></script>
+  <script src="/resources/testdriver-actions.js"></script>
+  <script src="/wai-aria/scripts/aria-utils.js"></script>
+</head>
+<body>
+
+<p>Tests <a href="https://w3c.github.io/aria/#button">button</a> and related roles.</p>
+
+<div role="button" aria-haspopup="false" data-testname="button aria-haspopup false" data-expectedrole="button" class="ex"></div>
+<div role="button" aria-haspopup="true" data-testname="button aria-haspopup true" data-expectedrole="button" class="ex"></div>
+<div role="button" aria-haspopup="menu" data-testname="button aria-haspopup menu" data-expectedrole="button" class="ex"></div>
+<div role="button" aria-haspopup="dialog" data-testname="button aria-haspopup dialog" data-expectedrole="button" class="ex"></div>
+<div role="button" aria-haspopup="listbox" data-testname="button aria-haspopup listbox" data-expectedrole="button" class="ex"></div>
+<div role="button" aria-haspopup="tree" data-testname="button aria-haspopup tree" data-expectedrole="button" class="ex"></div>
+<div role="button" aria-haspopup="grid" data-testname="button aria-haspopup grid" data-expectedrole="button" class="ex"></div>
+<div role="button" aria-pressed="true" data-testname="button aria-pressed true" data-expectedrole="button" class="ex"></div>
+<div role="button" aria-pressed="false" data-testname="button aria-pressed false" data-expectedrole="button" class="ex"></div>
+<div role="button" aria-pressed="" data-testname="button aria-pressed undefined" data-expectedrole="button" class="ex"></div>
+
+<script>
+AriaUtils.verifyRolesBySelector(".ex");
+</script>
+
+</body>
+</html>
diff --git a/tests/wpt/tests/wai-aria/role/menu-roles.html b/tests/wpt/tests/wai-aria/role/menu-roles.html
new file mode 100644
index 00000000000..224cf335a05
--- /dev/null
+++ b/tests/wpt/tests/wai-aria/role/menu-roles.html
@@ -0,0 +1,73 @@
+<!doctype html>
+<html>
+<head>
+    <title>Menu-related Role Verification Tests</title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/resources/testdriver.js"></script>
+    <script src="/resources/testdriver-vendor.js"></script>
+    <script src="/resources/testdriver-actions.js"></script>
+    <script src="/wai-aria/scripts/aria-utils.js"></script>
+</head>
+<style>
+    /* Typically horizontal */
+    [role="menubar"] {
+        display: flex;
+    }
+</style>
+<body>
+
+<p>Tests <a href="https://w3c.github.io/aria/#menu">menu</a> and related roles.</p>
+
+<div role="menu" data-testname="role is menu" data-expectedrole="menu" class="ex">
+    <div role="menuitem" data-testname="role is menuitem (in menu)" data-expectedrole="menuitem" class="ex">x</div>
+    <div role="menuitem">x</div>
+    <div role="menuitem">x</div>
+    <div role="group" data-testname="role is group (in menu)" data-expectedrole="group" class="ex">
+        <div role="menuitem" data-testname="role is menuitem (in group, in menu)" data-expectedrole="menuitem" class="ex">x</div>
+        <div role="menuitem">x</div>
+    </div>
+    <div role="group">
+        <div role="menuitemradio" aria-checked="true" data-testname="role is menuitemradio (in group, in menu)" data-expectedrole="menuitemradio" class="ex">x</div>
+        <div role="menuitemradio">x</div>
+    </div>
+    <div role="group">
+        <div role="menuitemcheckbox" aria-checked="true" data-testname="role is menuitemcheckbox (in group, in menu)" data-expectedrole="menuitemcheckbox" class="ex">x</div>
+        <div role="menuitemcheckbox">x</div>
+    </div>
+</div>
+
+<div role="menubar" data-testname="role is menubar" data-expectedrole="menubar" class="ex">
+    <div role="menuitem" data-testname="role is menuitem (in menubar)" data-expectedrole="menuitem" class="ex">x</div>
+    <div role="menuitem">x</div>
+    <div role="menuitem">x</div>
+    <div role="group" data-testname="role is group (in menubar)" data-expectedrole="group" class="ex">
+        <div role="menuitem" data-testname="role is menuitem (in group, in menubar)" data-expectedrole="menuitem" class="ex">x</div>
+        <div role="menuitem">x</div>
+    </div>
+    <div role="group">
+        <div role="menuitemradio" aria-checked="true" data-testname="role is menuitemradio (in group, in menubar)" data-expectedrole="menuitemradio" class="ex">x</div>
+        <div role="menuitemradio">x</div>
+    </div>
+    <div role="group">
+        <div role="menuitemcheckbox" aria-checked="true" data-testname="role is menuitemcheckbox (in group, in menubar)" data-expectedrole="menuitemcheckbox" class="ex">x</div>
+        <div role="menuitemcheckbox">x</div>
+    </div>
+</div>
+
+<nav role="menuitem" data-testname="orphaned menuitem outside the context of menu/menubar" data-expectedrole="navigation"
+     class="ex">x
+</nav>
+<nav role="menuitemradio" data-testname="orphaned menuitemradio outside the context of menu/menubar" data-expectedrole="navigation"
+     class="ex">x
+</nav>
+<nav role="menuitemcheckbox" data-testname="orphaned menuitemcheckbox outside the context of menu/menubar" data-expectedrole="navigation"
+     class="ex">x
+</nav>
+
+<script>
+    AriaUtils.verifyRolesBySelector(".ex");
+</script>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/tests/wai-aria/role/tab-roles.html b/tests/wpt/tests/wai-aria/role/tab-roles.html
new file mode 100644
index 00000000000..f84504e0b45
--- /dev/null
+++ b/tests/wpt/tests/wai-aria/role/tab-roles.html
@@ -0,0 +1,90 @@
+<!doctype html>
+<html>
+<head>
+    <title>Tab-related Role Verification Tests</title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/resources/testdriver.js"></script>
+    <script src="/resources/testdriver-vendor.js"></script>
+    <script src="/resources/testdriver-actions.js"></script>
+    <script src="/wai-aria/scripts/aria-utils.js"></script>
+</head>
+<body>
+
+<p>Tests <a href="https://w3c.github.io/aria/#tab">tab</a> and related roles.</p>
+
+<!--<div> tab with tablist/tab/tabpanel semantics-->
+<div role="tablist" data-testname="div role is tablist" data-expectedrole="tablist" class="ex">
+    <div role="tab" data-testname="role is tab (in div tablist)" data-expectedrole="tab" class="ex">x</div>
+</div>
+<div role="tabpanel" data-testname="role is tabpanel (with sibling div tablist)" data-expectedrole="tabpanel" class="ex"></div>
+
+<!--<div> tabs with tablist/tab/tabpanel semantics, selection, no focus management-->
+<div role="tablist" data-testname="div role is tablist (with selection)" data-expectedrole="tablist" class="ex">
+    <div role="tab" aria-selected="true" data-testname="role is tab and tab is selected" data-expectedrole="tab" class="ex">x</div>
+    <div role="tab" aria-selected="false" data-testname="role is tab and tab is not selected" data-expectedrole="tab" class="ex">y</div>
+</div>
+<div role="tabpanel" data-testname="role is tabpanel (faux selected)" data-expectedrole="tabpanel" class="ex"></div>
+<div role="tabpanel" data-testname="role is tabpanel (faux unselected)" data-expectedrole="tabpanel" class="ex"></div>
+
+<!--<div> tabs with tablist/tab/tabpanel semantics, selection, roving tabindex-->
+<div role="tablist" data-testname="div role is tablist (with selection, roving tabindex)" data-expectedrole="tablist" class="ex">
+    <div role="tab" aria-selected="true" tabindex = "0" data-testname="role is tab, tab is selected and in tab order" data-expectedrole="tab" class="ex">x</div>
+    <div role="tab" aria-selected="false" tabindex = "-1" data-testname="role is tab and tab is not selected, not tabbable" data-expectedrole="tab" class="ex">y</div>
+    <div role="tab" aria-selected="false" tabindex = "-1" data-testname="role is tab and tab is not selected, not tabbable (duplicate)" data-expectedrole="tab" class="ex">z</div>
+</div>
+<div role="tabpanel" data-testname="role is tabpanel with selection, roving tabindex" data-expectedrole="tabpanel" class="ex"></div>
+<div role="tabpanel" data-testname="role is tabpanel with selection, roving tabindex (duplicate)" data-expectedrole="tabpanel" class="ex"></div>
+<div role="tabpanel" data-testname="role is tabpanel with selection, roving tabindex (duplicate 2)" data-expectedrole="tabpanel" class="ex"></div>
+
+<!--<div> tabs with tablist/tab/tabpanel semantics and non-empty tabpanel-->
+<div role="tablist" data-testname="div role is tablist (with non-empty tabpanel)" data-expectedrole="tablist" class="ex">
+    <div role="tab" aria-selected="true" data-testname="role is tab and tab is selected (with non-empty tabpanel content)" data-expectedrole="tab" class="ex">x</div>
+    <div role="tab" aria-selected="false" data-testname="role is tab and tab is not selected (with non-empty tabpanel content)" data-expectedrole="tab" class="ex">y</div>
+</div>
+<div role="tabpanel" data-testname="role is tabpanel with selection, non-empty content" data-expectedrole="tabpanel" class="ex">Tab one's stuff</div>
+<div role="tabpanel" data-testname="role is tabpanel with selection, non-empty content (duplicate)" data-expectedrole="tabpanel" class="ex">Tab two's stuff</div>
+
+<!--<div> tabs with tablist/tab/tabpanel semantics, non-empty tabpanel and aria-controls-->
+<div role="tablist" data-testname="div role is tablist (with non-empty tabpanel and aria-controls)" data-expectedrole="tablist" class="ex">
+    <div role="tab" aria-controls = "tabpanel1" aria-selected="true" data-testname="role is tab, tab is selected (with aria-controls)" data-expectedrole="tab" class="ex">x</div>
+    <div role="tab" aria-controls = "tabpanel2" aria-selected="false" data-testname="role is tab, tab is not selected (with aria-controls)" data-expectedrole="tab" class="ex">y</div>
+</div>
+<div role="tabpanel" id="tabpanel1" data-testname="role is tabpanel with aria-controls and non-empty content" data-expectedrole="tabpanel" class="ex">Tab one's stuff</div>
+<div role="tabpanel" id="tabpanel2" data-testname="role is tabpanel with aria-controls and non-empty content (duplicate)" data-expectedrole="tabpanel" class="ex">Tab one's stuff</div>
+
+<!--<div> tablist with child <button> that has explicit role="tab"-->
+<div role="tablist" data-testname="div role for button parent container is tablist" data-expectedrole="tablist" class="ex">
+    <button role="tab" data-testname="button role is tab (in div tablist)" data-expectedrole="tab" class="ex">x</div>
+</div>
+
+<!--<ul> tablist with child <divs> that have explicit role="tab"-->
+<ul role="tablist" data-testname="ul role is tablist" data-expectedrole="tablist" class="ex">
+    <li>
+        <div role="tab" aria-selected="true" tabindex = "0" data-testname="role is tab (within li), tab is selected and in tab order" data-expectedrole="tab" class="ex">x</div>
+    </li>
+    <li>
+        <div role="tab" aria-selected="false" tabindex = "-1" data-testname="role is tab (within li), tab is not selected and in tab order" data-expectedrole="tab" class="ex">y</div>
+    </li>
+</ul>
+<div role="tabpanel" data-testname="role is tabpanel as sibling to ul" data-expectedrole="tabpanel" class="ex">Tab one's stuff</div>
+<div role="tabpanel" data-testname="role is tabpanel as sibling to ul (duplicate)" data-expectedrole="tabpanel" class="ex">Tab two's stuff</div>
+
+<!--<ul> tablist with child <divs> that have explicit role="tab", role="none" on li elements-->
+    <ul role="tablist" data-testname="ul role is tablist (child li have role none)" data-expectedrole="tablist" class="ex">
+        <li role="none">
+            <div role="tab" aria-selected="true" tabindex = "0" data-testname="role is tab (within li with role none), tab is selected and in tab order" data-expectedrole="tab" class="ex">x</div>
+        </li>
+        <li role="none">
+            <div role="tab" aria-selected="false" tabindex = "-1" data-testname="role is tab (within li with role none), tab is not selected and in tab order" data-expectedrole="tab" class="ex">y</div>
+        </li>
+    </ul>
+    <div role="tabpanel" data-testname="role is tabpanel as sibling to ul with child role none li elements" data-expectedrole="tabpanel" class="ex">Tab one's stuff</div>
+    <div role="tabpanel" data-testname="role is tabpanel as sibling to ul with child role none li elements (duplicate)" data-expectedrole="tabpanel" class="ex">Tab two's stuff</div>
+
+<script>
+    AriaUtils.verifyRolesBySelector(".ex");
+</script>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/tests/wai-aria/role/tree-roles.html b/tests/wpt/tests/wai-aria/role/tree-roles.html
new file mode 100644
index 00000000000..9613312e9bd
--- /dev/null
+++ b/tests/wpt/tests/wai-aria/role/tree-roles.html
@@ -0,0 +1,149 @@
+<!doctype html>
+<html>
+<head>
+  <title>Tree related Role Verification Tests</title>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <script src="/resources/testdriver.js"></script>
+  <script src="/resources/testdriver-vendor.js"></script>
+  <script src="/resources/testdriver-actions.js"></script>
+  <script src="/wai-aria/scripts/aria-utils.js"></script>
+</head>
+<style>
+  /* Hide collapsed rows */
+  [role="treegrid"] tr.hidden {
+    display: none;
+  }
+
+  /* Indents */
+  [role="treegrid"] tr[aria-level="2"] > td:first-child {
+    padding-left: 2ch;
+  }
+
+  [role="treegrid"] tr[aria-level="3"] > td:first-child {
+    padding-left: 4ch;
+  }
+
+  /* Collapse/expand icons */
+  [role="treegrid"] tr > td:first-child::before {
+    content: "";
+    display: inline-block;
+    width: 2ch;
+    height: 11px;
+    transition: transform 0.3s;
+    transform-origin: 5px 5px;
+  }
+
+  [role="treegrid"] tr[aria-expanded] > td:first-child::before,
+  [role="treegrid"] td[aria-expanded]:first-child::before {
+    cursor: pointer;
+
+    background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='12' height='12'%3E%3Cpolygon fill='black' points='2,0 2,10 10,5'%3E%3C/polygon%3E%3C/svg%3E%0A");
+    background-repeat: no-repeat;
+  }
+
+  [role="treegrid"] tr[aria-expanded="true"] > td:first-child::before,
+  [role="treegrid"] td[aria-expanded="true"]:first-child::before {
+    transform: rotate(90deg);
+  }
+</style>
+<body>
+
+<p>Tests <a href="https://w3c.github.io/aria/#tree">tree</a> and related roles.</p>
+
+<ul role="tree" data-testname="role is tree" data-expectedrole="tree" class="ex">
+  <li role="treeitem" data-testname="role is treeitem (in tree)" data-expectedrole="treeitem" class="ex">
+    x
+    <ul role="group" data-testname="role is group (in treeitem)" data-expectedrole="group" class="ex">
+      <li role="treeitem" data-testname="role is treeitem (in group, in treeitem)" data-expectedrole="treeitem" class="ex">x</li>
+      <li role="treeitem">x</li>
+    </ul>
+  </li>
+  <li role="treeitem">x</li>
+</ul>
+
+<table role="treegrid" data-testname="role is treegrid" data-expectedrole="treegrid" class="ex">
+  <tbody>
+    <tr role="row" aria-expanded="true" aria-level="1" aria-posinset="1" aria-setsize="2" data-testname="role is row (in treegrid)" data-expectedrole="row" class="ex expander">
+      <td role="gridcell" data-testname="role is gridcell (in row, in treegrid)" data-expectedrole="gridcell" class="ex">x</td>
+      <td role="gridcell">x</td>
+      <td role="gridcell">x</td>
+    </tr>
+    <tr role="row" aria-level="2" aria-posinset="1" aria-setsize="2">
+      <td role="gridcell">x</td>
+      <td role="gridcell">x</td>
+      <td role="gridcell">x</td>
+    </tr>
+    <tr aria-expanded="false" aria-level="2" aria-posinset="2" aria-setsize="2" role="row" class="expander">
+      <td role="gridcell">x</td>
+      <td role="gridcell">x</td>
+      <td role="gridcell">x</td>
+    </tr>
+    <tr role="row" aria-level="3" aria-posinset="1" aria-setsize="1" class="hidden">
+      <td role="gridcell">x</td>
+      <td role="gridcell">x</td>
+      <td role="gridcell">x</td>
+    </tr>
+    <tr role="row" aria-expanded="false" aria-level="1" aria-posinset="2" aria-setsize="2" class="expander">
+      <td role="gridcell">x</td>
+      <td role="gridcell">x</td>
+      <td role="gridcell">x</td>
+    </tr>
+    <tr role="row" aria-level="2" aria-posinset="1" aria-setsize="2" class="hidden">
+      <td role="gridcell">x</td>
+      <td role="gridcell">x</td>
+      <td role="gridcell">x</td>
+    </tr>
+    <tr role="row" aria-level="2" aria-posinset="1" aria-setsize="2" class="hidden">
+      <td role="gridcell">x</td>
+      <td role="gridcell">x</td>
+      <td role="gridcell">x</td>
+    </tr>
+  </tbody>
+</table>
+
+<nav role="treeitem" data-testname="orphaned treeitem outside the context of tree" data-expectedrole="navigation" class="ex">x</nav>
+
+<script>
+  AriaUtils.verifyRolesBySelector(".ex");
+
+  const expanders = document.querySelectorAll(".expander");
+  expanders.forEach((expander) => {
+    expander.addEventListener("click", () => {
+
+      const expanderLevel = parseInt(expander.getAttribute("aria-level"))
+      let nextSibling = expander.nextElementSibling;
+
+      // Toggle aria-expanded for the row being expanded
+      let isExpanding = expander.getAttribute("aria-expanded") !== "true";
+      expander.setAttribute("aria-expanded", isExpanding.toString());
+
+      while (nextSibling) {
+        const nextSiblingLevel = parseInt(nextSibling.getAttribute("aria-level"));
+
+        // Don't expand rows found on the same level
+        if (nextSiblingLevel === expanderLevel) nextSibling = null;
+
+        if (isExpanding) {
+          // Don't expand rows beyond the next level if an ".expander" row is found as the nextSibling
+          if (nextSiblingLevel - expanderLevel === 1) {
+            nextSibling.classList.remove("hidden");
+            // Don't expand sub rows found
+            if (nextSibling.hasAttribute("aria-expanded")) nextSibling.setAttribute("aria-expanded", "false");
+          }
+        } else {
+          // Only expand rows that are more "indented" than the ".expander" row. A higher aria-level indicates a
+          // higher "level"
+          if (nextSiblingLevel > expanderLevel) {
+            nextSibling.classList.add("hidden");
+          }
+        }
+
+        nextSibling = nextSibling.nextElementSibling;
+      }
+    });
+  });
+</script>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/tests/wasm/jsapi/assertions.js b/tests/wpt/tests/wasm/jsapi/assertions.js
index 162f5a9a6b8..3b370190682 100644
--- a/tests/wpt/tests/wasm/jsapi/assertions.js
+++ b/tests/wpt/tests/wasm/jsapi/assertions.js
@@ -6,6 +6,7 @@ function assert_function_name(fn, name, description) {
   assert_true(propdesc.configurable, "configurable", `${description} name should be configurable`);
   assert_equals(propdesc.value, name, `${description} name should be ${name}`);
 }
+globalThis.assert_function_name = assert_function_name;
 
 function assert_function_length(fn, length, description) {
   const propdesc = Object.getOwnPropertyDescriptor(fn, "length");
@@ -15,6 +16,7 @@ function assert_function_length(fn, length, description) {
   assert_true(propdesc.configurable, "configurable", `${description} length should be configurable`);
   assert_equals(propdesc.value, length, `${description} length should be ${length}`);
 }
+globalThis.assert_function_length = assert_function_length;
 
 function assert_exported_function(fn, { name, length }, description) {
   if (WebAssembly.Function === undefined) {
@@ -28,6 +30,7 @@ function assert_exported_function(fn, { name, length }, description) {
   assert_function_name(fn, name, description);
   assert_function_length(fn, length, description);
 }
+globalThis.assert_exported_function = assert_exported_function;
 
 function assert_Instance(instance, expected_exports) {
   assert_equals(Object.getPrototypeOf(instance), WebAssembly.Instance.prototype,
@@ -77,6 +80,7 @@ function assert_Instance(instance, expected_exports) {
     }
   }
 }
+globalThis.assert_Instance = assert_Instance;
 
 function assert_WebAssemblyInstantiatedSource(actual, expected_exports={}) {
   assert_equals(Object.getPrototypeOf(actual), Object.prototype,
@@ -98,3 +102,4 @@ function assert_WebAssemblyInstantiatedSource(actual, expected_exports={}) {
   assert_true(instance.configurable, "instance: configurable");
   assert_Instance(instance.value, expected_exports);
 }
+globalThis.assert_WebAssemblyInstantiatedSource = assert_WebAssemblyInstantiatedSource;
diff --git a/tests/wpt/tests/wasm/jsapi/bad-imports.js b/tests/wpt/tests/wasm/jsapi/bad-imports.js
index 786fc650e32..c7c9c6b6cdd 100644
--- a/tests/wpt/tests/wasm/jsapi/bad-imports.js
+++ b/tests/wpt/tests/wasm/jsapi/bad-imports.js
@@ -183,3 +183,4 @@ function test_bad_imports(t) {
       });
   }
 }
+globalThis.test_bad_imports = test_bad_imports;
diff --git a/tests/wpt/tests/wasm/jsapi/constructor/compile.any.js b/tests/wpt/tests/wasm/jsapi/constructor/compile.any.js
index e94ce117173..f822aa30e69 100644
--- a/tests/wpt/tests/wasm/jsapi/constructor/compile.any.js
+++ b/tests/wpt/tests/wasm/jsapi/constructor/compile.any.js
@@ -1,4 +1,4 @@
-// META: global=window,dedicatedworker,jsshell
+// META: global=window,dedicatedworker,jsshell,shadowrealm
 // META: script=/wasm/jsapi/wasm-module-builder.js
 
 function assert_Module(module) {
diff --git a/tests/wpt/tests/wasm/jsapi/constructor/instantiate-bad-imports.any.js b/tests/wpt/tests/wasm/jsapi/constructor/instantiate-bad-imports.any.js
index 30252bd6eeb..e4926c8d70a 100644
--- a/tests/wpt/tests/wasm/jsapi/constructor/instantiate-bad-imports.any.js
+++ b/tests/wpt/tests/wasm/jsapi/constructor/instantiate-bad-imports.any.js
@@ -1,4 +1,4 @@
-// META: global=window,dedicatedworker,jsshell
+// META: global=window,dedicatedworker,jsshell,shadowrealm
 // META: script=/wasm/jsapi/wasm-module-builder.js
 // META: script=/wasm/jsapi/bad-imports.js
 
diff --git a/tests/wpt/tests/wasm/jsapi/constructor/instantiate.any.js b/tests/wpt/tests/wasm/jsapi/constructor/instantiate.any.js
index 8152f3a56f3..34e005c4700 100644
--- a/tests/wpt/tests/wasm/jsapi/constructor/instantiate.any.js
+++ b/tests/wpt/tests/wasm/jsapi/constructor/instantiate.any.js
@@ -1,4 +1,4 @@
-// META: global=window,dedicatedworker,jsshell
+// META: global=window,dedicatedworker,jsshell,shadowrealm
 // META: script=/wasm/jsapi/wasm-module-builder.js
 // META: script=/wasm/jsapi/assertions.js
 // META: script=/wasm/jsapi/instanceTestFactory.js
diff --git a/tests/wpt/tests/wasm/jsapi/constructor/multi-value.any.js b/tests/wpt/tests/wasm/jsapi/constructor/multi-value.any.js
index 4b06d1da3c4..8786f9b953b 100644
--- a/tests/wpt/tests/wasm/jsapi/constructor/multi-value.any.js
+++ b/tests/wpt/tests/wasm/jsapi/constructor/multi-value.any.js
@@ -1,4 +1,4 @@
-// META: global=window,dedicatedworker,jsshell
+// META: global=window,dedicatedworker,jsshell,shadowrealm
 // META: script=/wasm/jsapi/wasm-module-builder.js
 // META: script=/wasm/jsapi/assertions.js
 
diff --git a/tests/wpt/tests/wasm/jsapi/constructor/toStringTag.any.js b/tests/wpt/tests/wasm/jsapi/constructor/toStringTag.any.js
index c6d2cdaf662..5fae8304f8c 100644
--- a/tests/wpt/tests/wasm/jsapi/constructor/toStringTag.any.js
+++ b/tests/wpt/tests/wasm/jsapi/constructor/toStringTag.any.js
@@ -1,4 +1,4 @@
-// META: global=window,dedicatedworker,jsshell
+// META: global=window,dedicatedworker,jsshell,shadowrealm
 
 "use strict";
 // https://webidl.spec.whatwg.org/#es-namespaces
diff --git a/tests/wpt/tests/wasm/jsapi/constructor/validate.any.js b/tests/wpt/tests/wasm/jsapi/constructor/validate.any.js
index 8b4f4582ab2..fce43d1e175 100644
--- a/tests/wpt/tests/wasm/jsapi/constructor/validate.any.js
+++ b/tests/wpt/tests/wasm/jsapi/constructor/validate.any.js
@@ -1,4 +1,4 @@
-// META: global=window,dedicatedworker,jsshell
+// META: global=window,dedicatedworker,jsshell,shadowrealm
 // META: script=/wasm/jsapi/wasm-module-builder.js
 
 let emptyModuleBinary;
diff --git a/tests/wpt/tests/wasm/jsapi/exception/basic.tentative.any.js b/tests/wpt/tests/wasm/jsapi/exception/basic.tentative.any.js
index acf644f904f..869c64b6d30 100644
--- a/tests/wpt/tests/wasm/jsapi/exception/basic.tentative.any.js
+++ b/tests/wpt/tests/wasm/jsapi/exception/basic.tentative.any.js
@@ -1,4 +1,4 @@
-// META: global=window,worker,jsshell
+// META: global=window,worker,jsshell,shadowrealm
 // META: script=/wasm/jsapi/wasm-module-builder.js
 
 function assert_throws_wasm(fn, message) {
diff --git a/tests/wpt/tests/wasm/jsapi/exception/constructor.tentative.any.js b/tests/wpt/tests/wasm/jsapi/exception/constructor.tentative.any.js
index 7ad08e1883b..a46d1816c35 100644
--- a/tests/wpt/tests/wasm/jsapi/exception/constructor.tentative.any.js
+++ b/tests/wpt/tests/wasm/jsapi/exception/constructor.tentative.any.js
@@ -1,4 +1,4 @@
-// META: global=window,dedicatedworker,jsshell
+// META: global=window,dedicatedworker,jsshell,shadowrealm
 // META: script=/wasm/jsapi/assertions.js
 
 test(() => {
diff --git a/tests/wpt/tests/wasm/jsapi/exception/getArg.tentative.any.js b/tests/wpt/tests/wasm/jsapi/exception/getArg.tentative.any.js
index f0a568a857f..87719c7ebdf 100644
--- a/tests/wpt/tests/wasm/jsapi/exception/getArg.tentative.any.js
+++ b/tests/wpt/tests/wasm/jsapi/exception/getArg.tentative.any.js
@@ -1,4 +1,4 @@
-// META: global=window,dedicatedworker,jsshell
+// META: global=window,dedicatedworker,jsshell,shadowrealm
 // META: script=/wasm/jsapi/memory/assertions.js
 
 test(() => {
diff --git a/tests/wpt/tests/wasm/jsapi/exception/identity.tentative.any.js b/tests/wpt/tests/wasm/jsapi/exception/identity.tentative.any.js
index 65787c107e3..2675668ec73 100644
--- a/tests/wpt/tests/wasm/jsapi/exception/identity.tentative.any.js
+++ b/tests/wpt/tests/wasm/jsapi/exception/identity.tentative.any.js
@@ -1,4 +1,4 @@
-// META: global=window,dedicatedworker,jsshell
+// META: global=window,dedicatedworker,jsshell,shadowrealm
 // META: script=/wasm/jsapi/assertions.js
 // META: script=/wasm/jsapi/wasm-module-builder.js
 
diff --git a/tests/wpt/tests/wasm/jsapi/exception/is.tentative.any.js b/tests/wpt/tests/wasm/jsapi/exception/is.tentative.any.js
index e28a88a3c5f..840d00bf0d4 100644
--- a/tests/wpt/tests/wasm/jsapi/exception/is.tentative.any.js
+++ b/tests/wpt/tests/wasm/jsapi/exception/is.tentative.any.js
@@ -1,4 +1,4 @@
-// META: global=window,dedicatedworker,jsshell
+// META: global=window,dedicatedworker,jsshell,shadowrealm
 // META: script=/wasm/jsapi/memory/assertions.js
 
 test(() => {
diff --git a/tests/wpt/tests/wasm/jsapi/exception/toString.tentative.any.js b/tests/wpt/tests/wasm/jsapi/exception/toString.tentative.any.js
index 00e801a6fc1..6885cf0deb6 100644
--- a/tests/wpt/tests/wasm/jsapi/exception/toString.tentative.any.js
+++ b/tests/wpt/tests/wasm/jsapi/exception/toString.tentative.any.js
@@ -1,4 +1,4 @@
-// META: global=window,dedicatedworker,jsshell
+// META: global=window,dedicatedworker,jsshell,shadowrealm
 
 test(() => {
   const argument = { parameters: [] };
diff --git a/tests/wpt/tests/wasm/jsapi/function/call.tentative.any.js b/tests/wpt/tests/wasm/jsapi/function/call.tentative.any.js
index 626cd13c9f0..2e63d5fa103 100644
--- a/tests/wpt/tests/wasm/jsapi/function/call.tentative.any.js
+++ b/tests/wpt/tests/wasm/jsapi/function/call.tentative.any.js
@@ -1,4 +1,4 @@
-// META: global=window,dedicatedworker,jsshell
+// META: global=window,dedicatedworker,jsshell,shadowrealm
 // META: script=/wasm/jsapi/assertions.js
 
 function addxy(x, y) {
diff --git a/tests/wpt/tests/wasm/jsapi/function/constructor.tentative.any.js b/tests/wpt/tests/wasm/jsapi/function/constructor.tentative.any.js
index 636aeca4dc1..fc92fcfaf0c 100644
--- a/tests/wpt/tests/wasm/jsapi/function/constructor.tentative.any.js
+++ b/tests/wpt/tests/wasm/jsapi/function/constructor.tentative.any.js
@@ -1,4 +1,4 @@
-// META: global=window,dedicatedworker,jsshell
+// META: global=window,dedicatedworker,jsshell,shadowrealm
 // META: script=/wasm/jsapi/assertions.js
 
 function addxy(x, y) {
diff --git a/tests/wpt/tests/wasm/jsapi/function/table.tentative.any.js b/tests/wpt/tests/wasm/jsapi/function/table.tentative.any.js
index d7d0d86e3b6..f0dd6ea6f85 100644
--- a/tests/wpt/tests/wasm/jsapi/function/table.tentative.any.js
+++ b/tests/wpt/tests/wasm/jsapi/function/table.tentative.any.js
@@ -1,4 +1,4 @@
-// META: global=window,dedicatedworker,jsshell
+// META: global=window,dedicatedworker,jsshell,shadowrealm
 // META: script=/wasm/jsapi/assertions.js
 
 function testfunc(n) {}
diff --git a/tests/wpt/tests/wasm/jsapi/function/type.tentative.any.js b/tests/wpt/tests/wasm/jsapi/function/type.tentative.any.js
index e01a23a9e43..72a7f1bfbe5 100644
--- a/tests/wpt/tests/wasm/jsapi/function/type.tentative.any.js
+++ b/tests/wpt/tests/wasm/jsapi/function/type.tentative.any.js
@@ -1,4 +1,4 @@
-// META: global=window,dedicatedworker,jsshell
+// META: global=window,dedicatedworker,jsshell,shadowrealm
 // META: script=/wasm/jsapi/assertions.js
 
 function addNumbers(x, y, z) {
diff --git a/tests/wpt/tests/wasm/jsapi/global/constructor.any.js b/tests/wpt/tests/wasm/jsapi/global/constructor.any.js
index dade7b1f55a..f83f77a5c3e 100644
--- a/tests/wpt/tests/wasm/jsapi/global/constructor.any.js
+++ b/tests/wpt/tests/wasm/jsapi/global/constructor.any.js
@@ -1,4 +1,4 @@
-// META: global=window,dedicatedworker,jsshell
+// META: global=window,dedicatedworker,jsshell,shadowrealm
 // META: script=/wasm/jsapi/assertions.js
 
 function assert_Global(actual, expected) {
diff --git a/tests/wpt/tests/wasm/jsapi/global/toString.any.js b/tests/wpt/tests/wasm/jsapi/global/toString.any.js
index 359c4273b5b..b308498982e 100644
--- a/tests/wpt/tests/wasm/jsapi/global/toString.any.js
+++ b/tests/wpt/tests/wasm/jsapi/global/toString.any.js
@@ -1,4 +1,4 @@
-// META: global=window,dedicatedworker,jsshell
+// META: global=window,dedicatedworker,jsshell,shadowrealm
 
 test(() => {
   const argument = { "value": "i32" };
diff --git a/tests/wpt/tests/wasm/jsapi/global/type.tentative.any.js b/tests/wpt/tests/wasm/jsapi/global/type.tentative.any.js
index 95adc2af0f6..78d612529dd 100644
--- a/tests/wpt/tests/wasm/jsapi/global/type.tentative.any.js
+++ b/tests/wpt/tests/wasm/jsapi/global/type.tentative.any.js
@@ -1,4 +1,4 @@
-// META: global=window,dedicatedworker,jsshell
+// META: global=window,dedicatedworker,jsshell,shadowrealm
 // META: script=/wasm/jsapi/assertions.js
 
 function assert_type(argument) {
diff --git a/tests/wpt/tests/wasm/jsapi/global/value-get-set.any.js b/tests/wpt/tests/wasm/jsapi/global/value-get-set.any.js
index f95b7ca9e3f..bee5581f418 100644
--- a/tests/wpt/tests/wasm/jsapi/global/value-get-set.any.js
+++ b/tests/wpt/tests/wasm/jsapi/global/value-get-set.any.js
@@ -1,4 +1,4 @@
-// META: global=window,dedicatedworker,jsshell
+// META: global=window,dedicatedworker,jsshell,shadowrealm
 
 test(() => {
   const thisValues = [
diff --git a/tests/wpt/tests/wasm/jsapi/global/valueOf.any.js b/tests/wpt/tests/wasm/jsapi/global/valueOf.any.js
index 0695a5a61fb..5bcb1718258 100644
--- a/tests/wpt/tests/wasm/jsapi/global/valueOf.any.js
+++ b/tests/wpt/tests/wasm/jsapi/global/valueOf.any.js
@@ -1,4 +1,4 @@
-// META: global=window,dedicatedworker,jsshell
+// META: global=window,dedicatedworker,jsshell,shadowrealm
 
 test(() => {
   const argument = { "value": "i32" };
diff --git a/tests/wpt/tests/wasm/jsapi/instance/constructor-bad-imports.any.js b/tests/wpt/tests/wasm/jsapi/instance/constructor-bad-imports.any.js
index e4a5abb8eb2..1ef4f8423de 100644
--- a/tests/wpt/tests/wasm/jsapi/instance/constructor-bad-imports.any.js
+++ b/tests/wpt/tests/wasm/jsapi/instance/constructor-bad-imports.any.js
@@ -1,4 +1,4 @@
-// META: global=window,dedicatedworker,jsshell
+// META: global=window,dedicatedworker,jsshell,shadowrealm
 // META: script=/wasm/jsapi/wasm-module-builder.js
 // META: script=/wasm/jsapi/bad-imports.js
 
diff --git a/tests/wpt/tests/wasm/jsapi/instance/constructor-caching.any.js b/tests/wpt/tests/wasm/jsapi/instance/constructor-caching.any.js
index 1aa4739b629..f969364d93f 100644
--- a/tests/wpt/tests/wasm/jsapi/instance/constructor-caching.any.js
+++ b/tests/wpt/tests/wasm/jsapi/instance/constructor-caching.any.js
@@ -1,4 +1,4 @@
-// META: global=window,dedicatedworker,jsshell
+// META: global=window,dedicatedworker,jsshell,shadowrealm
 // META: script=/wasm/jsapi/wasm-module-builder.js
 
 function getExports() {
diff --git a/tests/wpt/tests/wasm/jsapi/instance/constructor.any.js b/tests/wpt/tests/wasm/jsapi/instance/constructor.any.js
index 26390ebd2cd..24bf97356c8 100644
--- a/tests/wpt/tests/wasm/jsapi/instance/constructor.any.js
+++ b/tests/wpt/tests/wasm/jsapi/instance/constructor.any.js
@@ -1,4 +1,4 @@
-// META: global=window,dedicatedworker,jsshell
+// META: global=window,dedicatedworker,jsshell,shadowrealm
 // META: script=/wasm/jsapi/wasm-module-builder.js
 // META: script=/wasm/jsapi/assertions.js
 // META: script=/wasm/jsapi/instanceTestFactory.js
diff --git a/tests/wpt/tests/wasm/jsapi/instance/exports.any.js b/tests/wpt/tests/wasm/jsapi/instance/exports.any.js
index 6dcfbcee950..f7244923d83 100644
--- a/tests/wpt/tests/wasm/jsapi/instance/exports.any.js
+++ b/tests/wpt/tests/wasm/jsapi/instance/exports.any.js
@@ -1,4 +1,4 @@
-// META: global=window,dedicatedworker,jsshell
+// META: global=window,dedicatedworker,jsshell,shadowrealm
 // META: script=/wasm/jsapi/wasm-module-builder.js
 
 let emptyModuleBinary;
diff --git a/tests/wpt/tests/wasm/jsapi/instance/toString.any.js b/tests/wpt/tests/wasm/jsapi/instance/toString.any.js
index 547a9ca8295..d77037d65b9 100644
--- a/tests/wpt/tests/wasm/jsapi/instance/toString.any.js
+++ b/tests/wpt/tests/wasm/jsapi/instance/toString.any.js
@@ -1,4 +1,4 @@
-// META: global=window,dedicatedworker,jsshell
+// META: global=window,dedicatedworker,jsshell,shadowrealm
 // META: script=/wasm/jsapi/wasm-module-builder.js
 
 test(() => {
diff --git a/tests/wpt/tests/wasm/jsapi/instanceTestFactory.js b/tests/wpt/tests/wasm/jsapi/instanceTestFactory.js
index ac468947ec2..6e6ec875bda 100644
--- a/tests/wpt/tests/wasm/jsapi/instanceTestFactory.js
+++ b/tests/wpt/tests/wasm/jsapi/instanceTestFactory.js
@@ -759,3 +759,5 @@ const instanceTestFactory = [
     }
   ],
 ];
+
+globalThis.instanceTestFactory = instanceTestFactory;
diff --git a/tests/wpt/tests/wasm/jsapi/interface.any.js b/tests/wpt/tests/wasm/jsapi/interface.any.js
index 19d29ead0a7..8256fc209a7 100644
--- a/tests/wpt/tests/wasm/jsapi/interface.any.js
+++ b/tests/wpt/tests/wasm/jsapi/interface.any.js
@@ -1,4 +1,4 @@
-// META: global=window,dedicatedworker,jsshell
+// META: global=window,dedicatedworker,jsshell,shadowrealm
 // META: script=/wasm/jsapi/assertions.js
 
 function test_operations(object, object_name, operations) {
diff --git a/tests/wpt/tests/wasm/jsapi/memory/constructor-shared.tentative.any.js b/tests/wpt/tests/wasm/jsapi/memory/constructor-shared.tentative.any.js
index 216fc4ca555..0134b307749 100644
--- a/tests/wpt/tests/wasm/jsapi/memory/constructor-shared.tentative.any.js
+++ b/tests/wpt/tests/wasm/jsapi/memory/constructor-shared.tentative.any.js
@@ -1,4 +1,4 @@
-// META: global=window,dedicatedworker,jsshell
+// META: global=window,dedicatedworker,jsshell,shadowrealm
 // META: script=/wasm/jsapi/assertions.js
 // META: script=/wasm/jsapi/memory/assertions.js
 
diff --git a/tests/wpt/tests/wasm/jsapi/memory/constructor-types.tentative.any.js b/tests/wpt/tests/wasm/jsapi/memory/constructor-types.tentative.any.js
index d5378dbe82b..4653c6686a7 100644
--- a/tests/wpt/tests/wasm/jsapi/memory/constructor-types.tentative.any.js
+++ b/tests/wpt/tests/wasm/jsapi/memory/constructor-types.tentative.any.js
@@ -1,4 +1,4 @@
-// META: global=window,dedicatedworker,jsshell
+// META: global=window,dedicatedworker,jsshell,shadowrealm
 // META: script=/wasm/jsapi/assertions.js
 // META: script=/wasm/jsapi/memory/assertions.js
 
@@ -17,4 +17,4 @@ test(() => {
     const argument = { minimum: 4 };
     const memory = new WebAssembly.Memory(argument);
     assert_Memory(memory, { "size": 4 });
-  }, "Non-zero minimum");
\ No newline at end of file
+  }, "Non-zero minimum");
diff --git a/tests/wpt/tests/wasm/jsapi/memory/constructor.any.js b/tests/wpt/tests/wasm/jsapi/memory/constructor.any.js
index 0a0be11e370..8f413c9f48a 100644
--- a/tests/wpt/tests/wasm/jsapi/memory/constructor.any.js
+++ b/tests/wpt/tests/wasm/jsapi/memory/constructor.any.js
@@ -1,4 +1,4 @@
-// META: global=window,dedicatedworker,jsshell
+// META: global=window,dedicatedworker,jsshell,shadowrealm
 // META: script=/wasm/jsapi/assertions.js
 // META: script=/wasm/jsapi/memory/assertions.js
 
diff --git a/tests/wpt/tests/wasm/jsapi/memory/grow.any.js b/tests/wpt/tests/wasm/jsapi/memory/grow.any.js
index c511129491f..2eafe5761ea 100644
--- a/tests/wpt/tests/wasm/jsapi/memory/grow.any.js
+++ b/tests/wpt/tests/wasm/jsapi/memory/grow.any.js
@@ -1,4 +1,4 @@
-// META: global=window,dedicatedworker,jsshell
+// META: global=window,dedicatedworker,jsshell,shadowrealm
 // META: script=/wasm/jsapi/memory/assertions.js
 
 test(() => {
diff --git a/tests/wpt/tests/wasm/jsapi/memory/type.tentative.any.js b/tests/wpt/tests/wasm/jsapi/memory/type.tentative.any.js
index a96a3227adc..3f6531f5967 100644
--- a/tests/wpt/tests/wasm/jsapi/memory/type.tentative.any.js
+++ b/tests/wpt/tests/wasm/jsapi/memory/type.tentative.any.js
@@ -1,4 +1,4 @@
-// META: global=window,dedicatedworker,jsshell
+// META: global=window,dedicatedworker,jsshell,shadowrealm
 // META: script=/wasm/jsapi/assertions.js
 
 function assert_type(argument) {
@@ -34,4 +34,4 @@ test(() => {
 
 test(() => {
     assert_type({ "minimum": 0, "maximum": 10, "shared": true});
-}, "shared memory");
\ No newline at end of file
+}, "shared memory");
diff --git a/tests/wpt/tests/wasm/jsapi/module/constructor.any.js b/tests/wpt/tests/wasm/jsapi/module/constructor.any.js
index 9978f7e6ac8..95604aabe47 100644
--- a/tests/wpt/tests/wasm/jsapi/module/constructor.any.js
+++ b/tests/wpt/tests/wasm/jsapi/module/constructor.any.js
@@ -1,4 +1,4 @@
-// META: global=window,dedicatedworker,jsshell
+// META: global=window,dedicatedworker,jsshell,shadowrealm
 // META: script=/wasm/jsapi/wasm-module-builder.js
 // META: script=/wasm/jsapi/assertions.js
 
diff --git a/tests/wpt/tests/wasm/jsapi/module/customSections.any.js b/tests/wpt/tests/wasm/jsapi/module/customSections.any.js
index 4029877e92c..96958316e06 100644
--- a/tests/wpt/tests/wasm/jsapi/module/customSections.any.js
+++ b/tests/wpt/tests/wasm/jsapi/module/customSections.any.js
@@ -1,4 +1,4 @@
-// META: global=window,dedicatedworker,jsshell
+// META: global=window,dedicatedworker,jsshell,shadowrealm
 // META: script=/wasm/jsapi/wasm-module-builder.js
 
 function assert_ArrayBuffer(buffer, expected) {
diff --git a/tests/wpt/tests/wasm/jsapi/module/exports.any.js b/tests/wpt/tests/wasm/jsapi/module/exports.any.js
index 40a3935a4a2..499a2649b17 100644
--- a/tests/wpt/tests/wasm/jsapi/module/exports.any.js
+++ b/tests/wpt/tests/wasm/jsapi/module/exports.any.js
@@ -1,4 +1,4 @@
-// META: global=window,dedicatedworker,jsshell
+// META: global=window,dedicatedworker,jsshell,shadowrealm
 // META: script=/wasm/jsapi/wasm-module-builder.js
 
 let emptyModuleBinary;
diff --git a/tests/wpt/tests/wasm/jsapi/module/imports.any.js b/tests/wpt/tests/wasm/jsapi/module/imports.any.js
index ec550ce6c41..2ab1725359f 100644
--- a/tests/wpt/tests/wasm/jsapi/module/imports.any.js
+++ b/tests/wpt/tests/wasm/jsapi/module/imports.any.js
@@ -1,4 +1,4 @@
-// META: global=window,dedicatedworker,jsshell
+// META: global=window,dedicatedworker,jsshell,shadowrealm
 // META: script=/wasm/jsapi/wasm-module-builder.js
 
 function assert_ModuleImportDescriptor(import_, expected) {
diff --git a/tests/wpt/tests/wasm/jsapi/module/toString.any.js b/tests/wpt/tests/wasm/jsapi/module/toString.any.js
index 1c20cd6108c..10c707979d5 100644
--- a/tests/wpt/tests/wasm/jsapi/module/toString.any.js
+++ b/tests/wpt/tests/wasm/jsapi/module/toString.any.js
@@ -1,4 +1,4 @@
-// META: global=window,dedicatedworker,jsshell
+// META: global=window,dedicatedworker,jsshell,shadowrealm
 // META: script=/wasm/jsapi/wasm-module-builder.js
 
 test(() => {
diff --git a/tests/wpt/tests/wasm/jsapi/prototypes.any.js b/tests/wpt/tests/wasm/jsapi/prototypes.any.js
index 714f4f8430e..2316f7d9b4e 100644
--- a/tests/wpt/tests/wasm/jsapi/prototypes.any.js
+++ b/tests/wpt/tests/wasm/jsapi/prototypes.any.js
@@ -1,4 +1,4 @@
-// META: global=window,dedicatedworker,jsshell
+// META: global=window,dedicatedworker,jsshell,shadowrealm
 // META: script=/wasm/jsapi/assertions.js
 // META: script=/wasm/jsapi/wasm-module-builder.js
 
diff --git a/tests/wpt/tests/wasm/jsapi/table/constructor-types.tentative.any.js b/tests/wpt/tests/wasm/jsapi/table/constructor-types.tentative.any.js
index 99ca41b55a9..b4015bdc6f7 100644
--- a/tests/wpt/tests/wasm/jsapi/table/constructor-types.tentative.any.js
+++ b/tests/wpt/tests/wasm/jsapi/table/constructor-types.tentative.any.js
@@ -1,4 +1,4 @@
-// META: global=window,dedicatedworker,jsshell
+// META: global=window,dedicatedworker,jsshell,shadowrealm
 // META: script=/wasm/jsapi/assertions.js
 // META: script=/wasm/jsapi/table/assertions.js
 
@@ -17,4 +17,4 @@ test(() => {
   const argument = { "element": "anyfunc", "minimum": 5 };
   const table = new WebAssembly.Table(argument);
   assert_Table(table, { "length": 5 });
-}, "Non-zero minimum");
\ No newline at end of file
+}, "Non-zero minimum");
diff --git a/tests/wpt/tests/wasm/jsapi/table/constructor.any.js b/tests/wpt/tests/wasm/jsapi/table/constructor.any.js
index 6d38d04e4f5..51b1070d413 100644
--- a/tests/wpt/tests/wasm/jsapi/table/constructor.any.js
+++ b/tests/wpt/tests/wasm/jsapi/table/constructor.any.js
@@ -1,4 +1,4 @@
-// META: global=window,dedicatedworker,jsshell
+// META: global=window,dedicatedworker,jsshell,shadowrealm
 // META: script=/wasm/jsapi/wasm-module-builder.js
 // META: script=/wasm/jsapi/assertions.js
 // META: script=/wasm/jsapi/table/assertions.js
diff --git a/tests/wpt/tests/wasm/jsapi/table/get-set.any.js b/tests/wpt/tests/wasm/jsapi/table/get-set.any.js
index 9301057a533..abe6fecac98 100644
--- a/tests/wpt/tests/wasm/jsapi/table/get-set.any.js
+++ b/tests/wpt/tests/wasm/jsapi/table/get-set.any.js
@@ -1,4 +1,4 @@
-// META: global=window,dedicatedworker,jsshell
+// META: global=window,dedicatedworker,jsshell,shadowrealm
 // META: script=/wasm/jsapi/wasm-module-builder.js
 // META: script=assertions.js
 
diff --git a/tests/wpt/tests/wasm/jsapi/table/grow.any.js b/tests/wpt/tests/wasm/jsapi/table/grow.any.js
index 520d24bf4ba..4038f1e6493 100644
--- a/tests/wpt/tests/wasm/jsapi/table/grow.any.js
+++ b/tests/wpt/tests/wasm/jsapi/table/grow.any.js
@@ -1,4 +1,4 @@
-// META: global=window,dedicatedworker,jsshell
+// META: global=window,dedicatedworker,jsshell,shadowrealm
 // META: script=/wasm/jsapi/wasm-module-builder.js
 // META: script=assertions.js
 
diff --git a/tests/wpt/tests/wasm/jsapi/table/length.any.js b/tests/wpt/tests/wasm/jsapi/table/length.any.js
index a9ef095ded4..0e6de3f83e1 100644
--- a/tests/wpt/tests/wasm/jsapi/table/length.any.js
+++ b/tests/wpt/tests/wasm/jsapi/table/length.any.js
@@ -1,4 +1,4 @@
-// META: global=window,dedicatedworker,jsshell
+// META: global=window,dedicatedworker,jsshell,shadowrealm
 
 test(() => {
   const thisValues = [
diff --git a/tests/wpt/tests/wasm/jsapi/table/toString.any.js b/tests/wpt/tests/wasm/jsapi/table/toString.any.js
index 8a09f2832c1..b5fb25b9c1e 100644
--- a/tests/wpt/tests/wasm/jsapi/table/toString.any.js
+++ b/tests/wpt/tests/wasm/jsapi/table/toString.any.js
@@ -1,4 +1,4 @@
-// META: global=window,dedicatedworker,jsshell
+// META: global=window,dedicatedworker,jsshell,shadowrealm
 
 test(() => {
   const argument = { "element": "anyfunc", "initial": 0 };
diff --git a/tests/wpt/tests/wasm/jsapi/table/type.tentative.any.js b/tests/wpt/tests/wasm/jsapi/table/type.tentative.any.js
index ef1ceecb17d..ef9bbc5aa4a 100644
--- a/tests/wpt/tests/wasm/jsapi/table/type.tentative.any.js
+++ b/tests/wpt/tests/wasm/jsapi/table/type.tentative.any.js
@@ -1,4 +1,4 @@
-// META: global=window,dedicatedworker,jsshell
+// META: global=window,dedicatedworker,jsshell,shadowrealm
 // META: script=/wasm/jsapi/assertions.js
 
 function assert_type(argument) {
diff --git a/tests/wpt/tests/wasm/jsapi/tag/constructor.tentative.any.js b/tests/wpt/tests/wasm/jsapi/tag/constructor.tentative.any.js
index de63e7bf46d..54edf8c8f59 100644
--- a/tests/wpt/tests/wasm/jsapi/tag/constructor.tentative.any.js
+++ b/tests/wpt/tests/wasm/jsapi/tag/constructor.tentative.any.js
@@ -1,4 +1,4 @@
-// META: global=window,dedicatedworker,jsshell
+// META: global=window,dedicatedworker,jsshell,shadowrealm
 // META: script=/wasm/jsapi/assertions.js
 
 test(() => {
diff --git a/tests/wpt/tests/wasm/jsapi/tag/toString.tentative.any.js b/tests/wpt/tests/wasm/jsapi/tag/toString.tentative.any.js
index ad9a4ba152f..76fff0feef0 100644
--- a/tests/wpt/tests/wasm/jsapi/tag/toString.tentative.any.js
+++ b/tests/wpt/tests/wasm/jsapi/tag/toString.tentative.any.js
@@ -1,4 +1,4 @@
-// META: global=window,dedicatedworker,jsshell
+// META: global=window,dedicatedworker,jsshell,shadowrealm
 
 test(() => {
   const argument = { parameters: [] };
diff --git a/tests/wpt/tests/wasm/jsapi/tag/type.tentative.any.js b/tests/wpt/tests/wasm/jsapi/tag/type.tentative.any.js
index 9d2f0de1a00..58c96078bfe 100644
--- a/tests/wpt/tests/wasm/jsapi/tag/type.tentative.any.js
+++ b/tests/wpt/tests/wasm/jsapi/tag/type.tentative.any.js
@@ -1,4 +1,4 @@
-// META: global=window,dedicatedworker,jsshell
+// META: global=window,dedicatedworker,jsshell,shadowrealm
 // META: script=/wasm/jsapi/assertions.js
 
 function assert_type(argument) {
diff --git a/tests/wpt/tests/wasm/jsapi/wasm-module-builder.js b/tests/wpt/tests/wasm/jsapi/wasm-module-builder.js
index 86d836a5a37..3545c3a8da7 100644
--- a/tests/wpt/tests/wasm/jsapi/wasm-module-builder.js
+++ b/tests/wpt/tests/wasm/jsapi/wasm-module-builder.js
@@ -1284,6 +1284,7 @@ class WasmModuleBuilder {
     return new WebAssembly.Module(this.toBuffer(debug));
   }
 }
+globalThis.WasmModuleBuilder = WasmModuleBuilder;
 
 function wasmSignedLeb(val, max_len = 5) {
   let res = [];
@@ -1300,10 +1301,12 @@ function wasmSignedLeb(val, max_len = 5) {
   throw new Error(
       'Leb value <' + val + '> exceeds maximum length of ' + max_len);
 }
+globalThis.wasmSignedLeb = wasmSignedLeb;
 
 function wasmI32Const(val) {
   return [kExprI32Const, ...wasmSignedLeb(val, 5)];
 }
+globalThis.wasmI32Const = wasmI32Const;
 
 function wasmF32Const(f) {
   // Write in little-endian order at offset 0.
@@ -1312,6 +1315,7 @@ function wasmF32Const(f) {
     kExprF32Const, byte_view[0], byte_view[1], byte_view[2], byte_view[3]
   ];
 }
+globalThis.wasmI32Const = wasmI32Const;
 
 function wasmF64Const(f) {
   // Write in little-endian order at offset 0.
@@ -1321,3 +1325,4 @@ function wasmF64Const(f) {
     byte_view[3], byte_view[4], byte_view[5], byte_view[6], byte_view[7]
   ];
 }
+globalThis.wasmF64Const = wasmF64Const;
diff --git a/tests/wpt/tests/wasm/webapi/esm-integration/worker.tentative.html b/tests/wpt/tests/wasm/webapi/esm-integration/worker.tentative.html
index 8002e07ce7f..6145dd04ff8 100644
--- a/tests/wpt/tests/wasm/webapi/esm-integration/worker.tentative.html
+++ b/tests/wpt/tests/wasm/webapi/esm-integration/worker.tentative.html
@@ -10,4 +10,7 @@ worker.onmessage = (msg) => {
   assert_equals(msg, 42);
   done();
 }
+worker.onerror = () => {
+  assert_unreached("worker got an error");
+}
 </script>
diff --git a/tests/wpt/tests/web-animations/animation-model/animation-types/property-list.js b/tests/wpt/tests/web-animations/animation-model/animation-types/property-list.js
index c4ef7937ba3..14a175d7549 100644
--- a/tests/wpt/tests/web-animations/animation-model/animation-types/property-list.js
+++ b/tests/wpt/tests/web-animations/animation-model/animation-types/property-list.js
@@ -575,6 +575,12 @@ const gCSSProperties1 = {
       { type: 'discrete', options: [ [ 'full-width', 'proportional-width' ] ] }
     ]
   },
+  'font-variant-emoji': {
+    // https://drafts.csswg.org/css-fonts/#propdef-font-variant-emoji
+    types: [
+      { type: 'discrete', options: [ [ 'text', 'emoji' ] ] }
+    ]
+  },
   'font-variant-ligatures': {
     // https://drafts.csswg.org/css-fonts-3/#propdef-font-variant-ligatures
     types: [
diff --git a/tests/wpt/tests/web-animations/interfaces/Animation/constructor.html b/tests/wpt/tests/web-animations/interfaces/Animation/constructor.html
index d599fd72ea6..e964c10ee44 100644
--- a/tests/wpt/tests/web-animations/interfaces/Animation/constructor.html
+++ b/tests/wpt/tests/web-animations/interfaces/Animation/constructor.html
@@ -109,5 +109,16 @@ async_test(t => {
   document.body.appendChild(iframe);
 }, 'Animation constructed with a keyframe that target element is in iframe');
 
+test(t => {
+    const div = createDiv(t);
+    const effect = new KeyframeEffect(div, { opacity: [0, 1]}, 10000);
+    const anim1 = new Animation(effect);
+    anim1.play();
+    const anim2 = new Animation(effect);
+    anim2.play();
+    assert_equals(anim1.effect, null, 'Effect is reset on first animation');
+    assert_equals(anim1.playState, 'finished',
+                'Resetting the affect does not cancel the animation');
+}, 'Animation created with an affect associated with another animation.');
 </script>
 </body>
diff --git a/tests/wpt/tests/web-animations/timing-model/timelines/timelines.html b/tests/wpt/tests/web-animations/timing-model/timelines/timelines.html
index d570eed5c28..1609f85939e 100644
--- a/tests/wpt/tests/web-animations/timing-model/timelines/timelines.html
+++ b/tests/wpt/tests/web-animations/timing-model/timelines/timelines.html
@@ -77,18 +77,50 @@ async_test(t => {
 }, 'Timeline time should be the same for all RAF callbacks in an animation'
    + ' frame');
 
-async_test(t => {
+promise_test(async t => {
+  // A microtask checkpoint is run as part of the process of updating
+  // timelines to ensure that any microtasks queued during promise
+  // resolution are handled before dispatching animation events.
   const div = createDiv(t);
-  const animation = div.animate(null, 100 * MS_PER_SEC);
+  const events = [];
+  let microtaskFrameTime = undefined;
+  let finishFrameTime = undefined;
+  const waitForMicrotask = (animation) => {
+    return new Promise(resolve => {
+      queueMicrotask(() => {
+        events.push('microtask');
+        microtaskFrameTime = document.timeline.currentTime;
+        resolve();
+      });
+    });
+  }
+  const waitForFinishEvent = (animation) => {
+    return new Promise(resolve => {
+      animation.onfinish = (event) => {
+        events.push('finish');
+        finishFrameTime = event.timelineTime;
+        resolve();
+      };
+    });
+  }
 
-  animation.ready.then(t.step_func(() => {
-    const readyTimelineTime = document.timeline.currentTime;
-    requestAnimationFrame(t.step_func_done(() => {
-      assert_equals(readyTimelineTime, document.timeline.currentTime,
-                    'There should be a microtask checkpoint');
-    }));
-  }));
-}, 'Performs a microtask checkpoint after updating timelins');
+  await waitForNextFrame();
+
+  const animation = div.animate({ opacity: [0, 1] }, 1000 * MS_PER_SEC);
+  const finishPromise = waitForFinishEvent(animation);
+  await animation.ready;
+
+  // Advance the timing to effect end, to asynchronously queue up a finish task.
+  // Queue up microtask, which must be processed ahead of the finish event.
+  // See "Perform a microtask checkpoint" step in
+  // https://www.w3.org/TR/web-animations-1/#timelines.
+  animation.currentTime = animation.effect.getComputedTiming().duration;
+  const microtaskPromise = waitForMicrotask(animation);
+  await Promise.all([finishPromise, microtaskPromise]);
+  assert_array_equals(events, ['microtask', 'finish']);
+  assert_times_equal(microtaskFrameTime, finishFrameTime);
+
+}, 'Performs a microtask checkpoint after updating timelines');
 
 async_test(t => {
   const div = createDiv(t);
diff --git a/tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-default-value.html b/tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-default-value.html
new file mode 100644
index 00000000000..fe0cf15b43d
--- /dev/null
+++ b/tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-default-value.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>
+      audioparam-default-value.html
+    </title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/webaudio/resources/audit.js"></script>
+  </head>
+  <body>
+    <script id="layout-test-code">
+      const audit = Audit.createTaskRunner();
+
+      audit.define('test', function(task, should) {
+        const context = new OfflineAudioContext(1, 1, 44100);
+        const defaultValue = -1;
+        const gainNode = new GainNode(context, { gain: defaultValue });
+
+        should(gainNode.gain.defaultValue, "AudioParam's defaultValue").beEqualTo(defaultValue);
+
+        task.done();
+      });
+
+      audit.run();
+    </script>
+  </body>
+</html>
diff --git a/tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/exponentialRamp-special-cases.html b/tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/exponentialRamp-special-cases.html
new file mode 100644
index 00000000000..d1978098218
--- /dev/null
+++ b/tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/exponentialRamp-special-cases.html
@@ -0,0 +1,58 @@
+<!DOCTYPE html>
+<title>Test exponentialRampToValueAtTime() special cases</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+promise_test(async function() {
+  const bufferSize = 5;
+  const sampleRate = 16384;
+  const startSample = 3;
+  const offset0 = 2.;
+  const offset1 = -3.;
+  const context = new OfflineAudioContext(1, bufferSize, sampleRate);
+
+  const source = new ConstantSourceNode(context);
+  source.start();
+  // Explicit event to work around
+  // https://bugzilla.mozilla.org/show_bug.cgi?id=1265393
+  source.offset.setValueAtTime(offset0, 0.);
+  source.offset.exponentialRampToValueAtTime(offset1, startSample/sampleRate);
+  source.connect(context.destination);
+
+  const buffer = await context.startRendering();
+  assert_equals(buffer.length, bufferSize, "output buffer length");
+  const output = buffer.getChannelData(0);
+  for (let i = 0; i < startSample; ++i) {
+    assert_equals(output[i], offset0, "initial offset at sample " + i);
+  }
+  for (let i = startSample; i < bufferSize; ++i) {
+    assert_equals(output[i], offset1, "scheduled value at sample " + i);
+  }
+}, "v0 and v1 have opposite signs");
+
+promise_test(async function() {
+  const bufferSize = 4;
+  const sampleRate = 16384;
+  const startSample = 2;
+  const offset = -2.;
+  const context = new OfflineAudioContext(1, bufferSize, sampleRate);
+
+  const source = new ConstantSourceNode(context);
+  source.start();
+  // Explicit event to work around
+  // https://bugzilla.mozilla.org/show_bug.cgi?id=1265393
+  source.offset.setValueAtTime(0, 0.);
+  source.offset.exponentialRampToValueAtTime(offset, startSample/sampleRate);
+  source.connect(context.destination);
+
+  const buffer = await context.startRendering();
+  assert_equals(buffer.length, bufferSize, "output buffer length");
+  const output = buffer.getChannelData(0);
+  for (let i = 0; i < startSample; ++i) {
+    assert_equals(output[i], 0., "initial offset at sample " + i);
+  }
+  for (let i = startSample; i < bufferSize; ++i) {
+    assert_equals(output[i], offset, "scheduled value at sample " + i);
+  }
+}, "v0 is zero");
+</script>
diff --git a/tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/setTargetAtTime-after-event-within-block.html b/tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/setTargetAtTime-after-event-within-block.html
index 827aeeabd47..ca02b0db975 100644
--- a/tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/setTargetAtTime-after-event-within-block.html
+++ b/tests/wpt/tests/webaudio/the-audio-api/the-audioparam-interface/setTargetAtTime-after-event-within-block.html
@@ -50,5 +50,50 @@ promise_test(function() {
                       "scheduled value at sample " + i);
       }
     });
-});
+}, "setTargetAtTime() after setValueAtTime()");
+
+promise_test(async function() {
+  const bufferSize = 129;
+  const sampleRate = 16384;
+  const startSample1 = 125;
+  const target1 = Math.fround(-1./Math.expm1(-1.));
+  // Intentionally testing the second curve before and after the
+  // rendering quantum boundary.
+  const startSample2 = startSample1 + 1;
+  const target2 = 0.;
+  const timeConstant = 1./sampleRate;
+  const tolerance = Math.pow(2, -24); // Allow single precision math.
+  const context = new OfflineAudioContext(1, bufferSize, sampleRate);
+
+  const source = new ConstantSourceNode(context, {offset: 0.});
+  source.start();
+  source.offset.setTargetAtTime(target1, startSample1/sampleRate,
+                                timeConstant);
+  source.offset.setTargetAtTime(target2, startSample2/sampleRate,
+                                timeConstant);
+  source.connect(context.destination);
+
+  const buffer = await context.startRendering();
+
+  assert_equals(buffer.length, bufferSize, "output buffer length");
+  const output = buffer.getChannelData(0);
+  for (let i = 0; i <= startSample1; ++i) {
+    assert_equals(output[i], 0., "initial offset at sample " + i);
+  }
+  assert_approx_equals(
+    output[startSample2],
+    Math.fround(target1 * -Math.expm1(-(startSample2 - startSample1))),
+    tolerance,
+    "scheduled value at startSample2");
+  assert_approx_equals(
+    output[startSample2 + 1],
+    Math.fround(output[startSample2] * Math.exp(-1.)),
+    tolerance,
+    "scheduled value at startSample2 + 1");
+  assert_approx_equals(
+    output[startSample2 + 2],
+    Math.fround(output[startSample2] * Math.exp(-2.)),
+    tolerance,
+    "scheduled value at startSample2 + 2");
+}, "setTargetAtTime() after setTargetAtTime()");
 </script>
diff --git a/tests/wpt/tests/webaudio/the-audio-api/the-constantsourcenode-interface/test-constantsourcenode.html b/tests/wpt/tests/webaudio/the-audio-api/the-constantsourcenode-interface/test-constantsourcenode.html
index 04f61106c11..9dd03ea1167 100644
--- a/tests/wpt/tests/webaudio/the-audio-api/the-constantsourcenode-interface/test-constantsourcenode.html
+++ b/tests/wpt/tests/webaudio/the-audio-api/the-constantsourcenode-interface/test-constantsourcenode.html
@@ -124,7 +124,7 @@ async_test(function(t) {
       var result = e.renderedBuffer.getChannelData(0);
       var expected = buffer.getChannelData(0);
       for (var i = 0; i < 2048; ++i) {
-        assert_true(Math.abs(result[i] - expected[i]) < 1.342e-6, "sample " + i + " should equal " + expected[i]);
+        assert_approx_equals(result[i], expected[i], 1.342e-6, "sample " + i);
       }
     });
     t.done();
diff --git a/tests/wpt/tests/webcodecs/META.yml b/tests/wpt/tests/webcodecs/META.yml
index b5b838a4cf9..8570ee05e5a 100644
--- a/tests/wpt/tests/webcodecs/META.yml
+++ b/tests/wpt/tests/webcodecs/META.yml
@@ -1 +1,5 @@
 spec: https://w3c.github.io/webcodecs/
+suggested_reviewers:
+  - Djuffin
+  - sandersdan
+  - youennf
diff --git a/tests/wpt/tests/webcodecs/audio-decoder.https.any.js b/tests/wpt/tests/webcodecs/audio-decoder.https.any.js
index f83efe17a0f..606b052edc8 100644
--- a/tests/wpt/tests/webcodecs/audio-decoder.https.any.js
+++ b/tests/wpt/tests/webcodecs/audio-decoder.https.any.js
@@ -137,11 +137,22 @@ validButUnsupportedConfigs.forEach(entry => {
 validButUnsupportedConfigs.forEach(entry => {
   async_test(
       t => {
-        let codec = new AudioDecoder(getDefaultCodecInit(t));
-        assert_throws_dom('NotSupportedError', () => {
-          codec.configure(entry.config);
+        let codec = new AudioDecoder({
+          output: t.unreached_func('unexpected output'),
+          error: t.step_func_done(e => {
+            assert_true(e instanceof DOMException);
+            assert_equals(e.name, 'NotSupportedError');
+            assert_equals(codec.state, 'closed', 'state');
+          })
         });
-        t.done();
+        codec.configure(entry.config);
+        codec.flush()
+            .then(t.unreached_func('flush succeeded unexpectedly'))
+            .catch(t.step_func(e => {
+              assert_true(e instanceof DOMException);
+              assert_equals(e.name, 'NotSupportedError');
+              assert_equals(codec.state, 'closed', 'state');
+            }));
       },
       'Test that AudioDecoder.configure() doesn\'t support config: ' +
           entry.comment);
diff --git a/tests/wpt/tests/webcodecs/audio-encoder-codec-specific.https.any.js b/tests/wpt/tests/webcodecs/audio-encoder-codec-specific.https.any.js
index 28c75d2a606..e3396f999aa 100644
--- a/tests/wpt/tests/webcodecs/audio-encoder-codec-specific.https.any.js
+++ b/tests/wpt/tests/webcodecs/audio-encoder-codec-specific.https.any.js
@@ -96,3 +96,185 @@ promise_test(async t => {
   // We expect a significant reduction in the number of packets, over ~10s of silence.
   assert_less_than(dtx_outputs.length, (normal_outputs.length / 2));
 }, 'Test the Opus DTX flag works.');
+
+
+// The Opus bitrateMode enum chooses whether we use a constant or variable bitrate.
+// This test ensures that VBR/CBR is respected properly by encoding almost 10s of
+// silence and comparing the size of the encoded variable or constant bitrates.
+promise_test(async t => {
+  let sample_rate = 48000;
+  let total_duration_s = 10;
+  let data_count = 100;
+  let vbr_outputs = [];
+  let cbr_outputs = [];
+
+  let cbr_encoder = new AudioEncoder({
+    error: e => {
+      assert_unreached('error: ' + e);
+    },
+    output: chunk => {
+      cbr_outputs.push(chunk);
+    }
+  });
+
+  let vbr_encoder = new AudioEncoder({
+    error: e => {
+      assert_unreached('error: ' + e);
+    },
+    output: chunk => {
+      vbr_outputs.push(chunk);
+    }
+  });
+
+  let config = {
+    codec: 'opus',
+    sampleRate: sample_rate,
+    numberOfChannels: 2,
+    bitrate: 256000,  // 256kbit
+  };
+
+  let cbr_config = { ...config, bitrateMode: "constant" };
+  let vbr_config = { ...config, bitrateMode: "variable" };
+
+  let cbr_config_support = await AudioEncoder.isConfigSupported(cbr_config);
+  assert_implements_optional(cbr_config_support.supported, "Opus CBR not supported");
+
+  let vbr_config_support = await AudioEncoder.isConfigSupported(vbr_config);
+  assert_implements_optional(vbr_config_support.supported, "Opus VBR not supported");
+
+  // Configure one encoder with VBR and one CBR.
+  cbr_encoder.configure(cbr_config);
+  vbr_encoder.configure(vbr_config);
+
+  let timestamp_us = 0;
+  let data_duration_s = total_duration_s / data_count;
+  let data_length = data_duration_s * config.sampleRate;
+  for (let i = 0; i < data_count; i++) {
+    let data;
+
+    if (i == 0 || i == (data_count - 1)) {
+      // Send real data for the first and last 100ms.
+      data = make_audio_data(
+        timestamp_us, config.numberOfChannels, config.sampleRate,
+        data_length);
+
+    } else {
+      // Send silence for the rest of the 10s.
+      data = make_silent_audio_data(
+        timestamp_us, config.numberOfChannels, config.sampleRate,
+        data_length);
+    }
+
+    vbr_encoder.encode(data);
+    cbr_encoder.encode(data);
+    data.close();
+
+    timestamp_us += data_duration_s * 1_000_000;
+  }
+
+  await Promise.all([cbr_encoder.flush(), vbr_encoder.flush()])
+
+  cbr_encoder.close();
+  vbr_encoder.close();
+
+  let vbr_total_bytes = 0;
+  vbr_outputs.forEach(chunk => vbr_total_bytes += chunk.byteLength)
+
+  let cbr_total_bytes = 0;
+  cbr_outputs.forEach(chunk => cbr_total_bytes += chunk.byteLength)
+
+  // We expect a significant reduction in the size of the packets, over ~10s of silence.
+  assert_less_than(vbr_total_bytes, (cbr_total_bytes / 2));
+}, 'Test the Opus bitrateMode flag works.');
+
+
+// The AAC bitrateMode enum chooses whether we use a constant or variable bitrate.
+// This test exercises the VBR/CBR paths. Some platforms don't support VBR for AAC,
+// and still emit a constant bitrate.
+promise_test(async t => {
+  let sample_rate = 48000;
+  let total_duration_s = 10;
+  let data_count = 100;
+  let vbr_outputs = [];
+  let cbr_outputs = [];
+
+  let cbr_encoder = new AudioEncoder({
+    error: e => {
+      assert_unreached('error: ' + e);
+    },
+    output: chunk => {
+      cbr_outputs.push(chunk);
+    }
+  });
+
+  let vbr_encoder = new AudioEncoder({
+    error: e => {
+      assert_unreached('error: ' + e);
+    },
+    output: chunk => {
+      vbr_outputs.push(chunk);
+    }
+  });
+
+  let config = {
+    codec: 'mp4a.40.2',
+    sampleRate: sample_rate,
+    numberOfChannels: 2,
+    bitrate: 192000,  // 256kbit
+  };
+
+  let cbr_config = { ...config, bitrateMode: "constant" };
+  let vbr_config = { ...config, bitrateMode: "variable" };
+
+  let cbr_config_support = await AudioEncoder.isConfigSupported(cbr_config);
+  assert_implements_optional(cbr_config_support.supported, "AAC CBR not supported");
+
+  let vbr_config_support = await AudioEncoder.isConfigSupported(vbr_config);
+  assert_implements_optional(vbr_config_support.supported, "AAC VBR not supported");
+
+  // Configure one encoder with VBR and one CBR.
+  cbr_encoder.configure(cbr_config);
+  vbr_encoder.configure(vbr_config);
+
+  let timestamp_us = 0;
+  let data_duration_s = total_duration_s / data_count;
+  let data_length = data_duration_s * config.sampleRate;
+  for (let i = 0; i < data_count; i++) {
+    let data;
+
+    if (i == 0 || i == (data_count - 1)) {
+      // Send real data for the first and last 100ms.
+      data = make_audio_data(
+        timestamp_us, config.numberOfChannels, config.sampleRate,
+        data_length);
+
+    } else {
+      // Send silence for the rest of the 10s.
+      data = make_silent_audio_data(
+        timestamp_us, config.numberOfChannels, config.sampleRate,
+        data_length);
+    }
+
+    vbr_encoder.encode(data);
+    cbr_encoder.encode(data);
+    data.close();
+
+    timestamp_us += data_duration_s * 1_000_000;
+  }
+
+  await Promise.all([cbr_encoder.flush(), vbr_encoder.flush()])
+
+  cbr_encoder.close();
+  vbr_encoder.close();
+
+  let vbr_total_bytes = 0;
+  vbr_outputs.forEach(chunk => vbr_total_bytes += chunk.byteLength)
+
+  let cbr_total_bytes = 0;
+  cbr_outputs.forEach(chunk => cbr_total_bytes += chunk.byteLength)
+
+  // We'd like to confirm that the encoded size using VBR is less than CBR, but
+  // platforms without VBR support will silently revert to CBR (which is
+  // technically a subset of VBR).
+  assert_less_than_equal(vbr_total_bytes, cbr_total_bytes);
+}, 'Test the AAC bitrateMode flag works.');
diff --git a/tests/wpt/tests/webcodecs/audio-encoder-config.https.any.js b/tests/wpt/tests/webcodecs/audio-encoder-config.https.any.js
index 845b399744e..98a9513b7dc 100644
--- a/tests/wpt/tests/webcodecs/audio-encoder-config.https.any.js
+++ b/tests/wpt/tests/webcodecs/audio-encoder-config.https.any.js
@@ -215,11 +215,22 @@ validButUnsupportedConfigs.forEach(entry => {
 validButUnsupportedConfigs.forEach(entry => {
   async_test(
       t => {
-        let codec = new AudioEncoder(getDefaultCodecInit(t));
-        assert_throws_dom('NotSupportedError', () => {
-          codec.configure(entry.config);
+        let codec = new AudioEncoder({
+          output: t.unreached_func('unexpected output'),
+          error: t.step_func_done(e => {
+            assert_true(e instanceof DOMException);
+            assert_equals(e.name, 'NotSupportedError');
+            assert_equals(codec.state, 'closed', 'state');
+          })
         });
-        t.done();
+        codec.configure(entry.config);
+        codec.flush()
+            .then(t.unreached_func('flush succeeded unexpectedly'))
+            .catch(t.step_func(e => {
+              assert_true(e instanceof DOMException);
+              assert_equals(e.name, 'NotSupportedError');
+              assert_equals(codec.state, 'closed', 'state');
+            }));
       },
       'Test that AudioEncoder.configure() doesn\'t support config: ' +
           entry.comment);
@@ -241,6 +252,15 @@ const validConfigs = [
     sampleRate: 48000,
     numberOfChannels: 2,
     bitrate: 128000,
+    bitrateMode: "constant",
+    bogus: 123
+  },
+  {
+    codec: 'opus',
+    sampleRate: 48000,
+    numberOfChannels: 2,
+    bitrate: 128000,
+    bitrateMode: "variable",
     bogus: 123
   },
   {
diff --git a/tests/wpt/tests/webcodecs/audio-encoder.https.any.js b/tests/wpt/tests/webcodecs/audio-encoder.https.any.js
index 7db9148ed58..cd7739bcd26 100644
--- a/tests/wpt/tests/webcodecs/audio-encoder.https.any.js
+++ b/tests/wpt/tests/webcodecs/audio-encoder.https.any.js
@@ -122,6 +122,51 @@ promise_test(async t => {
       total_encoded_duration, total_duration_s * 1_000_000);
 }, 'Simple audio encoding');
 
+promise_test(async t => {
+  let outputs = 0;
+  let init = getDefaultCodecInit(t);
+  let firstOutput = new Promise(resolve => {
+    init.output = (chunk, metadata) => {
+      outputs++;
+      assert_equals(outputs, 1, 'outputs');
+      encoder.reset();
+      resolve();
+    };
+  });
+
+  let encoder = new AudioEncoder(init);
+  let config = {
+    codec: 'opus',
+    sampleRate: 48000,
+    numberOfChannels: 2,
+    bitrate: 256000  // 256kbit
+  };
+  encoder.configure(config);
+
+  let frame_count = 1024;
+  let frame1 = make_audio_data(
+      0, config.numberOfChannels, config.sampleRate, frame_count);
+  let frame2 = make_audio_data(
+      frame_count / config.sampleRate, config.numberOfChannels,
+      config.sampleRate, frame_count);
+  t.add_cleanup(() => {
+    frame1.close();
+    frame2.close();
+  });
+
+  encoder.encode(frame1);
+  encoder.encode(frame2);
+  const flushDone = encoder.flush();
+
+  // Wait for the first output, then reset.
+  await firstOutput;
+
+  // Flush should have been synchronously rejected.
+  await promise_rejects_dom(t, 'AbortError', flushDone);
+
+  assert_equals(outputs, 1, 'outputs');
+}, 'Test reset during flush');
+
 promise_test(async t => {
   let sample_rate = 48000;
   let total_duration_s = 1;
@@ -163,24 +208,24 @@ promise_test(async t => {
   }
 }, 'Encode audio with negative timestamp');
 
-async function checkEncodingError(config, good_data, bad_data) {
-  let error = null;
-  let outputs = 0;
-  let init = {
-    error: e => {
-      error = e;
-    },
-    output: chunk => {
-      outputs++;
-    }
-  };
-  let encoder = new AudioEncoder(init);
-
-
+async function checkEncodingError(t, config, good_data, bad_data) {
   let support = await AudioEncoder.isConfigSupported(config);
   assert_true(support.supported)
   config = support.config;
 
+  const callbacks = {};
+  let errors = 0;
+  let gotError = new Promise(resolve => callbacks.error = e => {
+    errors++;
+    resolve(e);
+  });
+
+  let outputs = 0;
+  callbacks.output = chunk => {
+    outputs++;
+  };
+
+  let encoder = new AudioEncoder(callbacks);
   encoder.configure(config);
   for (let data of good_data) {
     encoder.encode(data);
@@ -190,11 +235,21 @@ async function checkEncodingError(config, good_data, bad_data) {
 
   let txt_config = "sampleRate: " + config.sampleRate
                  + " numberOfChannels: " + config.numberOfChannels;
-  assert_equals(error, null, txt_config);
+  assert_equals(errors, 0, txt_config);
   assert_greater_than(outputs, 0);
+  outputs = 0;
+
   encoder.encode(bad_data);
-  await encoder.flush().catch(() => {});
-  assert_not_equals(error, null, txt_config);
+  await promise_rejects_dom(t, 'EncodingError', encoder.flush().catch((e) => {
+    assert_equals(errors, 0);
+    throw e;
+  }));
+
+  assert_equals(outputs, 0);
+  let e = await gotError;
+  assert_true(e instanceof DOMException);
+  assert_equals(e.name, 'EncodingError');
+  assert_equals(encoder.state, 'closed', 'state');
 }
 
 function channelNumberVariationTests() {
@@ -216,9 +271,9 @@ function channelNumberVariationTests() {
     ts += Math.floor(data2.duration / 1000000);
 
     let bad_data = make_audio_data(ts, channels + 1, sample_rate, length);
-    promise_test(async t =>
-      checkEncodingError(config, [data1, data2], bad_data),
-      "Channel number variation: " + channels);
+    promise_test(
+        async t => checkEncodingError(t, config, [data1, data2], bad_data),
+        'Channel number variation: ' + channels);
   }
 }
 channelNumberVariationTests();
@@ -242,9 +297,9 @@ function sampleRateVariationTests() {
     ts += Math.floor(data2.duration / 1000000);
 
     let bad_data = make_audio_data(ts, channels, sample_rate + 333, length);
-    promise_test(async t =>
-      checkEncodingError(config, [data1, data2], bad_data),
-      "Sample rate variation: " + sample_rate);
+    promise_test(
+        async t => checkEncodingError(t, config, [data1, data2], bad_data),
+        'Sample rate variation: ' + sample_rate);
   }
 }
 sampleRateVariationTests();
@@ -569,4 +624,4 @@ testOpusEncoderConfigs.forEach(entry => {
     assert_greater_than_equal(
         total_encoded_duration, total_duration_s * 1_000_000);
   }, 'Test encoding Opus with additional parameters: ' + entry.comment);
-})
\ No newline at end of file
+});
diff --git a/tests/wpt/tests/webcodecs/reconfiguring-encoder.https.any.js b/tests/wpt/tests/webcodecs/reconfiguring-encoder.https.any.js
index bc7e9b74fb9..5aec95f16d5 100644
--- a/tests/wpt/tests/webcodecs/reconfiguring-encoder.https.any.js
+++ b/tests/wpt/tests/webcodecs/reconfiguring-encoder.https.any.js
@@ -19,7 +19,6 @@ promise_setup(async () => {
   }[location.search];
   config.hardwareAcceleration = 'prefer-software';
   config.bitrateMode = "constant";
-  config.scalabilityMode = "L1T2";
   config.framerate = 30;
   ENCODER_CONFIG = config;
 });
diff --git a/tests/wpt/tests/webcodecs/transfering.https.any.js b/tests/wpt/tests/webcodecs/transfering.https.any.js
new file mode 100644
index 00000000000..b9487e589d8
--- /dev/null
+++ b/tests/wpt/tests/webcodecs/transfering.https.any.js
@@ -0,0 +1,133 @@
+// META: global=window,dedicatedworker
+
+promise_test(async t => {
+  let fmt = 'RGBA';
+  const rgb_plane = [
+    0xBA, 0xDF, 0x00, 0xD0, 0xBA, 0xDF, 0x01, 0xD0, 0xBA, 0xDF, 0x02, 0xD0,
+    0xBA, 0xDF, 0x03, 0xD0
+  ];
+  let data = new Uint8Array(rgb_plane);
+  let unused_buffer = new ArrayBuffer(123);
+  let init = {
+    format: fmt,
+    timestamp: 1234,
+    codedWidth: 2,
+    codedHeight: 2,
+    visibleRect: {x: 0, y: 0, width: 2, height: 2},
+    transfer: [data.buffer, unused_buffer]
+  };
+  assert_equals(data.length, 16, 'data.length');
+  assert_equals(unused_buffer.byteLength, 123, 'unused_buffer.byteLength');
+
+  let frame = new VideoFrame(data, init);
+  assert_equals(frame.format, fmt, 'format');
+  assert_equals(data.length, 0, 'data.length after detach');
+  assert_equals(unused_buffer.byteLength, 0, 'unused_buffer after detach');
+
+  const options = {
+    rect: {x: 0, y: 0, width: init.codedWidth, height: init.codedHeight}
+  };
+  let size = frame.allocationSize(options);
+  let output_data = new Uint8Array(size);
+  let layout = await frame.copyTo(output_data, options);
+  let expected_data = new Uint8Array(rgb_plane);
+  assert_equals(expected_data.length, size, 'expected_data size');
+  for (let i = 0; i < size; i++) {
+    assert_equals(expected_data[i], output_data[i], `expected_data[${i}]`);
+  }
+
+  frame.close();
+}, 'Test transfering ArrayBuffer to VideoFrame');
+
+
+promise_test(async t => {
+  const rgb_plane = [
+    0xBA, 0xDF, 0x00, 0xD0, 0xBA, 0xDF, 0x01, 0xD0, 0xBA, 0xDF, 0x02, 0xD0,
+    0xBA, 0xDF, 0x03, 0xD0
+  ];
+  let data = new Uint8Array(rgb_plane);
+  let detached_buffer = new ArrayBuffer(123);
+
+  // Detach `detached_buffer`
+  structuredClone({x: detached_buffer}, {transfer: [detached_buffer]});
+
+  let init = {
+    format: 'RGBA',
+    timestamp: 1234,
+    codedWidth: 2,
+    codedHeight: 2,
+    visibleRect: {x: 0, y: 0, width: 2, height: 2},
+    transfer: [data.buffer, detached_buffer]
+  };
+
+  try {
+    new VideoFrame(data, init);
+  } catch (error) {
+    assert_equals(error.name, 'DataCloneError', 'error.name');
+  }
+  // `data.buffer` didn't get detached
+  assert_equals(data.length, 16, 'data.length');
+}, 'Test transfering detached buffer to VideoFrame');
+
+
+promise_test(async t => {
+  const rgb_plane = [
+    0xEE, 0xEE, 0xEE, 0xEE, 0xEE, 0xEE, 0xEE, 0xEE, 0xEE, 0xEE, 0xEE, 0xEE,
+    0xEE, 0xEE, 0xEE, 0xEE
+  ];
+  const padding_size = 6;
+  let arraybuffer = new ArrayBuffer(padding_size + 16 /* pixels */);
+  let data = new Uint8Array(arraybuffer, padding_size);
+  data.set(rgb_plane);
+
+  let init = {
+    format: 'RGBA',
+    timestamp: 1234,
+    codedWidth: 2,
+    codedHeight: 2,
+    visibleRect: {x: 0, y: 0, width: 2, height: 2},
+    transfer: [arraybuffer]
+  };
+
+  let frame = new VideoFrame(data, init);
+  assert_equals(data.length, 0, 'data.length after detach');
+  assert_equals(arraybuffer.byteLength, 0, 'arraybuffer after detach');
+
+  const options = {
+    rect: {x: 0, y: 0, width: init.codedWidth, height: init.codedHeight}
+  };
+  let size = frame.allocationSize(options);
+  let output_data = new Uint8Array(size);
+  let layout = await frame.copyTo(output_data, options);
+  for (let i = 0; i < size; i++) {
+    assert_equals(output_data[i], 0xEE, `output_data[${i}]`);
+  }
+}, 'Test transfering view of an ArrayBuffer to VideoFrame');
+
+promise_test(async t => {
+  const rgb_plane = [
+    0xEE, 0xEE, 0xEE, 0xEE, 0xEE, 0xEE, 0xEE, 0xEE, 0xEE, 0xEE, 0xEE, 0xEE,
+    0xEE, 0xEE, 0xEE, 0xEE
+  ];
+  const padding_size = 6;
+  let arraybuffer = new ArrayBuffer(padding_size + 16 /* pixels */);
+  let data = new Uint8Array(arraybuffer, padding_size);
+  data.set(rgb_plane);
+
+  let init = {
+    format: 'RGBA',
+    timestamp: 1234,
+    codedWidth: 2,
+    codedHeight: 2,
+    visibleRect: {x: 0, y: 0, width: 2, height: 2},
+    transfer: [arraybuffer, arraybuffer]
+  };
+
+  try {
+    new VideoFrame(data, init);
+  } catch (error) {
+    assert_equals(error.name, 'DataCloneError', 'error.name');
+  }
+  // `data.buffer` didn't get detached
+  assert_equals(data.length, 16, 'data.length');
+}, 'Test transfering same array buffer twice');
diff --git a/tests/wpt/tests/webcodecs/video-decoder.https.any.js b/tests/wpt/tests/webcodecs/video-decoder.https.any.js
index 431ac4f34a9..190a524dd6c 100644
--- a/tests/wpt/tests/webcodecs/video-decoder.https.any.js
+++ b/tests/wpt/tests/webcodecs/video-decoder.https.any.js
@@ -58,6 +58,10 @@ const validButUnsupportedConfigs = [
     comment: 'Ambiguous codec',
     config: {codec: 'vp9'},
   },
+  {
+    comment: 'Codec with bad casing',
+    config: {codec: 'Vp09.00.10.08'},
+  },
   {
     comment: 'Codec with MIME type',
     config: {codec: 'video/webm; codecs="vp8"'},
@@ -92,22 +96,24 @@ validButUnsupportedConfigs.forEach(entry => {
 });
 
 validButUnsupportedConfigs.forEach(entry => {
-  promise_test(
-    async t => {
-        const callbacks = {
+  async_test(
+      t => {
+        let codec = new VideoDecoder({
           output: t.unreached_func('unexpected output'),
-        };
-        const error = new Promise(resolve => callbacks.error = e => {
-          resolve(e);
+          error: t.step_func_done(e => {
+            assert_true(e instanceof DOMException);
+            assert_equals(e.name, 'NotSupportedError');
+            assert_equals(codec.state, 'closed', 'state');
+          })
         });
-        let codec = new VideoDecoder(callbacks);
         codec.configure(entry.config);
-        let e = await error;
-        assert_true(e instanceof DOMException);
-        assert_equals(e.name, 'NotSupportedError');
-        assert_equals(codec.state, 'closed', 'state');
-
-        t.done();
+        codec.flush()
+            .then(t.unreached_func('flush succeeded unexpectedly'))
+            .catch(t.step_func(e => {
+              assert_true(e instanceof DOMException);
+              assert_equals(e.name, 'NotSupportedError');
+              assert_equals(codec.state, 'closed', 'state');
+            }));
       },
       'Test that VideoDecoder.configure() doesn\'t support config: ' +
           entry.comment);
diff --git a/tests/wpt/tests/webcodecs/video-encoder-config.https.any.js b/tests/wpt/tests/webcodecs/video-encoder-config.https.any.js
index be2574f7901..e4807361fca 100644
--- a/tests/wpt/tests/webcodecs/video-encoder-config.https.any.js
+++ b/tests/wpt/tests/webcodecs/video-encoder-config.https.any.js
@@ -89,6 +89,14 @@ const validButUnsupportedConfigs = [
       height: 480,
     },
   },
+  {
+    comment: 'Codec with bad casing',
+    config: {
+      codec: 'vP8',
+      width: 640,
+      height: 480,
+    },
+  },
   {
     comment: 'Width is too large',
     config: {
@@ -183,11 +191,22 @@ validButUnsupportedConfigs.forEach(entry => {
 validButUnsupportedConfigs.forEach(entry => {
   async_test(
       t => {
-        let codec = new VideoEncoder(getDefaultCodecInit(t));
-        assert_throws_dom('NotSupportedError', () => {
-          codec.configure(entry.config);
+        let codec = new VideoEncoder({
+          output: t.unreached_func('unexpected output'),
+          error: t.step_func_done(e => {
+            assert_true(e instanceof DOMException);
+            assert_equals(e.name, 'NotSupportedError');
+            assert_equals(codec.state, 'closed', 'state');
+          })
         });
-        t.done();
+        codec.configure(entry.config);
+        codec.flush()
+            .then(t.unreached_func('flush succeeded unexpectedly'))
+            .catch(t.step_func(e => {
+              assert_true(e instanceof DOMException);
+              assert_equals(e.name, 'NotSupportedError');
+              assert_equals(codec.state, 'closed', 'state');
+            }));
       },
       'Test that VideoEncoder.configure() doesn\'t support config: ' +
           entry.comment);
@@ -251,12 +270,7 @@ validConfigs.forEach(config => {
       assert_equals(new_config.latencyMode, config.latencyMode);
     if (config.alpha)
       assert_equals(new_config.alpha, config.alpha);
-    if (config.codec.startsWith('avc')) {
-      if (config.avc) {
-        assert_equals(new_config.avc.format, config.avc.format);
-      }
-    } else {
-      assert_equals(new_config.avc, undefined);
-    }
+    if (config.avc)
+      assert_equals(new_config.avc.format, config.avc.format);
   }, "VideoEncoder.isConfigSupported() supports:" + JSON.stringify(config));
 });
diff --git a/tests/wpt/tests/webcodecs/video-encoder-flush.https.any.js b/tests/wpt/tests/webcodecs/video-encoder-flush.https.any.js
new file mode 100644
index 00000000000..8f1724bc857
--- /dev/null
+++ b/tests/wpt/tests/webcodecs/video-encoder-flush.https.any.js
@@ -0,0 +1,47 @@
+// META: global=window,dedicatedworker
+// META: script=/common/media.js
+// META: script=/webcodecs/utils.js
+// META: script=/webcodecs/video-encoder-utils.js
+
+promise_test(async t => {
+  let codecInit = getDefaultCodecInit(t);
+  let encoderConfig = {
+    codec: 'vp8',
+    width: 640,
+    height: 480,
+    displayWidth: 800,
+    displayHeight: 600,
+  };
+
+  let outputs = 0;
+  let firstOutput = new Promise(resolve => {
+    codecInit.output = (chunk, metadata) => {
+      outputs++;
+      assert_equals(outputs, 1, 'outputs');
+      encoder.reset();
+      resolve();
+    };
+  });
+
+  let encoder = new VideoEncoder(codecInit);
+  encoder.configure(encoderConfig);
+
+  let frame1 = createFrame(640, 480, 0);
+  let frame2 = createFrame(640, 480, 33333);
+  t.add_cleanup(() => {
+    frame1.close();
+    frame2.close();
+  });
+
+  encoder.encode(frame1);
+  encoder.encode(frame2);
+  const flushDone = encoder.flush();
+
+  // Wait for the first output, then reset.
+  await firstOutput;
+
+  // Flush should have been synchronously rejected.
+  await promise_rejects_dom(t, 'AbortError', flushDone);
+
+  assert_equals(outputs, 1, 'outputs');
+}, 'Test reset during flush');
diff --git a/tests/wpt/tests/webcodecs/video-encoder-h264.https.any.js b/tests/wpt/tests/webcodecs/video-encoder-h264.https.any.js
new file mode 100644
index 00000000000..82370a8338c
--- /dev/null
+++ b/tests/wpt/tests/webcodecs/video-encoder-h264.https.any.js
@@ -0,0 +1,69 @@
+// META: global=window,dedicatedworker
+// META: script=/common/media.js
+// META: script=/webcodecs/utils.js
+// META: script=/webcodecs/video-encoder-utils.js
+// META: variant=?baseline
+// META: variant=?main
+// META: variant=?high
+
+promise_test(async t => {
+  const codecString = {
+    '?baseline': 'avc1.42001e',
+    '?main': 'avc1.4d001e',
+    '?high': 'avc1.64001e',
+  }[location.search];
+
+  let encoderConfig = {
+    codec: codecString,
+    width: 640,
+    height: 480,
+    displayWidth: 800,
+    displayHeight: 600,
+    avc: {format: 'avc'},  // AVC makes it easy to check the profile.
+  };
+
+  let supported = false;
+  try {
+    const support = await VideoEncoder.isConfigSupported(encoderConfig);
+    supported = support.supported;
+  } catch (e) {
+  }
+  assert_implements_optional(
+      supported, `H264 ${location.search.substring(1)} profile unsupported`);
+
+  let description = null;
+  let codecInit = {
+    error: t.unreached_func('Unexpected encoding error'),
+    output: (_, metadata) => {
+      assert_not_equals(metadata, null);
+      if (metadata.decoderConfig)
+        description = metadata.decoderConfig.description;
+    },
+  };
+
+  let encoder = new VideoEncoder(codecInit);
+  encoder.configure(encoderConfig);
+
+  let frame1 = createFrame(640, 480, 0);
+  let frame2 = createFrame(640, 480, 33333);
+  t.add_cleanup(() => {
+    frame1.close();
+    frame2.close();
+  });
+
+  encoder.encode(frame1);
+  encoder.encode(frame2);
+
+  await encoder.flush();
+
+  assert_not_equals(description, null);
+  assert_not_equals(description.length, 0);
+
+  // Profile is a hex code at xx in a codec string of form "avc1.xxyyzz".
+  let expectedProfileIndication = parseInt(codecString.substring(5, 7), 16);
+
+  // See AVCDecoderConfigurationRecord in ISO/IEC 14496-15 for details.
+  // https://www.w3.org/TR/webcodecs-avc-codec-registration/#dom-avcbitstreamformat-avc
+  let profileIndication = new Uint8Array(description)[1];
+  assert_equals(profileIndication, expectedProfileIndication);
+}, 'Test that encoding with a specific H264 profile actually produces that profile.');
diff --git a/tests/wpt/tests/webcodecs/video-encoder.https.any.js b/tests/wpt/tests/webcodecs/video-encoder.https.any.js
index c8db068e12f..2746e60917b 100644
--- a/tests/wpt/tests/webcodecs/video-encoder.https.any.js
+++ b/tests/wpt/tests/webcodecs/video-encoder.https.any.js
@@ -23,21 +23,6 @@ promise_test(t => {
   return endAfterEventLoopTurn();
 }, 'Test VideoEncoder construction');
 
-promise_test(t => {
-  let encoder = new VideoEncoder(getDefaultCodecInit(t));
-
-  let unsupportedCodecsList = [
-    'bogus',                    // Non existent codec
-    'vorbis',                   // Audio codec
-    'vp9',                      // Ambiguous codec
-    'video/webm; codecs="vp9"'  // Codec with mime type
-  ]
-
-  testConfigurations(encoder, defaultConfig, unsupportedCodecsList);
-
-  return endAfterEventLoopTurn();
-}, 'Test VideoEncoder.configure()');
-
 promise_test(async t => {
   let output_chunks = [];
   let codecInit = getDefaultCodecInit(t);
@@ -221,8 +206,12 @@ promise_test(async t => {
 
 promise_test(async t => {
   let output_chunks = [];
-  let codecInit = getDefaultCodecInit(t);
-  codecInit.output = chunk => output_chunks.push(chunk);
+  const codecInit = {
+    output: chunk => output_chunks.push(chunk),
+  };
+  const error = new Promise(resolve => codecInit.error = e => {
+    resolve(e);
+  });
 
   let encoder = new VideoEncoder(codecInit);
 
@@ -253,24 +242,21 @@ promise_test(async t => {
   output_chunks = [];
 
   let frame3 = createFrame(640, 480, 66666);
-  let frame4 = createFrame(640, 480, 100000);
 
   encoder.encode(frame3);
 
-  // Verify that a failed call to configure does not change the encoder's state.
   let badConfig = { ...defaultConfig };
-  badConfig.codec = 'bogus';
-  assert_throws_dom('NotSupportedError', () => encoder.configure(badConfig));
-
-  delete badConfig['codec'];
+  badConfig.codec = '';
   assert_throws_js(TypeError, () => encoder.configure(badConfig));
 
-  encoder.encode(frame4);
+  badConfig.codec = 'bogus';
+  encoder.configure(badConfig);
+  let e = await error;
+  assert_true(e instanceof DOMException);
+  assert_equals(e.name, 'NotSupportedError');
+  assert_equals(encoder.state, 'closed', 'state');
 
-  await encoder.flush();
-
-  assert_equals(output_chunks[0].timestamp, frame3.timestamp);
-  assert_equals(output_chunks[1].timestamp, frame4.timestamp);
+  // We may or may not have received frame3 before closing.
 }, 'Test successful encode() after re-configure().');
 
 promise_test(async t => {
diff --git a/tests/wpt/tests/webcodecs/videoDecoder-codec-specific.https.any.js b/tests/wpt/tests/webcodecs/videoDecoder-codec-specific.https.any.js
index 09e20379898..a3acb82ab26 100644
--- a/tests/wpt/tests/webcodecs/videoDecoder-codec-specific.https.any.js
+++ b/tests/wpt/tests/webcodecs/videoDecoder-codec-specific.https.any.js
@@ -418,7 +418,7 @@ promise_test(async t => {
 
   await promise_rejects_dom(t, "EncodingError",
     decoder.flush().catch((e) => {
-      assert_equals(errors, 0);
+      assert_equals(errors, 1);
       throw e;
     })
   );
@@ -453,7 +453,7 @@ promise_test(async t => {
 
   await promise_rejects_dom(t, "EncodingError",
     decoder.flush().catch((e) => {
-      assert_equals(errors, 0);
+      assert_equals(errors, 1);
       throw e;
     })
   );
@@ -568,7 +568,6 @@ promise_test(async t => {
   });
 }, 'Test low-latency decoding');
 
-
 promise_test(async t => {
   await checkImplements();
   const callbacks = {};
diff --git a/tests/wpt/tests/webcodecs/videoFrame-canvasImageSource.html b/tests/wpt/tests/webcodecs/videoFrame-canvasImageSource.html
index 397404be4ec..a60040e56a8 100644
--- a/tests/wpt/tests/webcodecs/videoFrame-canvasImageSource.html
+++ b/tests/wpt/tests/webcodecs/videoFrame-canvasImageSource.html
@@ -61,7 +61,21 @@ async_test(t => {
     frame.close();
     t.done();
   }));
-  video.src = 'four-colors.mp4';
+
+  const mediaConfig = {
+    type: 'file',
+    video: {
+      contentType: 'video/mp4; codecs="av01.0.04M.08"',
+      width: 320,
+      height: 240,
+      bitrate: 1000000,
+      framerate: '30'
+    }
+  };
+  navigator.mediaCapabilities.decodingInfo(mediaConfig).then(t.step_func(result => {
+    assert_implements_optional(result.supported, "AV.1 file streaming unsupported");
+    video.src = 'four-colors.mp4';
+  }));
 }, '<video> and VideoFrame constructed VideoFrame');
 
 test(t => {
diff --git a/tests/wpt/tests/webcodecs/videoFrame-construction.any.js b/tests/wpt/tests/webcodecs/videoFrame-construction.any.js
index 8e8a3eac18b..9f2929aedec 100644
--- a/tests/wpt/tests/webcodecs/videoFrame-construction.any.js
+++ b/tests/wpt/tests/webcodecs/videoFrame-construction.any.js
@@ -402,18 +402,10 @@ test(t => {
       TypeError,
       () => constructFrame({timestamp: 1234, codedWidth: 4, codedHeight: 0}),
       'invalid coded height');
-  assert_throws_js(
-      TypeError,
-      () => constructFrame({timestamp: 1234, codedWidth: 4, codedHeight: 1}),
-      'odd coded height');
   assert_throws_js(
       TypeError,
       () => constructFrame({timestamp: 1234, codedWidth: 0, codedHeight: 4}),
       'invalid coded width');
-  assert_throws_js(
-      TypeError,
-      () => constructFrame({timestamp: 1234, codedWidth: 3, codedHeight: 2}),
-      'odd coded width');
   assert_throws_js(
       TypeError, () => constructFrame({
                    timestamp: 1234,
diff --git a/tests/wpt/tests/webcodecs/videoFrame-copyTo.any.js b/tests/wpt/tests/webcodecs/videoFrame-copyTo.any.js
index 79ba3c63043..0fa57f43105 100644
--- a/tests/wpt/tests/webcodecs/videoFrame-copyTo.any.js
+++ b/tests/wpt/tests/webcodecs/videoFrame-copyTo.any.js
@@ -278,16 +278,6 @@ promise_test(async t => {
   await promise_rejects_js(t, TypeError, frame.copyTo(data, options));
 }, 'Test empty rect.');
 
-promise_test(async t => {
-  const frame = makeI420_4x2();
-  const options = {
-      rect: {x: 0, y: 0, width: 4, height: 1},
-  };
-  assert_throws_js(TypeError, () => frame.allocationSize(options));
-  const data = new Uint8Array(12);
-  await promise_rejects_js(t, TypeError, frame.copyTo(data, options));
-}, 'Test unaligned rect.');
-
 promise_test(async t => {
   const frame = makeI420_4x2();
   const options = {
diff --git a/tests/wpt/tests/webcodecs/videoFrame-odd-size.any.js b/tests/wpt/tests/webcodecs/videoFrame-odd-size.any.js
new file mode 100644
index 00000000000..da9754077f5
--- /dev/null
+++ b/tests/wpt/tests/webcodecs/videoFrame-odd-size.any.js
@@ -0,0 +1,50 @@
+// META: global=window,dedicatedworker
+// META: script=/webcodecs/videoFrame-utils.js
+
+test(t => {
+  let fmt = 'I420';
+  let vfInit = {
+    format: fmt,
+    timestamp: 1234,
+    codedWidth: 3,
+    codedHeight: 3,
+    visibleRect: {x: 0, y: 0, width: 3, height: 3},
+  };
+  let data = new Uint8Array([
+    1, 2, 3, 4, 5, 6, 7, 8, 9,  // y
+    1, 2, 3, 4,                 // u
+    1, 2, 3, 4,                 // v
+  ]);
+  let frame = new VideoFrame(data, vfInit);
+  assert_equals(frame.format, fmt, 'format');
+  assert_equals(frame.visibleRect.x, 0, 'visibleRect.x');
+  assert_equals(frame.visibleRect.y, 0, 'visibleRect.y');
+  assert_equals(frame.visibleRect.width, 3, 'visibleRect.width');
+  assert_equals(frame.visibleRect.height, 3, 'visibleRect.height');
+  frame.close();
+}, 'Test I420 VideoFrame construction with odd coded size');
+
+promise_test(async t => {
+  const init = {
+    format: 'I420',
+    timestamp: 0,
+    codedWidth: 3,
+    codedHeight: 3,
+  };
+  const buf = new Uint8Array([
+    1, 2, 3, 4, 5, 6, 7, 8, 9,  // y
+    10, 11, 12, 13,             // u
+    14, 15, 16, 17,             // v
+  ]);
+  const expectedLayout = [
+    {offset: 0, stride: 3},
+    {offset: 9, stride: 2},
+    {offset: 13, stride: 2},
+  ];
+  const frame = new VideoFrame(buf, init);
+  assert_equals(frame.allocationSize(), buf.length, 'allocationSize()');
+  const data = new Uint8Array(buf.length);
+  const layout = await frame.copyTo(data);
+  assert_layout_equals(layout, expectedLayout);
+  assert_buffer_equals(data, buf);
+}, 'Test I420 copyTo with odd coded size.');
diff --git a/tests/wpt/tests/webcodecs/videoFrame-serialization.crossAgentCluster.https.html b/tests/wpt/tests/webcodecs/videoFrame-serialization.crossAgentCluster.https.html
index 11b5e23124e..967f02ec2cb 100644
--- a/tests/wpt/tests/webcodecs/videoFrame-serialization.crossAgentCluster.https.html
+++ b/tests/wpt/tests/webcodecs/videoFrame-serialization.crossAgentCluster.https.html
@@ -5,66 +5,12 @@
   <script src='/resources/testharnessreport.js'></script>
   <script src='/common/get-host-info.sub.js'></script>
   <script src='/webcodecs/utils.js'></script>
-  <script id='workerCode' type='javascript/worker'>
-    self.onmessage = (e) => {
-      let frame = e.data.frame;
-      if (e.data.transfer) {
-        postMessage(frame, [frame]);
-      } else {
-        postMessage(frame);
-      }
-    };
-  </script>
-  <script id='sharedWorkerCode' type='javascript/worker'>
-    const data = new Uint8Array([
-      1, 2, 3, 4, 5, 6, 7, 8,
-      9, 10, 11, 12, 13, 14, 15, 16,
-    ]);
-    let received = new Map();
-    self.onconnect = function (event) {
-      const port = event.ports[0];
-      port.onmessage = function (e) {
-        if (e.data == 'create-frame') {
-          let frameOrError = null;
-          try {
-            frameOrError = new VideoFrame(data, {
-              timestamp: 0,
-              codedWidth: 2,
-              codedHeight: 2,
-              format: 'RGBA',
-            });
-          } catch (error) {
-            frameOrError = error
-          }
-          port.postMessage(frameOrError);
-          return;
-        }
-        if (e.data.hasOwnProperty('id')) {
-          port.postMessage(
-            received.get(e.data.id) ? 'RECEIVED' : 'NOT_RECEIVED');
-          return;
-        }
-        if (e.data.toString() == '[object VideoFrame]') {
-          received.set(e.data.timestamp, e.data);
-        }
-      };
-    };
-  </script>
 </head>
 <body>
 <script>
 const HELPER = '/webcodecs/videoFrame-serialization.crossAgentCluster.helper.html';
-const SAMEORIGIN_BASE = get_host_info().HTTPS_ORIGIN;
 const CROSSORIGIN_BASE = get_host_info().HTTPS_NOTSAMESITE_ORIGIN;
-const SAMEORIGIN_HELPER = SAMEORIGIN_BASE + HELPER;
 const CROSSORIGIN_HELPER = CROSSORIGIN_BASE + HELPER;
-const SERVICE_WORKER = 'serialization.crossAgentCluster.serviceworker.js';
-
-promise_test(async () => {
-  const target = (await appendIframe(SAMEORIGIN_HELPER)).contentWindow;
-  let frame = createVideoFrame(10);
-  assert_true(await canSerializeVideoFrame(target, frame));
-}, 'Verify frames can be passed within the same agent clusters');
 
 promise_test(async () => {
   const target = (await appendIframe(CROSSORIGIN_HELPER)).contentWindow;
@@ -72,149 +18,12 @@ promise_test(async () => {
   assert_false(await canSerializeVideoFrame(target, frame));
 }, 'Verify frames cannot be passed accross the different agent clusters');
 
-promise_test(async () => {
-  const blob = new Blob([document.querySelector('#workerCode').textContent], {
-    type: 'text/javascript',
-  });
-  const worker = new Worker(window.URL.createObjectURL(blob));
-  let frame = createVideoFrame(30);
-  worker.postMessage({frame: frame, transfer: false});
-  const received = await new Promise(resolve => worker.onmessage = e => {
-    resolve(e.data);
-  });
-  assert_equals(received.toString(), '[object VideoFrame]');
-  assert_equals(received.timestamp, 30);
-}, 'Verify frames can be passed back and forth between main and worker');
-
-promise_test(async () => {
-  const encodedScriptText = btoa("self.onmessage = (e) => { postMessage(e.data);};");
-  const scriptURL = 'data:text/javascript;base64,' + encodedScriptText;
-  const worker = new Worker(scriptURL);
-  let frame = createVideoFrame(40);
-  worker.postMessage(frame);
-  const received = await new Promise(resolve => worker.onmessage = e => {
-    resolve(e.data);
-  });
-  assert_equals(received.toString(), '[object VideoFrame]');
-  assert_equals(received.timestamp, 40);
-}, 'Verify frames can be passed back and forth between main and data-url worker');
-
-promise_test(async () => {
-  const blob = new Blob([document.querySelector('#sharedWorkerCode').textContent], {
-    type: 'text/javascript',
-  });
-  const worker = new SharedWorker(window.URL.createObjectURL(blob));
-  let frame = createVideoFrame(50);
-  worker.port.postMessage(frame);
-  worker.port.postMessage({'id': 50});
-  const received = await new Promise(resolve => worker.port.onmessage = e => {
-    resolve(e.data);
-  });
-  assert_equals(received, 'NOT_RECEIVED');
-}, 'Verify frames cannot be passed to sharedworker');
-
-promise_test(async () => {
-  navigator.serviceWorker.register(SERVICE_WORKER);
-  navigator.serviceWorker.ready.then((registration) => {
-    let frame = createVideoFrame(60);
-    registration.active.postMessage(frame);
-    registration.active.postMessage({'videoFrameId': 60});
-  });
-  const received = await new Promise(resolve => navigator.serviceWorker.onmessage = (e) => {
-    resolve(e.data);
-  });
-  assert_equals(received, 'NOT_RECEIVED');
-}, 'Verify frames cannot be passed to serviceworker');
-
-promise_test(async () => {
-  const target = (await appendIframe(SAMEORIGIN_HELPER)).contentWindow;
-  let frame = createVideoFrame(70);
-  assert_true(await canTransferVideoFrame(target, frame));
-  assert_true(isFrameClosed(frame));
-}, 'Verify frames can be transferred within the same agent clusters');
-
 promise_test(async () => {
   const target = (await appendIframe(CROSSORIGIN_HELPER)).contentWindow;
   let frame = createVideoFrame(80);
   assert_false(await canTransferVideoFrame(target, frame));
 }, 'Verify frames cannot be transferred accross the different agent clusters');
 
-promise_test(async () => {
-  const blob = new Blob([document.querySelector('#workerCode').textContent], {
-    type: 'text/javascript',
-  });
-  const worker = new Worker(window.URL.createObjectURL(blob));
-  let frame = createVideoFrame(90);
-  worker.postMessage({frame: frame, transfer: true}, [frame]);
-  const received = await new Promise(resolve => worker.onmessage = e => {
-    resolve(e.data);
-  });
-  assert_equals(received.toString(), '[object VideoFrame]');
-  assert_equals(received.timestamp, 90);
-}, 'Verify frames can be transferred back and forth between main and worker');
-
-promise_test(async () => {
-  const encodedScriptText = btoa("self.onmessage = (e) => { let f = e.data; postMessage(f, [f]); };");
-  const scriptURL = 'data:text/javascript;base64,' + encodedScriptText;
-  const worker = new Worker(scriptURL);
-  let frame = createVideoFrame(100);
-  worker.postMessage(frame, [frame]);
-  const received = await new Promise(resolve => worker.onmessage = e => {
-    resolve(e.data);
-  });
-  assert_equals(received.toString(), '[object VideoFrame]');
-  assert_equals(received.timestamp, 100);
-}, 'Verify frames can be transferred back and forth between main and data-url worker');
-
-promise_test(async () => {
-  const blob = new Blob([document.querySelector('#sharedWorkerCode').textContent], {
-    type: 'text/javascript',
-  });
-  const worker = new SharedWorker(window.URL.createObjectURL(blob));
-  let frame = createVideoFrame(110);
-  worker.port.postMessage(frame, [frame]);
-  worker.port.postMessage({'id': 110});
-  const received = await new Promise(resolve => worker.port.onmessage = e => {
-    resolve(e.data);
-  });
-  assert_equals(received, 'NOT_RECEIVED');
-}, 'Verify frames cannot be transferred to a sharedworker');
-
-promise_test(async () => {
-  navigator.serviceWorker.register(SERVICE_WORKER);
-  navigator.serviceWorker.ready.then((registration) => {
-    let frame = createVideoFrame(120);
-    registration.active.postMessage(frame, [frame]);
-    registration.active.postMessage({'videoFrameId': 120});
-  });
-  const received = await new Promise(resolve => navigator.serviceWorker.onmessage = (e) => {
-    resolve(e.data);
-  });
-  assert_equals(received, 'NOT_RECEIVED');
-}, 'Verify frames cannot be transferred to serviceworker');
-
-promise_test(async () => {
-  const blob = new Blob([document.querySelector('#sharedWorkerCode').textContent], {
-    type: 'text/javascript',
-  });
-  const worker = new SharedWorker(window.URL.createObjectURL(blob));
-  worker.port.postMessage('create-frame');
-  const received = await new Promise(resolve => worker.port.onmessage = e => {
-    resolve(e.data);
-  });
-  assert_true(received instanceof ReferenceError);
-}, 'Verify frames is unavailable in sharedworker');
-
-promise_test(async () => {
-  navigator.serviceWorker.register(SERVICE_WORKER);
-  let registration = await navigator.serviceWorker.ready;
-  registration.active.postMessage('create-VideoFrame');
-  const received = await new Promise(resolve => navigator.serviceWorker.onmessage = (e) => {
-    resolve(e.data);
-  });
-  assert_true(received instanceof ReferenceError);
-}, 'Verify frames is unavailable in serviceworker');
-
 function appendIframe(src) {
   const frame = document.createElement('iframe');
   document.body.appendChild(frame);
diff --git a/tests/wpt/tests/webcodecs/videoFrame-serialization.https.html b/tests/wpt/tests/webcodecs/videoFrame-serialization.https.html
new file mode 100644
index 00000000000..53eeae28d88
--- /dev/null
+++ b/tests/wpt/tests/webcodecs/videoFrame-serialization.https.html
@@ -0,0 +1,259 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <script src='/resources/testharness.js'></script>
+  <script src='/resources/testharnessreport.js'></script>
+  <script src='/common/get-host-info.sub.js'></script>
+  <script src='/webcodecs/utils.js'></script>
+  <script id='workerCode' type='javascript/worker'>
+    self.onmessage = (e) => {
+      let frame = e.data.frame;
+      if (e.data.transfer) {
+        postMessage(frame, [frame]);
+      } else {
+        postMessage(frame);
+      }
+    };
+  </script>
+  <script id='sharedWorkerCode' type='javascript/worker'>
+    const data = new Uint8Array([
+      1, 2, 3, 4, 5, 6, 7, 8,
+      9, 10, 11, 12, 13, 14, 15, 16,
+    ]);
+    let received = new Map();
+    self.onconnect = function (event) {
+      const port = event.ports[0];
+      port.onmessage = function (e) {
+        if (e.data == 'create-frame') {
+          let frameOrError = null;
+          try {
+            frameOrError = new VideoFrame(data, {
+              timestamp: 0,
+              codedWidth: 2,
+              codedHeight: 2,
+              format: 'RGBA',
+            });
+          } catch (error) {
+            frameOrError = error
+          }
+          port.postMessage(frameOrError);
+          return;
+        }
+        if (e.data.hasOwnProperty('id')) {
+          port.postMessage(
+            received.get(e.data.id) ? 'RECEIVED' : 'NOT_RECEIVED');
+          return;
+        }
+        if (e.data.toString() == '[object VideoFrame]') {
+          received.set(e.data.timestamp, e.data);
+        }
+      };
+    };
+  </script>
+</head>
+<body>
+<script>
+const HELPER = '/webcodecs/videoFrame-serialization.crossAgentCluster.helper.html';
+const SAMEORIGIN_BASE = get_host_info().HTTPS_ORIGIN;
+const CROSSORIGIN_BASE = get_host_info().HTTPS_NOTSAMESITE_ORIGIN;
+const SAMEORIGIN_HELPER = SAMEORIGIN_BASE + HELPER;
+const CROSSORIGIN_HELPER = CROSSORIGIN_BASE + HELPER;
+const SERVICE_WORKER = 'serialization.crossAgentCluster.serviceworker.js';
+
+promise_test(async (t) => {
+  const target = (await appendIframe(SAMEORIGIN_HELPER)).contentWindow;
+  let frame = createVideoFrame(10);
+  t.add_cleanup(() => frame.close());
+  assert_true(await canSerializeVideoFrame(target, frame));
+}, 'Verify frames can be passed within the same agent clusters');
+
+promise_test(async (t) => {
+  const blob = new Blob([document.querySelector('#workerCode').textContent], {
+    type: 'text/javascript',
+  });
+  const worker = new Worker(window.URL.createObjectURL(blob));
+  let frame = createVideoFrame(30);
+  t.add_cleanup(() => frame.close());
+  worker.postMessage({frame: frame, transfer: false});
+  const received = await new Promise(resolve => worker.onmessage = e => {
+    resolve(e.data);
+  });
+  assert_equals(received.toString(), '[object VideoFrame]');
+  assert_equals(received.timestamp, 30);
+}, 'Verify frames can be passed back and forth between main and worker');
+
+promise_test(async (t) => {
+  const encodedScriptText = btoa("self.onmessage = (e) => { postMessage(e.data);};");
+  const scriptURL = 'data:text/javascript;base64,' + encodedScriptText;
+  const worker = new Worker(scriptURL);
+  let frame = createVideoFrame(40);
+  t.add_cleanup(() => frame.close());
+  worker.postMessage(frame);
+  const received = await new Promise(resolve => worker.onmessage = e => {
+    resolve(e.data);
+  });
+  assert_equals(received.toString(), '[object VideoFrame]');
+  assert_equals(received.timestamp, 40);
+}, 'Verify frames can be passed back and forth between main and data-url worker');
+
+promise_test(async (t) => {
+  const blob = new Blob([document.querySelector('#sharedWorkerCode').textContent], {
+    type: 'text/javascript',
+  });
+  const worker = new SharedWorker(window.URL.createObjectURL(blob));
+  let frame = createVideoFrame(50);
+  t.add_cleanup(() => frame.close());
+  worker.port.postMessage(frame);
+  worker.port.postMessage({'id': 50});
+  const received = await new Promise(resolve => worker.port.onmessage = e => {
+    resolve(e.data);
+  });
+  assert_equals(received, 'NOT_RECEIVED');
+}, 'Verify frames cannot be passed to sharedworker');
+
+promise_test(async (t) => {
+  navigator.serviceWorker.register(SERVICE_WORKER);
+  navigator.serviceWorker.ready.then((registration) => {
+    let frame = createVideoFrame(60);
+    t.add_cleanup(() => frame.close());
+    registration.active.postMessage(frame);
+    registration.active.postMessage({'videoFrameId': 60});
+  });
+  const received = await new Promise(resolve => navigator.serviceWorker.onmessage = (e) => {
+    resolve(e.data);
+  });
+  assert_equals(received, 'NOT_RECEIVED');
+}, 'Verify frames cannot be passed to serviceworker');
+
+promise_test(async (t) => {
+  const target = (await appendIframe(SAMEORIGIN_HELPER)).contentWindow;
+  let frame = createVideoFrame(70);
+  t.add_cleanup(() => frame.close());
+  assert_true(await canTransferVideoFrame(target, frame));
+  assert_true(isFrameClosed(frame));
+}, 'Verify frames can be transferred within the same agent clusters');
+
+promise_test(async (t) => {
+  const blob = new Blob([document.querySelector('#workerCode').textContent], {
+    type: 'text/javascript',
+  });
+  const worker = new Worker(window.URL.createObjectURL(blob));
+  let frame = createVideoFrame(90);
+  t.add_cleanup(() => frame.close());
+  worker.postMessage({frame: frame, transfer: true}, [frame]);
+  const received = await new Promise(resolve => worker.onmessage = e => {
+    resolve(e.data);
+  });
+  assert_equals(received.toString(), '[object VideoFrame]');
+  assert_equals(received.timestamp, 90);
+}, 'Verify frames can be transferred back and forth between main and worker');
+
+promise_test(async (t) => {
+  const encodedScriptText = btoa("self.onmessage = (e) => { let f = e.data; postMessage(f, [f]); };");
+  const scriptURL = 'data:text/javascript;base64,' + encodedScriptText;
+  const worker = new Worker(scriptURL);
+  let frame = createVideoFrame(100);
+  t.add_cleanup(() => frame.close());
+  worker.postMessage(frame, [frame]);
+  const received = await new Promise(resolve => worker.onmessage = e => {
+    resolve(e.data);
+  });
+  assert_equals(received.toString(), '[object VideoFrame]');
+  assert_equals(received.timestamp, 100);
+}, 'Verify frames can be transferred back and forth between main and data-url worker');
+
+promise_test(async (t) => {
+  const blob = new Blob([document.querySelector('#sharedWorkerCode').textContent], {
+    type: 'text/javascript',
+  });
+  const worker = new SharedWorker(window.URL.createObjectURL(blob));
+  let frame = createVideoFrame(110);
+  t.add_cleanup(() => frame.close());
+  worker.port.postMessage(frame, [frame]);
+  worker.port.postMessage({'id': 110});
+  const received = await new Promise(resolve => worker.port.onmessage = e => {
+    resolve(e.data);
+  });
+  assert_equals(received, 'NOT_RECEIVED');
+}, 'Verify frames cannot be transferred to a sharedworker');
+
+promise_test(async (t) => {
+  navigator.serviceWorker.register(SERVICE_WORKER);
+  navigator.serviceWorker.ready.then((registration) => {
+    let frame = createVideoFrame(120);
+    t.add_cleanup(() => frame.close());
+    registration.active.postMessage(frame, [frame]);
+    registration.active.postMessage({'videoFrameId': 120});
+  });
+  const received = await new Promise(resolve => navigator.serviceWorker.onmessage = (e) => {
+    resolve(e.data);
+  });
+  assert_equals(received, 'NOT_RECEIVED');
+}, 'Verify frames cannot be transferred to serviceworker');
+
+promise_test(async () => {
+  const blob = new Blob([document.querySelector('#sharedWorkerCode').textContent], {
+    type: 'text/javascript',
+  });
+  const worker = new SharedWorker(window.URL.createObjectURL(blob));
+  worker.port.postMessage('create-frame');
+  const received = await new Promise(resolve => worker.port.onmessage = e => {
+    resolve(e.data);
+  });
+  assert_true(received instanceof ReferenceError);
+}, 'Verify frames is unavailable in sharedworker');
+
+promise_test(async () => {
+  navigator.serviceWorker.register(SERVICE_WORKER);
+  let registration = await navigator.serviceWorker.ready;
+  registration.active.postMessage('create-VideoFrame');
+  const received = await new Promise(resolve => navigator.serviceWorker.onmessage = (e) => {
+    resolve(e.data);
+  });
+  assert_true(received instanceof ReferenceError);
+}, 'Verify frames is unavailable in serviceworker');
+
+function appendIframe(src) {
+  const frame = document.createElement('iframe');
+  document.body.appendChild(frame);
+  frame.src = src;
+  return new Promise(resolve => frame.onload = () => resolve(frame));
+};
+
+function createVideoFrame(ts) {
+  let data = new Uint8Array([
+    1, 2, 3, 4, 5, 6, 7, 8,
+    9, 10, 11, 12, 13, 14, 15, 16,
+  ]);
+  return new VideoFrame(data, {
+    timestamp: ts,
+    codedWidth: 2,
+    codedHeight: 2,
+    format: 'RGBA',
+  });
+}
+
+function canSerializeVideoFrame(target, vf) {
+  return canPostVideoFrame(target, vf, false);
+};
+
+function canTransferVideoFrame(target, vf) {
+  return canPostVideoFrame(target, vf, true);
+};
+
+function canPostVideoFrame(target, vf, transfer) {
+  if (transfer) {
+    target.postMessage(vf, '*', [vf]);
+    assert_true(isFrameClosed(vf));
+  } else {
+    target.postMessage(vf, '*');
+  }
+  // vf.timestamp doesn't change after vf is closed, so it's fine to use it.
+  target.postMessage({'id': vf.timestamp}, '*');
+  return new Promise(resolve => window.onmessage = e => {
+    resolve(e.data == 'RECEIVED');
+  });
+};
+</script>
+</body>
+</html>
diff --git a/tests/wpt/tests/webdriver/tests/bidi/__init__.py b/tests/wpt/tests/webdriver/tests/bidi/__init__.py
index 9d049f0a548..98a95a37fc3 100644
--- a/tests/wpt/tests/webdriver/tests/bidi/__init__.py
+++ b/tests/wpt/tests/webdriver/tests/bidi/__init__.py
@@ -50,6 +50,11 @@ def any_list(actual: Any) -> None:
     assert isinstance(actual, list)
 
 
+def any_list_or_null(actual: Any) -> None:
+    if actual is not None:
+        any_list(actual)
+
+
 def any_string(actual: Any) -> None:
     assert isinstance(actual, str)
 
diff --git a/tests/wpt/tests/webdriver/tests/bidi/browsing_context/handle_user_prompt/handle_user_prompt.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/handle_user_prompt/handle_user_prompt.py
new file mode 100644
index 00000000000..5d9fe587b69
--- /dev/null
+++ b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/handle_user_prompt/handle_user_prompt.py
@@ -0,0 +1,176 @@
+import asyncio
+import pytest
+
+import webdriver.bidi.error as error
+from webdriver.bidi.modules.script import ContextTarget
+
+pytestmark = pytest.mark.asyncio
+
+USER_PROMPT_OPENED_EVENT = "browsingContext.userPromptOpened"
+
+
+async def test_alert(bidi_session, wait_for_event, top_context, subscribe_events):
+    await subscribe_events([USER_PROMPT_OPENED_EVENT])
+    on_entry = wait_for_event(USER_PROMPT_OPENED_EVENT)
+
+    # Save as the task to await for it later.
+    task = asyncio.create_task(
+        bidi_session.script.evaluate(
+            expression="window.alert('test')",
+            target=ContextTarget(top_context["context"]),
+            await_promise=False,
+        )
+    )
+
+    # Wait for prompt to appear.
+    await on_entry
+
+    await bidi_session.browsing_context.handle_user_prompt(
+        context=top_context["context"]
+    )
+
+    # Make sure that script returned.
+    result = await task
+
+    assert result == {"type": "undefined"}
+
+
+@pytest.mark.parametrize("accept", [True, False])
+async def test_confirm(
+    bidi_session, wait_for_event, top_context, subscribe_events, accept
+):
+    await subscribe_events([USER_PROMPT_OPENED_EVENT])
+    on_entry = wait_for_event(USER_PROMPT_OPENED_EVENT)
+
+    # Save as the task to await for it later.
+    task = asyncio.create_task(
+        bidi_session.script.evaluate(
+            expression="window.confirm('test')",
+            target=ContextTarget(top_context["context"]),
+            await_promise=False,
+        )
+    )
+
+    # Wait for prompt to appear.
+    await on_entry
+
+    await bidi_session.browsing_context.handle_user_prompt(
+        context=top_context["context"], accept=accept
+    )
+
+    # Check that return result of confirm is correct.
+    result = await task
+
+    assert result == {"type": "boolean", "value": accept}
+
+
+@pytest.mark.parametrize("accept", [True, False])
+async def test_prompt(
+    bidi_session, wait_for_event, top_context, subscribe_events, accept
+):
+    await subscribe_events([USER_PROMPT_OPENED_EVENT])
+    on_entry = wait_for_event(USER_PROMPT_OPENED_EVENT)
+
+    # Save as the task to await for it later.
+    task = asyncio.create_task(
+        bidi_session.script.evaluate(
+            expression="window.prompt('Enter Your Name: ')",
+            target=ContextTarget(top_context["context"]),
+            await_promise=False,
+        )
+    )
+
+    # Wait for prompt to appear.
+    await on_entry
+
+    test_user_text = "Test"
+    await bidi_session.browsing_context.handle_user_prompt(
+        context=top_context["context"], accept=accept, user_text=test_user_text
+    )
+
+    # Check that return result of prompt is correct.
+    result = await task
+
+    if accept is True:
+        assert result == {"type": "string", "value": test_user_text}
+    else:
+        assert result == {"type": "null"}
+
+
+@pytest.mark.parametrize("type_hint", ["tab", "window"])
+async def test_two_top_level_contexts(
+    bidi_session, top_context, inline, subscribe_events, wait_for_event, type_hint
+):
+    new_context = await bidi_session.browsing_context.create(type_hint=type_hint)
+
+    await subscribe_events([USER_PROMPT_OPENED_EVENT])
+    on_entry = wait_for_event(USER_PROMPT_OPENED_EVENT)
+
+    await bidi_session.browsing_context.navigate(
+        context=new_context["context"],
+        url=inline("<script>window.alert('test')</script>"),
+    )
+
+    # Wait for prompt to appear.
+    await on_entry
+
+    # Try to close the prompt in another context.
+    with pytest.raises(error.NoSuchAlertException):
+        await bidi_session.browsing_context.handle_user_prompt(
+            context=top_context["context"]
+        )
+
+    # Close the prompt in the correct context
+    await bidi_session.browsing_context.handle_user_prompt(
+        context=new_context["context"]
+    )
+
+    await bidi_session.browsing_context.close(context=new_context["context"])
+
+
+async def test_multiple_frames(
+    bidi_session,
+    top_context,
+    inline,
+    test_page_multiple_frames,
+    subscribe_events,
+    wait_for_event,
+):
+    await subscribe_events([USER_PROMPT_OPENED_EVENT])
+    on_entry = wait_for_event(USER_PROMPT_OPENED_EVENT)
+
+    await bidi_session.browsing_context.navigate(
+        context=top_context["context"],
+        url=test_page_multiple_frames,
+        wait="complete",
+    )
+
+    contexts = await bidi_session.browsing_context.get_tree(root=top_context["context"])
+    assert len(contexts) == 1
+
+    assert len(contexts[0]["children"]) == 2
+    frame_1 = contexts[0]["children"][0]
+    frame_2 = contexts[0]["children"][1]
+
+    # Open a prompt in the first frame
+    await bidi_session.browsing_context.navigate(
+        context=frame_1["context"],
+        url=inline("<script>window.response = window.confirm('test')</script>"),
+    )
+
+    # Wait for prompt to appear.
+    await on_entry
+
+    # Close prompt from the second frame.
+    await bidi_session.browsing_context.handle_user_prompt(
+        context=frame_2["context"], accept=True
+    )
+
+    # Check that return result of confirm is correct.
+    result = await bidi_session.script.evaluate(
+        expression="window.response",
+        target=ContextTarget(frame_1["context"]),
+        await_promise=False,
+    )
+
+    assert result == {"type": "boolean", "value": True}
diff --git a/tests/wpt/tests/webdriver/tests/bidi/browsing_context/navigation_started/__init__.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/navigation_started/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/wpt/tests/webdriver/tests/bidi/browsing_context/navigation_started/navigation_started.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/navigation_started/navigation_started.py
new file mode 100644
index 00000000000..34f3a6246c8
--- /dev/null
+++ b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/navigation_started/navigation_started.py
@@ -0,0 +1,354 @@
+import asyncio
+
+import pytest
+from tests.support.sync import AsyncPoll
+
+from webdriver.error import TimeoutException
+from webdriver.bidi.error import UnknownErrorException
+from webdriver.bidi.modules.script import ContextTarget
+
+from ... import int_interval
+from .. import assert_navigation_info
+
+
+pytestmark = pytest.mark.asyncio
+
+NAVIGATION_STARTED_EVENT = "browsingContext.navigationStarted"
+PAGE_EMPTY = "/webdriver/tests/bidi/browsing_context/support/empty.html"
+
+
+async def test_unsubscribe(bidi_session):
+    await bidi_session.session.subscribe(events=[NAVIGATION_STARTED_EVENT])
+    await bidi_session.session.unsubscribe(events=[NAVIGATION_STARTED_EVENT])
+
+    # Track all received browsingContext.navigationStarted events in the events array
+    events = []
+
+    async def on_event(method, data):
+        events.append(data)
+
+    remove_listener = bidi_session.add_event_listener(
+        NAVIGATION_STARTED_EVENT, on_event
+    )
+
+    await bidi_session.browsing_context.create(type_hint="tab")
+
+    wait = AsyncPoll(bidi_session, timeout=0.5)
+    with pytest.raises(TimeoutException):
+        await wait.until(lambda _: len(events) > 0)
+
+    remove_listener()
+
+
+async def test_subscribe(
+    bidi_session, subscribe_events, inline, new_tab, wait_for_event
+):
+    await subscribe_events(events=[NAVIGATION_STARTED_EVENT])
+
+    on_entry = wait_for_event(NAVIGATION_STARTED_EVENT)
+    url = inline("<div>foo</div>")
+    result = await bidi_session.browsing_context.navigate(
+        context=new_tab["context"], url=url
+    )
+    event = await on_entry
+
+    assert_navigation_info(
+        event,
+        {
+            "context": new_tab["context"],
+            "navigation": result["navigation"],
+            "url": url,
+        },
+    )
+
+
+async def test_timestamp(
+    bidi_session, current_time, subscribe_events, inline, new_tab, wait_for_event
+):
+    await subscribe_events(events=[NAVIGATION_STARTED_EVENT])
+
+    time_start = await current_time()
+
+    on_entry = wait_for_event(NAVIGATION_STARTED_EVENT)
+    url = inline("<div>foo</div>")
+    result = await bidi_session.browsing_context.navigate(
+        context=new_tab["context"], url=url
+    )
+    event = await on_entry
+
+    time_end = await current_time()
+
+    assert_navigation_info(
+        event,
+        {
+            "context": new_tab["context"],
+            "navigation": result["navigation"],
+            "timestamp": int_interval(time_start, time_end),
+        },
+    )
+
+
+async def test_iframe(
+    bidi_session, subscribe_events, top_context, test_page_same_origin_frame, test_page
+):
+    events = []
+
+    async def on_event(method, data):
+        events.append(data)
+
+    remove_listener = bidi_session.add_event_listener(
+        NAVIGATION_STARTED_EVENT, on_event
+    )
+
+    await subscribe_events(events=[NAVIGATION_STARTED_EVENT])
+
+    result = await bidi_session.browsing_context.navigate(
+        context=top_context["context"], url=test_page_same_origin_frame, wait="complete"
+    )
+
+    # Check that 2 navigation-started events were received, one for the top context
+    # and one for the iframe.
+    assert len(events) == 2
+
+    contexts = await bidi_session.browsing_context.get_tree(root=top_context["context"])
+
+    assert len(contexts) == 1
+    root_info = contexts[0]
+    children_info = root_info["children"]
+    assert len(children_info) == 1
+
+    # First navigation-started event comes from the top-level browsing context.
+    assert_navigation_info(
+        events[0],
+        {
+            "context": top_context["context"],
+            "navigation": result["navigation"],
+            "url": test_page_same_origin_frame,
+        },
+    )
+
+    assert_navigation_info(
+        events[1],
+        {
+            "context": children_info[0]["context"],
+            "url": test_page,
+        },
+    )
+    assert events[1]["navigation"] is not None
+    assert events[1]["navigation"] != result["navigation"]
+
+    remove_listener()
+
+
+async def test_nested_iframes(
+    bidi_session,
+    subscribe_events,
+    top_context,
+    test_page_nested_frames,
+    test_page_same_origin_frame,
+    test_page,
+):
+    events = []
+
+    async def on_event(method, data):
+        events.append(data)
+
+    remove_listener = bidi_session.add_event_listener(
+        NAVIGATION_STARTED_EVENT, on_event
+    )
+
+    await subscribe_events(events=[NAVIGATION_STARTED_EVENT])
+
+    result = await bidi_session.browsing_context.navigate(
+        context=top_context["context"], url=test_page_nested_frames, wait="complete"
+    )
+
+    # Check that 3 navigation-started events were received, one for the top context
+    # and one for each of the 2 iframes.
+    assert len(events) == 3
+
+    contexts = await bidi_session.browsing_context.get_tree(root=top_context["context"])
+
+    assert len(contexts) == 1
+    root_info = contexts[0]
+    assert len(root_info["children"]) == 1
+    child1_info = root_info["children"][0]
+    assert len(child1_info["children"]) == 1
+    child2_info = child1_info["children"][0]
+
+    assert_navigation_info(
+        events[0],
+        {
+            "context": root_info["context"],
+            "navigation": result["navigation"],
+            "url": test_page_nested_frames,
+        },
+    )
+
+    assert_navigation_info(
+        events[1],
+        {
+            "context": child1_info["context"],
+            "url": test_page_same_origin_frame,
+        },
+    )
+    assert events[1]["navigation"] is not None
+    assert events[1]["navigation"] != result["navigation"]
+
+    assert_navigation_info(
+        events[2],
+        {
+            "context": child2_info["context"],
+            "url": test_page,
+        },
+    )
+    assert events[2]["navigation"] is not None
+    assert events[2]["navigation"] != result["navigation"]
+    assert events[2]["navigation"] != events[1]["navigation"]
+
+    remove_listener()
+
+
+@pytest.mark.parametrize("type_hint", ["tab", "window"])
+async def test_new_context(bidi_session, subscribe_events, wait_for_event, type_hint):
+    await subscribe_events(events=[NAVIGATION_STARTED_EVENT])
+
+    on_entry = wait_for_event(NAVIGATION_STARTED_EVENT)
+    top_level_context = await bidi_session.browsing_context.create(type_hint="tab")
+    navigation_info = await on_entry
+    assert_navigation_info(
+        navigation_info,
+        {
+            "context": top_level_context["context"],
+            "url": "about:blank",
+        },
+    )
+
+
+async def test_same_document_navigation(bidi_session, new_tab, url, subscribe_events):
+    await bidi_session.browsing_context.navigate(
+        context=new_tab["context"], url=url(PAGE_EMPTY), wait="complete"
+    )
+
+    await subscribe_events(events=[NAVIGATION_STARTED_EVENT])
+
+    # Track all received browsingContext.navigationStarted events in the events array
+    events = []
+
+    async def on_event(method, data):
+        events.append(data)
+
+    remove_listener = bidi_session.add_event_listener(
+        NAVIGATION_STARTED_EVENT, on_event
+    )
+
+    await bidi_session.browsing_context.navigate(
+        context=new_tab["context"], url=url(PAGE_EMPTY + "#foo"), wait="complete"
+    )
+
+    remove_listener()
+
+
+async def test_window_open(bidi_session, subscribe_events, wait_for_event, top_context):
+    await subscribe_events(events=[NAVIGATION_STARTED_EVENT])
+
+    on_entry = wait_for_event(NAVIGATION_STARTED_EVENT)
+
+    await bidi_session.script.evaluate(
+        expression="""window.open('about:blank');""",
+        target=ContextTarget(top_context["context"]),
+        await_promise=False,
+    )
+
+    navigation_info = await on_entry
+    assert_navigation_info(
+        navigation_info,
+        {
+            "url": "about:blank",
+        },
+    )
+    assert navigation_info["navigation"] is not None
+
+    # Retrieve all contexts to get the context for the new window.
+    contexts = await bidi_session.browsing_context.get_tree()
+    assert navigation_info["context"] == contexts[-1]["context"]
+
+
+async def test_document_write(bidi_session, subscribe_events, top_context):
+    await subscribe_events(events=[NAVIGATION_STARTED_EVENT])
+
+    # Track all received browsingContext.navigationStarted events in the events array
+    events = []
+
+    async def on_event(method, data):
+        events.append(data)
+
+    remove_listener = bidi_session.add_event_listener(
+        NAVIGATION_STARTED_EVENT, on_event
+    )
+
+    await bidi_session.script.evaluate(
+        expression="""document.open(); document.write("<h1>Replaced</h1>"); document.close();""",
+        target=ContextTarget(top_context["context"]),
+        await_promise=False,
+    )
+
+    wait = AsyncPoll(bidi_session, timeout=0.5)
+    with pytest.raises(TimeoutException):
+        await wait.until(lambda _: len(events) > 0)
+
+    remove_listener()
+
+
+async def test_page_with_base_tag(
+    bidi_session, subscribe_events, inline, new_tab, wait_for_event
+):
+    await subscribe_events(events=[NAVIGATION_STARTED_EVENT])
+
+    on_entry = wait_for_event(NAVIGATION_STARTED_EVENT)
+    url = inline("""<base href="/relative-path">""")
+    result = await bidi_session.browsing_context.navigate(
+        context=new_tab["context"], url=url
+    )
+    event = await on_entry
+
+    assert_navigation_info(
+        event,
+        {"context": new_tab["context"], "navigation": result["navigation"], "url": url},
+    )
+
+
+@pytest.mark.parametrize(
+    "url",
+    [
+        "thisprotocoldoesnotexist://",
+        "https://doesnotexist.localhost/",
+    ],
+    ids=[
+        "protocol",
+        "host",
+    ],
+)
+async def test_invalid_navigation(
+    bidi_session, new_tab, subscribe_events, wait_for_event, url
+):
+    await subscribe_events(events=[NAVIGATION_STARTED_EVENT])
+
+    on_entry = wait_for_event(NAVIGATION_STARTED_EVENT)
+
+    with pytest.raises(UnknownErrorException):
+        await bidi_session.browsing_context.navigate(
+            context=new_tab["context"], url=url, wait="complete"
+        )
+
+    navigation_info = await on_entry
+    assert_navigation_info(
+        navigation_info,
+        {
+            "context": new_tab["context"],
+            "url": url,
+        },
+    )
+    assert navigation_info["navigation"] is not None
+
+    await bidi_session.session.unsubscribe(events=[NAVIGATION_STARTED_EVENT])
diff --git a/tests/wpt/tests/webdriver/tests/bidi/browsing_context/print/background.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/print/background.py
index 1b854742eac..5f1f518928a 100644
--- a/tests/wpt/tests/webdriver/tests/bidi/browsing_context/print/background.py
+++ b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/print/background.py
@@ -2,7 +2,7 @@ import base64
 import pytest
 
 from tests.support.asserts import assert_pdf
-from tests.support.image import px_to_cm
+from tests.support.image import pt_to_cm
 
 pytestmark = pytest.mark.asyncio
 
@@ -46,8 +46,8 @@ async def test_background(
             "left": 0
         },
         page={
-            "width": px_to_cm(1),
-            "height": px_to_cm(1)
+            "width": pt_to_cm(1),
+            "height": pt_to_cm(1),
         },
     )
 
diff --git a/tests/wpt/tests/webdriver/tests/bidi/browsing_context/print/invalid.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/print/invalid.py
index 7193ecd0172..78f9a13cbab 100644
--- a/tests/wpt/tests/webdriver/tests/bidi/browsing_context/print/invalid.py
+++ b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/print/invalid.py
@@ -124,6 +124,8 @@ async def test_params_page_invalid_type(bidi_session, top_context, page):
     [
         {"height": -1},
         {"width": -1},
+        {"height": 0.03},
+        {"width": 0.03},
     ],
 )
 async def test_params_page_invalid_value(bidi_session, top_context, page):
diff --git a/tests/wpt/tests/webdriver/tests/bidi/browsing_context/print/margin.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/print/margin.py
index 8ca1ef7077f..0ceb68f4b09 100644
--- a/tests/wpt/tests/webdriver/tests/bidi/browsing_context/print/margin.py
+++ b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/print/margin.py
@@ -1,8 +1,15 @@
 # META: timeout=long
+from math import ceil
 import pytest
 
+from webdriver.bidi.error import UnsupportedOperationException
+from tests.support.image import inch_in_cm, inch_in_point
+
 pytestmark = pytest.mark.asyncio
 
+DEFAULT_PAGE_HEIGHT = 27.94
+DEFAULT_PAGE_WIDTH = 21.59
+
 
 def get_content(css=""):
     return f"""
@@ -14,7 +21,7 @@ def get_content(css=""):
             }}
             div {{
                 background-color: black;
-                height: 27.94cm;
+                height: {DEFAULT_PAGE_HEIGHT}cm;
                 {css}
             }}
         </style>
@@ -25,22 +32,22 @@ def get_content(css=""):
     "margin, reference_css, css",
     [
         (
-            {"top": 2.54},
+            {"top": inch_in_cm},
             "margin-top: 1.54cm;",
             "",
         ),
         (
-            {"left": 2.54},
+            {"left": inch_in_cm},
             "margin-left: 1.54cm;",
             "",
         ),
         (
-            {"right": 2.54},
+            {"right": inch_in_cm},
             "margin-right: 1.54cm;",
             "",
         ),
         (
-            {"bottom": 2.54},
+            {"bottom": inch_in_cm},
             "height: 24.4cm;",
             "height: 26.94cm;",
         ),
@@ -63,7 +70,9 @@ async def test_margin_default(
 ):
     default_content_page = inline(get_content(css))
     await bidi_session.browsing_context.navigate(
-        context=top_context["context"], url=default_content_page, wait="complete"
+        context=top_context["context"],
+        url=default_content_page,
+        wait="complete"
     )
     value_with_margin = await bidi_session.browsing_context.print(
         context=top_context["context"],
@@ -80,11 +89,16 @@ async def test_margin_default(
 @pytest.mark.parametrize(
     "margin",
     [
-        {"top": 27.94},
-        {"left": 21.59},
-        {"right": 21.59},
-        {"bottom": 27.94},
-        {"top": 27.94, "left": 21.59, "right": 21.59, "bottom": 27.94},
+        {"top": DEFAULT_PAGE_HEIGHT},
+        {"left": DEFAULT_PAGE_WIDTH},
+        {"right": DEFAULT_PAGE_WIDTH},
+        {"bottom": DEFAULT_PAGE_HEIGHT},
+        {
+            "top": DEFAULT_PAGE_HEIGHT,
+            "left": DEFAULT_PAGE_WIDTH,
+            "right": DEFAULT_PAGE_WIDTH,
+            "bottom": DEFAULT_PAGE_HEIGHT,
+        },
     ],
     ids=[
         "top",
@@ -98,21 +112,70 @@ async def test_margin_same_as_page_dimension(
     bidi_session,
     top_context,
     inline,
-    assert_pdf_content,
     margin,
 ):
     page = inline("Text")
     await bidi_session.browsing_context.navigate(
         context=top_context["context"], url=page, wait="complete"
     )
-    print_value = await bidi_session.browsing_context.print(
-        context=top_context["context"],
-        shrink_to_fit=False,
-        margin=margin,
+
+    # This yields an empty content area: https://github.com/w3c/webdriver-bidi/issues/473
+    with pytest.raises(UnsupportedOperationException):
+        await bidi_session.browsing_context.print(
+            context=top_context["context"],
+            shrink_to_fit=False,
+            margin=margin,
+        )
+
+
+@pytest.mark.parametrize(
+    "margin",
+    [
+        {"top": DEFAULT_PAGE_HEIGHT - ceil(inch_in_cm / inch_in_point)},
+        {"left": DEFAULT_PAGE_WIDTH - ceil(inch_in_cm / inch_in_point)},
+        {"right": DEFAULT_PAGE_WIDTH - ceil(inch_in_cm / inch_in_point)},
+        {"bottom": DEFAULT_PAGE_HEIGHT - ceil(inch_in_cm / inch_in_point)},
+    ],
+    ids=[
+        "top",
+        "left",
+        "right",
+        "bottom",
+    ],
+)
+async def test_margin_minimum_page_size(
+    bidi_session,
+    top_context,
+    inline,
+    assert_pdf_dimensions,
+    margin,
+):
+    page = inline("Text")
+    await bidi_session.browsing_context.navigate(
+        context=top_context["context"], url=page, wait="complete"
     )
 
-    # Check that content is out of page dimensions.
-    await assert_pdf_content(print_value, [{"type": "string", "value": ""}])
+    value = await bidi_session.browsing_context.print(
+        context=top_context["context"],
+        shrink_to_fit=False,
+        margin=margin
+    )
+
+    if "top" in margin or "bottom" in margin:
+        expected_width = DEFAULT_PAGE_WIDTH
+    else:
+        expected_width = DEFAULT_PAGE_WIDTH - (inch_in_cm / inch_in_point)
+
+    if "left" in margin or "right" in margin:
+        expected_height = DEFAULT_PAGE_HEIGHT
+    else:
+        expected_height = DEFAULT_PAGE_HEIGHT - (inch_in_cm / inch_in_point)
+
+    # Check that margins don't affect page dimensions and equal defaults.
+    await assert_pdf_dimensions(value, {
+       "width": expected_width,
+       "height": expected_height,
+    })
 
 
 @pytest.mark.parametrize(
@@ -144,5 +207,9 @@ async def test_margin_does_not_affect_page_size(
         margin=margin
     )
 
-    # Check that margins don't affect page dimencions and equal in this case defaults.
-    await assert_pdf_dimensions(value, {"width": 21.59, "height": 27.94})
+    # Check that margins don't affect page dimensions
+    # and equal in this case defaults.
+    await assert_pdf_dimensions(value, {
+        "width": DEFAULT_PAGE_WIDTH,
+        "height": DEFAULT_PAGE_HEIGHT,
+    })
diff --git a/tests/wpt/tests/webdriver/tests/bidi/browsing_context/reload/__init__.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/reload/__init__.py
index e69de29bb2d..3cec19363dc 100644
--- a/tests/wpt/tests/webdriver/tests/bidi/browsing_context/reload/__init__.py
+++ b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/reload/__init__.py
@@ -0,0 +1,40 @@
+import pytest
+
+from webdriver.bidi.error import UnknownErrorException
+
+from ... import any_string
+
+
+async def reload_and_assert(
+    bidi_session,
+    context,
+    expected_error=False,
+    last_navigation=None,
+    url=None,
+    wait="complete",
+):
+    if expected_error:
+        with pytest.raises(UnknownErrorException):
+            await bidi_session.browsing_context.reload(
+                context=context['context'], wait=wait
+            )
+
+    else:
+        result = await bidi_session.browsing_context.reload(
+            context=context['context'], wait=wait
+        )
+
+        any_string(result["navigation"])
+        any_string(result["url"])
+
+        if last_navigation is not None:
+            assert result["navigation"] != last_navigation
+
+        if url is not None:
+            assert result["url"] == url
+
+            contexts = await bidi_session.browsing_context.get_tree(root=context['context'])
+            assert len(contexts) == 1
+            assert contexts[0]["url"] == url
+
+        return result
diff --git a/tests/wpt/tests/webdriver/tests/bidi/browsing_context/reload/frame.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/reload/frame.py
index ce9281583f2..dd2bf6a40f0 100644
--- a/tests/wpt/tests/webdriver/tests/bidi/browsing_context/reload/frame.py
+++ b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/reload/frame.py
@@ -1,35 +1,28 @@
 import pytest
 
+from . import reload_and_assert
+
 pytestmark = pytest.mark.asyncio
 
 
-@pytest.mark.parametrize("domain", ["", "alt"],
-                         ids=["same_origin", "cross_origin"])
+@pytest.mark.parametrize("domain", ["", "alt"], ids=["same_origin", "cross_origin"])
 async def test_origin(bidi_session, new_tab, inline, domain):
-    frame_start_url = inline("frame")
-    url_before = inline(f"<iframe src='{frame_start_url}'></iframe>",
-                        domain=domain)
+    frame_url = inline("frame")
+    parent_url = inline(f"<iframe src='{frame_url}'></iframe>", domain=domain)
 
     # Navigate and assert (top-level).
     result = await bidi_session.browsing_context.navigate(
-        context=new_tab['context'], url=url_before, wait="complete")
-    assert result["url"] == url_before
+        context=new_tab['context'], url=parent_url, wait="complete")
+    assert result["url"] == parent_url
 
     contexts = await bidi_session.browsing_context.get_tree(
         root=new_tab['context'])
     assert len(contexts) == 1
-    assert contexts[0]["url"] == url_before
+    assert contexts[0]["url"] == parent_url
 
     assert len(contexts[0]["children"]) == 1
     frame = contexts[0]["children"][0]
-    assert frame["url"] == frame_start_url
+    assert frame["url"] == frame_url
 
     # Reload and assert (frame).
-    result = await bidi_session.browsing_context.reload(
-        context=frame['context'], wait="complete")
-    assert result == {}
-
-    contexts = await bidi_session.browsing_context.get_tree(
-        root=frame['context'])
-    assert len(contexts) == 1
-    assert contexts[0]["url"] == frame_start_url
+    reload_and_assert(bidi_session, frame, last_navigation=result["navigation"], url=frame_url)
diff --git a/tests/wpt/tests/webdriver/tests/bidi/browsing_context/reload/reload.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/reload/reload.py
index b6e957e8a8c..fb5157a3651 100644
--- a/tests/wpt/tests/webdriver/tests/bidi/browsing_context/reload/reload.py
+++ b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/reload/reload.py
@@ -1,57 +1,73 @@
+from pathlib import Path
+
 import pytest
 
-from pathlib import Path
+from . import reload_and_assert
+
 
 pytestmark = pytest.mark.asyncio
 
 PNG_BLACK_DOT = "/webdriver/tests/bidi/browsing_context/support/black_dot.png"
 
 
-async def test_return_value(bidi_session, inline, new_tab):
-    url = inline("<div>foo</div>")
-    await bidi_session.browsing_context.navigate(context=new_tab["context"],
-                                                 url=url)
+@pytest.mark.parametrize("hash", [False, True], ids=["without hash", "with hash"])
+async def test_reload(bidi_session, inline, new_tab, hash):
+    url = inline("""<div id="foo""")
+    if hash:
+        url += "#foo"
 
-    result = await bidi_session.browsing_context.reload(
-        context=new_tab["context"])
-    assert result == {}
+    navigate_result = await bidi_session.browsing_context.navigate(
+        context=new_tab["context"],
+        url=url,
+        wait="complete"
+    )
+
+    reload_and_assert(
+        bidi_session,
+        new_tab,
+        last_navigation=navigate_result["navigation"],
+        url=url
+    )
 
 
 @pytest.mark.parametrize(
-    "initial_url",
+    "url",
     [
         "about:blank",
-        "https://example.com/#foo",
         "data:text/html,<p>foo</p>",
-        f'file://{Path(__file__).parent.parent.resolve() / "support/empty.html"}',
+        f'{Path(__file__).parents[1].as_uri()}/support/empty.html',
     ],
     ids=[
         "about:blank",
-        "hash",
         "data url",
         "file url",
     ],
 )
-async def test_reload(bidi_session, new_tab, initial_url):
-    await bidi_session.browsing_context.navigate(context=new_tab["context"],
-                                                 url=initial_url)
-    await bidi_session.browsing_context.reload(context=new_tab["context"],
-                                               wait="complete")
+async def test_reload_special_protocols(bidi_session, new_tab, url):
+    navigate_result = await bidi_session.browsing_context.navigate(
+        context=new_tab["context"],
+        url=url,
+        wait="complete"
+    )
 
-    contexts = await bidi_session.browsing_context.get_tree(
-        root=new_tab['context'])
-    assert len(contexts) == 1
-    assert contexts[0]["url"] == initial_url
+    reload_and_assert(
+        bidi_session,
+        new_tab,
+        last_navigation=navigate_result["navigation"],
+        url=url
+    )
 
 
 async def test_image(bidi_session, new_tab, url):
-    initial_url = url(PNG_BLACK_DOT)
-    await bidi_session.browsing_context.navigate(context=new_tab["context"],
-                                                 url=initial_url)
-    await bidi_session.browsing_context.reload(context=new_tab["context"],
-                                               wait="complete")
+    navigate_result = await bidi_session.browsing_context.navigate(
+        context=new_tab["context"],
+        url=url(PNG_BLACK_DOT),
+        wait="complete"
+    )
 
-    contexts = await bidi_session.browsing_context.get_tree(
-        root=new_tab['context'])
-    assert len(contexts) == 1
-    assert contexts[0]["url"] == initial_url
+    reload_and_assert(
+        bidi_session,
+        new_tab,
+        last_navigation=navigate_result["navigation"],
+        url=url
+    )
diff --git a/tests/wpt/tests/webdriver/tests/bidi/browsing_context/reload/wait.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/reload/wait.py
index 2b581c2f0db..2de09b9735e 100644
--- a/tests/wpt/tests/webdriver/tests/bidi/browsing_context/reload/wait.py
+++ b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/reload/wait.py
@@ -24,13 +24,22 @@ async def wait_for_reload(bidi_session, context, wait, expect_timeout):
 @pytest.mark.parametrize("wait", ["none", "interactive", "complete"])
 async def test_expected_url(bidi_session, inline, new_tab, wait):
     url = inline("<div>foo</div>")
-    await bidi_session.browsing_context.navigate(context=new_tab["context"],
-                                                 url=url,
-                                                 wait="complete")
-    result = await bidi_session.browsing_context.reload(
-        context=new_tab["context"], wait=wait)
-    assert result == {}
+
+    navigate_result = await bidi_session.browsing_context.navigate(
+        context=new_tab["context"],
+        url=url,
+        wait="complete"
+    )
+
+    reload_result = await bidi_session.browsing_context.reload(
+        context=new_tab["context"],
+        wait=wait
+    )
+
     if wait != "none":
+        assert reload_result["navigation"] != navigate_result["navigation"]
+        assert reload_result["url"] == url
+
         contexts = await bidi_session.browsing_context.get_tree(
             root=new_tab["context"], max_depth=0)
         assert contexts[0]["url"] == url
diff --git a/tests/wpt/tests/webdriver/tests/bidi/browsing_context/user_prompt_closed/__init__.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/user_prompt_closed/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/wpt/tests/webdriver/tests/bidi/browsing_context/user_prompt_closed/user_prompt_closed.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/user_prompt_closed/user_prompt_closed.py
new file mode 100644
index 00000000000..f9283437234
--- /dev/null
+++ b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/user_prompt_closed/user_prompt_closed.py
@@ -0,0 +1,270 @@
+import asyncio
+import pytest
+from tests.support.sync import AsyncPoll
+from webdriver.error import TimeoutException
+
+pytestmark = pytest.mark.asyncio
+
+USER_PROMPT_CLOSED_EVENT = "browsingContext.userPromptClosed"
+USER_PROMPT_OPENED_EVENT = "browsingContext.userPromptOpened"
+
+
+async def test_unsubscribe(bidi_session, inline, new_tab, wait_for_event):
+    await bidi_session.session.subscribe(
+        events=[USER_PROMPT_CLOSED_EVENT, USER_PROMPT_OPENED_EVENT]
+    )
+    await bidi_session.session.unsubscribe(events=[USER_PROMPT_CLOSED_EVENT])
+
+    on_entry = wait_for_event("browsingContext.userPromptOpened")
+
+    await bidi_session.browsing_context.navigate(
+        context=new_tab["context"],
+        url=inline("<script>window.alert('test')</script>"),
+    )
+
+    # Wait for the alert to open
+    await on_entry
+
+    # Track all received browsingContext.userPromptClosed events in the events array
+    events = []
+
+    async def on_event(method, data):
+        events.append(data)
+
+    remove_listener = bidi_session.add_event_listener(
+        USER_PROMPT_CLOSED_EVENT, on_event
+    )
+
+    await bidi_session.browsing_context.handle_user_prompt(context=new_tab["context"])
+
+    wait = AsyncPoll(bidi_session, timeout=0.5)
+    with pytest.raises(TimeoutException):
+        await wait.until(lambda _: len(events) > 0)
+
+    remove_listener()
+
+
+async def test_subscribe_with_alert(
+    bidi_session, subscribe_events, inline, new_tab, wait_for_event
+):
+    await subscribe_events(events=[USER_PROMPT_CLOSED_EVENT, USER_PROMPT_OPENED_EVENT])
+
+    on_prompt_opened = wait_for_event(USER_PROMPT_OPENED_EVENT)
+
+    await bidi_session.browsing_context.navigate(
+        context=new_tab["context"],
+        url=inline("<script>window.alert('test')</script>"),
+    )
+
+    # Wait for the prompt to open.
+    await on_prompt_opened
+
+    on_prompt_closed = wait_for_event(USER_PROMPT_CLOSED_EVENT)
+
+    await bidi_session.browsing_context.handle_user_prompt(context=new_tab["context"])
+
+    event = await on_prompt_closed
+
+    assert event == {"context": new_tab["context"], "accepted": True}
+
+
+@pytest.mark.parametrize("accept", [True, False])
+async def test_subscribe_with_confirm(
+    bidi_session, subscribe_events, inline, new_tab, wait_for_event, accept
+):
+    await subscribe_events(events=[USER_PROMPT_CLOSED_EVENT, USER_PROMPT_OPENED_EVENT])
+
+    on_prompt_opened = wait_for_event(USER_PROMPT_OPENED_EVENT)
+
+    await bidi_session.browsing_context.navigate(
+        context=new_tab["context"],
+        url=inline("<script>window.confirm('test')</script>"),
+    )
+
+    # Wait for the prompt to open.
+    await on_prompt_opened
+
+    on_prompt_closed = wait_for_event(USER_PROMPT_CLOSED_EVENT)
+
+    await bidi_session.browsing_context.handle_user_prompt(
+        context=new_tab["context"], accept=accept
+    )
+
+    event = await on_prompt_closed
+
+    assert event == {"context": new_tab["context"], "accepted": accept}
+
+
+@pytest.mark.parametrize("accept", [True, False])
+async def test_subscribe_with_prompt(
+    bidi_session, subscribe_events, inline, new_tab, wait_for_event, accept
+):
+    await subscribe_events(events=[USER_PROMPT_CLOSED_EVENT, USER_PROMPT_OPENED_EVENT])
+
+    on_prompt_opened = wait_for_event(USER_PROMPT_OPENED_EVENT)
+
+    await bidi_session.browsing_context.navigate(
+        context=new_tab["context"],
+        url=inline("<script>window.prompt('Enter Your Name: ')</script>"),
+    )
+
+    # Wait for the prompt to open.
+    await on_prompt_opened
+
+    on_prompt_closed = wait_for_event(USER_PROMPT_CLOSED_EVENT)
+
+    test_user_text = "Test"
+    await bidi_session.browsing_context.handle_user_prompt(
+        context=new_tab["context"], accept=accept, user_text=test_user_text
+    )
+
+    event = await on_prompt_closed
+
+    if accept is True:
+        assert event == {
+            "context": new_tab["context"],
+            "accepted": accept,
+            "userText": test_user_text,
+        }
+    else:
+        assert event == {"context": new_tab["context"], "accepted": accept}
+
+
+async def test_subscribe_with_prompt_with_defaults(
+    bidi_session, subscribe_events, inline, new_tab, wait_for_event
+):
+    await subscribe_events(events=[USER_PROMPT_CLOSED_EVENT, USER_PROMPT_OPENED_EVENT])
+
+    on_prompt_opened = wait_for_event(USER_PROMPT_OPENED_EVENT)
+
+    await bidi_session.browsing_context.navigate(
+        context=new_tab["context"],
+        url=inline("<script>window.prompt('Enter Your Name: ')</script>"),
+    )
+
+    # Wait for the prompt to open.
+    await on_prompt_opened
+
+    on_prompt_closed = wait_for_event(USER_PROMPT_CLOSED_EVENT)
+
+    await bidi_session.browsing_context.handle_user_prompt(
+        context=new_tab["context"]
+    )
+
+    event = await on_prompt_closed
+
+    assert event == {"context": new_tab["context"], "accepted": True}
+
+
+@pytest.mark.parametrize("type_hint", ["tab", "window"])
+async def test_subscribe_to_one_context(
+    bidi_session, subscribe_events, inline, wait_for_event, type_hint
+):
+    new_context = await bidi_session.browsing_context.create(type_hint=type_hint)
+
+    # Subscribe to open events for all contexts.
+    await subscribe_events(events=[USER_PROMPT_OPENED_EVENT])
+
+    # Subscribe to close events for only one context.
+    await subscribe_events(
+        events=[USER_PROMPT_CLOSED_EVENT],
+        contexts=[new_context["context"]],
+    )
+    # Track all received browsingContext.userPromptClosed events in the events array
+    events = []
+
+    async def on_event(_, data):
+        events.append(data)
+
+    remove_listener = bidi_session.add_event_listener(
+        USER_PROMPT_CLOSED_EVENT, on_event
+    )
+
+    on_prompt_opened = wait_for_event(USER_PROMPT_OPENED_EVENT)
+
+    another_new_context = await bidi_session.browsing_context.create(
+        type_hint=type_hint
+    )
+
+    # Open a prompt in the different context.
+    await bidi_session.browsing_context.navigate(
+        context=another_new_context["context"],
+        url=inline(f"<script>window.alert('second tab')</script>"),
+    )
+
+    await on_prompt_opened
+
+    await bidi_session.browsing_context.handle_user_prompt(
+        context=another_new_context["context"]
+    )
+
+    # Make sure we don't receive this event.
+    wait = AsyncPoll(bidi_session, timeout=0.5)
+    with pytest.raises(TimeoutException):
+        await wait.until(lambda _: len(events) > 0)
+
+    on_prompt_opened = wait_for_event(USER_PROMPT_OPENED_EVENT)
+    on_prompt_closed = wait_for_event(USER_PROMPT_CLOSED_EVENT)
+
+    # Open a prompt in the subscribed context.
+    await bidi_session.browsing_context.navigate(
+        context=new_context["context"],
+        url=inline(f"<script>window.alert('first tab')</script>"),
+    )
+
+    await on_prompt_opened
+    await bidi_session.browsing_context.handle_user_prompt(
+        context=new_context["context"]
+    )
+
+    event = await on_prompt_closed
+
+    assert event == {
+        "context": new_context["context"],
+        "accepted": True,
+    }
+
+    remove_listener()
+    await bidi_session.browsing_context.close(context=new_context["context"])
+    await bidi_session.browsing_context.close(context=another_new_context["context"])
+
+
+async def test_iframe(
+    bidi_session,
+    new_tab,
+    inline,
+    test_origin,
+    subscribe_events,
+    wait_for_event,
+):
+    await subscribe_events(events=[USER_PROMPT_CLOSED_EVENT, USER_PROMPT_OPENED_EVENT])
+
+    on_prompt_opened = wait_for_event(USER_PROMPT_OPENED_EVENT)
+    on_prompt_closed = wait_for_event(USER_PROMPT_CLOSED_EVENT)
+
+    await bidi_session.browsing_context.navigate(
+        context=new_tab["context"],
+        url=inline(f"<iframe src='{test_origin}'>"),
+        wait="complete",
+    )
+
+    contexts = await bidi_session.browsing_context.get_tree(root=new_tab["context"])
+    assert len(contexts) == 1
+
+    assert len(contexts[0]["children"]) == 1
+    frame = contexts[0]["children"][0]
+
+    await bidi_session.browsing_context.navigate(
+        context=frame["context"],
+        url=inline("<script>window.alert('in iframe')</script>"),
+    )
+
+    await on_prompt_opened
+
+    await bidi_session.browsing_context.handle_user_prompt(
+        context=frame["context"]
+    )
+
+    event = await on_prompt_closed
+
+    assert event == {"context": new_tab["context"], "accepted": True}
diff --git a/tests/wpt/tests/webdriver/tests/bidi/browsing_context/user_prompt_opened/__init__.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/user_prompt_opened/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/wpt/tests/webdriver/tests/bidi/browsing_context/user_prompt_opened/user_prompt_opened.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/user_prompt_opened/user_prompt_opened.py
new file mode 100644
index 00000000000..703f789caaf
--- /dev/null
+++ b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/user_prompt_opened/user_prompt_opened.py
@@ -0,0 +1,170 @@
+import pytest
+from tests.support.sync import AsyncPoll
+from webdriver.error import TimeoutException
+
+pytestmark = pytest.mark.asyncio
+
+USER_PROMPT_OPENED_EVENT = "browsingContext.userPromptOpened"
+
+
+async def test_unsubscribe(bidi_session, inline, new_tab):
+    await bidi_session.session.subscribe(events=[USER_PROMPT_OPENED_EVENT])
+    await bidi_session.session.unsubscribe(events=[USER_PROMPT_OPENED_EVENT])
+
+    # Track all received browsingContext.userPromptOpened events in the events array
+    events = []
+
+    async def on_event(method, data):
+        events.append(data)
+
+    remove_listener = bidi_session.add_event_listener(
+        USER_PROMPT_OPENED_EVENT, on_event
+    )
+
+    await bidi_session.browsing_context.navigate(
+        context=new_tab["context"],
+        url=inline("<script>window.alert('test')</script>"),
+    )
+
+    wait = AsyncPoll(bidi_session, timeout=0.5)
+    with pytest.raises(TimeoutException):
+        await wait.until(lambda _: len(events) > 0)
+
+    remove_listener()
+
+
+@pytest.mark.parametrize("prompt_type", ["alert", "confirm", "prompt"])
+async def test_prompt_type(
+    bidi_session, subscribe_events, inline, new_tab, wait_for_event, prompt_type
+):
+    await subscribe_events(events=[USER_PROMPT_OPENED_EVENT])
+    on_entry = wait_for_event(USER_PROMPT_OPENED_EVENT)
+
+    text = "test"
+
+    await bidi_session.browsing_context.navigate(
+        context=new_tab["context"],
+        url=inline(f"<script>window.{prompt_type}('{text}')</script>"),
+    )
+
+    event = await on_entry
+
+    assert event == {
+        "context": new_tab["context"],
+        "type": prompt_type,
+        "message": text,
+    }
+
+
+async def test_prompt_default_value(
+    bidi_session, inline, new_tab, subscribe_events, wait_for_event
+):
+    await subscribe_events(events=[USER_PROMPT_OPENED_EVENT])
+    on_entry = wait_for_event(USER_PROMPT_OPENED_EVENT)
+
+    text = "test"
+    default = "default"
+
+    await bidi_session.browsing_context.navigate(
+        context=new_tab["context"],
+        url=inline(f"<script>window.prompt('{text}', '{default}')</script>"),
+    )
+
+    event = await on_entry
+
+    assert event == {
+        "context": new_tab["context"],
+        "type": "prompt",
+        "message": text,
+        "defaultValue": default,
+    }
+
+@pytest.mark.parametrize("type_hint", ["tab", "window"])
+async def test_subscribe_to_one_context(
+    bidi_session, subscribe_events, inline, wait_for_event, type_hint
+):
+    new_context = await bidi_session.browsing_context.create(type_hint=type_hint)
+    await subscribe_events(
+        events=[USER_PROMPT_OPENED_EVENT], contexts=[new_context["context"]]
+    )
+    # Track all received browsingContext.userPromptOpened events in the events array
+    events = []
+
+    async def on_event(_, data):
+        events.append(data)
+
+    remove_listener = bidi_session.add_event_listener(
+        USER_PROMPT_OPENED_EVENT, on_event
+    )
+
+    on_entry = wait_for_event(USER_PROMPT_OPENED_EVENT)
+
+    another_new_context = await bidi_session.browsing_context.create(
+        type_hint=type_hint
+    )
+
+    # Open a prompt in the different context.
+    await bidi_session.browsing_context.navigate(
+        context=another_new_context["context"],
+        url=inline(f"<script>window.alert('second tab')</script>"),
+    )
+
+    # Make sure we don't receive this event.
+    wait = AsyncPoll(bidi_session, timeout=0.5)
+    with pytest.raises(TimeoutException):
+        await wait.until(lambda _: len(events) > 0)
+
+    # Open a prompt in the subscribed context.
+    await bidi_session.browsing_context.navigate(
+        context=new_context["context"],
+        url=inline(f"<script>window.alert('first tab')</script>"),
+    )
+
+    event = await on_entry
+
+    assert event == {
+        "context": new_context["context"],
+        "type": "alert",
+        "message": "first tab",
+    }
+
+    remove_listener()
+    await bidi_session.browsing_context.close(context=new_context["context"])
+    await bidi_session.browsing_context.close(context=another_new_context["context"])
+
+
+async def test_iframe(
+    bidi_session,
+    new_tab,
+    inline,
+    test_origin,
+    subscribe_events,
+    wait_for_event,
+):
+    await subscribe_events([USER_PROMPT_OPENED_EVENT])
+    on_entry = wait_for_event(USER_PROMPT_OPENED_EVENT)
+
+    await bidi_session.browsing_context.navigate(
+        context=new_tab["context"],
+        url=inline(f"<iframe src='{test_origin}'>"),
+        wait="complete",
+    )
+
+    contexts = await bidi_session.browsing_context.get_tree(root=new_tab["context"])
+    assert len(contexts) == 1
+
+    assert len(contexts[0]["children"]) == 1
+    frame = contexts[0]["children"][0]
+
+    await bidi_session.browsing_context.navigate(
+        context=frame["context"],
+        url=inline("<script>window.alert('in iframe')</script>"),
+    )
+
+    event = await on_entry
+
+    assert event == {
+        "context": new_tab["context"],
+        "type": "alert",
+        "message": "in iframe",
+    }
diff --git a/tests/wpt/tests/webdriver/tests/bidi/input/__init__.py b/tests/wpt/tests/webdriver/tests/bidi/input/__init__.py
index 17f1ae6eb3e..809379d56dc 100644
--- a/tests/wpt/tests/webdriver/tests/bidi/input/__init__.py
+++ b/tests/wpt/tests/webdriver/tests/bidi/input/__init__.py
@@ -2,15 +2,19 @@ import json
 
 from webdriver.bidi.modules.script import ContextTarget
 
-
-async def get_events(bidi_session, context):
-    """Return list of key events recorded on the test_actions.html page."""
+async def get_object_from_context(bidi_session, context, object_path):
+    """Return a plain JS object from a given context, accessible at the given object_path"""
     events_str = await bidi_session.script.evaluate(
-        expression="JSON.stringify(allEvents.events)",
+        expression=f"JSON.stringify({object_path})",
         target=ContextTarget(context),
         await_promise=False,
     )
-    events = json.loads(events_str["value"])
+    return json.loads(events_str["value"])
+
+
+async def get_events(bidi_session, context):
+    """Return list of key events recorded on the test_actions.html page."""
+    events = await get_object_from_context(bidi_session, context, "allEvents.events")
 
     # `key` values in `allEvents` may be escaped (see `escapeSurrogateHalf` in
     # test_actions.html), so this converts them back into unicode literals.
diff --git a/tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/__init__.py b/tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/__init__.py
index fb5bffaebc2..626dbad1476 100644
--- a/tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/__init__.py
+++ b/tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/__init__.py
@@ -1,14 +1,38 @@
 from webdriver.bidi.modules.script import ContextTarget
 
-from ... import get_viewport_dimensions, remote_mapping_to_dict
+from .. import get_object_from_context
+
+
+def remote_mapping_to_dict(js_object):
+    obj = {}
+    for key, value in js_object:
+        obj[key] = value["value"]
+
+    return obj
+
+
+async def assert_pointer_events(
+    bidi_session, context, expected_events, target, pointer_type
+):
+    events = await get_object_from_context(
+        bidi_session, context["context"], "window.recordedEvents"
+    )
+
+    assert len(events) == len(expected_events)
+    event_types = [e["type"] for e in events]
+    assert expected_events == event_types
+
+    for e in events:
+        assert e["target"] == target
+        assert e["pointerType"] == pointer_type
+
 
 
 async def get_inview_center_bidi(bidi_session, context, element):
     elem_rect = await get_element_rect(bidi_session,
                                        context=context,
                                        element=element)
-    viewport_rect = await get_viewport_dimensions(bidi_session,
-                                                  context=context)
+    viewport_rect = await get_viewport_rect(bidi_session, context=context)
 
     x = {
         "left": max(0, min(elem_rect["x"],
@@ -45,3 +69,68 @@ el => el.getBoundingClientRect().toJSON()
     )
 
     return remote_mapping_to_dict(result["value"])
+
+
+async def get_shadow_root_from_test_page(bidi_session, context, nested=False):
+    custom_element = await bidi_session.script.call_function(
+        function_declaration="""() => document.querySelector("custom-element")""",
+        target=ContextTarget(context["context"]),
+        await_promise=False,
+    )
+
+    shadow_root = custom_element["value"]["shadowRoot"]
+
+    if nested:
+        custom_element = await bidi_session.script.call_function(
+            function_declaration="""shadowRoot => shadowRoot.querySelector("inner-custom-element")""",
+            target=ContextTarget(context["context"]),
+            arguments=[shadow_root],
+            await_promise=False,
+        )
+        shadow_root = custom_element["value"]["shadowRoot"]
+
+    return shadow_root
+
+
+async def get_viewport_rect(bidi_session, context):
+    expression = """
+        ({
+          height: window.innerHeight || document.documentElement.clientHeight,
+          width: window.innerWidth || document.documentElement.clientWidth,
+        });
+    """
+    result = await bidi_session.script.evaluate(
+        expression=expression,
+        target=ContextTarget(context["context"]),
+        await_promise=False,
+    )
+
+    return remote_mapping_to_dict(result["value"])
+
+
+async def record_pointer_events(bidi_session, context, container, selector):
+    # Record basic mouse / pointer events on the element matching the given
+    # selector in the container.
+    # The serialized element will be returned
+    target = await bidi_session.script.call_function(
+        function_declaration=f"""container => {{
+            const target = container.querySelector("{selector}");
+            window.recordedEvents = [];
+            function onPointerEvent(event) {{
+                window.recordedEvents.push({{
+                    "type": event.type,
+                    "pointerType": event.pointerType,
+                    "target": event.target.id
+                }});
+            }}
+            target.addEventListener("pointerdown", onPointerEvent);
+            target.addEventListener("pointerup", onPointerEvent);
+            return target;
+        }}
+        """,
+        arguments=[container],
+        target=ContextTarget(context["context"]),
+        await_promise=False,
+    )
+
+    return target
\ No newline at end of file
diff --git a/tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/invalid.py b/tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/invalid.py
index 19b7a57dd11..0269a1bc8f3 100644
--- a/tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/invalid.py
+++ b/tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/invalid.py
@@ -1,117 +1,799 @@
-import pytest
+# META: timeout=long
 
-from webdriver.bidi.modules.input import Actions, get_element_origin
-from webdriver.bidi.error import (
-    InvalidArgumentException,
-    MoveTargetOutOfBoundsException,
-    NoSuchElementException,
-    NoSuchFrameException,
-    NoSuchNodeException,
-)
-from webdriver.bidi.modules.script import ContextTarget
+import pytest
+import pytest_asyncio
+
+from webdriver.bidi.modules.input import Actions
+from webdriver.bidi.error import InvalidArgumentException
 
 
 pytestmark = pytest.mark.asyncio
 
 
+MAX_INT = 9007199254740991
+MIN_INT = -MAX_INT
+
+
+@pytest_asyncio.fixture
+async def perform_actions(bidi_session, top_context):
+    async def perform_actions(actions, context=top_context["context"]):
+        return await bidi_session.input.perform_actions(
+            actions=actions, context=context
+        )
+
+    yield perform_actions
+
+
+def create_key_action(key_action, overrides=None, removals=None):
+    action = {
+        "type": key_action,
+        "value": "",
+    }
+
+    if overrides is not None:
+        action.update(overrides)
+
+    if removals is not None:
+        for removal in removals:
+            del action[removal]
+
+    return action
+
+
+def create_pointer_action(pointer_action, overrides=None, removals=None):
+    action = {
+        "type": pointer_action,
+        "width": 0,
+        "height": 0,
+        "pressure": 0.0,
+        "tangentialPressure": 0.0,
+        "twist": 0,
+        "tiltX": 0,
+        "tiltY": 0,
+    }
+
+    if pointer_action == "pointerMove":
+        action.update({"x": 0, "y": 0})
+    elif pointer_action in ["pointerDown", "pointerUp"]:
+        action.update({"button": 0})
+
+    if overrides is not None:
+        action.update(overrides)
+
+    if removals is not None:
+        for removal in removals:
+            del action[removal]
+
+    return action
+
+
+def create_wheel_action(wheel_action, overrides=None, removals=None):
+    action = {
+        "type": wheel_action,
+        "x": 0,
+        "y": 0,
+        "deltaX": 0,
+        "deltaY": 0,
+        "deltaZ": 0,
+        "deltaMode": 0,
+        "origin": "viewport",
+    }
+
+    if overrides is not None:
+        action.update(overrides)
+
+    if removals is not None:
+        for removal in removals:
+            del action[removal]
+
+    return action
+
+
 @pytest.mark.parametrize("value", [None, True, 42, {}, []])
-async def test_params_context_invalid_type(bidi_session, value):
+async def test_params_context_invalid_type(perform_actions, value):
     actions = Actions()
     actions.add_key()
+
     with pytest.raises(InvalidArgumentException):
-        await bidi_session.input.perform_actions(actions=actions, context=value)
+        await perform_actions(actions, context=value)
 
 
-async def test_params_contexts_value_invalid_value(bidi_session):
-    actions = Actions()
-    actions.add_key()
-    with pytest.raises(NoSuchFrameException):
-        await bidi_session.input.perform_actions(actions=actions, context="foo")
+@pytest.mark.parametrize("value", [None, "foo", True, 42, {}])
+async def test_params_input_source_actions_invalid_type(perform_actions, value):
+    with pytest.raises(InvalidArgumentException):
+        await perform_actions(value)
+
+
+@pytest.mark.parametrize("value", [None, "foo", True, 42, {}])
+async def test_params_input_source_action_sequence_invalid_type(perform_actions, value):
+    with pytest.raises(InvalidArgumentException):
+        await perform_actions([value])
+
+
+async def test_params_input_source_action_sequence_type_missing(perform_actions):
+    actions = [
+        {
+            "id": "foo",
+            "actions": [],
+        }
+    ]
+
+    with pytest.raises(InvalidArgumentException):
+        await perform_actions(actions)
+
+
+@pytest.mark.parametrize("action_type", ["none", "key", "pointer", "wheel"])
+async def test_params_input_source_action_sequence_id_missing(
+    perform_actions, action_type
+):
+    actions = [
+        {
+            "type": action_type,
+            "actions": [],
+        }
+    ]
+
+    with pytest.raises(InvalidArgumentException):
+        await perform_actions(actions)
+
+
+@pytest.mark.parametrize("action_type", ["none", "key", "pointer", "wheel"])
+async def test_params_input_source_action_sequence_actions_missing(
+    perform_actions, action_type
+):
+    actions = [
+        {
+            "type": action_type,
+            "id": "foo",
+        }
+    ]
+
+    with pytest.raises(InvalidArgumentException):
+        await perform_actions(actions)
+
+
+@pytest.mark.parametrize("value", [None, True, 42, [], {}])
+async def test_params_input_source_action_sequence_type_invalid_type(
+    perform_actions, value
+):
+    actions = [
+        {
+            "type": value,
+            "id": "foo",
+            "actions": [],
+        }
+    ]
+
+    with pytest.raises(InvalidArgumentException):
+        await perform_actions(actions)
+
+
+@pytest.mark.parametrize("action_type", ["", "nones", "keys", "pointers", "wheels"])
+async def test_params_input_source_action_sequence_type_invalid_value(
+    perform_actions, action_type
+):
+    actions = [
+        {
+            "type": action_type,
+            "id": "foo",
+            "actions": [],
+        }
+    ]
+
+    with pytest.raises(InvalidArgumentException):
+        await perform_actions(actions)
+
+
+@pytest.mark.parametrize("action_type", ["none", "key", "pointer", "wheel"])
+@pytest.mark.parametrize("value", [None, True, 42, [], {}])
+async def test_params_input_source_action_sequence_id_invalid_type(
+    perform_actions, action_type, value
+):
+    actions = [
+        {
+            "type": action_type,
+            "id": value,
+            "actions": [],
+        }
+    ]
+
+    with pytest.raises(InvalidArgumentException):
+        await perform_actions(actions)
+
+
+@pytest.mark.parametrize("action_type", ["none", "key", "pointer", "wheel"])
+@pytest.mark.parametrize("value", [None, "foo", True, 42, {}])
+async def test_params_input_source_action_sequence_actions_invalid_type(
+    perform_actions, action_type, value
+):
+    actions = [
+        {
+            "type": action_type,
+            "id": "foo",
+            "actions": value,
+        }
+    ]
+
+    with pytest.raises(InvalidArgumentException):
+        await perform_actions(actions)
+
+
+@pytest.mark.parametrize("action_type", ["none", "key", "pointer", "wheel"])
+@pytest.mark.parametrize("value", [None, "foo", True, 42, {}])
+async def test_params_input_source_action_sequence_actions_actions_invalid_type(
+    perform_actions, action_type, value
+):
+    actions = [
+        {
+            "type": action_type,
+            "id": "foo",
+            "actions": [value],
+        }
+    ]
+
+    with pytest.raises(InvalidArgumentException):
+        await perform_actions(actions)
+
+
+@pytest.mark.parametrize("value", [None, "foo", True, 42, []])
+async def test_params_input_source_action_sequence_pointer_parameters_invalid_type(
+    perform_actions, value
+):
+    actions = [{"type": "pointer", "id": "foo", "actions": [], "parameters": value}]
+
+    with pytest.raises(InvalidArgumentException):
+        await perform_actions(actions)
+
+
+@pytest.mark.parametrize("value", [None, True, 42, [], {}])
+async def test_params_input_source_action_sequence_pointer_parameters_pointer_type_invalid_type(
+    perform_actions, value
+):
+    actions = [
+        {
+            "type": "pointer",
+            "id": "foo",
+            "actions": [],
+            "parameters": {
+                "pointerType": value,
+            },
+        }
+    ]
+
+    with pytest.raises(InvalidArgumentException):
+        await perform_actions(actions)
+
+
+@pytest.mark.parametrize("value", ["", "mouses", "pens", "touchs"])
+async def test_params_input_source_action_sequence_pointer_parameters_pointer_type_invalid_value(
+    perform_actions, value
+):
+    actions = [
+        {
+            "type": "pointer",
+            "id": "foo",
+            "actions": [],
+            "parameters": {
+                "pointerType": value,
+            },
+        }
+    ]
+
+    with pytest.raises(InvalidArgumentException):
+        await perform_actions(actions)
+
+
+@pytest.mark.parametrize("action_type", ["none", "key", "pointer", "wheel"])
+@pytest.mark.parametrize("value", [None, True, 42, [], {}])
+async def test_params_input_source_action_sequence_actions_type_invalid_type(
+    perform_actions, action_type, value
+):
+    action = {"type": value, "duration": 0}
+
+    with pytest.raises(InvalidArgumentException):
+        await perform_actions([{"type": action_type, "id": "foo", "actions": [action]}])
+
+
+@pytest.mark.parametrize("action_type", ["none", "key", "pointer", "wheel"])
+@pytest.mark.parametrize("value", ["", "pauses"])
+async def test_params_input_source_action_sequence_actions_subtype_invalid_value(
+    perform_actions, action_type, value
+):
+    action = {"type": value, "duration": 0}
+
+    with pytest.raises(InvalidArgumentException):
+        await perform_actions([{"type": action_type, "id": "foo", "actions": [action]}])
+
+
+@pytest.mark.parametrize("action_type", ["none", "key", "pointer", "wheel"])
+@pytest.mark.parametrize("value", [None, "foo", True, 0.1, [], {}])
+async def test_params_input_source_action_sequence_actions_pause_duration_invalid_type(
+    perform_actions, action_type, value
+):
+    action = {"type": "pause", "duration": value}
+
+    with pytest.raises(InvalidArgumentException):
+        await perform_actions([{"type": action_type, "id": "foo", "actions": [action]}])
+
+
+@pytest.mark.parametrize("action_type", ["none", "key", "pointer", "wheel"])
+@pytest.mark.parametrize("value", [-1, MAX_INT + 1])
+async def test_params_input_source_action_sequence_actions_pause_duration_invalid_value(
+    perform_actions, action_type, value
+):
+    action = {"type": "pause", "duration": value}
+
+    with pytest.raises(InvalidArgumentException):
+        await perform_actions([{"type": action_type, "id": "foo", "actions": [action]}])
+
+
+@pytest.mark.parametrize("value", ["", "pauses"])
+async def test_params_null_action_type_invalid_value(perform_actions, value):
+    action = {"type": value, "duration": 0}
+
+    with pytest.raises(InvalidArgumentException):
+        await perform_actions([{"type": "none", "id": "foo", "actions": [action]}])
+
+
+async def test_params_key_action_subtype_missing(perform_actions):
+    action = create_key_action("keyDown", {"value": "f"}, removals=["type"])
+
+    with pytest.raises(InvalidArgumentException):
+        await perform_actions([{"type": "key", "id": "foo", "actions": [action]}])
+
+
+@pytest.mark.parametrize("value", ["", "keyDowns", "keyUps"])
+async def test_params_key_action_subtype_invalid_value(perform_actions, value):
+    action = create_key_action(value, {"value": "f"})
+
+    with pytest.raises(InvalidArgumentException):
+        await perform_actions([{"type": "key", "id": "foo", "actions": [action]}])
+
+
+@pytest.mark.parametrize("key_action", ["keyDown", "keyUp"])
+async def test_params_key_action_value_missing(perform_actions, key_action):
+    action = create_key_action(key_action, {"value": "f"}, removals=["value"])
+
+    with pytest.raises(InvalidArgumentException):
+        await perform_actions([{"type": "key", "id": "foo", "actions": [action]}])
+
+
+@pytest.mark.parametrize("key_action", ["keyDown", "keyUp"])
+@pytest.mark.parametrize("value", [None, True, 42, [], {}])
+async def test_params_key_action_value_invalid_type(perform_actions, key_action, value):
+    action = create_key_action(key_action, {"value": value})
+
+    with pytest.raises(InvalidArgumentException):
+        await perform_actions([{"type": "key", "id": "foo", "actions": [action]}])
 
 
 @pytest.mark.parametrize(
     "value",
-    [("fa"), ("\u0BA8\u0BBFb"), ("\u0BA8\u0BBF\u0BA8"), ("\u1100\u1161\u11A8c")],
+    ["fa", "\u0BA8\u0BBFb", "\u0BA8\u0BBF\u0BA8", "\u1100\u1161\u11A8c"],
 )
-async def test_params_actions_invalid_value_multiple_codepoints(
-    bidi_session, top_context, setup_key_test, value
+async def test_params_key_action_value_invalid_multiple_codepoints(perform_actions, value):
+    actions = [
+        create_key_action("keyDown", {"value": value}),
+        create_key_action("keyUp", {"value": value}),
+    ]
+
+    with pytest.raises(InvalidArgumentException):
+        await perform_actions([{"type": "key", "id": "foo", "actions": actions}])
+
+
+@pytest.mark.parametrize("value", ["", "pointerDowns", "pointerMoves", "pointerUps"])
+async def test_params_pointer_action_subtype_invalid_value(perform_actions, value):
+    if value == "pointerMoves":
+        action = create_pointer_action(value, {"x": 0, "y": 0})
+    else:
+        action = create_pointer_action(value, {"button": 0})
+
+    with pytest.raises(InvalidArgumentException):
+        await perform_actions([{"type": "pointer", "id": "foo", "actions": [action]}])
+
+
+@pytest.mark.parametrize("coordinate", ["x", "y"])
+async def test_params_pointer_action_up_down_button_missing(perform_actions,  coordinate):
+    action = create_pointer_action("pointerMove", removals=[coordinate])
+
+    with pytest.raises(InvalidArgumentException):
+        await perform_actions([{"type": "pointer", "id": "foo", "actions": [action]}])
+
+
+@pytest.mark.parametrize("coordinate", ["x", "y"])
+@pytest.mark.parametrize("value", [None, "foo", True, 0.1, [], {}])
+async def test_params_pointer_action_move_coordinate_invalid_type(
+    perform_actions, coordinate, value
 ):
-    actions = Actions()
-    actions.add_key().key_down(value).key_up(value)
-    with pytest.raises(InvalidArgumentException):
-        await bidi_session.input.perform_actions(
-            actions=actions, context=top_context["context"]
-        )
-
-
-@pytest.mark.parametrize("missing", ["x", "y"])
-async def test_params_actions_missing_coordinates(bidi_session, top_context, missing):
-    actions = Actions()
-    actions.add_pointer().pointer_move(x=0, y=0)
-
-    json_actions = actions.to_json()
-    pointer_input_source_json = json_actions[-1]["actions"]
-    del pointer_input_source_json[-1][missing]
+    action = create_pointer_action(
+        "pointerMove",
+        {
+            "x": value if coordinate == "x" else 0,
+            "y": value if coordinate == "y" else 0,
+        },
+    )
 
     with pytest.raises(InvalidArgumentException):
-        await bidi_session.input.perform_actions(
-            actions=json_actions, context=top_context["context"]
-        )
+        await perform_actions([{"type": "pointer", "id": "foo", "actions": [action]}])
+
+
+@pytest.mark.parametrize("coordinate", ["x", "y"])
+@pytest.mark.parametrize("value", [MIN_INT - 1, MAX_INT + 1])
+async def test_params_pointer_action_move_coordinate_invalid_value(
+    perform_actions, coordinate, value
+):
+    action = create_pointer_action(
+        "pointerMove",
+        {
+            "x": value if coordinate == "x" else 0,
+            "y": value if coordinate == "y" else 0,
+        },
+    )
+
+    with pytest.raises(InvalidArgumentException):
+        await perform_actions([{"type": "pointer", "id": "foo", "actions": [action]}])
+
+
+@pytest.mark.parametrize("value", [None, True, 42, [], {}])
+async def test_params_pointer_action_move_origin_invalid_type(perform_actions, value):
+    action = create_pointer_action("pointerMove", {"origin": value})
+
+    with pytest.raises(InvalidArgumentException):
+        await perform_actions([{"type": "pointer", "id": "foo", "actions": [action]}])
+
+
+@pytest.mark.parametrize("value", ["", "pointers", "viewports"])
+async def test_params_pointer_action_move_origin_invalid_value(perform_actions, value):
+    action = create_pointer_action("pointerMove", {"origin": value})
+
+    with pytest.raises(InvalidArgumentException):
+        await perform_actions([{"type": "pointer", "id": "foo", "actions": [action]}])
+
+
+@pytest.mark.parametrize("pointer_action", ["pointerDown", "pointerUp"])
+async def test_params_pointer_action_up_down_button_missing(perform_actions,  pointer_action):
+    action = create_pointer_action(pointer_action, removals=["button"])
+
+    with pytest.raises(InvalidArgumentException):
+        await perform_actions([{"type": "pointer", "id": "foo", "actions": [action]}])
+
+
+@pytest.mark.parametrize("pointer_action", ["pointerDown", "pointerUp"])
+@pytest.mark.parametrize("value", [None, "foo", True, 0.1, [], {}])
+async def test_params_pointer_action_up_down_button_invalid_type(
+    perform_actions, pointer_action, value
+):
+    action = create_pointer_action(pointer_action, {"button": value})
+
+    with pytest.raises(InvalidArgumentException):
+        await perform_actions([{"type": "pointer", "id": "foo", "actions": [action]}])
+
+
+@pytest.mark.parametrize("pointer_action", ["pointerDown", "pointerUp"])
+@pytest.mark.parametrize("value", [-1, MAX_INT + 1])
+async def test_params_pointer_action_up_down_button_invalid_value(
+    perform_actions, pointer_action, value
+):
+    action = create_pointer_action(pointer_action, {"button": value})
+
+    with pytest.raises(InvalidArgumentException):
+        await perform_actions([{"type": "pointer", "id": "foo", "actions": [action]}])
+
+
+@pytest.mark.parametrize("pointer_action", ["pointerDown", "pointerMove", "pointerUp"])
+@pytest.mark.parametrize("dimension", ["width", "height"])
+@pytest.mark.parametrize("value", [None, "foo", True, 0.1, [], {}])
+async def test_params_pointer_action_common_properties_dimensions_invalid_type(
+    perform_actions, dimension, pointer_action, value
+):
+    action = create_pointer_action(
+        pointer_action,
+        {
+            "width": value if dimension == "width" else 0,
+            "height": value if dimension == "height" else 0,
+        },
+    )
+
+    with pytest.raises(InvalidArgumentException):
+        await perform_actions([{"type": "pointer", "id": "foo", "actions": [action]}])
+
+
+@pytest.mark.parametrize("dimension", ["width", "height"])
+@pytest.mark.parametrize("pointer_action", ["pointerDown", "pointerMove", "pointerUp"])
+@pytest.mark.parametrize("value", [-1, MAX_INT + 1])
+async def test_params_pointer_action_common_properties_dimensions_invalid_value(
+    perform_actions, dimension, pointer_action, value
+):
+    action = create_pointer_action(
+        pointer_action,
+        {
+            "width": value if dimension == "width" else 0,
+            "height": value if dimension == "height" else 0,
+        },
+    )
+
+    with pytest.raises(InvalidArgumentException):
+        await perform_actions([{"type": "pointer", "id": "foo", "actions": [action]}])
+
+
+@pytest.mark.parametrize("pointer_action", ["pointerDown", "pointerMove", "pointerUp"])
+@pytest.mark.parametrize("pressure", ["pressure", "tangentialPressure"])
+@pytest.mark.parametrize("value", [None, "foo", True, [], {}])
+async def test_params_pointer_action_common_properties_pressure_invalid_type(
+    perform_actions, pointer_action, pressure, value
+):
+    action = create_pointer_action(
+        pointer_action,
+        {
+            "pressure": value if pressure == "pressure" else 0.0,
+            "tangentialPressure": value if pressure == "tangentialPressure" else 0.0,
+        },
+    )
+
+    with pytest.raises(InvalidArgumentException):
+        await perform_actions([{"type": "pointer", "id": "foo", "actions": [action]}])
+
+
+@pytest.mark.parametrize("pointer_action", ["pointerDown", "pointerMove", "pointerUp"])
+@pytest.mark.parametrize("value", [None, "foo", True, 0.1, [], {}])
+async def test_params_pointer_action_common_properties_twist_invalid_type(
+    perform_actions, pointer_action, value
+):
+    action = create_pointer_action(pointer_action, {"twist": value})
+
+    with pytest.raises(InvalidArgumentException):
+        await perform_actions([{"type": "pointer", "id": "foo", "actions": [action]}])
+
+
+@pytest.mark.parametrize("pointer_action", ["pointerDown", "pointerMove", "pointerUp"])
+@pytest.mark.parametrize("value", [-1, 360])
+async def test_params_pointer_action_common_properties_twist_invalid_value(
+    perform_actions, pointer_action, value
+):
+    action = create_pointer_action(pointer_action, {"twist": value})
+
+    with pytest.raises(InvalidArgumentException):
+        await perform_actions([{"type": "pointer", "id": "foo", "actions": [action]}])
+
+
+@pytest.mark.parametrize("pointer_action", ["pointerDown", "pointerMove", "pointerUp"])
+@pytest.mark.parametrize("angle", ["altitudeAngle", "azimuthAngle"])
+@pytest.mark.parametrize("value", [None, "foo", True, [], {}])
+async def test_params_pointer_action_common_properties_angle_invalid_type(
+    perform_actions, pointer_action, angle, value
+):
+    action = create_pointer_action(
+        pointer_action,
+        {
+            "altitudeAngle": value if angle == "altitudeAngle" else 0.0,
+            "azimuthAngle": value if angle == "azimuthAngle" else 0.0,
+        },
+    )
+
+    with pytest.raises(InvalidArgumentException):
+        await perform_actions([{"type": "pointer", "id": "foo", "actions": [action]}])
+
+
+@pytest.mark.parametrize("pointer_action", ["pointerDown", "pointerMove", "pointerUp"])
+@pytest.mark.parametrize("tilt", ["tiltX", "tiltY"])
+@pytest.mark.parametrize("value", [None, "foo", True, 0.1, [], {}])
+async def test_params_pointer_action_common_properties_tilt_invalid_type(
+    perform_actions, pointer_action, tilt, value
+):
+    action = create_pointer_action(
+        pointer_action,
+        {
+            "tiltX": value if tilt == "tiltX" else 0,
+            "tiltY": value if tilt == "tiltY" else 0,
+        },
+    )
+
+    with pytest.raises(InvalidArgumentException):
+        await perform_actions([{"type": "pointer", "id": "foo", "actions": [action]}])
+
+
+@pytest.mark.parametrize("pointer_action", ["pointerDown", "pointerMove", "pointerUp"])
+@pytest.mark.parametrize("tilt", ["tiltX", "tiltY"])
+@pytest.mark.parametrize("value", [-91, 91])
+async def test_params_pointer_action_common_properties_tilt_invalid_value(
+    perform_actions, pointer_action, tilt, value
+):
+    action = create_pointer_action(
+        pointer_action,
+        {
+            "tiltX": value if tilt == "tiltX" else 0,
+            "tiltY": value if tilt == "tiltY" else 0,
+        },
+    )
+
+    with pytest.raises(InvalidArgumentException):
+        await perform_actions([{"type": "pointer", "id": "foo", "actions": [action]}])
+
+
+@pytest.mark.parametrize("coordinate", ["x", "y"])
+@pytest.mark.parametrize("value", [None, "foo", True, 0.1, [], {}])
+async def test_params_wheel_action_scroll_coordinate_invalid_type(
+    perform_actions, coordinate, value
+):
+    action = create_wheel_action(
+        "scroll",
+        {
+            "x": value if coordinate == "x" else 0,
+            "y": value if coordinate == "y" else 0,
+        },
+    )
+
+    with pytest.raises(InvalidArgumentException):
+        await perform_actions([{"type": "wheel", "id": "foo", "actions": [action]}])
+
+
+@pytest.mark.parametrize("coordinate", ["x", "y"])
+@pytest.mark.parametrize("value", [MIN_INT - 1, MAX_INT + 1])
+async def test_params_wheel_action_scroll_coordinate_invalid_value(
+    perform_actions, coordinate, value
+):
+    action = create_wheel_action(
+        "scroll",
+        {
+            "x": value if coordinate == "x" else 0,
+            "y": value if coordinate == "y" else 0,
+        },
+    )
+
+    with pytest.raises(InvalidArgumentException):
+        await perform_actions([{"type": "wheel", "id": "foo", "actions": [action]}])
+
+
+@pytest.mark.parametrize("delta", ["x", "y"])
+@pytest.mark.parametrize("value", [None, "foo", True, 0.1, [], {}])
+async def test_params_wheel_action_scroll_delta_invalid_type(
+    perform_actions, delta, value
+):
+    action = create_wheel_action(
+        "scroll",
+        {
+            "deltaX": value if delta == "x" else 0,
+            "deltaY": value if delta == "y" else 0,
+        },
+    )
+
+    with pytest.raises(InvalidArgumentException):
+        await perform_actions([{"type": "wheel", "id": "foo", "actions": [action]}])
+
+
+@pytest.mark.parametrize("delta", ["x", "y"])
+@pytest.mark.parametrize("value", [MIN_INT - 1, MAX_INT + 1])
+async def test_params_wheel_action_scroll_delta_invalid_value(
+    perform_actions, delta, value
+):
+    action = create_wheel_action(
+        "scroll",
+        {
+            "deltaX": value if delta == "x" else 0,
+            "deltaY": value if delta == "y" else 0,
+        },
+    )
+
+    with pytest.raises(InvalidArgumentException):
+        await perform_actions([{"type": "wheel", "id": "foo", "actions": [action]}])
+
+
+@pytest.mark.parametrize("value", [None, True, 42, [], {}])
+async def test_params_wheel_action_scroll_origin_invalid_type(perform_actions, value):
+    action = create_wheel_action("scroll", {"origin": value})
+
+    with pytest.raises(InvalidArgumentException):
+        await perform_actions([{"type": "wheel", "id": "foo", "actions": [action]}])
+
+
+@pytest.mark.parametrize("value", ["", "pointers", "viewports"])
+async def test_params_wheel_action_scroll_origin_invalid_value(perform_actions, value):
+    action = create_wheel_action("scroll", {"origin": value})
+
+    with pytest.raises(InvalidArgumentException):
+        await perform_actions([{"type": "wheel", "id": "foo", "actions": [action]}])
+
+
+async def test_params_wheel_action_scroll_origin_pointer_not_supported(perform_actions):
+    # Pointer origin isn't currently supported for wheel input source
+    # See: https://github.com/w3c/webdriver/issues/1758
+    action = create_wheel_action("scroll", {"origin": "pointer"})
+
+    with pytest.raises(InvalidArgumentException):
+        await perform_actions([{"type": "wheel", "id": "foo", "actions": [action]}])
 
 
 @pytest.mark.parametrize("missing", ["x", "y", "deltaX", "deltaY"])
-async def test_params_actions_missing_wheel_property(
-    bidi_session, top_context, missing
-):
-    actions = Actions()
-    actions.add_wheel().scroll(x=0, y=0, delta_x=5, delta_y=10)
-
-    json_actions = actions.to_json()
-    wheel_input_actions_json = json_actions[-1]["actions"]
-    del wheel_input_actions_json[-1][missing]
+async def test_params_wheel_action_scroll_property_missing(perform_actions, missing):
+    action = create_wheel_action("scroll", removals=[missing])
 
     with pytest.raises(InvalidArgumentException):
-        await bidi_session.input.perform_actions(
-            actions=json_actions, context=top_context["context"]
-        )
+        await perform_actions([{"type": "wheel", "id": "foo", "actions": [action]}])
 
 
-async def test_params_actions_origin_element_outside_viewport(
-    bidi_session, top_context, get_actions_origin_page, get_element
+# Element origin tests for pointer and wheel input sources
+
+@pytest.mark.parametrize("input_source", ["pointer", "wheel"])
+@pytest.mark.parametrize("value", [None, False, 42, [], {}])
+async def test_params_origin_element_type_invalid_type(
+    perform_actions, input_source, value
 ):
-    url = get_actions_origin_page(
-        """width: 100px; height: 50px; background: green;
-           position: relative; left: -200px; top: -100px;"""
-    )
-    await bidi_session.browsing_context.navigate(
-        context=top_context["context"],
-        url=url,
-        wait="complete",
-    )
+    origin = {"origin": {"type": value}}
 
-    elem = await get_element("#inner")
+    if input_source == "pointer":
+        action = create_pointer_action("pointerMove", origin)
+    elif input_source == "wheel":
+        action = create_wheel_action("scroll", origin)
 
-    actions = Actions()
-    actions.add_pointer().pointer_move(x=0, y=0, origin=get_element_origin(elem))
-    with pytest.raises(MoveTargetOutOfBoundsException):
-        await bidi_session.input.perform_actions(
-            actions=actions, context=top_context["context"]
-        )
-
-
-@pytest.mark.parametrize("value", [True, 42, []])
-async def test_params_actions_origin_invalid_type(bidi_session, top_context, value):
-    actions = Actions()
-    actions.add_pointer().pointer_move(x=0, y=0, origin=value)
     with pytest.raises(InvalidArgumentException):
-        await bidi_session.input.perform_actions(
-            actions=actions, context=top_context["context"]
-        )
+        await perform_actions([{"type": input_source, "id": "foo", "actions": [action]}])
 
 
-@pytest.mark.parametrize("value", [None, True, 42, {}, [], "foo"])
-async def test_params_actions_origin_invalid_value_type(
-    bidi_session, top_context, get_actions_origin_page, get_element, value
+@pytest.mark.parametrize("input_source", ["pointer", "wheel"])
+async def test_params_origin_element_element_missing(
+    perform_actions, input_source
+):
+    origin = {"origin": {"type": "element"}}
+
+    if input_source == "pointer":
+        action = create_pointer_action("pointerMove", origin)
+    elif input_source == "wheel":
+        action = create_wheel_action("scroll", origin)
+
+    with pytest.raises(InvalidArgumentException):
+        await perform_actions([{"type": input_source, "id": "foo", "actions": [action]}])
+
+
+@pytest.mark.parametrize("input_source", ["pointer", "wheel"])
+@pytest.mark.parametrize("value", [None, False, 42, "foo", []])
+async def test_params_origin_element_element_invalid_type(
+    perform_actions, input_source, value
+):
+    origin = {"origin": {"type": "element", "element": value}}
+
+    if input_source == "pointer":
+        action = create_pointer_action("pointerMove", origin)
+    elif input_source == "wheel":
+        action = create_wheel_action("scroll", origin)
+
+    with pytest.raises(InvalidArgumentException):
+        await perform_actions([{"type": input_source, "id": "foo", "actions": [action]}])
+
+
+@pytest.mark.parametrize("input_source", ["pointer", "wheel"])
+async def test_params_origin_element_element_sharedid_missing(
+    perform_actions, input_source
+):
+    origin = {"origin": {"type": "element", "element": {}}}
+
+    if input_source == "pointer":
+        action = create_pointer_action("pointerMove", origin)
+    elif input_source == "wheel":
+        action = create_wheel_action("scroll", origin)
+
+    with pytest.raises(InvalidArgumentException):
+        await perform_actions([{"type": input_source, "id": "foo", "actions": [action]}])
+
+
+@pytest.mark.parametrize("input_source", ["pointer", "wheel"])
+@pytest.mark.parametrize("value", [None, False, 42, [], {}])
+async def test_params_origin_element_element_sharedid_invalid_type(
+    perform_actions, input_source, value
+):
+    origin = {"origin": {"type": "element", "element": {"sharedId": value}}}
+
+    if input_source == "pointer":
+        action = create_pointer_action("pointerMove", origin)
+    elif input_source == "wheel":
+        action = create_wheel_action("scroll", origin)
+
+    with pytest.raises(InvalidArgumentException):
+        await perform_actions([{"type": input_source, "id": "foo", "actions": [action]}])
+
+
+@pytest.mark.parametrize("input_source", ["pointer", "wheel"])
+async def test_params_origin_element_invalid_with_shared_reference(
+    bidi_session, top_context, get_actions_origin_page, get_element, perform_actions, input_source
 ):
     await bidi_session.browsing_context.navigate(
         context=top_context["context"],
@@ -119,114 +801,12 @@ async def test_params_actions_origin_invalid_value_type(
         wait="complete",
     )
 
-    elem = await get_element("#inner")
-    actions = Actions()
-    actions.add_pointer().pointer_move(
-        x=0, y=0, origin={"type": value, "element": {"sharedId": elem["sharedId"]}}
-    )
+    origin = {"origin": await get_element("#inner")}
+
+    if input_source == "pointer":
+        action = create_pointer_action("pointerMove", origin)
+    elif input_source == "wheel":
+        action = create_wheel_action("scroll", origin)
+
     with pytest.raises(InvalidArgumentException):
-        await bidi_session.input.perform_actions(
-            actions=actions, context=top_context["context"]
-        )
-
-
-@pytest.mark.parametrize("value", [None, True, 42, {}, [], "foo"])
-async def test_params_actions_origin_invalid_value_element(
-    bidi_session, top_context, value
-):
-    actions = Actions()
-    actions.add_pointer().pointer_move(
-        x=0, y=0, origin={"type": "element", "element": value}
-    )
-    with pytest.raises(InvalidArgumentException):
-        await bidi_session.input.perform_actions(
-            actions=actions, context=top_context["context"]
-        )
-
-
-async def test_params_actions_origin_invalid_value_serialized_element(
-    bidi_session, top_context, get_actions_origin_page, get_element
-):
-    await bidi_session.browsing_context.navigate(
-        context=top_context["context"],
-        url=get_actions_origin_page(""),
-        wait="complete",
-    )
-
-    elem = await get_element("#inner")
-
-    actions = Actions()
-    actions.add_pointer().pointer_move(x=0, y=0, origin=elem)
-    with pytest.raises(InvalidArgumentException):
-        await bidi_session.input.perform_actions(
-            actions=actions, context=top_context["context"]
-        )
-
-
-@pytest.mark.parametrize(
-    "expression",
-    [
-        "document.querySelector('input#button').attributes[0]",
-        "document.querySelector('#with-text-node').childNodes[0]",
-        """document.createProcessingInstruction("xml-stylesheet", "href='foo.css'")""",
-        "document.querySelector('#with-comment').childNodes[0]",
-        "document",
-        "document.doctype",
-        "document.createDocumentFragment()",
-        "document.querySelector('#custom-element').shadowRoot",
-    ],
-    ids=[
-        "attribute",
-        "text node",
-        "processing instruction",
-        "comment",
-        "document",
-        "doctype",
-        "document fragment",
-        "shadow root",
-    ]
-)
-async def test_params_actions_origin_no_such_element(
-    bidi_session, top_context, get_test_page, expression
-):
-    await bidi_session.browsing_context.navigate(
-        context=top_context["context"],
-        url=get_test_page(),
-        wait="complete",
-    )
-
-    node = await bidi_session.script.evaluate(
-        expression=expression,
-        target=ContextTarget(top_context["context"]),
-        await_promise=False,
-    )
-
-    actions = Actions()
-    actions.add_pointer().pointer_move(x=0, y=0, origin=get_element_origin(node))
-    with pytest.raises(NoSuchElementException):
-        await bidi_session.input.perform_actions(
-            actions=actions, context=top_context["context"]
-        )
-
-
-async def test_params_actions_origin_no_such_node(bidi_session, top_context):
-    actions = Actions()
-    actions.add_pointer().pointer_move(
-        x=0, y=0, origin={"type": "element", "element": {"sharedId": "foo"}}
-    )
-    with pytest.raises(NoSuchNodeException):
-        await bidi_session.input.perform_actions(
-            actions=actions, context=top_context["context"]
-        )
-
-
-@pytest.mark.parametrize("origin", ["viewport", "pointer"])
-async def test_params_actions_origin_outside_viewport(
-    bidi_session, top_context, origin
-):
-    actions = Actions()
-    actions.add_pointer().pointer_move(x=-50, y=-50, origin=origin)
-    with pytest.raises(MoveTargetOutOfBoundsException):
-        await bidi_session.input.perform_actions(
-            actions=actions, context=top_context["context"]
-        )
+        await perform_actions([{"type": input_source, "id": "foo", "actions": [action]}])
diff --git a/tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/key.py b/tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/key.py
index 9189bc96cc4..ac3099a1ba3 100644
--- a/tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/key.py
+++ b/tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/key.py
@@ -1,13 +1,24 @@
 import pytest
 
+from webdriver.bidi.error import NoSuchFrameException
 from webdriver.bidi.modules.input import Actions
+from webdriver.bidi.modules.script import ContextTarget
 
 from tests.support.keys import Keys
 from .. import get_keys_value
+from . import get_shadow_root_from_test_page
 
 pytestmark = pytest.mark.asyncio
 
 
+async def test_invalid_browsing_context(bidi_session):
+    actions = Actions()
+    actions.add_key()
+
+    with pytest.raises(NoSuchFrameException):
+        await bidi_session.input.perform_actions(actions=actions, context="foo")
+
+
 async def test_key_backspace(bidi_session, top_context, setup_key_test):
     actions = Actions()
     actions.add_key().send_keys("efcd").send_keys([Keys.BACKSPACE, Keys.BACKSPACE])
@@ -45,6 +56,48 @@ async def test_key_codepoint(
     assert keys_value == value
 
 
+@pytest.mark.parametrize("mode", ["open", "closed"])
+@pytest.mark.parametrize("nested", [False, True], ids=["outer", "inner"])
+async def test_key_shadow_tree(bidi_session, top_context, get_test_page, mode, nested):
+    await bidi_session.browsing_context.navigate(
+        context=top_context["context"],
+        url=get_test_page(
+            shadow_doc="<div><input type=text></div>",
+            shadow_root_mode=mode,
+            nested_shadow_dom=nested,
+        ),
+        wait="complete",
+    )
+
+    shadow_root = await get_shadow_root_from_test_page(bidi_session, top_context, nested)
+    input_el = await bidi_session.script.call_function(
+        function_declaration=f"""shadowRoot => {{
+            const input = shadowRoot.querySelector('input');
+            input.focus();
+            return input;
+        }}
+        """,
+        arguments=[shadow_root],
+        target=ContextTarget(top_context["context"]),
+        await_promise=False,
+    )
+
+    actions = Actions()
+    (actions.add_key().key_down("a").key_up("a"))
+    await bidi_session.input.perform_actions(
+        actions=actions, context=top_context["context"]
+    )
+
+    input_value = await bidi_session.script.call_function(
+        function_declaration="input => input.value",
+        arguments=[input_el],
+        target=ContextTarget(top_context["context"]),
+        await_promise=False,
+    )
+
+    assert input_value["value"] == "a"
+
+
 async def test_null_response_value(bidi_session, top_context):
     actions = Actions()
     actions.add_key().key_down("a").key_up("a")
diff --git a/tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/key_events.py b/tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/key_events.py
index f01f327b234..e93c132e0ac 100644
--- a/tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/key_events.py
+++ b/tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/key_events.py
@@ -76,9 +76,7 @@ async def test_non_printable_key_sends_events(
         (Keys.R_SHIFT, "R_SHIFT"),
     ],
 )
-async def test_key_modifier_key(
-    bidi_session, top_context, setup_key_test, key, event
-):
+async def test_key_modifier_key(bidi_session, top_context, setup_key_test, key, event):
     code = ALL_EVENTS[event]["code"]
     value = ALL_EVENTS[event]["key"]
 
diff --git a/tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/pointer.py b/tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/pointer.py
new file mode 100644
index 00000000000..6109450a23c
--- /dev/null
+++ b/tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/pointer.py
@@ -0,0 +1,15 @@
+import pytest
+
+from webdriver.bidi.error import NoSuchFrameException
+from webdriver.bidi.modules.input import Actions
+
+
+pytestmark = pytest.mark.asyncio
+
+
+async def test_invalid_browsing_context(bidi_session):
+    actions = Actions()
+    actions.add_pointer()
+
+    with pytest.raises(NoSuchFrameException):
+        await bidi_session.input.perform_actions(actions=actions, context="foo")
diff --git a/tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/pointer_mouse.py b/tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/pointer_mouse.py
index bb5d78f3013..c0c4d6ff953 100644
--- a/tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/pointer_mouse.py
+++ b/tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/pointer_mouse.py
@@ -1,12 +1,18 @@
 import pytest
 
+from webdriver.bidi.error import MoveTargetOutOfBoundsException
 from webdriver.bidi.modules.input import Actions, get_element_origin
 
 from tests.support.asserts import assert_move_to_coordinates
 from tests.support.helpers import filter_dict
 
 from .. import get_events
-from . import get_element_rect, get_inview_center_bidi
+from . import (
+    assert_pointer_events,
+    get_inview_center_bidi,
+    get_shadow_root_from_test_page,
+    record_pointer_events,
+)
 
 pytestmark = pytest.mark.asyncio
 
@@ -48,6 +54,41 @@ async def test_click_at_coordinates(bidi_session, top_context, load_static_test_
     assert expected == filtered_events[1:]
 
 
+@pytest.mark.parametrize("origin", ["pointer", "viewport"])
+async def test_params_actions_origin_outside_viewport(bidi_session, top_context, origin):
+    actions = Actions()
+    actions.add_pointer().pointer_move(x=-50, y=-50, origin=origin)
+
+    with pytest.raises(MoveTargetOutOfBoundsException):
+        await bidi_session.input.perform_actions(
+            actions=actions, context=top_context["context"]
+        )
+
+
+async def test_params_actions_origin_element_outside_viewport(
+    bidi_session, top_context, get_actions_origin_page, get_element
+):
+    url = get_actions_origin_page(
+        """width: 100px; height: 50px; background: green;
+           position: relative; left: -200px; top: -100px;"""
+    )
+    await bidi_session.browsing_context.navigate(
+        context=top_context["context"],
+        url=url,
+        wait="complete",
+    )
+
+    elem = await get_element("#inner")
+
+    actions = Actions()
+    actions.add_pointer().pointer_move(x=0, y=0, origin=get_element_origin(elem))
+
+    with pytest.raises(MoveTargetOutOfBoundsException):
+        await bidi_session.input.perform_actions(
+            actions=actions, context=top_context["context"]
+        )
+
+
 async def test_context_menu_at_coordinates(
     bidi_session, top_context, load_static_test_page
 ):
@@ -73,14 +114,55 @@ async def test_context_menu_at_coordinates(
     assert len(events) == 4
 
     expected = [
-        {"type": "mousedown", "button": 2},
-        {"type": "contextmenu", "button": 2},
+        {"type": "mousedown", "button": 2, "buttons": 2},
+        {"type": "contextmenu", "button": 2, "buttons": 2},
+    ]
+    # Some browsers in some platforms may dispatch `contextmenu` event as a
+    # a default action of `mouseup`.  In the case, `.buttons` of the event
+    # should be 0.
+    anotherExpected = [
+        {"type": "mousedown", "button": 2, "buttons": 2},
+        {"type": "contextmenu", "button": 2, "buttons": 0},
     ]
     filtered_events = [filter_dict(e, expected[0]) for e in events]
     mousedown_contextmenu_events = [
         x for x in filtered_events if x["type"] in ["mousedown", "contextmenu"]
     ]
-    assert expected == mousedown_contextmenu_events
+    assert mousedown_contextmenu_events in [expected, anotherExpected]
+
+
+async def test_middle_click(bidi_session, top_context, load_static_test_page):
+    await load_static_test_page(page="test_actions.html")
+
+    div_point = {
+        "x": 82,
+        "y": 187,
+    }
+
+    actions = Actions()
+    (
+        actions.add_pointer()
+        .pointer_move(x=div_point["x"], y=div_point["y"])
+        .pointer_down(button=1)
+        .pointer_up(button=1)
+    )
+    await bidi_session.input.perform_actions(
+        actions=actions, context=top_context["context"]
+    )
+
+
+    events = await get_events(bidi_session, top_context["context"])
+    assert len(events) == 3
+
+    expected = [
+      {"type": "mousedown", "button": 1, "buttons": 4},
+      {"type": "mouseup", "button": 1, "buttons": 0},
+    ]
+    filtered_events = [filter_dict(e, expected[0]) for e in events]
+    mousedown_mouseup_events = [
+        x for x in filtered_events if x["type"] in ["mousedown", "mouseup"]
+    ]
+    assert expected == mousedown_mouseup_events
 
 
 async def test_click_element_center(
@@ -117,6 +199,53 @@ async def test_click_element_center(
             assert e["target"] == "outer"
 
 
+@pytest.mark.parametrize("mode", ["open", "closed"])
+@pytest.mark.parametrize("nested", [False, True], ids=["outer", "inner"])
+async def test_click_element_in_shadow_tree(
+    bidi_session, top_context, get_test_page, mode, nested
+):
+    await bidi_session.browsing_context.navigate(
+        context=top_context["context"],
+        url=get_test_page(
+            shadow_doc="""
+            <div id="pointer-target"
+                 style="width: 10px; height: 10px; background-color:blue;">
+            </div>""",
+            shadow_root_mode=mode,
+            nested_shadow_dom=nested,
+        ),
+        wait="complete",
+    )
+
+    shadow_root = await get_shadow_root_from_test_page(
+        bidi_session, top_context, nested
+    )
+
+    target = await record_pointer_events(
+        bidi_session, top_context, shadow_root, "#pointer-target"
+    )
+
+    actions = Actions()
+    (
+        actions.add_pointer()
+        .pointer_move(x=0, y=0, origin=get_element_origin(target))
+        .pointer_down(button=0)
+        .pointer_up(button=0)
+    )
+
+    await bidi_session.input.perform_actions(
+        actions=actions, context=top_context["context"]
+    )
+
+    await assert_pointer_events(
+        bidi_session,
+        top_context,
+        expected_events=["pointerdown", "pointerup"],
+        target="pointer-target",
+        pointer_type="mouse",
+    )
+
+
 async def test_click_navigation(
     bidi_session,
     top_context,
@@ -155,131 +284,3 @@ async def test_click_navigation(
         await click_link()
         event = await on_entry
         assert event["url"] == destination
-
-
-@pytest.mark.parametrize("drag_duration", [0, 300, 800])
-@pytest.mark.parametrize(
-    "dx, dy", [(20, 0), (0, 15), (10, 15), (-20, 0), (10, -15), (-10, -15)]
-)
-async def test_drag_and_drop(
-    bidi_session,
-    top_context,
-    get_element,
-    load_static_test_page,
-    dx,
-    dy,
-    drag_duration,
-):
-    await load_static_test_page(page="test_actions.html")
-
-    drag_target = await get_element("#dragTarget")
-    initial_rect = await get_element_rect(
-        bidi_session, context=top_context, element=drag_target
-    )
-    initial_center = await get_inview_center_bidi(
-        bidi_session, context=top_context, element=drag_target
-    )
-
-    # Conclude chain with extra move to allow time for last queued
-    # coordinate-update of drag_target and to test that drag_target is "dropped".
-    actions = Actions()
-    (
-        actions.add_pointer()
-        .pointer_move(x=0, y=0, origin=get_element_origin(drag_target))
-        .pointer_down(button=0)
-        .pointer_move(dx, dy, duration=drag_duration, origin="pointer")
-        .pointer_up(button=0)
-        .pointer_move(80, 50, duration=100, origin="pointer")
-    )
-
-    await bidi_session.input.perform_actions(
-        actions=actions, context=top_context["context"]
-    )
-
-    # mouseup that ends the drag is at the expected destination
-    events = await get_events(bidi_session, top_context["context"])
-    e = events[1]
-    assert e["type"] == "mouseup"
-    assert e["pageX"] == pytest.approx(initial_center["x"] + dx, abs=1.0)
-    assert e["pageY"] == pytest.approx(initial_center["y"] + dy, abs=1.0)
-    # check resulting location of the dragged element
-    final_rect = await get_element_rect(
-        bidi_session, context=top_context, element=drag_target
-    )
-    assert initial_rect["x"] + dx == final_rect["x"]
-    assert initial_rect["y"] + dy == final_rect["y"]
-
-
-@pytest.mark.parametrize("drag_duration", [0, 300, 800])
-async def test_drag_and_drop_with_draggable_element(bidi_session, top_context,
-                                                    get_element,
-                                                    load_static_test_page,
-                                                    drag_duration):
-    await load_static_test_page(page="test_actions.html")
-
-    drag_target = await get_element("#draggable")
-    drop_target = await get_element("#droppable")
-
-    # Conclude chain with extra move to allow time for last queued
-    # coordinate-update of drag_target and to test that drag_target is "dropped".
-    actions = Actions()
-    (
-        actions.add_pointer()
-        .pointer_move(x=0, y=0, origin=get_element_origin(drag_target))
-        .pointer_down(button=0)
-        .pointer_move(x=0, y=0, duration=drag_duration, origin=get_element_origin(drop_target))
-        .pointer_up(button=0)
-    )
-
-    await bidi_session.input.perform_actions(actions=actions,
-                                             context=top_context["context"])
-
-    # mouseup that ends the drag is at the expected destination
-    events = await get_events(bidi_session, top_context["context"])
-
-    drag_events_captured = [
-        ev["type"] for ev in events
-        if ev["type"].startswith("drag") or ev["type"].startswith("drop")
-    ]
-    assert "dragstart" in drag_events_captured
-    assert "dragenter" in drag_events_captured
-    # dragleave never happens if the mouse moves directly into the drop element
-    # without intermediate movements.
-    if drag_duration != 0:
-        assert "dragleave" in drag_events_captured
-    assert "dragover" in drag_events_captured
-    assert "drop" in drag_events_captured
-    assert "dragend" in drag_events_captured
-
-    def last_index(list, value):
-        return len(list) - list[::-1].index(value) - 1
-
-    # The order should follow the diagram:
-    #
-    #  - dragstart
-    #  - dragenter
-    #  - ...
-    #  - dragenter
-    #  - dragleave
-    #  - ...
-    #  - dragleave
-    #  - dragover
-    #  - ...
-    #  - dragover
-    #  - drop
-    #  - dragend
-    #
-    assert drag_events_captured.index(
-        "dragstart") < drag_events_captured.index("dragenter")
-    if drag_duration != 0:
-        assert last_index(drag_events_captured,
-                      "dragenter") < last_index(drag_events_captured, "dragleave")
-        assert last_index(drag_events_captured,
-                      "dragleave") < last_index(drag_events_captured, "dragover")
-    else:
-        assert last_index(drag_events_captured,
-                      "dragenter") < last_index(drag_events_captured, "dragover")
-    assert last_index(drag_events_captured,
-                  "dragover") < drag_events_captured.index("drop")
-    assert drag_events_captured.index(
-        "drop") == drag_events_captured.index("dragend") - 1
diff --git a/tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/pointer_mouse_drag.py b/tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/pointer_mouse_drag.py
new file mode 100644
index 00000000000..7cd2e386c67
--- /dev/null
+++ b/tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/pointer_mouse_drag.py
@@ -0,0 +1,137 @@
+# META: timeout=long
+
+import pytest
+
+from webdriver.bidi.modules.input import Actions, get_element_origin
+
+from .. import get_events
+from . import get_element_rect, get_inview_center_bidi
+
+pytestmark = pytest.mark.asyncio
+
+@pytest.mark.parametrize("drag_duration", [0, 300, 800])
+@pytest.mark.parametrize(
+    "dx, dy", [(20, 0), (0, 15), (10, 15), (-20, 0), (10, -15), (-10, -15)]
+)
+async def test_drag_and_drop(
+    bidi_session,
+    top_context,
+    get_element,
+    load_static_test_page,
+    dx,
+    dy,
+    drag_duration,
+):
+    await load_static_test_page(page="test_actions.html")
+
+    drag_target = await get_element("#dragTarget")
+    initial_rect = await get_element_rect(
+        bidi_session, context=top_context, element=drag_target
+    )
+    initial_center = await get_inview_center_bidi(
+        bidi_session, context=top_context, element=drag_target
+    )
+
+    # Conclude chain with extra move to allow time for last queued
+    # coordinate-update of drag_target and to test that drag_target is "dropped".
+    actions = Actions()
+    (
+        actions.add_pointer()
+        .pointer_move(x=0, y=0, origin=get_element_origin(drag_target))
+        .pointer_down(button=0)
+        .pointer_move(dx, dy, duration=drag_duration, origin="pointer")
+        .pointer_up(button=0)
+        .pointer_move(80, 50, duration=100, origin="pointer")
+    )
+
+    await bidi_session.input.perform_actions(
+        actions=actions, context=top_context["context"]
+    )
+
+    # mouseup that ends the drag is at the expected destination
+    events = await get_events(bidi_session, top_context["context"])
+    e = events[1]
+    assert e["type"] == "mouseup"
+    assert e["pageX"] == pytest.approx(initial_center["x"] + dx, abs=1.0)
+    assert e["pageY"] == pytest.approx(initial_center["y"] + dy, abs=1.0)
+    # check resulting location of the dragged element
+    final_rect = await get_element_rect(
+        bidi_session, context=top_context, element=drag_target
+    )
+    assert initial_rect["x"] + dx == final_rect["x"]
+    assert initial_rect["y"] + dy == final_rect["y"]
+
+
+@pytest.mark.parametrize("drag_duration", [0, 300, 800])
+async def test_drag_and_drop_with_draggable_element(bidi_session, top_context,
+                                                    get_element,
+                                                    load_static_test_page,
+                                                    drag_duration):
+    await load_static_test_page(page="test_actions.html")
+
+    drag_target = await get_element("#draggable")
+    drop_target = await get_element("#droppable")
+
+    # Conclude chain with extra move to allow time for last queued
+    # coordinate-update of drag_target and to test that drag_target is "dropped".
+    actions = Actions()
+    (
+        actions.add_pointer()
+        .pointer_move(x=0, y=0, origin=get_element_origin(drag_target))
+        .pointer_down(button=0)
+        .pointer_move(x=0, y=0, duration=drag_duration, origin=get_element_origin(drop_target))
+        .pointer_up(button=0)
+    )
+
+    await bidi_session.input.perform_actions(actions=actions,
+                                             context=top_context["context"])
+
+    # mouseup that ends the drag is at the expected destination
+    events = await get_events(bidi_session, top_context["context"])
+
+    drag_events_captured = [
+        ev["type"] for ev in events
+        if ev["type"].startswith("drag") or ev["type"].startswith("drop")
+    ]
+    assert "dragstart" in drag_events_captured
+    assert "dragenter" in drag_events_captured
+    # dragleave never happens if the mouse moves directly into the drop element
+    # without intermediate movements.
+    if drag_duration != 0:
+        assert "dragleave" in drag_events_captured
+    assert "dragover" in drag_events_captured
+    assert "drop" in drag_events_captured
+    assert "dragend" in drag_events_captured
+
+    def last_index(list, value):
+        return len(list) - list[::-1].index(value) - 1
+
+    # The order should follow the diagram:
+    #
+    #  - dragstart
+    #  - dragenter
+    #  - ...
+    #  - dragenter
+    #  - dragleave
+    #  - ...
+    #  - dragleave
+    #  - dragover
+    #  - ...
+    #  - dragover
+    #  - drop
+    #  - dragend
+    #
+    assert drag_events_captured.index(
+        "dragstart") < drag_events_captured.index("dragenter")
+    if drag_duration != 0:
+        assert last_index(drag_events_captured,
+                      "dragenter") < last_index(drag_events_captured, "dragleave")
+        assert last_index(drag_events_captured,
+                      "dragleave") < last_index(drag_events_captured, "dragover")
+    else:
+        assert last_index(drag_events_captured,
+                      "dragenter") < last_index(drag_events_captured, "dragover")
+    assert last_index(drag_events_captured,
+                  "dragover") < drag_events_captured.index("drop")
+    assert drag_events_captured.index(
+        "drop") == drag_events_captured.index("dragend") - 1
diff --git a/tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/pointer_origin.py b/tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/pointer_origin.py
index 8667574602d..f6721e07f39 100644
--- a/tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/pointer_origin.py
+++ b/tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/pointer_origin.py
@@ -1,5 +1,6 @@
 import pytest
 
+from webdriver.bidi.error import NoSuchElementException
 from webdriver.bidi.modules.input import Actions, get_element_origin
 from webdriver.bidi.modules.script import ContextTarget
 
@@ -146,3 +147,50 @@ async def test_element_larger_than_viewport(bidi_session, top_context,
                                                context=top_context)
     assert click_coords["x"] == pytest.approx(center["x"], abs=1.0)
     assert click_coords["y"] == pytest.approx(center["y"], abs=1.0)
+
+
+@pytest.mark.parametrize(
+    "expression",
+    [
+        "document.querySelector('input#button').attributes[0]",
+        "document.querySelector('#with-text-node').childNodes[0]",
+        """document.createProcessingInstruction("xml-stylesheet", "href='foo.css'")""",
+        "document.querySelector('#with-comment').childNodes[0]",
+        "document",
+        "document.doctype",
+        "document.createDocumentFragment()",
+        "document.querySelector('#custom-element').shadowRoot",
+    ],
+    ids=[
+        "attribute",
+        "text node",
+        "processing instruction",
+        "comment",
+        "document",
+        "doctype",
+        "document fragment",
+        "shadow root",
+    ]
+)
+async def test_params_actions_origin_no_such_element(
+    bidi_session, top_context, get_test_page, expression
+):
+    await bidi_session.browsing_context.navigate(
+        context=top_context["context"],
+        url=get_test_page(),
+        wait="complete",
+    )
+
+    node = await bidi_session.script.evaluate(
+        expression=expression,
+        target=ContextTarget(top_context["context"]),
+        await_promise=False,
+    )
+
+    actions = Actions()
+    actions.add_pointer().pointer_move(x=0, y=0, origin=get_element_origin(node))
+
+    with pytest.raises(NoSuchElementException):
+        await bidi_session.input.perform_actions(
+            actions=actions, context=top_context["context"]
+        )
diff --git a/tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/pointer_pen.py b/tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/pointer_pen.py
index 30728f9a136..04fb24edccd 100644
--- a/tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/pointer_pen.py
+++ b/tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/pointer_pen.py
@@ -1,13 +1,67 @@
 import pytest
 
 from webdriver.bidi.modules.input import Actions, get_element_origin
+from webdriver.bidi.modules.script import ContextTarget
 
 from .. import get_events
-from . import get_inview_center_bidi
+from . import (
+    assert_pointer_events,
+    get_inview_center_bidi,
+    get_shadow_root_from_test_page,
+    record_pointer_events,
+)
 
 pytestmark = pytest.mark.asyncio
 
 
+@pytest.mark.parametrize("mode", ["open", "closed"])
+@pytest.mark.parametrize("nested", [False, True], ids=["outer", "inner"])
+async def test_pen_pointer_in_shadow_tree(
+    bidi_session, top_context, get_test_page, mode, nested
+):
+    await bidi_session.browsing_context.navigate(
+        context=top_context["context"],
+        url=get_test_page(
+            shadow_doc="""
+            <div id="pointer-target"
+                 style="width: 10px; height: 10px; background-color:blue;">
+            </div>""",
+            shadow_root_mode=mode,
+            nested_shadow_dom=nested,
+        ),
+        wait="complete",
+    )
+
+    shadow_root = await get_shadow_root_from_test_page(
+        bidi_session, top_context, nested
+    )
+
+    # Add a simplified event recorder to track events in the test ShadowRoot.
+    target = await record_pointer_events(
+        bidi_session, top_context, shadow_root, "#pointer-target"
+    )
+
+    actions = Actions()
+    (
+        actions.add_pointer(pointer_type="pen")
+        .pointer_move(x=0, y=0, origin=get_element_origin(target))
+        .pointer_down(button=0)
+        .pointer_up(button=0)
+    )
+
+    await bidi_session.input.perform_actions(
+        actions=actions, context=top_context["context"]
+    )
+
+    await assert_pointer_events(
+        bidi_session,
+        top_context,
+        expected_events=["pointerdown", "pointerup"],
+        target="pointer-target",
+        pointer_type="pen",
+    )
+
+
 async def test_pen_pointer_properties(
     bidi_session, top_context, get_element, load_static_test_page
 ):
diff --git a/tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/pointer_touch.py b/tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/pointer_touch.py
index 126e72c76ed..c1c430765f7 100644
--- a/tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/pointer_touch.py
+++ b/tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/pointer_touch.py
@@ -1,13 +1,67 @@
 import pytest
 
 from webdriver.bidi.modules.input import Actions, get_element_origin
+from webdriver.bidi.modules.script import ContextTarget
 
 from .. import get_events
-from . import get_inview_center_bidi
+from . import (
+    assert_pointer_events,
+    get_inview_center_bidi,
+    get_shadow_root_from_test_page,
+    record_pointer_events,
+)
 
 pytestmark = pytest.mark.asyncio
 
 
+@pytest.mark.parametrize("mode", ["open", "closed"])
+@pytest.mark.parametrize("nested", [False, True], ids=["outer", "inner"])
+async def test_touch_pointer_in_shadow_tree(
+    bidi_session, top_context, get_test_page, mode, nested
+):
+    await bidi_session.browsing_context.navigate(
+        context=top_context["context"],
+        url=get_test_page(
+            shadow_doc="""
+            <div id="pointer-target"
+                 style="width: 10px; height: 10px; background-color:blue;">
+            </div>""",
+            shadow_root_mode=mode,
+            nested_shadow_dom=nested,
+        ),
+        wait="complete",
+    )
+
+    shadow_root = await get_shadow_root_from_test_page(
+        bidi_session, top_context, nested
+    )
+
+    # Add a simplified event recorder to track events in the test ShadowRoot.
+    target = await record_pointer_events(
+        bidi_session, top_context, shadow_root, "#pointer-target"
+    )
+
+    actions = Actions()
+    (
+        actions.add_pointer(pointer_type="touch")
+        .pointer_move(x=0, y=0, origin=get_element_origin(target))
+        .pointer_down(button=0)
+        .pointer_up(button=0)
+    )
+
+    await bidi_session.input.perform_actions(
+        actions=actions, context=top_context["context"]
+    )
+
+    await assert_pointer_events(
+        bidi_session,
+        top_context,
+        expected_events=["pointerdown", "pointerup"],
+        target="pointer-target",
+        pointer_type="touch",
+    )
+
+
 async def test_touch_pointer_properties(
     bidi_session, top_context, get_element, load_static_test_page
 ):
diff --git a/tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/wheel.py b/tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/wheel.py
index cf96a9cd9ba..2da3861f937 100644
--- a/tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/wheel.py
+++ b/tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/wheel.py
@@ -1,20 +1,32 @@
 import pytest
 
+from webdriver.bidi.error import NoSuchFrameException
 from webdriver.bidi.modules.input import Actions, get_element_origin
-from .. import get_events
+from webdriver.bidi.modules.script import ContextTarget
+
+from .. import get_events, get_object_from_context
+from . import get_shadow_root_from_test_page
 
 pytestmark = pytest.mark.asyncio
 
 
+async def test_invalid_browsing_context(bidi_session):
+    actions = Actions()
+    actions.add_wheel()
+
+    with pytest.raises(NoSuchFrameException):
+        await bidi_session.input.perform_actions(actions=actions, context="foo")
+
+
 @pytest.mark.parametrize("delta_x, delta_y", [(0, 10), (5, 0), (5, 10)])
-async def test_wheel_scroll(
+async def test_scroll_not_scrollable(
     bidi_session, setup_wheel_test, top_context, get_element, delta_x, delta_y
 ):
     actions = Actions()
 
-    outer = await get_element("#outer")
+    target = await get_element("#not-scrollable")
     actions.add_wheel().scroll(
-        x=0, y=0, delta_x=delta_x, delta_y=delta_y, origin=get_element_origin(outer)
+        x=0, y=0, delta_x=delta_x, delta_y=delta_y, origin=get_element_origin(target)
     )
 
     await bidi_session.input.perform_actions(
@@ -24,37 +36,14 @@ async def test_wheel_scroll(
 
     assert len(events) == 1
     assert events[0]["type"] == "wheel"
-    assert events[0]["deltaX"] >= delta_x
-    assert events[0]["deltaY"] >= delta_y
+    assert events[0]["deltaX"] == delta_x
+    assert events[0]["deltaY"] == delta_y
     assert events[0]["deltaZ"] == 0
-    assert events[0]["target"] == "outer"
+    assert events[0]["target"] == "not-scrollable-content"
 
 
 @pytest.mark.parametrize("delta_x, delta_y", [(0, 10), (5, 0), (5, 10)])
-async def test_wheel_scroll_iframe(
-    bidi_session, setup_wheel_test, top_context, get_element, delta_x, delta_y
-):
-    actions = Actions()
-
-    subframe = await get_element("#subframe")
-    actions.add_wheel().scroll(
-        x=0, y=0, delta_x=delta_x, delta_y=delta_y, origin=get_element_origin(subframe)
-    )
-
-    await bidi_session.input.perform_actions(
-        actions=actions, context=top_context["context"]
-    )
-    events = await get_events(bidi_session, top_context["context"])
-    assert len(events) == 1
-    assert events[0]["type"] == "wheel"
-    assert events[0]["deltaX"] >= delta_x
-    assert events[0]["deltaY"] >= delta_y
-    assert events[0]["deltaZ"] == 0
-    assert events[0]["target"] == "iframeContent"
-
-
-@pytest.mark.parametrize("delta_x, delta_y", [(0, 10), (5, 0), (5, 10)])
-async def test_wheel_scroll_overflow(
+async def test_scroll_scrollable_overflow(
     bidi_session, setup_wheel_test, top_context, get_element, delta_x, delta_y
 ):
     actions = Actions()
@@ -75,7 +64,98 @@ async def test_wheel_scroll_overflow(
     events = await get_events(bidi_session, top_context["context"])
     assert len(events) == 1
     assert events[0]["type"] == "wheel"
-    assert events[0]["deltaX"] >= delta_x
-    assert events[0]["deltaY"] >= delta_y
+    assert events[0]["deltaX"] == delta_x
+    assert events[0]["deltaY"] == delta_y
     assert events[0]["deltaZ"] == 0
-    assert events[0]["target"] == "scrollContent"
+    assert events[0]["target"] == "scrollable-content"
+
+
+@pytest.mark.parametrize("delta_x, delta_y", [(0, 10), (5, 0), (5, 10)])
+async def test_scroll_iframe(
+    bidi_session, setup_wheel_test, top_context, get_element, delta_x, delta_y
+):
+    actions = Actions()
+
+    target = await get_element("#iframe")
+    actions.add_wheel().scroll(
+        x=0, y=0, delta_x=delta_x, delta_y=delta_y, origin=get_element_origin(target)
+    )
+
+    await bidi_session.input.perform_actions(
+        actions=actions, context=top_context["context"]
+    )
+    events = await get_events(bidi_session, top_context["context"])
+    assert len(events) == 1
+    assert events[0]["type"] == "wheel"
+    assert events[0]["deltaX"] == delta_x
+    assert events[0]["deltaY"] == delta_y
+    assert events[0]["deltaZ"] == 0
+    assert events[0]["target"] == "iframeContent"
+
+
+@pytest.mark.parametrize("mode", ["open", "closed"])
+@pytest.mark.parametrize("nested", [False, True], ids=["outer", "inner"])
+async def test_scroll_shadow_tree(
+    bidi_session, top_context, get_test_page, mode, nested
+):
+    await bidi_session.browsing_context.navigate(
+        context=top_context["context"],
+        url=get_test_page(
+            shadow_doc="""
+            <div id="scrollableShadowTree"
+                 style="width: 100px; height: 100px; overflow: auto;">
+                <div
+                    id="scrollableShadowTreeContent"
+                    style="width: 600px; height: 1000px; background-color:blue"></div>
+            </div>""",
+            shadow_root_mode=mode,
+            nested_shadow_dom=nested,
+        ),
+        wait="complete",
+    )
+
+    shadow_root = await get_shadow_root_from_test_page(bidi_session, top_context, nested)
+
+    # Add a simplified event recorder to track events in the test ShadowRoot.
+    scrollable = await bidi_session.script.call_function(
+        function_declaration=f"""shadowRoot => {{
+            window.wheelEvents = [];
+            const scrollable = shadowRoot.querySelector("#scrollableShadowTree");
+            scrollable.addEventListener("wheel",
+                function(event) {{
+                    window.wheelEvents.push({{
+                        "deltaX": event.deltaX,
+                        "deltaY": event.deltaY,
+                        "target": event.target.id
+                    }});
+                }}
+            );
+            return scrollable;
+        }}
+        """,
+        arguments=[shadow_root],
+        target=ContextTarget(top_context["context"]),
+        await_promise=False,
+    )
+
+    actions = Actions()
+    actions.add_wheel().scroll(
+        x=0,
+        y=0,
+        delta_x=5,
+        delta_y=10,
+        origin=get_element_origin(scrollable),
+    )
+
+    await bidi_session.input.perform_actions(
+        actions=actions, context=top_context["context"]
+    )
+
+    events = await get_object_from_context(
+        bidi_session, top_context["context"], "window.wheelEvents"
+    )
+
+    assert len(events) == 1
+    assert events[0]["deltaX"] >= 5
+    assert events[0]["deltaY"] >= 10
+    assert events[0]["target"] == "scrollableShadowTreeContent"
\ No newline at end of file
diff --git a/tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/wheel_origin.py b/tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/wheel_origin.py
new file mode 100644
index 00000000000..999b1415006
--- /dev/null
+++ b/tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/wheel_origin.py
@@ -0,0 +1,55 @@
+import pytest
+
+from webdriver.bidi.error import NoSuchElementException
+from webdriver.bidi.modules.input import Actions, get_element_origin
+from webdriver.bidi.modules.script import ContextTarget
+
+
+pytestmark = pytest.mark.asyncio
+
+
+@pytest.mark.parametrize(
+    "expression",
+    [
+        "document.querySelector('input#button').attributes[0]",
+        "document.querySelector('#with-text-node').childNodes[0]",
+        """document.createProcessingInstruction("xml-stylesheet", "href='foo.css'")""",
+        "document.querySelector('#with-comment').childNodes[0]",
+        "document",
+        "document.doctype",
+        "document.createDocumentFragment()",
+        "document.querySelector('#custom-element').shadowRoot",
+    ],
+    ids=[
+        "attribute",
+        "text node",
+        "processing instruction",
+        "comment",
+        "document",
+        "doctype",
+        "document fragment",
+        "shadow root",
+    ]
+)
+async def test_params_actions_origin_no_such_element(
+    bidi_session, top_context, get_test_page, expression
+):
+    await bidi_session.browsing_context.navigate(
+        context=top_context["context"],
+        url=get_test_page(),
+        wait="complete",
+    )
+
+    node = await bidi_session.script.evaluate(
+        expression=expression,
+        target=ContextTarget(top_context["context"]),
+        await_promise=False,
+    )
+
+    actions = Actions()
+    actions.add_wheel().scroll(x=0, y=0, delta_x=5, delta_y=10, origin=get_element_origin(node))
+
+    with pytest.raises(NoSuchElementException):
+        await bidi_session.input.perform_actions(
+            actions=actions, context=top_context["context"]
+        )
diff --git a/tests/wpt/tests/webdriver/tests/bidi/network/__init__.py b/tests/wpt/tests/webdriver/tests/bidi/network/__init__.py
index 19a4a69b4c5..cab997d14d9 100644
--- a/tests/wpt/tests/webdriver/tests/bidi/network/__init__.py
+++ b/tests/wpt/tests/webdriver/tests/bidi/network/__init__.py
@@ -4,6 +4,7 @@ from .. import (
     any_int,
     any_int_or_null,
     any_list,
+    any_list_or_null,
     any_string,
     any_string_or_null,
     recursive_compare,
@@ -101,6 +102,8 @@ def assert_request_data(request_data, expected_request):
 def assert_base_parameters(
     event,
     context=None,
+    intercepts=None,
+    is_blocked=None,
     navigation=None,
     redirect_count=None,
     expected_request=None,
@@ -108,6 +111,7 @@ def assert_base_parameters(
     recursive_compare(
         {
             "context": any_string_or_null,
+            "isBlocked": any_bool,
             "navigation": any_string_or_null,
             "redirectCount": any_int,
             "request": any_dict,
@@ -119,6 +123,20 @@ def assert_base_parameters(
     if context is not None:
         assert event["context"] == context
 
+    if is_blocked is not None:
+        assert event["isBlocked"] == is_blocked
+
+    if event["isBlocked"]:
+        assert isinstance(event["intercepts"], list)
+        assert len(event["intercepts"]) > 0
+        for intercept in event["intercepts"]:
+            assert isinstance(intercept, str)
+    else:
+        assert "intercepts" not in event
+
+    if intercepts is not None:
+        assert event["intercepts"] == intercepts
+
     if navigation is not None:
         assert event["navigation"] == navigation
 
@@ -133,6 +151,8 @@ def assert_base_parameters(
 def assert_before_request_sent_event(
     event,
     context=None,
+    intercepts=None,
+    is_blocked=None,
     navigation=None,
     redirect_count=None,
     expected_request=None,
@@ -145,6 +165,8 @@ def assert_before_request_sent_event(
     assert_base_parameters(
         event,
         context=context,
+        intercepts=intercepts,
+        is_blocked=is_blocked,
         navigation=navigation,
         redirect_count=redirect_count,
         expected_request=expected_request,
@@ -187,6 +209,8 @@ def assert_response_data(response_data, expected_response):
 def assert_response_event(
     event,
     context=None,
+    intercepts=None,
+    is_blocked=None,
     navigation=None,
     redirect_count=None,
     expected_request=None,
@@ -201,6 +225,8 @@ def assert_response_event(
     assert_base_parameters(
         event,
         context=context,
+        intercepts=intercepts,
+        is_blocked=is_blocked,
         navigation=navigation,
         redirect_count=redirect_count,
         expected_request=expected_request,
diff --git a/tests/wpt/tests/webdriver/tests/bidi/network/add_intercept/add_intercept.py b/tests/wpt/tests/webdriver/tests/bidi/network/add_intercept/add_intercept.py
new file mode 100644
index 00000000000..b68cf2789b9
--- /dev/null
+++ b/tests/wpt/tests/webdriver/tests/bidi/network/add_intercept/add_intercept.py
@@ -0,0 +1,173 @@
+import asyncio
+import uuid
+
+import pytest
+from webdriver.bidi.modules.script import ScriptEvaluateResultException
+
+from .. import (
+    assert_before_request_sent_event,
+    assert_response_event,
+)
+
+PAGE_EMPTY_HTML = "/webdriver/tests/bidi/network/support/empty.html"
+PAGE_EMPTY_TEXT = "/webdriver/tests/bidi/network/support/empty.txt"
+PAGE_OTHER_TEXT = "/webdriver/tests/bidi/network/support/other.txt"
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize("phase", ["beforeRequestSent", "responseStarted"])
+async def test_other_context(
+    bidi_session,
+    wait_for_event,
+    url,
+    top_context,
+    add_intercept,
+    fetch,
+    setup_network_test,
+    phase,
+):
+    # Subscribe to network events only in top_context
+    network_events = await setup_network_test(
+        events=[
+            "network.beforeRequestSent",
+            "network.responseStarted",
+            "network.responseCompleted",
+        ],
+        contexts=[top_context["context"]],
+    )
+
+    # Create another tab, where network events are not monitored.
+    other_context = await bidi_session.browsing_context.create(type_hint="tab")
+    await bidi_session.browsing_context.navigate(
+        context=other_context["context"], url=url(PAGE_EMPTY_HTML), wait="complete"
+    )
+
+    # Add an intercept.
+    text_url = url(PAGE_EMPTY_TEXT)
+    intercept = await add_intercept(
+        phases=["beforeRequestSent"],
+        url_patterns=[{"type": "string", "pattern": text_url}],
+    )
+
+    # Request to top_context should be blocked and throw a ScriptEvaluateResultException
+    # from the AbortController.
+    with pytest.raises(ScriptEvaluateResultException):
+        await fetch(text_url, context=top_context)
+
+    # Request to other_context should not be blocked.
+    await fetch(text_url, context=other_context)
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize("phase", ["beforeRequestSent", "responseStarted"])
+async def test_other_url(
+    bidi_session,
+    wait_for_event,
+    url,
+    top_context,
+    add_intercept,
+    fetch,
+    setup_network_test,
+    phase,
+):
+    network_events = await setup_network_test(
+        events=[
+            "network.beforeRequestSent",
+            "network.responseStarted",
+            "network.responseCompleted",
+        ],
+    )
+
+    # Add an intercept.
+    text_url = url(PAGE_EMPTY_TEXT)
+    intercept = await add_intercept(
+        phases=[phase],
+        url_patterns=[{"type": "string", "pattern": text_url}],
+    )
+
+    # Request to PAGE_EMPTY_TEXT should be blocked and throw a ScriptEvaluateResultException
+    # from the AbortController.
+    with pytest.raises(ScriptEvaluateResultException):
+        await fetch(text_url)
+
+    # Request to PAGE_OTHER_TEXT should not be blocked.
+    await fetch(url(PAGE_OTHER_TEXT))
+
+
+@pytest.mark.asyncio
+async def test_return_value(bidi_session, add_intercept):
+    intercept = await add_intercept(phases=["beforeRequestSent"], url_patterns=[])
+
+    assert isinstance(intercept, str)
+    uuid.UUID(hex=intercept)
+
+
+@pytest.mark.asyncio
+async def test_two_intercepts(
+    bidi_session,
+    wait_for_event,
+    url,
+    top_context,
+    add_intercept,
+    fetch,
+    setup_network_test,
+):
+    network_events = await setup_network_test(
+        events=[
+            "network.beforeRequestSent",
+            "network.responseStarted",
+            "network.responseCompleted",
+        ],
+    )
+
+    # Add a string intercept to catch requests to PAGE_EMPTY_TEXT.
+    text_url = url(PAGE_EMPTY_TEXT)
+    string_intercept = await add_intercept(
+        phases=["beforeRequestSent"],
+        url_patterns=[{"type": "string", "pattern": text_url}],
+    )
+    # Add a second intercept to catch all requests.
+    global_intercept = await add_intercept(
+        phases=["beforeRequestSent"],
+        url_patterns=[],
+    )
+
+    # Perform a request to PAGE_EMPTY_TEXT, which should match both intercepts
+    on_network_event = wait_for_event("network.beforeRequestSent")
+    asyncio.ensure_future(fetch(text_url))
+    event = await on_network_event
+
+    assert_before_request_sent_event(
+        event, is_blocked=True, intercepts=[string_intercept, global_intercept]
+    )
+
+    # Perform a request to PAGE_OTHER_TEXT, which should only match one intercept
+    other_url = url(PAGE_OTHER_TEXT)
+
+    on_network_event = wait_for_event("network.beforeRequestSent")
+    asyncio.ensure_future(fetch(other_url))
+    event = await on_network_event
+
+    assert_before_request_sent_event(
+        event, is_blocked=True, intercepts=[global_intercept]
+    )
+
+    # Remove the global intercept, requests to PAGE_OTHER_TEXT should no longer
+    # be blocked.
+    await bidi_session.network.remove_intercept(intercept=global_intercept)
+    await fetch(other_url)
+
+    # Requests to PAGE_EMPTY_TEXT should still be blocked, but only by one
+    # intercept.
+    on_network_event = wait_for_event("network.beforeRequestSent")
+    asyncio.ensure_future(fetch(text_url))
+    event = await on_network_event
+
+    assert_before_request_sent_event(
+        event, is_blocked=True, intercepts=[string_intercept]
+    )
+
+    # Remove the string intercept, requests to PAGE_EMPTY_TEXT should no longer
+    # be blocked.
+    await bidi_session.network.remove_intercept(intercept=string_intercept)
+    await fetch(text_url)
diff --git a/tests/wpt/tests/webdriver/tests/bidi/network/add_intercept/invalid.py b/tests/wpt/tests/webdriver/tests/bidi/network/add_intercept/invalid.py
index dc15d5ea904..ac7b2738548 100644
--- a/tests/wpt/tests/webdriver/tests/bidi/network/add_intercept/invalid.py
+++ b/tests/wpt/tests/webdriver/tests/bidi/network/add_intercept/invalid.py
@@ -116,6 +116,7 @@ async def test_params_url_patterns_pattern_property_unescaped_character(
 @pytest.mark.parametrize(
     "value",
     [
+        "",
         "http/",
         "http\\*",
         "http\\(",
@@ -135,7 +136,22 @@ async def test_params_url_patterns_pattern_protocol_invalid_value(bidi_session,
         )
 
 
-@pytest.mark.parametrize("value", ["abc/com/", "abc?com", "abc#com", "abc:com", "::1"])
+@pytest.mark.parametrize(
+    "value",
+    [
+        "file",
+        "file:",
+    ],
+)
+async def test_params_url_patterns_pattern_protocol_file_invalid_value(bidi_session, value):
+    with pytest.raises(error.InvalidArgumentException):
+        await bidi_session.network.add_intercept(
+            phases=["beforeRequestSent"],
+            url_patterns=[{"type": "pattern", "protocol": value, "hostname": "example.com"}],
+        )
+
+
+@pytest.mark.parametrize("value", ["", "abc/com/", "abc?com", "abc#com", "abc:com", "abc::com", "::1"])
 async def test_params_url_patterns_pattern_hostname_invalid_value(bidi_session, value):
     with pytest.raises(error.InvalidArgumentException):
         await bidi_session.network.add_intercept(
@@ -144,7 +160,7 @@ async def test_params_url_patterns_pattern_hostname_invalid_value(bidi_session,
         )
 
 
-@pytest.mark.parametrize("value", ["abcd", "-1", "80 ", "1.3", ":80", "65536"])
+@pytest.mark.parametrize("value", ["", "abcd", "-1", "80 ", "1.3", ":80", "80:", "65536"])
 async def test_params_url_patterns_pattern_port_invalid_value(bidi_session, value):
     with pytest.raises(error.InvalidArgumentException):
         await bidi_session.network.add_intercept(
diff --git a/tests/wpt/tests/webdriver/tests/bidi/network/add_intercept/phases.py b/tests/wpt/tests/webdriver/tests/bidi/network/add_intercept/phases.py
new file mode 100644
index 00000000000..7dd13a46ac2
--- /dev/null
+++ b/tests/wpt/tests/webdriver/tests/bidi/network/add_intercept/phases.py
@@ -0,0 +1,124 @@
+import asyncio
+
+import pytest
+from webdriver.bidi.modules.script import ScriptEvaluateResultException
+
+from .. import (
+    assert_before_request_sent_event,
+    assert_response_event,
+)
+
+PAGE_EMPTY_TEXT = "/webdriver/tests/bidi/network/support/empty.txt"
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    "phases, intercepted_phase",
+    [
+        (["beforeRequestSent"], "beforeRequestSent"),
+        (["responseStarted"], "responseStarted"),
+        (["beforeRequestSent", "responseStarted"], "beforeRequestSent"),
+        (["responseStarted", "beforeRequestSent"], "beforeRequestSent"),
+        (["beforeRequestSent", "beforeRequestSent"], "beforeRequestSent"),
+    ],
+)
+async def test_request_response_phases(
+    bidi_session,
+    wait_for_event,
+    url,
+    setup_network_test,
+    add_intercept,
+    fetch,
+    phases,
+    intercepted_phase,
+):
+    network_events = await setup_network_test(
+        events=[
+            "network.beforeRequestSent",
+            "network.responseStarted",
+            "network.responseCompleted",
+        ]
+    )
+    before_request_sent_events = network_events["network.beforeRequestSent"]
+    response_started_events = network_events["network.responseStarted"]
+    response_completed_events = network_events["network.responseCompleted"]
+
+    text_url = url(PAGE_EMPTY_TEXT)
+    intercept = await add_intercept(
+        phases=phases,
+        url_patterns=[{"type": "string", "pattern": text_url}],
+    )
+
+    assert isinstance(intercept, str)
+
+    on_network_event = wait_for_event(f"network.{intercepted_phase}")
+
+    # Request to top_context should be blocked and throw a ScriptEvaluateResultException
+    # from the AbortController.
+    with pytest.raises(ScriptEvaluateResultException):
+        await fetch(text_url)
+
+    await on_network_event
+    expected_request = {"method": "GET", "url": text_url}
+
+    if intercepted_phase == "beforeRequestSent":
+        assert len(before_request_sent_events) == 1
+        assert len(response_started_events) == 0
+        assert_before_request_sent_event(
+            before_request_sent_events[0],
+            expected_request=expected_request,
+            is_blocked=True,
+            intercepts=[intercept],
+        )
+    elif intercepted_phase == "responseStarted":
+        assert len(before_request_sent_events) == 1
+        assert len(response_started_events) == 1
+        assert_before_request_sent_event(
+            before_request_sent_events[0],
+            expected_request=expected_request,
+            is_blocked=False,
+        )
+        assert_response_event(
+            response_started_events[0],
+            expected_request=expected_request,
+            is_blocked=True,
+            intercepts=[intercept],
+        )
+
+    # Check that we did not receive response completed events.
+    assert len(response_completed_events) == 0
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize("phase", ["beforeRequestSent", "responseStarted"])
+async def test_not_listening_to_phase_event(
+    bidi_session,
+    wait_for_event,
+    url,
+    top_context,
+    setup_network_test,
+    add_intercept,
+    fetch,
+    phase,
+):
+    events = [
+        "network.beforeRequestSent",
+        "network.responseStarted",
+        "network.responseCompleted",
+    ]
+
+    # Remove the event corresponding to the intercept phase from the monitored
+    # events.
+    events.remove(f"network.{phase}")
+
+    network_events = await setup_network_test(events=events)
+
+    # Add an intercept without listening to the corresponding network event
+    text_url = url(PAGE_EMPTY_TEXT)
+    intercept = await add_intercept(
+        phases=[phase],
+        url_patterns=[{"type": "string", "pattern": text_url}],
+    )
+
+    # Request should not be blocked.
+    await fetch(text_url)
diff --git a/tests/wpt/tests/webdriver/tests/bidi/network/add_intercept/url_patterns.py b/tests/wpt/tests/webdriver/tests/bidi/network/add_intercept/url_patterns.py
new file mode 100644
index 00000000000..f32bc8df91d
--- /dev/null
+++ b/tests/wpt/tests/webdriver/tests/bidi/network/add_intercept/url_patterns.py
@@ -0,0 +1,235 @@
+import asyncio
+
+import pytest
+import pytest_asyncio
+
+from .. import assert_before_request_sent_event
+
+
+@pytest.fixture
+def substitute_host(server_config):
+    """This test will perform various requests which should not reach the
+    external network. All strings refering to a domain will define it as a
+    placeholder which needs to be dynamically replaced by a value from the
+    current server configuration"""
+
+    def substitute_host(str):
+        wpt_host = server_config["browser_host"]
+        return str.format(
+            wpt_host=wpt_host,
+            wpt_host_upper=wpt_host.upper(),
+        )
+
+    return substitute_host
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    "patterns, url_template",
+    [
+        ([], "https://{wpt_host}"),
+        ([], "https://{wpt_host}/"),
+        ([], "https://{wpt_host}:1234/"),
+        ([], "https://{wpt_host}/path"),
+        ([], "https://{wpt_host}/?search"),
+        ([{},], "https://{wpt_host}"),
+        ([{},], "https://{wpt_host}/"),
+        ([{},], "https://{wpt_host}:1234/"),
+        ([{},], "https://{wpt_host}/path"),
+        ([{},], "https://{wpt_host}/?search"),
+        ([{"protocol": "https"},], "https://{wpt_host}/"),
+        ([{"protocol": "https"},], "https://{wpt_host}:1234/"),
+        ([{"protocol": "https"},], "https://{wpt_host}/path"),
+        ([{"protocol": "https"},], "https://{wpt_host}/?search"),
+        ([{"protocol": "HTTPS"},], "https://{wpt_host}/"),
+        ([{"hostname": "{wpt_host}"},], "https://{wpt_host}/"),
+        ([{"hostname": "{wpt_host}"},], "https://{wpt_host}:1234/"),
+        ([{"hostname": "{wpt_host}"},], "https://{wpt_host}/path"),
+        ([{"hostname": "{wpt_host}"},], "https://{wpt_host}/?search"),
+        ([{"hostname": "{wpt_host}"},], "https://{wpt_host_upper}/"),
+        ([{"hostname": "{wpt_host_upper}"},], "https://{wpt_host}/"),
+        ([{"port": "1234"},], "https://{wpt_host}:1234/"),
+        ([{"pathname": ""},], "https://{wpt_host}"),
+        ([{"pathname": ""},], "https://{wpt_host}/"),
+        ([{"pathname": "path"},], "https://{wpt_host}/path"),
+        ([{"search": ""},], "https://{wpt_host}/"),
+        ([{"search": ""},], "https://{wpt_host}/?"),
+        ([{"search": "search"},], "https://{wpt_host}/?search"),
+    ],
+)
+async def test_pattern_patterns_matching(
+    bidi_session,
+    wait_for_event,
+    setup_network_test,
+    add_intercept,
+    fetch,
+    substitute_host,
+    patterns,
+    url_template,
+):
+    network_events = await setup_network_test(
+        events=[
+            "network.beforeRequestSent",
+        ]
+    )
+
+    for pattern in patterns:
+        for key in pattern:
+            pattern[key] = substitute_host(pattern[key])
+
+        pattern.update({"type": "pattern"})
+
+    intercept = await add_intercept(phases=["beforeRequestSent"], url_patterns=patterns)
+
+    on_network_event = wait_for_event("network.beforeRequestSent")
+    asyncio.ensure_future(fetch(substitute_host(url_template)))
+    event = await on_network_event
+
+    assert_before_request_sent_event(event, is_blocked=True, intercepts=[intercept])
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    "pattern, url_template",
+    [
+        ({"protocol": "http"}, "https://{wpt_host}/"),
+        ({"hostname": "abc.{wpt_host}"}, "https://{wpt_host}/"),
+        ({"hostname": "web-platform"}, "https://{wpt_host}/"),
+        ({"hostname": "web-platform.com"}, "https://{wpt_host}/"),
+        ({"port": "443"}, "https://{wpt_host}:1234/"),
+        ({"port": "1234"}, "https://{wpt_host}/"),
+        ({"pathname": ""}, "https://{wpt_host}/path"),
+        ({"pathname": "path"}, "https://{wpt_host}/"),
+        ({"pathname": "path"}, "https://{wpt_host}/path/"),
+        ({"pathname": "path"}, "https://{wpt_host}/other/path"),
+        ({"pathname": "path"}, "https://{wpt_host}/path/continued"),
+        ({"search": ""}, "https://{wpt_host}/?search"),
+        ({"search": "search"}, "https://{wpt_host}/?other"),
+    ],
+)
+async def test_pattern_patterns_not_matching(
+    bidi_session,
+    wait_for_event,
+    setup_network_test,
+    add_intercept,
+    fetch,
+    substitute_host,
+    pattern,
+    url_template,
+):
+    network_events = await setup_network_test(
+        events=[
+            "network.beforeRequestSent",
+        ]
+    )
+
+    for key in pattern:
+        pattern[key] = substitute_host(pattern[key])
+
+    pattern.update({"type": "pattern"})
+
+    intercept = await add_intercept(phases=["beforeRequestSent"], url_patterns=[pattern])
+
+    on_network_event = wait_for_event("network.beforeRequestSent")
+    asyncio.ensure_future(fetch(substitute_host(url_template)))
+    event = await on_network_event
+
+    assert_before_request_sent_event(event, is_blocked=False)
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    "pattern, url_template",
+    [
+        ("https://{wpt_host}/", "https://{wpt_host}/"),
+        ("https://{wpt_host}", "https://{wpt_host}/"),
+        ("https://{wpt_host}/", "https://{wpt_host}"),
+        ("HTTPS://{wpt_host}/", "https://{wpt_host}/"),
+        ("https://{wpt_host}/", "HTTPS://{wpt_host}/"),
+        ("https://{wpt_host_upper}/", "https://{wpt_host}/"),
+        ("https://{wpt_host}/", "https://{wpt_host_upper}/"),
+        ("https://user:password@{wpt_host}/", "https://{wpt_host}/"),
+        ("https://{wpt_host}/", "https://{wpt_host}:443/"),
+        ("https://{wpt_host}:443/", "https://{wpt_host}/"),
+        ("https://{wpt_host}:443/", "https://{wpt_host}:443/"),
+        ("https://{wpt_host}:1234/", "https://{wpt_host}:1234/"),
+        ("https://{wpt_host}/path", "https://{wpt_host}/path"),
+        ("https://{wpt_host}/?search", "https://{wpt_host}/?search"),
+        ("https://{wpt_host}/#ref", "https://{wpt_host}/"),
+        ("https://{wpt_host}/", "https://{wpt_host}/#ref"),
+        ("https://{wpt_host}/#ref1", "https://{wpt_host}/#ref2"),
+    ],
+)
+async def test_string_patterns_matching(
+    bidi_session,
+    wait_for_event,
+    url,
+    setup_network_test,
+    add_intercept,
+    fetch,
+    substitute_host,
+    pattern,
+    url_template,
+):
+    network_events = await setup_network_test(
+        events=[
+            "network.beforeRequestSent",
+        ]
+    )
+
+    intercept = await add_intercept(
+        phases=["beforeRequestSent"],
+        url_patterns=[{"type": "string", "pattern": substitute_host(pattern)}],
+    )
+
+    on_network_event = wait_for_event("network.beforeRequestSent")
+    asyncio.ensure_future(fetch(substitute_host(url_template)))
+    event = await on_network_event
+
+    assert_before_request_sent_event(event, is_blocked=True, intercepts=[intercept])
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    "pattern, url_template",
+    [
+        ("https://{wpt_host}/", "https://some.other.host/"),
+        ("https://{wpt_host}:1234/", "https://{wpt_host}:5678/"),
+        ("https://{wpt_host}/", "https://{wpt_host}:5678/"),
+        ("https://{wpt_host}/path", "https://{wpt_host}/other/path"),
+        ("https://{wpt_host}/path", "https://{wpt_host}/path/continued"),
+        ("https://{wpt_host}/pathcase", "https://{wpt_host}/PATHCASE"),
+        ("https://{wpt_host}/?searchcase", "https://{wpt_host}/?SEARCHCASE"),
+        ("https://{wpt_host}/?key", "https://{wpt_host}/?otherkey"),
+        ("https://{wpt_host}/?key", "https://{wpt_host}/?key=value"),
+        ("https://{wpt_host}/?a=b&c=d", "https://{wpt_host}/?c=d&a=b"),
+        ("https://{wpt_host}/??", "https://{wpt_host}/?"),
+    ],
+)
+async def test_string_patterns_not_matching(
+    bidi_session,
+    wait_for_event,
+    setup_network_test,
+    add_intercept,
+    fetch,
+    substitute_host,
+    pattern,
+    url_template,
+):
+    network_events = await setup_network_test(
+        events=[
+            "network.beforeRequestSent",
+        ]
+    )
+
+
+    intercept = await add_intercept(
+        phases=["beforeRequestSent"],
+        url_patterns=[{"type": "string", "pattern": substitute_host(pattern)}],
+    )
+
+    on_network_event = wait_for_event("network.beforeRequestSent")
+    asyncio.ensure_future(fetch(substitute_host(url_template)))
+    event = await on_network_event
+
+    assert_before_request_sent_event(event, is_blocked=False)
diff --git a/tests/wpt/tests/webdriver/tests/bidi/network/conftest.py b/tests/wpt/tests/webdriver/tests/bidi/network/conftest.py
index 924d5a34c6d..9f74cc67cc6 100644
--- a/tests/wpt/tests/webdriver/tests/bidi/network/conftest.py
+++ b/tests/wpt/tests/webdriver/tests/bidi/network/conftest.py
@@ -3,6 +3,7 @@ import json
 import pytest
 import pytest_asyncio
 
+from webdriver.bidi.error import NoSuchInterceptException
 from webdriver.bidi.modules.script import ContextTarget
 
 RESPONSE_COMPLETED_EVENT = "network.responseCompleted"
@@ -10,6 +11,34 @@ RESPONSE_COMPLETED_EVENT = "network.responseCompleted"
 PAGE_EMPTY_HTML = "/webdriver/tests/bidi/network/support/empty.html"
 
 
+@pytest_asyncio.fixture
+async def add_intercept(bidi_session):
+    """Add a network intercept for the provided phases and url patterns, and
+    ensure the intercept is removed at the end of the test."""
+
+    intercepts = []
+    async def add_intercept(phases, url_patterns):
+        nonlocal intercepts
+        intercept = await bidi_session.network.add_intercept(
+            phases=phases,
+            url_patterns=url_patterns,
+        )
+        intercepts.append(intercept)
+
+        return intercept
+
+    yield add_intercept
+
+    # Remove all added intercepts at the end of the test
+    for intercept in intercepts:
+        try:
+            await bidi_session.network.remove_intercept(intercept=intercept)
+        except (NoSuchInterceptException):
+            # Ignore exceptions in case a specific intercept was already removed
+            # during the test.
+            pass
+
+
 @pytest.fixture
 def fetch(bidi_session, top_context, configuration):
     """Perform a fetch from the page of the provided context, default to the
diff --git a/tests/wpt/tests/webdriver/tests/bidi/network/remove_intercept/invalid.py b/tests/wpt/tests/webdriver/tests/bidi/network/remove_intercept/invalid.py
index d6063d22ec3..4b3526bfc37 100644
--- a/tests/wpt/tests/webdriver/tests/bidi/network/remove_intercept/invalid.py
+++ b/tests/wpt/tests/webdriver/tests/bidi/network/remove_intercept/invalid.py
@@ -16,8 +16,8 @@ async def test_params_intercept_invalid_value(bidi_session, value):
         await bidi_session.network.remove_intercept(intercept=value)
 
 
-async def test_params_intercept_removed_intercept(bidi_session):
-    intercept = await bidi_session.network.add_intercept(
+async def test_params_intercept_removed_intercept(bidi_session, add_intercept):
+    intercept = await add_intercept(
         phases=["beforeRequestSent"],
         url_patterns=[{"type": "string", "pattern": "https://example.com"}],
     )
diff --git a/tests/wpt/tests/webdriver/tests/bidi/network/remove_intercept/remove_intercept.py b/tests/wpt/tests/webdriver/tests/bidi/network/remove_intercept/remove_intercept.py
new file mode 100644
index 00000000000..dbb439a9e52
--- /dev/null
+++ b/tests/wpt/tests/webdriver/tests/bidi/network/remove_intercept/remove_intercept.py
@@ -0,0 +1,99 @@
+# META: timeout=long
+
+import asyncio
+
+import pytest
+from webdriver.bidi.modules.script import ScriptEvaluateResultException
+
+from .. import (
+    assert_before_request_sent_event,
+    assert_response_event,
+)
+
+PAGE_EMPTY_HTML = "/webdriver/tests/bidi/network/support/empty.html"
+PAGE_EMPTY_TEXT = "/webdriver/tests/bidi/network/support/empty.txt"
+PAGE_OTHER_TEXT = "/webdriver/tests/bidi/network/support/other.txt"
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize("phase", ["beforeRequestSent", "responseStarted"])
+async def test_remove_intercept(
+    bidi_session, wait_for_event, url, setup_network_test, add_intercept, fetch, phase
+):
+    network_events = await setup_network_test(
+        events=[
+            "network.beforeRequestSent",
+            "network.responseStarted",
+            "network.responseCompleted",
+        ]
+    )
+    before_request_sent_events = network_events["network.beforeRequestSent"]
+    response_started_events = network_events["network.responseStarted"]
+    response_completed_events = network_events["network.responseCompleted"]
+
+    text_url = url(PAGE_EMPTY_TEXT)
+    intercept = await add_intercept(
+        phases=[phase],
+        url_patterns=[{"type": "string", "pattern": text_url}],
+    )
+
+    on_network_event = wait_for_event(f"network.{phase}")
+
+    # Request to top_context should be blocked and throw a ScriptEvaluateResultException
+    # from the AbortController.
+    with pytest.raises(ScriptEvaluateResultException):
+        await fetch(text_url)
+
+    await on_network_event
+
+    assert len(before_request_sent_events) == 1
+
+    if phase == "beforeRequestSent":
+        assert len(response_started_events) == 0
+        assert_before_request_sent_event(
+            before_request_sent_events[0], is_blocked=True, intercepts=[intercept]
+        )
+    elif phase == "responseStarted":
+        assert len(response_started_events) == 1
+        assert_before_request_sent_event(
+            before_request_sent_events[0], is_blocked=False
+        )
+        assert_response_event(
+            response_started_events[0], is_blocked=True, intercepts=[intercept]
+        )
+
+    # Check that we did not receive response completed events.
+    assert len(response_completed_events) == 0
+
+    # Remove the intercept
+    await bidi_session.network.remove_intercept(intercept=intercept)
+
+    # The next request should not be blocked
+    on_response_completed = wait_for_event(f"network.responseCompleted")
+    await fetch(text_url)
+    await on_response_completed
+
+    # Assert the network events have the expected interception properties
+    assert len(before_request_sent_events) == 2
+    assert_before_request_sent_event(before_request_sent_events[1], is_blocked=False)
+
+    if phase == "beforeRequestSent":
+        assert len(response_started_events) == 1
+        assert_response_event(response_started_events[0], is_blocked=False)
+    elif phase == "responseStarted":
+        assert len(response_started_events) == 2
+        assert_response_event(response_started_events[1], is_blocked=False)
+
+    assert len(response_completed_events) == 1
+    assert_response_event(response_completed_events[0], is_blocked=False)
+
+
+@pytest.mark.asyncio
+async def test_return_value(bidi_session, add_intercept):
+    intercept = await add_intercept(
+        phases=["beforeRequestSent"],
+        url_patterns=[],
+    )
+
+    result = await bidi_session.network.remove_intercept(intercept=intercept)
+    assert result == {}
diff --git a/tests/wpt/tests/webdriver/tests/bidi/network/support/other.txt b/tests/wpt/tests/webdriver/tests/bidi/network/support/other.txt
new file mode 100644
index 00000000000..e45c9c2666d
--- /dev/null
+++ b/tests/wpt/tests/webdriver/tests/bidi/network/support/other.txt
@@ -0,0 +1 @@
+other
diff --git a/tests/wpt/tests/webdriver/tests/bidi/script/__init__.py b/tests/wpt/tests/webdriver/tests/bidi/script/__init__.py
index 5635a4bbfb0..603abc84375 100644
--- a/tests/wpt/tests/webdriver/tests/bidi/script/__init__.py
+++ b/tests/wpt/tests/webdriver/tests/bidi/script/__init__.py
@@ -1,5 +1,7 @@
 from __future__ import annotations
 from typing import Any, Callable, Mapping
+from webdriver.bidi.modules.script import ContextTarget
+
 from .. import any_int, any_string, recursive_compare
 
 
@@ -190,6 +192,9 @@ REMOTE_VALUES: list[tuple[str, dict]] = [
     ("(function*() { yield 'a'; })()", {
         "type": "generator",
     }),
+    ("(async function*() { yield await Promise.resolve(1); })()", {
+        "type": "generator",
+    }),
     ("Promise.resolve()", {"type": "promise", },),
     ("new Int32Array()", {"type": "typedarray", },),
     ("new ArrayBuffer()", {"type": "arraybuffer", },),
@@ -211,3 +216,24 @@ REMOTE_VALUES: list[tuple[str, dict]] = [
     ("window", {"type": "window", },),
     ("new URL('https://example.com')", {"type": "object", },),
 ]
+
+
+async def create_sandbox(bidi_session, context, sandbox_name="Test", method="evaluate"):
+    if method == "evaluate":
+        result = await bidi_session.script.evaluate(
+            raw_result=True,
+            expression="1 + 2",
+            await_promise=False,
+            target=ContextTarget(context, sandbox=sandbox_name),
+        )
+    elif method == "call_function":
+        result = await bidi_session.script.call_function(
+            raw_result=True,
+            function_declaration="() => 1 + 2",
+            await_promise=False,
+            target=ContextTarget(context, sandbox=sandbox_name),
+        )
+    else:
+        raise Exception(f"Unsupported method to create a sandbox: {method}")
+
+    return result["realm"]
diff --git a/tests/wpt/tests/webdriver/tests/bidi/script/realm_created/__init__.py b/tests/wpt/tests/webdriver/tests/bidi/script/realm_created/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/wpt/tests/webdriver/tests/bidi/script/realm_created/realm_created.py b/tests/wpt/tests/webdriver/tests/bidi/script/realm_created/realm_created.py
new file mode 100644
index 00000000000..2a86adecb18
--- /dev/null
+++ b/tests/wpt/tests/webdriver/tests/bidi/script/realm_created/realm_created.py
@@ -0,0 +1,222 @@
+import pytest
+from tests.support.sync import AsyncPoll
+
+from webdriver.bidi.modules.script import RealmTarget
+from webdriver.error import TimeoutException
+from .. import create_sandbox
+
+
+pytestmark = pytest.mark.asyncio
+
+REALM_CREATED_EVENT = "script.realmCreated"
+
+
+async def test_unsubscribe(bidi_session):
+    await bidi_session.session.subscribe(events=[REALM_CREATED_EVENT])
+    await bidi_session.session.unsubscribe(events=[REALM_CREATED_EVENT])
+
+    events = []
+
+    async def on_event(method, data):
+        events.append(data)
+
+    remove_listener = bidi_session.add_event_listener(REALM_CREATED_EVENT, on_event)
+
+    await bidi_session.browsing_context.create(type_hint="tab")
+
+    assert len(events) == 0
+
+    remove_listener()
+
+
+@pytest.mark.parametrize("type_hint", ["window", "tab"])
+async def test_create_context(bidi_session, subscribe_events, type_hint):
+    await subscribe_events(events=[REALM_CREATED_EVENT])
+
+    events = []
+
+    async def on_event(method, data):
+        events.append(data)
+
+    remove_listener = bidi_session.add_event_listener(REALM_CREATED_EVENT, on_event)
+
+    new_context = await bidi_session.browsing_context.create(type_hint=type_hint)
+
+    wait = AsyncPoll(bidi_session, message="Didn't receive realm created events")
+    await wait.until(lambda _: len(events) >= 1)
+
+    result = await bidi_session.script.get_realms(context=new_context["context"])
+
+    assert events[-1] == result[0]
+
+    remove_listener()
+
+
+async def test_navigate(bidi_session, subscribe_events, inline, new_tab):
+    await subscribe_events(events=[REALM_CREATED_EVENT])
+
+    events = []
+
+    async def on_event(method, data):
+        events.append(data)
+
+    remove_listener = bidi_session.add_event_listener(REALM_CREATED_EVENT, on_event)
+
+    await bidi_session.browsing_context.navigate(
+        context=new_tab["context"], url=inline("<div>foo</div>"), wait="complete"
+    )
+
+    result = await bidi_session.script.get_realms(context=new_tab["context"])
+
+    assert events[-1] == result[0]
+
+    remove_listener()
+
+
+async def test_reload(bidi_session, subscribe_events, new_tab, inline):
+    await bidi_session.browsing_context.navigate(
+        context=new_tab["context"], url=inline("<div>foo</div>"), wait="complete"
+    )
+
+    await subscribe_events(events=[REALM_CREATED_EVENT])
+
+    events = []
+
+    async def on_event(method, data):
+        events.append(data)
+
+    remove_listener = bidi_session.add_event_listener(REALM_CREATED_EVENT, on_event)
+
+    await bidi_session.browsing_context.reload(
+        context=new_tab["context"], wait="complete"
+    )
+
+    result = await bidi_session.script.get_realms(context=new_tab["context"])
+
+    assert events[-1] == result[0]
+
+    remove_listener()
+
+
+@pytest.mark.parametrize("method", ["evaluate", "call_function"])
+async def test_sandbox(
+    bidi_session, subscribe_events, new_tab, wait_for_event, test_origin, method
+):
+    await bidi_session.browsing_context.navigate(
+        context=new_tab["context"], url=test_origin, wait="complete"
+    )
+    await subscribe_events(events=[REALM_CREATED_EVENT])
+
+    on_realm_created = wait_for_event(REALM_CREATED_EVENT)
+
+    sandbox_name = "Test"
+    sandbox_realm = await create_sandbox(
+        bidi_session, new_tab["context"], sandbox_name, method
+    )
+
+    event = await on_realm_created
+
+    assert event == {
+        "context": new_tab["context"],
+        "origin": test_origin,
+        "realm": sandbox_realm,
+        "sandbox": sandbox_name,
+        "type": "window",
+    }
+
+
+@pytest.mark.parametrize("domain", ["", "alt"], ids=["same_origin", "cross_origin"])
+async def test_iframe(bidi_session, subscribe_events, top_context, inline, domain):
+    await subscribe_events(events=[REALM_CREATED_EVENT])
+
+    events = []
+
+    async def on_event(method, data):
+        events.append(data)
+
+    remove_listener = bidi_session.add_event_listener(REALM_CREATED_EVENT, on_event)
+
+    frame_url = inline("<div>foo</div>")
+    url = inline(f"<iframe src='{frame_url}'></iframe>", domain=domain)
+    await bidi_session.browsing_context.navigate(
+        url=url, context=top_context["context"], wait="complete"
+    )
+
+    realms = await bidi_session.script.get_realms()
+
+    for realm in realms:
+        # Find the relevant event for the specific realm
+        event = [item for item in events if item["realm"] == realm["realm"]]
+        assert event[0] == realm
+
+    remove_listener()
+
+
+async def test_subscribe_to_one_context(
+    bidi_session, subscribe_events, new_tab, inline, top_context
+):
+    await bidi_session.browsing_context.navigate(
+        context=new_tab["context"], url=inline("<div>foo</div>"), wait="complete"
+    )
+
+    # Subscribe to a specific context
+    await subscribe_events(events=[REALM_CREATED_EVENT], contexts=[new_tab["context"]])
+
+    events = []
+
+    async def on_event(method, data):
+        events.append(data)
+
+    remove_listener = bidi_session.add_event_listener(REALM_CREATED_EVENT, on_event)
+
+    await bidi_session.browsing_context.navigate(
+        context=top_context["context"], url=inline("<div>foo</div>"), wait="complete"
+    )
+
+    # Make sure we didn't receive the event for the top context
+    wait = AsyncPoll(bidi_session, timeout=0.5)
+    with pytest.raises(TimeoutException):
+        await wait.until(lambda _: len(events) > 0)
+
+    await bidi_session.browsing_context.navigate(
+        context=new_tab["context"], url=inline("<div>foo</div>"), wait="complete"
+    )
+
+    result = await bidi_session.script.get_realms(context=new_tab["context"])
+
+    assert events[-1] == result[0]
+
+    remove_listener()
+
+
+@pytest.mark.parametrize("method", ["evaluate", "call_function"])
+async def test_script_when_realm_is_created(
+    bidi_session, subscribe_events, new_tab, wait_for_event, inline, method
+):
+    await bidi_session.browsing_context.navigate(
+        context=new_tab["context"], url=inline("<div>foo</div>"), wait="complete"
+    )
+    await subscribe_events(events=[REALM_CREATED_EVENT])
+
+    on_realm_created = wait_for_event(REALM_CREATED_EVENT)
+
+    await bidi_session.browsing_context.reload(context=new_tab["context"])
+
+    realm_info = await on_realm_created
+
+    # Validate that it's possible to execute the script
+    # as soon as a realm is created.
+    if method == "evaluate":
+        result = await bidi_session.script.evaluate(
+            expression="1 + 2",
+            await_promise=False,
+            target=RealmTarget(realm_info["realm"]),
+        )
+    else:
+        result = await bidi_session.script.call_function(
+            function_declaration="() => 1 + 2",
+            await_promise=False,
+            target=RealmTarget(realm_info["realm"]),
+        )
+
+    assert result == {"type": "number", "value": 3}
diff --git a/tests/wpt/tests/webdriver/tests/bidi/script/realm_destroyed/__init__.py b/tests/wpt/tests/webdriver/tests/bidi/script/realm_destroyed/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/wpt/tests/webdriver/tests/bidi/script/realm_destroyed/realm_destroyed.py b/tests/wpt/tests/webdriver/tests/bidi/script/realm_destroyed/realm_destroyed.py
new file mode 100644
index 00000000000..e3f4dc0af01
--- /dev/null
+++ b/tests/wpt/tests/webdriver/tests/bidi/script/realm_destroyed/realm_destroyed.py
@@ -0,0 +1,238 @@
+import pytest
+from tests.support.sync import AsyncPoll
+from webdriver.error import TimeoutException
+
+from .. import create_sandbox
+
+
+pytestmark = pytest.mark.asyncio
+
+REALM_DESTROYED_EVENT = "script.realmDestroyed"
+
+
+async def test_unsubscribe(bidi_session):
+    new_context = await bidi_session.browsing_context.create(type_hint="tab")
+    await bidi_session.session.subscribe(events=[REALM_DESTROYED_EVENT])
+    await bidi_session.session.unsubscribe(events=[REALM_DESTROYED_EVENT])
+
+    events = []
+
+    async def on_event(method, data):
+        events.append(data)
+
+    remove_listener = bidi_session.add_event_listener(REALM_DESTROYED_EVENT, on_event)
+
+    await bidi_session.browsing_context.close(context=new_context["context"])
+
+    assert len(events) == 0
+
+    remove_listener()
+
+
+@pytest.mark.parametrize("type_hint", ["window", "tab"])
+async def test_close_context(bidi_session, subscribe_events, wait_for_event, type_hint):
+    new_context = await bidi_session.browsing_context.create(type_hint=type_hint)
+    await subscribe_events(events=[REALM_DESTROYED_EVENT])
+
+    result = await bidi_session.script.get_realms(context=new_context["context"])
+
+    on_realm_destroyed = wait_for_event(REALM_DESTROYED_EVENT)
+
+    await bidi_session.browsing_context.close(context=new_context["context"])
+
+    event = await on_realm_destroyed
+
+    assert event == {"realm": result[0]["realm"]}
+
+
+async def test_navigate(
+    bidi_session, subscribe_events, wait_for_event, inline, new_tab
+):
+    await subscribe_events(events=[REALM_DESTROYED_EVENT])
+
+    result = await bidi_session.script.get_realms(context=new_tab["context"])
+
+    on_realm_destroyed = wait_for_event(REALM_DESTROYED_EVENT)
+
+    await bidi_session.browsing_context.navigate(
+        context=new_tab["context"], url=inline("<div>foo</div>"), wait="complete"
+    )
+
+    event = await on_realm_destroyed
+
+    assert event == {"realm": result[0]["realm"]}
+
+
+async def test_reload_context(
+    bidi_session, subscribe_events, wait_for_event, top_context
+):
+    await subscribe_events(events=[REALM_DESTROYED_EVENT])
+
+    result = await bidi_session.script.get_realms(context=top_context["context"])
+
+    on_realm_destroyed = wait_for_event(REALM_DESTROYED_EVENT)
+
+    await bidi_session.browsing_context.reload(context=top_context["context"])
+
+    event = await on_realm_destroyed
+
+    assert event == {"realm": result[0]["realm"]}
+
+
+@pytest.mark.parametrize("method", ["evaluate", "call_function"])
+async def test_sandbox(bidi_session, subscribe_events, new_tab, method):
+    await subscribe_events(events=[REALM_DESTROYED_EVENT])
+
+    # Track all received script.realmDestroyed events in the destroyed_realm_ids array
+    destroyed_realm_ids = []
+
+    async def on_event(method, data):
+        destroyed_realm_ids.append(data["realm"])
+
+    remove_listener = bidi_session.add_event_listener(REALM_DESTROYED_EVENT, on_event)
+
+    sandbox_realm = await create_sandbox(
+        bidi_session, new_tab["context"], "test", method
+    )
+
+    await bidi_session.browsing_context.close(context=new_tab["context"])
+
+    wait = AsyncPoll(bidi_session, message="Didn't receive realm destroyed events")
+    await wait.until(lambda _: len(destroyed_realm_ids) >= 2)
+
+    assert sandbox_realm in destroyed_realm_ids
+
+    remove_listener()
+
+
+async def test_subscribe_after_sandbox_creation(
+    bidi_session, subscribe_events, new_tab, inline
+):
+    sandbox_realm = await create_sandbox(bidi_session, new_tab["context"])
+
+    await subscribe_events(events=[REALM_DESTROYED_EVENT])
+
+    # Track all received script.realmDestroyed events in the destroyed_realm_ids array
+    destroyed_realm_ids = []
+
+    async def on_event(method, data):
+        destroyed_realm_ids.append(data["realm"])
+
+    remove_listener = bidi_session.add_event_listener(REALM_DESTROYED_EVENT, on_event)
+
+    await bidi_session.browsing_context.navigate(
+        context=new_tab["context"], url=inline("<div>foo</div>"), wait="complete"
+    )
+
+    wait = AsyncPoll(bidi_session, message="Didn't receive realm destroyed events")
+    await wait.until(lambda _: len(destroyed_realm_ids) >= 2)
+
+    assert sandbox_realm in destroyed_realm_ids
+
+    remove_listener()
+
+
+@pytest.mark.parametrize("domain", ["", "alt"], ids=["same_origin", "cross_origin"])
+async def test_iframe(
+    bidi_session, subscribe_events, top_context, inline, wait_for_event, domain
+):
+    frame_url = inline("<div>foo</div>")
+    url = inline(f"<iframe src='{frame_url}'></iframe>", domain=domain)
+    await bidi_session.browsing_context.navigate(
+        url=url, context=top_context["context"], wait="complete"
+    )
+
+    contexts = await bidi_session.browsing_context.get_tree(root=top_context["context"])
+
+    await subscribe_events(events=[REALM_DESTROYED_EVENT])
+
+    on_realm_destroyed = wait_for_event(REALM_DESTROYED_EVENT)
+
+    frame_context = contexts[0]["children"][0]["context"]
+    result = await bidi_session.script.get_realms(context=frame_context)
+
+    await bidi_session.browsing_context.navigate(
+        context=frame_context, url=inline("<div>foo</div>"), wait="complete"
+    )
+
+    event = await on_realm_destroyed
+
+    assert event == {"realm": result[0]["realm"]}
+
+
+async def test_iframe_destroy_parent(
+    bidi_session, subscribe_events, test_page_same_origin_frame, new_tab
+):
+    await bidi_session.browsing_context.navigate(
+        url=test_page_same_origin_frame, context=new_tab["context"], wait="complete"
+    )
+
+    contexts = await bidi_session.browsing_context.get_tree(root=new_tab["context"])
+
+    await subscribe_events(events=[REALM_DESTROYED_EVENT])
+
+    # Track all received script.realmDestroyed events in the destroyed_realm_ids array
+    destroyed_realm_ids = []
+
+    async def on_event(method, data):
+        destroyed_realm_ids.append(data["realm"])
+
+    remove_listener = bidi_session.add_event_listener(REALM_DESTROYED_EVENT, on_event)
+
+    realm_for_iframe = await bidi_session.script.get_realms(
+        context=contexts[0]["children"][0]["context"]
+    )
+    realm_for_parent = await bidi_session.script.get_realms(context=new_tab["context"])
+
+    await bidi_session.browsing_context.close(context=new_tab["context"])
+
+    wait = AsyncPoll(bidi_session, message="Didn't receive realm destroyed events")
+    await wait.until(lambda _: len(destroyed_realm_ids) >= 2)
+
+    assert realm_for_iframe[0]["realm"] in destroyed_realm_ids
+    assert realm_for_parent[0]["realm"] in destroyed_realm_ids
+
+    remove_listener()
+
+
+async def test_subscribe_to_one_context(
+    bidi_session, subscribe_events, new_tab, inline, top_context
+):
+    await bidi_session.browsing_context.navigate(
+        context=new_tab["context"], url=inline("<div>foo</div>"), wait="complete"
+    )
+
+    # Subscribe to a specific context
+    await subscribe_events(
+        events=[REALM_DESTROYED_EVENT], contexts=[new_tab["context"]]
+    )
+
+    # Track all received script.realmDestroyed events in the destroyed_realm_ids array
+    destroyed_realm_ids = []
+
+    async def on_event(method, data):
+        destroyed_realm_ids.append(data["realm"])
+
+    remove_listener = bidi_session.add_event_listener(REALM_DESTROYED_EVENT, on_event)
+
+    await bidi_session.browsing_context.navigate(
+        context=top_context["context"], url=inline("<div>foo</div>"), wait="complete"
+    )
+
+    # Make sure we didn't receive the event for the top context
+    wait = AsyncPoll(bidi_session, timeout=0.5)
+    with pytest.raises(TimeoutException):
+        await wait.until(lambda _: len(destroyed_realm_ids) > 0)
+
+    result = await bidi_session.script.get_realms(context=new_tab["context"])
+
+    await bidi_session.browsing_context.navigate(
+        context=new_tab["context"], url=inline("<div>foo</div>"), wait="complete"
+    )
+
+    wait = AsyncPoll(bidi_session, message="Didn't receive realm destroyed events")
+    await wait.until(lambda _: len(destroyed_realm_ids) >= 1)
+
+    assert result[0]["realm"] in destroyed_realm_ids
+
+    remove_listener()
diff --git a/tests/wpt/tests/webdriver/tests/classic/fullscreen_window/fullscreen.py b/tests/wpt/tests/webdriver/tests/classic/fullscreen_window/fullscreen.py
index 94f25ed9bdb..ce9e033d641 100644
--- a/tests/wpt/tests/webdriver/tests/classic/fullscreen_window/fullscreen.py
+++ b/tests/wpt/tests/webdriver/tests/classic/fullscreen_window/fullscreen.py
@@ -1,5 +1,9 @@
 from tests.support.asserts import assert_error, assert_success
-from tests.support.helpers import is_fullscreen
+from tests.support.helpers import (
+    document_hidden,
+    is_fullscreen,
+    is_maximized,
+)
 
 
 def fullscreen(session):
@@ -17,37 +21,68 @@ def test_no_browsing_context(session, closed_frame):
     assert_success(response)
 
 
-def test_fullscreen(session):
+def test_response_payload(session, screen_size):
+    assert not is_fullscreen(session)
+
     response = fullscreen(session)
-    assert_success(response)
+    value = assert_success(response)
 
     assert is_fullscreen(session)
 
+    assert isinstance(value, dict)
+    assert isinstance(value.get("x"), int)
+    assert isinstance(value.get("y"), int)
+    assert isinstance(value.get("width"), int)
+    assert isinstance(value.get("height"), int)
+
+
+def test_fullscreen_from_normal_window(session, screen_size):
+    assert not is_fullscreen(session)
 
-def test_payload(session):
     response = fullscreen(session)
+    assert_success(response, session.window.rect)
 
-    assert response.status == 200
-    assert isinstance(response.body["value"], dict)
-
-    value = response.body["value"]
-    assert "width" in value
-    assert "height" in value
-    assert "x" in value
-    assert "y" in value
-    assert isinstance(value["width"], int)
-    assert isinstance(value["height"], int)
-    assert isinstance(value["x"], int)
-    assert isinstance(value["y"], int)
+    assert is_fullscreen(session)
+    assert session.window.size == screen_size
 
 
-def test_fullscreen_twice_is_idempotent(session):
+def test_fullscreen_from_maximized_window(session, screen_size):
+    assert not is_fullscreen(session)
+
+    session.window.maximize()
+    assert is_maximized(session)
+
+    response = fullscreen(session)
+    assert_success(response, session.window.rect)
+    assert not is_maximized(session)
+
+    assert session.window.size == screen_size
+
+
+def test_fullscreen_from_minimized_window(session, screen_size):
+    assert not document_hidden(session)
+
+    session.window.minimize()
+    assert document_hidden(session)
+    assert not is_fullscreen(session)
+
+    response = fullscreen(session)
+    assert_success(response, session.window.rect)
+    assert not document_hidden(session)
+    assert is_fullscreen(session)
+
+    assert session.window.size == screen_size
+
+
+def test_fullscreen_twice_is_idempotent(session, screen_size):
     assert not is_fullscreen(session)
 
     first_response = fullscreen(session)
-    assert_success(first_response)
+    assert_success(first_response, session.window.rect)
     assert is_fullscreen(session)
+    assert session.window.size == screen_size
 
     second_response = fullscreen(session)
-    assert_success(second_response)
+    assert_success(second_response, session.window.rect)
     assert is_fullscreen(session)
+    assert session.window.size == screen_size
diff --git a/tests/wpt/tests/webdriver/tests/classic/maximize_window/maximize.py b/tests/wpt/tests/webdriver/tests/classic/maximize_window/maximize.py
index e233e45a10d..3cbd47043f5 100644
--- a/tests/wpt/tests/webdriver/tests/classic/maximize_window/maximize.py
+++ b/tests/wpt/tests/webdriver/tests/classic/maximize_window/maximize.py
@@ -1,7 +1,11 @@
 # META: timeout=long
 
 from tests.support.asserts import assert_error, assert_success
-from tests.support.helpers import document_hidden, is_fullscreen
+from tests.support.helpers import (
+    document_hidden,
+    is_fullscreen,
+    is_maximized,
+)
 
 
 def maximize(session):
@@ -19,82 +23,88 @@ def test_no_browsing_context(session, closed_frame):
     assert_success(response)
 
 
+def test_response_payload(session):
+    assert not is_maximized(session)
+
+    response = maximize(session)
+    value = assert_success(response, session.window.rect)
+
+    assert is_maximized(session)
+
+    assert isinstance(value, dict)
+    assert isinstance(value.get("x"), int)
+    assert isinstance(value.get("y"), int)
+    assert isinstance(value.get("width"), int)
+    assert isinstance(value.get("height"), int)
+
+
 def test_fully_exit_fullscreen(session):
+    assert not is_maximized(session)
+
     session.window.fullscreen()
     assert is_fullscreen(session)
 
     response = maximize(session)
-    assert_success(response)
-    assert not is_fullscreen(session)
+    assert_success(response, session.window.rect)
+
+    assert is_maximized(session)
+    assert not document_hidden(session)
 
 
-def test_restore_the_window(session):
+def test_restore_from_minimized(session):
+    assert not is_maximized(session)
+
     session.window.minimize()
     assert document_hidden(session)
+    assert not is_maximized(session)
 
     response = maximize(session)
-    assert_success(response)
+    assert_success(response, session.window.rect)
+
+    assert is_maximized(session)
+    assert not document_hidden(session)
 
 
-def test_maximize(session):
-    before_size = session.window.size
+def test_maximize_from_normal_window(session):
+    assert not is_maximized(session)
 
     response = maximize(session)
-    assert_success(response)
+    assert_success(response, session.window.rect)
 
-    assert before_size != session.window.size
+    assert is_maximized(session)
+    assert not document_hidden(session)
 
 
-def test_payload(session):
-    before_size = session.window.size
+def test_maximize_with_window_already_at_maximum_size(session, available_screen_size):
+    assert not is_maximized(session)
 
-    response = maximize(session)
-
-    assert response.status == 200
-    assert isinstance(response.body["value"], dict)
-
-    value = response.body["value"]
-    assert "width" in value
-    assert "height" in value
-    assert "x" in value
-    assert "y" in value
-    assert isinstance(value["width"], int)
-    assert isinstance(value["height"], int)
-    assert isinstance(value["x"], int)
-    assert isinstance(value["y"], int)
-
-    assert before_size != session.window.size
-
-
-def test_maximize_twice_is_idempotent(session):
-    first_response = maximize(session)
-    assert_success(first_response)
-    max_size = session.window.size
-
-    second_response = maximize(session)
-    assert_success(second_response)
-    assert session.window.size == max_size
-
-
-def test_maximize_when_resized_to_max_size(session):
-    # Determine the largest available window size by first maximising
-    # the window and getting the window rect dimensions.
-    #
-    # Then resize the window to the maximum available size.
-    session.end()
-    session.window.maximize()
-    available = session.window.size
-    session.window.size = (800, 600)
-    session.end()
-
-    session.window.size = available
+    # Resize the window to the maximum available size.
+    session.window.size = available_screen_size
+    assert session.window.size == available_screen_size
 
     # In certain window managers a window extending to the full available
     # dimensions of the screen may not imply that the window is maximised,
     # since this is often a special state.  If a remote end expects a DOM
     # resize event, this may not fire if the window has already reached
     # its expected dimensions.
-    before = session.window.size
-    session.window.maximize()
-    after = session.window.size
-    assert after == before
+    response = maximize(session)
+    assert_success(response, session.window.rect)
+
+    assert is_maximized(session)
+    assert not document_hidden(session)
+
+
+def test_maximize_twice_is_idempotent(session):
+    assert not is_maximized(session)
+
+    first_response = maximize(session)
+    assert_success(first_response, session.window.rect)
+
+    assert is_maximized(session)
+    assert not document_hidden(session)
+
+    second_response = maximize(session)
+    assert_success(second_response, session.window.rect)
+
+    assert is_maximized(session)
+    assert not document_hidden(session)
diff --git a/tests/wpt/tests/webdriver/tests/classic/minimize_window/minimize.py b/tests/wpt/tests/webdriver/tests/classic/minimize_window/minimize.py
index 616b250c705..ed02280a135 100644
--- a/tests/wpt/tests/webdriver/tests/classic/minimize_window/minimize.py
+++ b/tests/wpt/tests/webdriver/tests/classic/minimize_window/minimize.py
@@ -1,7 +1,7 @@
 # META: timeout=long
 
 from tests.support.asserts import assert_error, assert_success
-from tests.support.helpers import document_hidden, is_fullscreen
+from tests.support.helpers import document_hidden, is_fullscreen, is_maximized
 
 
 def minimize(session):
@@ -19,41 +19,52 @@ def test_no_browsing_context(session, closed_frame):
     assert_success(response)
 
 
-def test_fully_exit_fullscreen(session):
-    session.window.fullscreen()
-    assert is_fullscreen(session)
+def test_response_payload(session):
+    assert not document_hidden(session)
 
     response = minimize(session)
-    assert_success(response)
+    value = assert_success(response, session.window.rect)
+
+    assert document_hidden(session)
+
+    assert isinstance(value, dict)
+    assert isinstance(value.get("x"), int)
+    assert isinstance(value.get("y"), int)
+    assert isinstance(value.get("width"), int)
+    assert isinstance(value.get("height"), int)
+
+
+def test_restore_from_fullscreen(session):
+    assert not document_hidden(session)
+
+    session.window.fullscreen()
+    assert is_fullscreen(session)
+    assert not document_hidden(session)
+
+    response = minimize(session)
+    assert_success(response, session.window.rect)
     assert not is_fullscreen(session)
     assert document_hidden(session)
 
 
-def test_minimize(session):
+def test_restore_from_maximized(session):
+    assert not document_hidden(session)
+
+    session.window.maximize()
+    assert is_maximized(session)
     assert not document_hidden(session)
 
     response = minimize(session)
-    assert_success(response)
+    assert_success(response, session.window.rect)
+    assert not is_maximized(session)
     assert document_hidden(session)
 
 
-def test_payload(session):
+def test_minimize_from_normal_window(session):
     assert not document_hidden(session)
 
     response = minimize(session)
-    value = assert_success(response)
-    assert isinstance(value, dict)
-
-    value = response.body["value"]
-    assert "width" in value
-    assert "height" in value
-    assert "x" in value
-    assert "y" in value
-    assert isinstance(value["width"], int)
-    assert isinstance(value["height"], int)
-    assert isinstance(value["x"], int)
-    assert isinstance(value["y"], int)
-
+    assert_success(response, session.window.rect)
     assert document_hidden(session)
 
 
@@ -61,9 +72,9 @@ def test_minimize_twice_is_idempotent(session):
     assert not document_hidden(session)
 
     first_response = minimize(session)
-    assert_success(first_response)
+    assert_success(first_response, session.window.rect)
     assert document_hidden(session)
 
     second_response = minimize(session)
-    assert_success(second_response)
+    assert_success(second_response, session.window.rect)
     assert document_hidden(session)
diff --git a/tests/wpt/tests/webdriver/tests/classic/new_session/default_values.py b/tests/wpt/tests/webdriver/tests/classic/new_session/default_values.py
index abd4a5a64c5..678d7a8e881 100644
--- a/tests/wpt/tests/webdriver/tests/classic/new_session/default_values.py
+++ b/tests/wpt/tests/webdriver/tests/classic/new_session/default_values.py
@@ -1,5 +1,3 @@
-# META: timeout=long
-
 from tests.support.asserts import assert_error, assert_success
 
 
@@ -17,11 +15,6 @@ def test_repeat_new_session(new_session, add_browser_capabilities):
     assert_error(response, "session not created")
 
 
-def test_no_capabilites(new_session):
-    response, _ = new_session({})
-    assert_error(response, "invalid argument")
-
-
 def test_missing_first_match(new_session, add_browser_capabilities):
     response, _ = new_session({"capabilities": {"alwaysMatch": add_browser_capabilities({})}})
     assert_success(response)
@@ -33,14 +26,14 @@ def test_missing_always_match(new_session, add_browser_capabilities):
 
 
 def test_desired(new_session, add_browser_capabilities):
-    response, _ = new_session({"desiredCapbilities": add_browser_capabilities({})})
+    response, _ = new_session({"desiredCapabilities": add_browser_capabilities({})})
     assert_error(response, "invalid argument")
 
 
 def test_ignore_non_spec_fields_in_capabilities(new_session, add_browser_capabilities):
     response, _ = new_session({"capabilities": {
         "alwaysMatch": add_browser_capabilities({}),
-        "desiredCapbilities": {"pageLoadStrategy": "eager"},
+        "desiredCapabilities": {"pageLoadStrategy": "eager"},
     }})
     value = assert_success(response)
     assert value["capabilities"]["pageLoadStrategy"] == "normal"
diff --git a/tests/wpt/tests/webdriver/tests/classic/new_session/no_capabilities.py b/tests/wpt/tests/webdriver/tests/classic/new_session/no_capabilities.py
new file mode 100644
index 00000000000..31ee90555a7
--- /dev/null
+++ b/tests/wpt/tests/webdriver/tests/classic/new_session/no_capabilities.py
@@ -0,0 +1,8 @@
+from tests.support.asserts import assert_error
+
+# Passing no capabilities to the webdriver executable can cause various
+# side-effects. As such this particular test should be run separately.
+
+def test_no_capabilites(new_session):
+    response, _ = new_session({})
+    assert_error(response, "invalid argument")
diff --git a/tests/wpt/tests/webdriver/tests/classic/perform_actions/invalid.py b/tests/wpt/tests/webdriver/tests/classic/perform_actions/invalid.py
index 6c3f1341405..b0302131a0a 100644
--- a/tests/wpt/tests/webdriver/tests/classic/perform_actions/invalid.py
+++ b/tests/wpt/tests/webdriver/tests/classic/perform_actions/invalid.py
@@ -2,6 +2,8 @@
 
 import pytest
 
+from webdriver.error import InvalidArgumentException
+
 from tests.support.asserts import assert_error
 from . import perform_actions
 
@@ -198,7 +200,7 @@ def test_input_source_action_sequence_actions_subtype_invalid_value(
 ):
     actions = [
         {
-            "type": value,
+            "type": action_type,
             "id": "foo",
             "actions": [
                 {
@@ -459,38 +461,22 @@ def test_pointer_action_up_down_button_missing(session, pointer_action):
 @pytest.mark.parametrize("pointer_action", ["pointerDown", "pointerUp"])
 @pytest.mark.parametrize("value", [None, "foo", True, 0.1, [], {}])
 def test_pointer_action_up_down_button_invalid_type(session, pointer_action, value):
-    actions = [
-        {
-            "type": "pointer",
-            "id": "foo",
-            "actions": [
-                {
-                    "type": pointer_action,
-                    "button": value,
-                }
-            ],
-        }
-    ]
-    response = perform_actions(session, actions)
+    action = create_pointer_common_object(pointer_action, {"button": value})
+
+    response = perform_actions(
+        session, [{"type": "pointer", "id": "foo", "actions": [action]}]
+    )
     assert_error(response, "invalid argument")
 
 
 @pytest.mark.parametrize("pointer_action", ["pointerDown", "pointerUp"])
 @pytest.mark.parametrize("value", [-1, MAX_INT + 1])
 def test_pointer_action_up_down_button_invalid_value(session, pointer_action, value):
-    actions = [
-        {
-            "type": "pointer",
-            "id": "foo",
-            "actions": [
-                {
-                    "type": pointer_action,
-                    "button": value,
-                }
-            ],
-        }
-    ]
-    response = perform_actions(session, actions)
+    action = create_pointer_common_object(pointer_action, {"button": value})
+
+    response = perform_actions(
+        session, [{"type": "pointer", "id": "foo", "actions": [action]}]
+    )
     assert_error(response, "invalid argument")
 
 
@@ -516,7 +502,7 @@ def test_pointer_action_common_properties_dimensions_invalid_type(
 
 @pytest.mark.parametrize("pointer_action", ["pointerDown", "pointerMove", "pointerUp"])
 @pytest.mark.parametrize("dimension", ["width", "height"])
-@pytest.mark.parametrize("value", [MIN_INT - 1, MAX_INT + 1])
+@pytest.mark.parametrize("value", [-1, MAX_INT + 1])
 def test_pointer_action_common_properties_dimensions_invalid_value(
     session, dimension, pointer_action, value
 ):
@@ -770,6 +756,30 @@ def test_wheel_action_scroll_origin_invalid_value(session, value):
     assert_error(response, "invalid argument")
 
 
+def test_wheel_action_scroll_origin_pointer_not_supported(session):
+    # Pointer origin isn't currently supported for wheel input source
+    # See: https://github.com/w3c/webdriver/issues/1758
+
+    actions = [
+        {
+            "type": "wheel",
+            "id": "foo",
+            "actions": [
+                {
+                    "type": "scroll",
+                    "x": 0,
+                    "y": 0,
+                    "deltaX": 0,
+                    "deltaY": 0,
+                    "origin": "pointer",
+                }
+            ],
+        }
+    ]
+    response = perform_actions(session, actions)
+    assert_error(response, "invalid argument")
+
+
 @pytest.mark.parametrize(
     "value",
     [
@@ -821,3 +831,14 @@ def test_wheel_action_scroll_origin_element_invalid_value(session):
     ]
     response = perform_actions(session, actions)
     assert_error(response, "no such element")
+
+
+@pytest.mark.parametrize("missing", ["x", "y", "deltaX", "deltaY"])
+def test_wheel_action_scroll_missing_property(
+    session, test_actions_scroll_page, wheel_chain, missing
+):
+    actions = wheel_chain.scroll(0, 0, 5, 10, origin="viewport")
+    del actions._actions[-1][missing]
+
+    with pytest.raises(InvalidArgumentException):
+        actions.perform()
diff --git a/tests/wpt/tests/webdriver/tests/classic/perform_actions/pointer_mouse.py b/tests/wpt/tests/webdriver/tests/classic/perform_actions/pointer_mouse.py
index 152447aeefd..97295f56f41 100644
--- a/tests/wpt/tests/webdriver/tests/classic/perform_actions/pointer_mouse.py
+++ b/tests/wpt/tests/webdriver/tests/classic/perform_actions/pointer_mouse.py
@@ -74,18 +74,53 @@ def test_context_menu_at_coordinates(session, test_actions_page, mouse_chain):
         .pointer_down(button=2) \
         .pointer_up(button=2) \
         .perform()
+
     events = get_events(session)
-    expected = [
-        {"type": "mousedown", "button": 2},
-        {"type": "contextmenu", "button": 2},
-    ]
     assert len(events) == 4
+
+    expected = [
+        {"type": "mousedown", "button": 2, "buttons": 2},
+        {"type": "contextmenu", "button": 2, "buttons": 2},
+    ]
+    # Some browsers in some platforms may dispatch `contextmenu` event as a
+    # a default action of `mouseup`.  In the case, `.buttons` of the event
+    # should be 0.
+    anotherExpected = [
+        {"type": "mousedown", "button": 2, "buttons": 2},
+        {"type": "contextmenu", "button": 2, "buttons": 0},
+    ]
     filtered_events = [filter_dict(e, expected[0]) for e in events]
     mousedown_contextmenu_events = [
         x for x in filtered_events
         if x["type"] in ["mousedown", "contextmenu"]
     ]
-    assert expected == mousedown_contextmenu_events
+    assert mousedown_contextmenu_events in [expected, anotherExpected]
+
+
+def test_middle_click(session, test_actions_page, mouse_chain):
+    div_point = {
+        "x": 82,
+        "y": 187,
+    }
+    mouse_chain \
+        .pointer_move(div_point["x"], div_point["y"]) \
+        .pointer_down(button=1) \
+        .pointer_up(button=1) \
+        .perform()
+
+    events = get_events(session)
+    assert len(events) == 3
+
+    expected = [
+      {"type": "mousedown", "button": 1, "buttons": 4},
+      {"type": "mouseup", "button": 1, "buttons": 0},
+    ]
+    filtered_events = [filter_dict(e, expected[0]) for e in events]
+    mousedown_mouseup_events = [
+        x for x in filtered_events
+        if x["type"] in ["mousedown", "mouseup"]
+    ]
+    assert expected == mousedown_mouseup_events
 
 
 def test_click_element_center(session, test_actions_page, mouse_chain):
diff --git a/tests/wpt/tests/webdriver/tests/classic/perform_actions/wheel.py b/tests/wpt/tests/webdriver/tests/classic/perform_actions/wheel.py
index c83c90df3de..a75a84378a6 100644
--- a/tests/wpt/tests/webdriver/tests/classic/perform_actions/wheel.py
+++ b/tests/wpt/tests/webdriver/tests/classic/perform_actions/wheel.py
@@ -1,10 +1,9 @@
 import pytest
 
-from webdriver.error import InvalidArgumentException, NoSuchWindowException
+from webdriver.error import NoSuchWindowException
+
 
 from tests.classic.perform_actions.support.refine import get_events
-from tests.support.asserts import assert_move_to_coordinates
-from tests.support.helpers import filter_dict
 
 
 def test_null_response_value(session, wheel_chain):
@@ -22,51 +21,51 @@ def test_no_browsing_context(session, closed_window, wheel_chain):
         wheel_chain.scroll(0, 0, 0, 10).perform()
 
 
-def test_wheel_scroll(session, test_actions_scroll_page, wheel_chain):
-    session.execute_script("document.scrollingElement.scrollTop = 0")
+def test_scroll_not_scrollable(session, test_actions_scroll_page, wheel_chain):
+    target = session.find.css("#not-scrollable", all=False)
+
+    wheel_chain.scroll(0, 0, 5, 10, origin=target).perform()
 
-    outer = session.find.css("#outer", all=False)
-    wheel_chain.scroll(0, 0, 5, 10, origin=outer).perform()
     events = get_events(session)
     assert len(events) == 1
     assert events[0]["type"] == "wheel"
-    assert events[0]["deltaX"] >= 5
-    assert events[0]["deltaY"] >= 10
+    assert events[0]["deltaX"] == 5
+    assert events[0]["deltaY"] == 10
     assert events[0]["deltaZ"] == 0
-    assert events[0]["target"] == "outer"
+    assert events[0]["target"] == "not-scrollable-content"
 
 
-def test_wheel_scroll_overflow(session, test_actions_scroll_page, wheel_chain):
-    session.execute_script("document.scrollingElement.scrollTop = 0")
+def test_scroll_scrollable_overflow(session, test_actions_scroll_page, wheel_chain):
+    target = session.find.css("#scrollable", all=False)
+
+    wheel_chain.scroll(0, 0, 5, 10, origin=target).perform()
 
-    scrollable = session.find.css("#scrollable", all=False)
-    wheel_chain.scroll(0, 0, 5, 10, origin=scrollable).perform()
     events = get_events(session)
     assert len(events) == 1
     assert events[0]["type"] == "wheel"
-    assert events[0]["deltaX"] >= 5
-    assert events[0]["deltaY"] >= 10
+    assert events[0]["deltaX"] == 5
+    assert events[0]["deltaY"] == 10
     assert events[0]["deltaZ"] == 0
-    assert events[0]["target"] == "scrollContent"
+    assert events[0]["target"] == "scrollable-content"
 
 
-def test_wheel_scroll_iframe(session, test_actions_scroll_page, wheel_chain):
-    session.execute_script("document.scrollingElement.scrollTop = 0")
+def test_scroll_iframe(session, test_actions_scroll_page, wheel_chain):
+    target = session.find.css("#iframe", all=False)
+
+    wheel_chain.scroll(0, 0, 5, 10, origin=target).perform()
 
-    subframe = session.find.css("#subframe", all=False)
-    wheel_chain.scroll(0, 0, 5, 10, origin=subframe).perform()
     events = get_events(session)
     assert len(events) == 1
     assert events[0]["type"] == "wheel"
-    assert events[0]["deltaX"] >= 5
-    assert events[0]["deltaY"] >= 10
+    assert events[0]["deltaX"] == 5
+    assert events[0]["deltaY"] == 10
     assert events[0]["deltaZ"] == 0
     assert events[0]["target"] == "iframeContent"
 
 
 @pytest.mark.parametrize("mode", ["open", "closed"])
 @pytest.mark.parametrize("nested", [False, True], ids=["outer", "inner"])
-def test_wheel_scroll_shadow_tree(session, get_test_page, wheel_chain, mode, nested):
+def test_scroll_shadow_tree(session, get_test_page, wheel_chain, mode, nested):
     session.url = get_test_page(
         shadow_doc="""
         <div id="scrollableShadowTree"
@@ -109,17 +108,6 @@ def test_wheel_scroll_shadow_tree(session, get_test_page, wheel_chain, mode, nes
 
     events = session.execute_script("return window.wheelEvents;") or []
     assert len(events) == 1
-    assert events[0]["deltaX"] >= 5
-    assert events[0]["deltaY"] >= 10
+    assert events[0]["deltaX"] == 5
+    assert events[0]["deltaY"] == 10
     assert events[0]["target"] == "scrollableShadowTreeContent"
-
-
-@pytest.mark.parametrize("missing", ["x", "y", "deltaX", "deltaY"])
-def test_wheel_missing_prop(session, test_actions_scroll_page, wheel_chain, missing):
-    session.execute_script("document.scrollingElement.scrollTop = 0")
-
-    outer = session.find.css("#outer", all=False)
-    actions = wheel_chain.scroll(0, 0, 5, 10, origin=outer)
-    del actions._actions[-1][missing]
-    with pytest.raises(InvalidArgumentException):
-        actions.perform()
diff --git a/tests/wpt/tests/webdriver/tests/classic/print/printcmd.py b/tests/wpt/tests/webdriver/tests/classic/print/printcmd.py
index aec7769c3e8..07d419d1bb3 100644
--- a/tests/wpt/tests/webdriver/tests/classic/print/printcmd.py
+++ b/tests/wpt/tests/webdriver/tests/classic/print/printcmd.py
@@ -75,7 +75,9 @@ def test_large_html_document(session, inline):
     (["9-"], ["Page 9", "Page 10"]),
     (["-2"], ["Page 1", "Page 2"]),
     (["7"], ["Page 7"]),
+    ([7],["Page 7"]),
     (["-2", "9-", "7"], ["Page 1", "Page 2", "Page 7", "Page 9", "Page 10"]),
+    (["-2", "9-", 7], ["Page 1", "Page 2", "Page 7", "Page 9", "Page 10"]),
     (["-5", "2-"], ["Page 1", "Page 2", "Page 3", "Page 4", "Page 5", "Page 6", "Page 7", "Page 8", "Page 9", "Page 10"]),
     ([], ["Page 1", "Page 2", "Page 3", "Page 4", "Page 5", "Page 6", "Page 7", "Page 8", "Page 9", "Page 10"]),
 ])
diff --git a/tests/wpt/tests/webdriver/tests/classic/set_window_rect/set.py b/tests/wpt/tests/webdriver/tests/classic/set_window_rect/set.py
index 23382288a3d..af37c2f70d3 100644
--- a/tests/wpt/tests/webdriver/tests/classic/set_window_rect/set.py
+++ b/tests/wpt/tests/webdriver/tests/classic/set_window_rect/set.py
@@ -5,8 +5,7 @@ import pytest
 from webdriver.transport import Response
 
 from tests.support.asserts import assert_error, assert_success
-from tests.support.helpers import (available_screen_size, document_hidden,
-                                   is_fullscreen, screen_size)
+from tests.support.helpers import document_hidden, is_fullscreen, is_maximized
 
 
 def set_window_rect(session, rect):
@@ -26,11 +25,20 @@ def test_no_top_browsing_context(session, closed_window):
     assert_error(response, "no such window")
 
 
-def test_no_browsing_context(session, closed_frame):
-    response = set_window_rect(session, {"width": 750, "height": 700})
-    value = assert_success(response)
-    assert value["width"] == 750
-    assert value["height"] == 700
+def test_no_browsing_context(session, closed_window):
+    response = set_window_rect(session, {})
+    assert_error(response, "no such window")
+
+
+def test_response_payload(session):
+    response = set_window_rect(session, {"x": 400, "y": 400})
+    value = assert_success(response, session.window.rect)
+
+    assert isinstance(value, dict)
+    assert isinstance(value.get("x"), int)
+    assert isinstance(value.get("y"), int)
+    assert isinstance(value.get("width"), int)
+    assert isinstance(value.get("height"), int)
 
 
 @pytest.mark.parametrize("rect", [
@@ -76,33 +84,96 @@ def test_invalid_types(session, rect):
     {"height": -2},
     {"width": -1, "height": -2},
 ])
-def test_out_of_bounds(session, rect):
+def test_invalid_values(session, rect):
     response = set_window_rect(session, rect)
     assert_error(response, "invalid argument")
 
 
-def test_width_height_floats(session):
-    response = set_window_rect(session, {"width": 750.5, "height": 700})
-    value = assert_success(response)
-    assert value["width"] == 750
-    assert value["height"] == 700
+def test_restore_from_fullscreen(session):
+    assert not is_fullscreen(session)
 
-    response = set_window_rect(session, {"width": 750, "height": 700.5})
-    value = assert_success(response)
-    assert value["width"] == 750
-    assert value["height"] == 700
+    original = session.window.rect
+    target_rect = {
+        "x": original["x"],
+        "y": original["y"],
+        "width": original["width"] + 50,
+        "height": original["height"] + 50
+    }
+
+    session.window.fullscreen()
+    assert is_fullscreen(session)
+
+    response = set_window_rect(session, target_rect)
+    value = assert_success(response, session.window.rect)
+
+    assert not is_fullscreen(session)
+    assert value == target_rect
+
+
+def test_restore_from_minimized(session):
+    assert not document_hidden(session)
+
+    original = session.window.rect
+    target_rect = {
+        "x": original["x"],
+        "y": original["y"],
+        "width": original["width"] + 50,
+        "height": original["height"] + 50
+    }
+
+    session.window.minimize()
+    assert document_hidden(session)
+
+    response = set_window_rect(session, target_rect)
+    value = assert_success(response, session.window.rect)
+
+    assert not document_hidden(session)
+    assert value == target_rect
+
+
+def test_restore_from_maximized(session):
+    assert not is_maximized(session)
+
+    original = session.window.rect
+    target_rect = {
+        "x": original["x"],
+        "y": original["y"],
+        "width": original["width"] + 50,
+        "height": original["height"] + 50
+    }
+
+    session.window.maximize()
+    assert is_maximized(session)
+
+    response = set_window_rect(session, target_rect)
+    value = assert_success(response, session.window.rect)
+
+    assert not is_maximized(session)
+    assert value == target_rect
 
 
 def test_x_y_floats(session):
-    response = set_window_rect(session, {"x": 0.5, "y": 420})
+    response = set_window_rect(session, {"x": 150.5, "y": 250})
     value = assert_success(response)
-    assert value["x"] == 0
-    assert value["y"] == 420
+    assert value["x"] == 150
+    assert value["y"] == 250
 
-    response = set_window_rect(session, {"x": 100, "y": 450.5})
-    value = assert_success(response)
-    assert value["x"] == 100
-    assert value["y"] == 450
+    response = set_window_rect(session, {"x": 150, "y": 250.5})
+    value = assert_success(response, session.window.rect)
+    assert value["x"] == 150
+    assert value["y"] == 250
+
+
+def test_width_height_floats(session):
+    response = set_window_rect(session, {"width": 500.5, "height": 420})
+    value = assert_success(response, session.window.rect)
+    assert value["width"] == 500
+    assert value["height"] == 420
+
+    response = set_window_rect(session, {"width": 500, "height": 450.5})
+    value = assert_success(response, session.window.rect)
+    assert value["width"] == 500
+    assert value["height"] == 450
 
 
 @pytest.mark.parametrize("rect", [
@@ -138,84 +209,77 @@ def test_no_change(session, rect):
     assert_success(response, original)
 
 
-def test_fully_exit_fullscreen(session):
-    session.window.fullscreen()
-    assert is_fullscreen(session)
+def test_set_to_available_size(
+    session, available_screen_size, minimal_screen_position
+):
+    minimal_x, minimal_y = minimal_screen_position
+    available_width, available_height = available_screen_size
+    target_rect = {
+        "x": minimal_x,
+        "y": minimal_y,
+        "width": available_width,
+        "height": available_height,
+    }
 
-    response = set_window_rect(session, {"width": 600, "height": 400})
-    value = assert_success(response)
-    assert value["width"] == 600
-    assert value["height"] == 400
+    response = set_window_rect(session, target_rect)
+    value = assert_success(response, session.window.rect)
 
-    assert not is_fullscreen(session)
+    assert value == target_rect
 
 
-def test_restore_from_minimized(session):
-    session.window.minimize()
-    assert document_hidden(session)
+def test_set_to_screen_size(
+    session, available_screen_size, minimal_screen_position, screen_size
+):
+    minimal_x, minimal_y = minimal_screen_position
+    available_width, available_height = available_screen_size
+    screen_width, screen_height = screen_size
+    target_rect = {
+        "x": minimal_x,
+        "y": minimal_y,
+        "width": screen_width,
+        "height": screen_height,
+    }
 
-    response = set_window_rect(session, {"width": 750, "height": 700})
-    value = assert_success(response)
-    assert value["width"] == 750
-    assert value["height"] == 700
+    response = set_window_rect(session, target_rect)
+    value = assert_success(response, session.window.rect)
 
-    assert not document_hidden(session)
+    assert value["width"] >= available_width
+    assert value["width"] <= screen_width
+    assert value["height"] >= available_height
+    assert value["height"] <= screen_height
 
 
-def test_restore_from_maximized(session):
-    original_size = session.window.size
-    session.window.maximize()
-    assert session.window.size != original_size
-
-    response = set_window_rect(session, {"width": 750, "height": 700})
-    value = assert_success(response)
-    assert value["width"] == 750
-    assert value["height"] == 700
-
-
-def test_height_width(session):
-    # The window position might be auto-adjusted by the browser
-    # if it exceeds the lower right corner. As such ensure that
-    # there is enough space left so no window move will occur.
-    session.window.position = (50, 50)
-
-    original = session.window.rect
-    screen_width, screen_height = screen_size(session)
-
-    response = set_window_rect(session, {
-        "width": screen_width - 100,
-        "height": screen_height - 100
-    })
-    assert_success(response, {
-        "x": original["x"],
-        "y": original["y"],
-        "width": screen_width - 100,
-        "height": screen_height - 100,
-    })
-
-
-def test_height_width_smaller_than_minimum_browser_size(session):
-    original = session.window.rect
-
-    response = set_window_rect(session, {"width": 10, "height": 10})
-    rect = assert_success(response)
-    assert rect["width"] < original["width"]
-    assert rect["width"] > 10
-    assert rect["height"] < original["height"]
-    assert rect["height"] > 10
-
-
-def test_height_width_larger_than_max(session):
-    screen_width, screen_height = screen_size(session)
-    avail_width, avail_height = available_screen_size(session)
-
-    response = set_window_rect(session, {
+def test_set_larger_than_screen_size(
+    session, available_screen_size, minimal_screen_position, screen_size
+):
+    minimal_x, minimal_y = minimal_screen_position
+    available_width, available_height = available_screen_size
+    screen_width, screen_height = screen_size
+    target_rect = {
+        "x": minimal_x,
+        "y": minimal_y,
         "width": screen_width + 100,
-        "height": screen_height + 100
-    })
-    rect = assert_success(response)
-    assert rect["width"] >= avail_width
-    assert rect["height"] >= avail_height
+        "height": screen_height + 100,
+    }
+
+    response = set_window_rect(session, target_rect)
+    value = assert_success(response, session.window.rect)
+
+    assert value["width"] >= available_width
+    assert value["height"] >= available_height
+
+
+def test_set_smaller_than_minimum_browser_size(session):
+    original_width, original_height = session.window.size
+
+    # A window size of 10x10px shouldn't be supported by any browser.
+    response = set_window_rect(session, {"width": 10, "height": 10})
+    value = assert_success(response, session.window.rect)
+
+    assert value["width"] < original_width
+    assert value["width"] > 10
+    assert value["height"] < original_height
+    assert value["height"] > 10
 
 
 def test_height_width_as_current(session):
@@ -225,12 +289,9 @@ def test_height_width_as_current(session):
         "width": original["width"],
         "height": original["height"]
     })
-    assert_success(response, {
-        "x": original["x"],
-        "y": original["y"],
-        "width": original["width"],
-        "height": original["height"]
-    })
+    value = assert_success(response, session.window.rect)
+
+    assert value == original
 
 
 def test_height_as_current(session):
@@ -240,12 +301,14 @@ def test_height_as_current(session):
         "width": original["width"] + 10,
         "height": original["height"]
     })
-    assert_success(response, {
+    value = assert_success(response, session.window.rect)
+
+    assert value == {
         "x": original["x"],
         "y": original["y"],
         "width": original["width"] + 10,
         "height": original["height"]
-    })
+    }
 
 
 def test_width_as_current(session):
@@ -255,12 +318,14 @@ def test_width_as_current(session):
         "width": original["width"],
         "height": original["height"] + 10
     })
-    assert_success(response, {
+    value = assert_success(response, session.window.rect)
+
+    assert value == {
         "x": original["x"],
         "y": original["y"],
         "width": original["width"],
         "height": original["height"] + 10
-    })
+    }
 
 
 def test_x_y(session):
@@ -269,50 +334,14 @@ def test_x_y(session):
         "x": original["x"] + 10,
         "y": original["y"] + 10
     })
-    assert_success(response, {
+    value = assert_success(response, session.window.rect)
+
+    assert value == {
         "x": original["x"] + 10,
         "y": original["y"] + 10,
         "width": original["width"],
         "height": original["height"]
-    })
-
-
-def test_negative_x_y(session):
-    original = session.window.rect
-
-    response = set_window_rect(session, {"x": - 8, "y": - 8})
-
-    os = session.capabilities["platformName"]
-    # certain WMs prohibit windows from being moved off-screen
-    if os == "linux":
-        rect = assert_success(response)
-        assert rect["x"] <= 0
-        assert rect["y"] <= 0
-        assert rect["width"] == original["width"]
-        assert rect["height"] == original["height"]
-
-    # On macOS, windows can only be moved off the screen on the
-    # horizontal axis.  The system menu bar also blocks windows from
-    # being moved to (0,0).
-    elif os == "mac":
-        value = assert_success(response)
-
-        # `screen.availTop` is not standardized but all browsers we care
-        # about on MacOS implement the CSSOM View mode `Screen` interface.
-        avail_top = session.execute_script("return window.screen.availTop;")
-
-        assert value == {"x": -8,
-                         "y": avail_top,
-                         "width": original["width"],
-                         "height": original["height"]}
-
-    # It turns out that Windows is the only platform on which the
-    # window can be reliably positioned off-screen.
-    elif os == "windows":
-        assert_success(response, {"x": -8,
-                                  "y": -8,
-                                  "width": original["width"],
-                                  "height": original["height"]})
+    }
 
 
 def test_x_y_as_current(session):
@@ -322,12 +351,14 @@ def test_x_y_as_current(session):
         "x": original["x"],
         "y": original["y"]
     })
-    assert_success(response, {
+    value = assert_success(response, session.window.rect)
+
+    assert value == {
         "x": original["x"],
         "y": original["y"],
         "width": original["width"],
         "height": original["height"]
-    })
+    }
 
 
 def test_x_as_current(session):
@@ -337,12 +368,14 @@ def test_x_as_current(session):
         "x": original["x"],
         "y": original["y"] + 10
     })
-    assert_success(response, {
+    value = assert_success(response, session.window.rect)
+
+    assert value == {
         "x": original["x"],
         "y": original["y"] + 10,
         "width": original["width"],
         "height": original["height"]
-    })
+    }
 
 
 def test_y_as_current(session):
@@ -352,12 +385,48 @@ def test_y_as_current(session):
         "x": original["x"] + 10,
         "y": original["y"]
     })
-    assert_success(response, {
+    value = assert_success(response, session.window.rect)
+
+    assert value == {
         "x": original["x"] + 10,
         "y": original["y"],
         "width": original["width"],
         "height": original["height"]
-    })
+    }
+
+
+def test_negative_x_y(session, minimal_screen_position):
+    original = session.window.rect
+
+    response = set_window_rect(session, {"x": - 8, "y": - 8})
+    value = assert_success(response, session.window.rect)
+
+    os = session.capabilities["platformName"]
+    # certain WMs prohibit windows from being moved off-screen
+    if os == "linux":
+        assert value["x"] <= 0
+        assert value["y"] <= 0
+        assert value["width"] == original["width"]
+        assert value["height"] == original["height"]
+
+    # On macOS when not running headless, windows can only be moved off the
+    # screen on the horizontal axis.  The system menu bar also blocks windows
+    # from being moved to (0,0).
+    elif os == "mac":
+        assert value["x"] == -8
+        assert value["y"] <= minimal_screen_position[1]
+        assert value["width"] == original["width"]
+        assert value["height"] == original["height"]
+
+    # It turns out that Windows is the only platform on which the
+    # window can be reliably positioned off-screen.
+    elif os == "windows":
+        assert value == {
+            "x": -8,
+            "y": -8,
+            "width": original["width"],
+            "height": original["height"]
+        }
 
 
 """
@@ -385,19 +454,3 @@ def test_resize_by_script(session):
         assert size2 == (800, 900)
     assert size2 == {"width": 200, "height": 100}
 """
-
-
-def test_payload(session):
-    response = set_window_rect(session, {"x": 400, "y": 400})
-
-    assert response.status == 200
-    assert isinstance(response.body["value"], dict)
-    value = response.body["value"]
-    assert "width" in value
-    assert "height" in value
-    assert "x" in value
-    assert "y" in value
-    assert isinstance(value["width"], int)
-    assert isinstance(value["height"], int)
-    assert isinstance(value["x"], int)
-    assert isinstance(value["y"], int)
diff --git a/tests/wpt/tests/webdriver/tests/classic/switch_to_parent_frame/switch.py b/tests/wpt/tests/webdriver/tests/classic/switch_to_parent_frame/switch.py
index 9c6db8d2cd6..b6c500bcd84 100644
--- a/tests/wpt/tests/webdriver/tests/classic/switch_to_parent_frame/switch.py
+++ b/tests/wpt/tests/webdriver/tests/classic/switch_to_parent_frame/switch.py
@@ -1,8 +1,9 @@
 import pytest
 
-from webdriver import NoSuchElementException
+from webdriver import NoSuchElementException, NoSuchWindowException
 
-from tests.support.asserts import assert_error, assert_success
+from tests.support.asserts import assert_error, assert_success, errors
+from tests.support.sync import Poll
 
 
 def switch_to_parent_frame(session):
@@ -46,6 +47,21 @@ def test_no_parent_browsing_context(session, url):
     button = session.find.css("#remove-top", all=False)
     button.click()
 
+    def is_window_closed(s):
+        try:
+            s.find.css("#remove-top", all=False)
+            return False
+        except NoSuchWindowException:
+            return True
+
+    # Wait until iframe is gone.
+    wait = Poll(
+        session,
+        timeout=5,
+        message="Iframe is still present",
+    )
+    wait.until(lambda s: is_window_closed(s))
+
     response = switch_to_parent_frame(session)
     assert_error(response, "no such window")
 
diff --git a/tests/wpt/tests/webdriver/tests/support/fixtures.py b/tests/wpt/tests/webdriver/tests/support/fixtures.py
index 850c654d2a6..d7ca4d0fab7 100644
--- a/tests/wpt/tests/webdriver/tests/support/fixtures.py
+++ b/tests/wpt/tests/webdriver/tests/support/fixtures.py
@@ -108,6 +108,43 @@ async def reset_current_session_if_necessary(caps):
             _current_session = None
 
 
+@pytest.fixture()
+def screen_size(session):
+    """Return the size (width/height) of the screen."""
+    return tuple(session.execute_script("""
+        return [
+            screen.width,
+            screen.height,
+        ];
+        """))
+
+
+@pytest.fixture()
+def available_screen_size(session):
+    """Return the effective available screen size (width/height).
+
+    This is size which excludes any fixed window manager elements like menu
+    bars, and the dock on MacOS.
+    """
+    return tuple(session.execute_script("""
+        return [
+            screen.availWidth,
+            screen.availHeight,
+        ];
+        """))
+
+
+@pytest.fixture()
+def minimal_screen_position(session):
+    """Return the minimal position (x/y) a window can be positioned at."""
+    return tuple(session.execute_script("""
+        return [
+            screen.availLeft,
+            screen.availTop,
+        ];
+        """))
+
+
 @pytest_asyncio.fixture(scope="function")
 async def session(capabilities, configuration):
     """Create and start a session for a test that does not itself test session creation.
diff --git a/tests/wpt/tests/webdriver/tests/support/helpers.py b/tests/wpt/tests/webdriver/tests/support/helpers.py
index c0d0cb11dc4..dbc5abc2475 100644
--- a/tests/wpt/tests/webdriver/tests/support/helpers.py
+++ b/tests/wpt/tests/webdriver/tests/support/helpers.py
@@ -151,10 +151,7 @@ def center_point(element):
 
 
 def document_hidden(session):
-    """Polls for the document to become hidden."""
-    def hidden(session):
-        return session.execute_script("return document.hidden")
-    return Poll(session, timeout=3, raises=None).until(hidden)
+    return session.execute_script("return document.hidden")
 
 
 def document_location(session):
@@ -207,27 +204,24 @@ def is_fullscreen(session):
         """)
 
 
-def screen_size(session):
-    """Returns the available width/height size of the screen."""
-    return tuple(session.execute_script("""
-        return [
-            screen.availWidth,
-            screen.availHeight,
-        ];
-        """))
+def is_maximized(session):
+    dimensions = session.execute_script("""
+        return {
+            availWidth: screen.availWidth,
+            availHeight: screen.availHeight,
+            windowWidth: window.outerWidth,
+            windowHeight: window.outerHeight,
+        }
+        """)
 
-
-def available_screen_size(session):
-    """
-    Returns the effective available screen width/height size,
-    excluding any fixed window manager elements.
-    """
-    return tuple(session.execute_script("""
-        return [
-            screen.availWidth - screen.availLeft,
-            screen.availHeight - screen.availTop,
-        ];
-        """))
+    return (
+        # The maximized window can still have a border attached which would
+        # cause its dimensions to exceed the whole available screen.
+        dimensions["windowWidth"] >= dimensions["availWidth"] and
+        dimensions["windowHeight"] >= dimensions["availHeight"] and
+        # Only return true if the window is not in fullscreen mode
+        not is_fullscreen(session)
+    )
 
 
 def filter_dict(source, d):
diff --git a/tests/wpt/tests/webdriver/tests/support/html/test_actions_scroll.html b/tests/wpt/tests/webdriver/tests/support/html/test_actions_scroll.html
index cc9278954a0..db5952ed74d 100644
--- a/tests/wpt/tests/webdriver/tests/support/html/test_actions_scroll.html
+++ b/tests/wpt/tests/webdriver/tests/support/html/test_actions_scroll.html
@@ -1,103 +1,139 @@
 <!doctype html>
 <meta charset=utf-8>
 <html>
-<head>
+  <head>
     <title>Test Actions</title>
     <style>
-      div { padding: 0; margin: 0; }
-      .area { width: 100px; height: 50px; background-color: #ccc; }
-      #scrollable { width: 100px; height: 100px; overflow: scroll; }
-      #scrollContent { width: 600px; height: 1000px; background-color: blue; }
-      #subframe { width: 100px; height: 100px; }
+      div {
+        padding: 0;
+        margin: 0;
+      }
+
+      #not-scrollable {
+        margin-bottom: 100px;
+        width: 100px;
+        height: 50px;
+      }
+
+      #not-scrollable-content {
+        width: 200px;
+        height: 100px;
+        background-color: #ccc;
+      }
+
+      #scrollable {
+        width: 100px;
+        height: 100px;
+        overflow: scroll;
+      }
+
+      #scrollable-content {
+        width: 600px;
+        height: 1000px;
+        background-color: blue;
+      }
+
+      #iframe {
+        width: 100px;
+        height: 100px;
+      }
+
+      #event-reporter {
+        white-space: pre-line;
+      }
     </style>
+
     <script>
-        "use strict";
-        var els = {};
-        var allEvents = { events: [] };
-        function displayMessage(message) {
-            document.getElementById("events").innerHTML = "<p>" + message + "</p>";
-        }
+      var eventReporter;
+      var allEvents = { events: [] };
 
-        function appendMessage(message) {
-            document.getElementById("events").innerHTML += "<p>" + message + "</p>";
-        }
+      function addMessage(message) {
+        eventReporter.textContent = `${message}\n${eventReporter.textContent}`;
+      }
 
-        function recordWheelEvent(event) {
-          allEvents.events.push({
-            "type": event.type,
-            "button": event.button,
-            "buttons": event.buttons,
-            "deltaX": event.deltaX,
-            "deltaY": event.deltaY,
-            "deltaZ": event.deltaZ,
-            "deltaMode": event.deltaMode,
-            "target": event.target.id
-          });
-          appendMessage(event.type + " " +
-              "button: " + event.button + ", " +
-              "pageX: " + event.pageX + ", " +
-              "pageY: " + event.pageY + ", " +
-              "button: " + event.button + ", " +
-              "buttons: " + event.buttons + ", " +
-              "deltaX: " + event.deltaX + ", " +
-              "deltaY: " + event.deltaY + ", " +
-              "deltaZ: " + event.deltaZ + ", " +
-              "deltaMode: " + event.deltaMode + ", " +
-              "target id: " + event.target.id);
-        }
-
-        function resetEvents() {
-          allEvents.events.length = 0;
-          displayMessage("");
-        }
-
-        document.addEventListener("DOMContentLoaded", function() {
-          var outer = document.getElementById("outer");
-          outer.addEventListener("wheel", recordWheelEvent);
-
-          var scrollable = document.getElementById("scrollable");
-          scrollable.addEventListener("wheel", recordWheelEvent);
+      function recordWheelEvent(event) {
+        allEvents.events.push({
+          "type": event.type,
+          "button": event.button,
+          "buttons": event.buttons,
+          "pageX": event.pageX,
+          "pageY": event.pageY,
+          "deltaX": event.deltaX,
+          "deltaY": event.deltaY,
+          "deltaZ": event.deltaZ,
+          "deltaMode": event.deltaMode,
+          "target": event.target.id,
         });
-    </script>
-</head>
-<body>
-  <div>
-    <h2>ScrollReporter</h2>
-    <div id="outer" class="area">
-    </div>
-  </div>
-  <div>
-    <h2>OverflowScrollReporter</h2>
-    <div id="scrollable">
-      <div id="scrollContent"></div>
-    </div>
-  </div>
-  <div>
-    <h2>IframeScrollReporter</h2>
-    <iframe id='subframe' srcdoc='
-      <script>
-        document.scrollingElement.addEventListener("wheel",
-          function(event) {
-            window.parent.allEvents.events.push({
-            "type": event.type,
-            "button": event.button,
-            "buttons": event.buttons,
-            "deltaX": event.deltaX,
-            "deltaY": event.deltaY,
-            "deltaZ": event.deltaZ,
-            "deltaMode": event.deltaMode,
-            "target": event.target.id
-          });
-          }
+
+        addMessage(
+          "type: " + event.type + " " +
+          "button: " + event.button + ", " +
+          "buttons: " + event.buttons + ", " +
+          "pageX: " + event.pageX + ", " +
+          "pageY: " + event.pageY + ", " +
+          "deltaX: " + event.deltaX + ", " +
+          "deltaY: " + event.deltaY + ", " +
+          "deltaZ: " + event.deltaZ + ", " +
+          "deltaMode: " + event.deltaMode + ", " +
+          "target id: " + event.target.id
         );
-      </script>
-      <div id="iframeContent"
-       style="width: 7500px; height: 7500px; background-color:blue" ></div>'>
-    </iframe>
-  </div>
-  <div id="resultContainer">
-    <h2>Events</h2>
-    <div id="events"></div>
-  </div>
-</body>
+      }
+
+      document.addEventListener("DOMContentLoaded", function () {
+        eventReporter = document.getElementById("event-reporter");
+
+        var noScroll = document.getElementById("not-scrollable");
+        noScroll.addEventListener("wheel", recordWheelEvent);
+
+        var scrollable = document.getElementById("scrollable");
+        scrollable.addEventListener("wheel", recordWheelEvent);
+      });
+    </script>
+  </head>
+
+  <body>
+    <div>
+      <h2>Scroll Reporter</h2>
+      <div id="not-scrollable">
+        <div id="not-scrollable-content"></div>
+      </div>
+    </div>
+
+    <div>
+      <h2>Overflow Scroll Reporter</h2>
+      <div id="scrollable">
+        <div id="scrollable-content"></div>
+      </div>
+    </div>
+
+    <div>
+      <h2>iframe Scroll Reporter</h2>
+      <iframe id="iframe" srcdoc='
+        <script>
+          document.scrollingElement.addEventListener("wheel", event => {
+            window.parent.recordWheelEvent({
+              "type": event.type,
+              "button": event.button,
+              "buttons": event.buttons,
+              "pageX": event.pageX,
+              "pageY": event.pageY,
+              "deltaX": event.deltaX,
+              "deltaY": event.deltaY,
+              "deltaZ": event.deltaZ,
+              "deltaMode": event.deltaMode,
+              "target": event.target
+            });
+          });
+        </script>
+        <div id="iframeContent" style="width: 7500px; height: 7500px; background-color:blue">
+        </div>'>
+      </iframe>
+    </div>
+
+    <div id="resultContainer">
+      <hr />
+      <h2>Events</h2>
+      <div id="event-reporter"></div>
+    </div>
+  </body>
 </html>
diff --git a/tests/wpt/tests/webdriver/tests/support/image.py b/tests/wpt/tests/webdriver/tests/support/image.py
index 9597b05a22f..533b8b20682 100644
--- a/tests/wpt/tests/webdriver/tests/support/image.py
+++ b/tests/wpt/tests/webdriver/tests/support/image.py
@@ -4,16 +4,21 @@ from typing import NamedTuple, Tuple
 from tests.support.asserts import assert_png
 
 
-PPI = 96
 inch_in_cm = 2.54
+inch_in_pixel = 96
+inch_in_point = 72
 
 
 def cm_to_px(cm: float) -> float:
-    return round(cm * PPI / inch_in_cm)
+    return round(cm * inch_in_pixel / inch_in_cm)
 
 
 def px_to_cm(px: float) -> float:
-    return px * inch_in_cm / PPI
+    return px * inch_in_cm / inch_in_pixel
+
+
+def pt_to_cm(pt: float) -> float:
+    return pt * inch_in_cm / inch_in_point
 
 
 def png_dimensions(screenshot) -> Tuple[int, int]:
diff --git a/tests/wpt/tests/webdriver/tests/support/keys.py b/tests/wpt/tests/webdriver/tests/support/keys.py
index c353644dddf..3794a4296f6 100644
--- a/tests/wpt/tests/webdriver/tests/support/keys.py
+++ b/tests/wpt/tests/webdriver/tests/support/keys.py
@@ -441,7 +441,7 @@ ALL_EVENTS = OrderedDict(
         )),
         ("META", OrderedDict(
             [
-                ("code", "OSLeft"),
+                ("code", "MetaLeft"),
                 ("ctrl", False),
                 ("key", "Meta"),
                 ("location", 1),
@@ -749,7 +749,7 @@ ALL_EVENTS = OrderedDict(
         )),
         ("R_META", OrderedDict(
             [
-                ("code", "OSRight"),
+                ("code", "MetaRight"),
                 ("ctrl", False),
                 ("key", "Meta"),
                 ("location", 2),
diff --git a/tests/wpt/tests/webidl/ecmascript-binding/replaceable-setter-throws-if-defineownproperty-fails.html b/tests/wpt/tests/webidl/ecmascript-binding/replaceable-setter-throws-if-defineownproperty-fails.html
new file mode 100644
index 00000000000..872bbff9604
--- /dev/null
+++ b/tests/wpt/tests/webidl/ecmascript-binding/replaceable-setter-throws-if-defineownproperty-fails.html
@@ -0,0 +1,38 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>[Replaceable] setter throws TypeError if [[DefineOwnProperty]] fails</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<link rel="author" title="Alexey Shvayka" href="shvaikalesh@gmail.com">
+<link rel="help" href="https://webidl.spec.whatwg.org/#Replaceable">
+
+<body>
+<script>
+for (const key of ["self", "parent", "origin", "innerWidth"]) {
+    test(() => {
+        Object.defineProperty(window, key, { configurable: false });
+        assert_throws_js(TypeError, () => { window[key] = 1; });
+
+        const desc = Object.getOwnPropertyDescriptor(window, key);
+        assert_false("value" in desc);
+        assert_equals(typeof desc.get, "function");
+        assert_equals(typeof desc.set, "function");
+        assert_true(desc.enumerable);
+        assert_false(desc.configurable);
+    }, `window.${key} setter throws TypeError if called on non-configurable accessor property`);
+}
+
+for (const key of ["screen", "length", "event", "outerHeight"]) {
+    test(() => {
+        const { set } = Object.getOwnPropertyDescriptor(window, key);
+        Object.defineProperty(window, key, { value: 1, writable: false, configurable: false });
+        assert_throws_js(TypeError, () => { set.call(window, 2); });
+
+        const desc = Object.getOwnPropertyDescriptor(window, key);
+        assert_equals(desc.value, 1);
+        assert_false(desc.writable);
+        assert_true(desc.enumerable);
+        assert_false(desc.configurable);
+    }, `window.${key} setter throws TypeError if called on non-configurable non-writable data property`);
+}
+</script>
diff --git a/tests/wpt/tests/webmessaging/META.yml b/tests/wpt/tests/webmessaging/META.yml
index 95d5071171b..cce20869bc0 100644
--- a/tests/wpt/tests/webmessaging/META.yml
+++ b/tests/wpt/tests/webmessaging/META.yml
@@ -1,6 +1,5 @@
 spec: https://html.spec.whatwg.org/multipage/web-messaging.html
 suggested_reviewers:
-  - zqzhang
   - jdm
   - mkruisselbrink
   - annevk
diff --git a/tests/wpt/tests/webrtc-encoded-transform/RTCEncodedAudioFrame-clone.https.html b/tests/wpt/tests/webrtc-encoded-transform/RTCEncodedAudioFrame-clone.https.html
index ec993387720..83cf642d77f 100644
--- a/tests/wpt/tests/webrtc-encoded-transform/RTCEncodedAudioFrame-clone.https.html
+++ b/tests/wpt/tests/webrtc-encoded-transform/RTCEncodedAudioFrame-clone.https.html
@@ -35,8 +35,9 @@ promise_test(async t => {
       const receiverReader = receiverStreams.readable.getReader();
       const result = await receiverReader.read();
       const original = result.value;
-      let clone = original.clone();
+      let clone = structuredClone(original);
       assert_equals(original.timestamp, clone.timestamp);
+      assert_equals(original.getMetadata().absCaptureTime, clone.getMetadata().absCaptureTime);
       assert_array_equals(Array.from(original.data), Array.from(clone.data));
       await writer2.write(clone);
       resolve();
diff --git a/tests/wpt/tests/webrtc-encoded-transform/RTCEncodedAudioFrame-receive-cloned.https.html b/tests/wpt/tests/webrtc-encoded-transform/RTCEncodedAudioFrame-receive-cloned.https.html
new file mode 100644
index 00000000000..66ce0bbcefb
--- /dev/null
+++ b/tests/wpt/tests/webrtc-encoded-transform/RTCEncodedAudioFrame-receive-cloned.https.html
@@ -0,0 +1,52 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>RTCEncodedAudioFrame can be cloned and distributed</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src=/resources/testdriver.js></script>
+<script src=/resources/testdriver-vendor.js></script>
+<script src='../mediacapture-streams/permission-helper.js'></script>
+<script src="../webrtc/RTCPeerConnection-helper.js"></script>
+<script src="../service-workers/service-worker/resources/test-helpers.sub.js"></script>
+
+<script>
+"use strict";
+promise_test(async t => {
+  const caller1 = new RTCPeerConnection();
+  t.add_cleanup(() => caller1.close());
+  const callee1 = new RTCPeerConnection({encodedInsertableStreams:true});
+  t.add_cleanup(() => callee1.close());
+  await setMediaPermission("granted", ["microphone"]);
+  const inputStream = await navigator.mediaDevices.getUserMedia({audio:true});
+  const inputTrack = inputStream.getAudioTracks()[0];
+  t.add_cleanup(() => inputTrack.stop());
+  caller1.addTrack(inputTrack)
+  exchangeIceCandidates(caller1, callee1);
+
+  const caller2 = new RTCPeerConnection({encodedInsertableStreams:true});
+  t.add_cleanup(() => caller2.close());
+  const sender2 = caller2.addTransceiver("audio").sender;
+  const writer2 = sender2.createEncodedStreams().writable.getWriter();
+  sender2.replaceTrack(new MediaStreamTrackGenerator({ kind: 'audio' }));
+
+  const framesReceivedCorrectly = new Promise((resolve, reject) => {
+    callee1.ontrack = async e => {
+      const receiverStreams = e.receiver.createEncodedStreams();
+      const receiverReader = receiverStreams.readable.getReader();
+      const receiverWriter = receiverStreams.writable.getWriter();
+      const result = await receiverReader.read();
+      const originalAudioFrame = result.value;
+      let clonedAudioFrame = structuredClone(originalAudioFrame);
+      assert_equals(originalAudioFrame.timestamp, clonedAudioFrame.timestamp);
+      assert_array_equals(Array.from(originalAudioFrame.data), Array.from(clonedAudioFrame.data));
+      await writer2.write(clonedAudioFrame);
+      await receiverWriter.write(structuredClone(originalAudioFrame));
+      resolve();
+    }
+  });
+
+  await exchangeOfferAnswer(caller1, callee1);
+
+  return framesReceivedCorrectly;
+}, "Cloning before sending works");
+</script>
diff --git a/tests/wpt/tests/webrtc-encoded-transform/RTCEncodedAudioFrame-send-incoming.https.html b/tests/wpt/tests/webrtc-encoded-transform/RTCEncodedAudioFrame-send-incoming.https.html
new file mode 100644
index 00000000000..1e2bbc95bd1
--- /dev/null
+++ b/tests/wpt/tests/webrtc-encoded-transform/RTCEncodedAudioFrame-send-incoming.https.html
@@ -0,0 +1,63 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>RTCEncodedAudioFrame can be cloned and distributed</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src=/resources/testdriver.js></script>
+<script src=/resources/testdriver-vendor.js></script>
+<script src='../mediacapture-streams/permission-helper.js'></script>
+<script src="../webrtc/RTCPeerConnection-helper.js"></script>
+<script src="../service-workers/service-worker/resources/test-helpers.sub.js"></script>
+
+<script>
+"use strict";
+promise_test(async t => {
+  const caller1 = new RTCPeerConnection();
+  t.add_cleanup(() => caller1.close());
+  const callee1 = new RTCPeerConnection({encodedInsertableStreams:true});
+  t.add_cleanup(() => callee1.close());
+  await setMediaPermission("granted", ["microphone"]);
+  const inputStream = await navigator.mediaDevices.getUserMedia({audio:true});
+  const inputTrack = inputStream.getAudioTracks()[0];
+  t.add_cleanup(() => inputTrack.stop());
+  caller1.addTrack(inputTrack)
+  exchangeIceCandidates(caller1, callee1);
+
+  const caller2 = new RTCPeerConnection({encodedInsertableStreams:true});
+  t.add_cleanup(() => caller2.close());
+  const callee2 = new RTCPeerConnection({encodedInsertableStreams:true});
+  t.add_cleanup(() => callee2.close());
+  const sender2 = caller2.addTransceiver("audio").sender;
+  const writer2 = sender2.createEncodedStreams().writable.getWriter();
+  sender2.replaceTrack(new MediaStreamTrackGenerator({ kind: 'audio' }));
+  exchangeIceCandidates(caller2, callee2);
+
+  const IncomingframesSentAndReceivedCorrectly = new Promise((resolve, reject) => {
+    // Write the received incoming frames on callee1 to caller2.
+    callee1.ontrack = async e => {
+      const receiverStreams = e.receiver.createEncodedStreams();
+      const receiverReader = receiverStreams.readable.getReader();
+      const result = await receiverReader.read();
+      const original = result.value;
+      await writer2.write(original);
+      resolve();
+    }
+
+        // callee2 receives frames over the PC from caller2.
+    callee2.ontrack = async e => {
+      const receiverStreams = e.receiver.createEncodedStreams();
+      const receiverReader = receiverStreams.readable.getReader();
+      const receiverWriter = receiverStreams.writable.getWriter();
+      const result = await receiverReader.read();
+      receiverWriter.write(result.value);
+      resolve();
+    }
+
+  });
+
+  await exchangeOfferAnswer(caller1, callee1);
+  await exchangeOfferAnswer(caller2, callee2);
+
+  return IncomingframesSentAndReceivedCorrectly;
+}, "Send endoded incoming frame");
+</script>
diff --git a/tests/wpt/tests/webrtc-encoded-transform/RTCEncodedVideoFrame-clone.https.html b/tests/wpt/tests/webrtc-encoded-transform/RTCEncodedVideoFrame-clone.https.html
index 29330729dcc..0c51df25bbb 100644
--- a/tests/wpt/tests/webrtc-encoded-transform/RTCEncodedVideoFrame-clone.https.html
+++ b/tests/wpt/tests/webrtc-encoded-transform/RTCEncodedVideoFrame-clone.https.html
@@ -54,7 +54,7 @@ promise_test(async t => {
 
   for (let i = 0; i < numFramesToSend; i++) {
     const result = await senderReader.read();
-    senderWriter.write(result.value.clone());
+    senderWriter.write(structuredClone(result.value));
   }
   return framesReceivedCorrectly;
 }, "Cloning before sending works");
diff --git a/tests/wpt/tests/webrtc-encoded-transform/RTCPeerConnection-insertable-streams-audio.https.html b/tests/wpt/tests/webrtc-encoded-transform/RTCPeerConnection-insertable-streams-audio.https.html
index ad5af10bd1e..9bf852763a5 100644
--- a/tests/wpt/tests/webrtc-encoded-transform/RTCPeerConnection-insertable-streams-audio.https.html
+++ b/tests/wpt/tests/webrtc-encoded-transform/RTCPeerConnection-insertable-streams-audio.https.html
@@ -72,6 +72,7 @@ async function testAudioFlow(t, negotiationFunction, perFrameCallback = () => {}
   for (let i = 0; i < numFramesPassthrough; i++) {
     const result = await senderReader.read();
     const frame = result.value;
+    perFrameCallback(frame);
     frameInfos.push({
       data: frame.data,
       timestamp: frame.timestamp,
@@ -79,7 +80,6 @@ async function testAudioFlow(t, negotiationFunction, perFrameCallback = () => {}
       metadata: frame.getMetadata(),
       getMetadata() { return this.metadata; }
     });
-    perFrameCallback(frame);
     senderWriter.write(frame);
   }
 
@@ -93,6 +93,7 @@ async function testAudioFlow(t, negotiationFunction, perFrameCallback = () => {}
     int8View.fill(i);
 
     frame.data = buffer;
+    perFrameCallback(frame);
     frameInfos.push({
       data: frame.data,
       timestamp: frame.timestamp,
@@ -100,7 +101,6 @@ async function testAudioFlow(t, negotiationFunction, perFrameCallback = () => {}
       metadata: frame.getMetadata(),
       getMetadata() { return this.metadata; }
     });
-    perFrameCallback(frame);
     senderWriter.write(frame);
   }
 
@@ -111,6 +111,7 @@ async function testAudioFlow(t, negotiationFunction, perFrameCallback = () => {}
     const int8View = new Int8Array(frame.data);
     int8View.fill(i);
 
+    perFrameCallback(frame);
     frameInfos.push({
       data: frame.data,
       timestamp: frame.timestamp,
@@ -118,7 +119,6 @@ async function testAudioFlow(t, negotiationFunction, perFrameCallback = () => {}
       metadata: frame.getMetadata(),
       getMetadata() { return this.metadata; }
     });
-    perFrameCallback(frame);
     senderWriter.write(frame);
   }
 
@@ -233,6 +233,23 @@ promise_test(async t => {
   });
 }, 'Encoded frames serialize and deserialize into a deep clone');
 
+promise_test(async t => {
+  let clonedFrames = [];
+  function rewriteFrameTimestamps(frame) {
+    // Add 1 to the rtp timestamp of the frame.
+    const metadata = frame.getMetadata();
+    metadata.rtpTimestamp += 1;
+    frame.setMetadata(metadata);
+
+    assert_equals(frame.getMetadata().rtpTimestamp, metadata.rtpTimestamp)
+  };
+
+  // Run audio flows which will assert that the frames received have the
+  // rtp timestamp set by our modification.
+  await testAudioFlow(
+    t, exchangeOfferAnswer, rewriteFrameTimestamps);
+}, 'Modifying rtp timestamp');
+
 </script>
 </body>
 </html>
diff --git a/tests/wpt/tests/webrtc-encoded-transform/codec-specific-metadata.https.html b/tests/wpt/tests/webrtc-encoded-transform/codec-specific-metadata.https.html
deleted file mode 100644
index bef61b39f30..00000000000
--- a/tests/wpt/tests/webrtc-encoded-transform/codec-specific-metadata.https.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src=/resources/testdriver.js></script>
-<script src=/resources/testdriver-vendor.js></script>
-<script src='../mediacapture-streams/permission-helper.js'></script>
-<script src="../webrtc/RTCPeerConnection-helper.js"></script>
-<script src="../service-workers/service-worker/resources/test-helpers.sub.js"></script>
-<script src='./helper.js'></script>
-<script>
-"use strict";
-
-promise_test(async t => {
-  const senderReader = await setupLoopbackWithCodecAndGetReader(t, 'VP8');
-  const result = await senderReader.read();
-  const metadata = result.value.getMetadata();
-  // RTCEncodedVideoFrameAdditionalMetadata-only fields.
-  assert_true(Array.isArray(metadata.decodeTargetIndications),
-              'decodeTargetIndication is an array');
-  assert_equals(typeof metadata.isLastFrameInPicture, 'boolean',
-                'isLastFrameInPicture is a boolean');
-  assert_equals(typeof metadata.simulcastIdx, 'number',
-                'simulcastIdx is a number');
-  assert_equals(metadata.codec, 'vp8');
-  assert_equals(typeof metadata.codecSpecifics, 'object',
-                'codecSpecifics is an object');
-  // VP8-only
-  assert_equals(typeof metadata.codecSpecifics.nonReference, 'boolean',
-                'codecSpecifics.nonReference is a boolean');
-  assert_equals(typeof metadata.codecSpecifics.pictureId, 'number',
-                'codecSpecifics.pictureId is a number');
-  assert_equals(typeof metadata.codecSpecifics.tl0PicIdx, 'number',
-                'codecSpecifics.tl0PicIdx is a number');
-  assert_equals(typeof metadata.codecSpecifics.temporalIdx, 'number',
-                'codecSpecifics.temporalIdx is a number');
-  assert_equals(typeof metadata.codecSpecifics.layerSync, 'boolean',
-                'codecSpecifics.layerSync is a boolean');
-  assert_equals(typeof metadata.codecSpecifics.keyIdx, 'number',
-                'codecSpecifics.keyIdx is a number');
-  assert_equals(typeof metadata.codecSpecifics.partitionId, 'number',
-                'codecSpecifics.partitionId is a number');
-  assert_equals(typeof metadata.codecSpecifics.beginningOfPartition, 'boolean',
-                'codecSpecifics.beginningOfPartition is a boolean');
-}, "[VP8] getMetadata() supports the expected codec specifics");
-</script>
diff --git a/tests/wpt/tests/webrtc-encoded-transform/set-metadata.https.html b/tests/wpt/tests/webrtc-encoded-transform/set-metadata.https.html
index 712971a6261..c4699598cf9 100644
--- a/tests/wpt/tests/webrtc-encoded-transform/set-metadata.https.html
+++ b/tests/wpt/tests/webrtc-encoded-transform/set-metadata.https.html
@@ -16,13 +16,15 @@ promise_test(async t => {
   const metadata = result.value.getMetadata();
   // TODO(https://crbug.com/webrtc/14709): When RTCEncodedVideoFrame has a
   // constructor, create a new frame from scratch instead of cloning it to
-  // ensure that none of the metadata was carried over via clone(). This would
-  // allow us to be confident that setMetadata() is doing all the work.
+  // ensure that none of the metadata was carried over via structuredClone().
+  // This would allow us to be confident that setMetadata() is doing all the
+  // work.
   //
-  // At that point, we can refactor the clone() implementation to be the same as
-  // constructor() + set data + setMetadata() to ensure that clone() cannot do
-  // things that are not already exposed in JavaScript (no secret steps!).
-  const clone = result.value.clone();
+  // At that point, we can refactor the structuredClone() implementation to be
+  // the same as constructor() + set data + setMetadata() to ensure that
+  // structuredClone() cannot do things that are not already exposed in
+  // JavaScript (no secret steps!).
+  const clone = structuredClone(result.value);
   clone.setMetadata(metadata);
   const cloneMetadata = clone.getMetadata();
   // Encoding related metadata.
@@ -35,44 +37,12 @@ promise_test(async t => {
                 'spatialIndex');
   assert_equals(cloneMetadata.temporalIndex, metadata.temporalIndex,
                 'temporalIndex');
-  assert_equals(cloneMetadata.frameType, metadata.frameType,
-                'frameType');
-  // RTCEncodedVideoFrameAdditionalMetadata-only fields.
-  assert_array_equals(cloneMetadata.decodeTargetIndications,
-                      metadata.decodeTargetIndications,
-                      'decodeTargetIndications');
-  assert_equals(cloneMetadata.isLastFrameInPicture,
-                metadata.isLastFrameInPicture, 'isLastFrameInPicture');
-  assert_equals(cloneMetadata.simulcastIdx, metadata.simulcastIdx,
-                'simulcastIdx');
-  assert_equals(cloneMetadata.codec, metadata.codec, 'codec');
-  // VP8-specifics.
-  assert_equals(cloneMetadata.codecSpecifics.nonReference,
-                metadata.codecSpecifics.nonReference,
-                'codecSpecifics.nonReference');
-  assert_equals(cloneMetadata.codecSpecifics.pictureId,
-                metadata.codecSpecifics.pictureId, 'codecSpecifics.pictureId');
-  assert_equals(cloneMetadata.codecSpecifics.tl0PicIdx,
-                metadata.codecSpecifics.tl0PicIdx, 'codecSpecifics.tl0PicIdx');
-  assert_equals(cloneMetadata.codecSpecifics.temporalIdx,
-                metadata.codecSpecifics.temporalIdx,
-                'codecSpecifics.temporalIdx');
-  assert_equals(cloneMetadata.codecSpecifics.layerSync,
-                metadata.codecSpecifics.layerSync, 'codecSpecifics.layerSync');
-  assert_equals(cloneMetadata.codecSpecifics.keyIdx,
-                metadata.codecSpecifics.keyIdx, 'codecSpecifics.keyIdx.');
-  assert_equals(cloneMetadata.codecSpecifics.partitionId,
-                metadata.codecSpecifics.partitionId,
-                'codecSpecifics.partitionId');
-  assert_equals(cloneMetadata.codecSpecifics.beginningOfPartition,
-                metadata.codecSpecifics.beginningOfPartition,
-                'codecSpecifics.beginningOfPartition');
   // RTP related metadata.
   // TODO(https://crbug.com/webrtc/14709): This information also needs to be
-  // settable but isn't - the assertions only pass because clone() copies them
-  // for us. It would be great if different layers didn't consider different
-  // subset of the struct as "the metadata". Can we consolidate into a single
-  // webrtc struct for all metadata?
+  // settable but isn't - the assertions only pass because structuredClone()
+  // copies them for us. It would be great if different layers didn't consider
+  // different subset of the struct as "the metadata". Can we consolidate into a
+  // single webrtc struct for all metadata?
   assert_equals(cloneMetadata.synchronizationSource,
                 metadata.synchronizationSource, 'synchronizationSource');
   assert_array_equals(cloneMetadata.contributingSources,
diff --git a/tests/wpt/tests/webrtc-extensions/RTCRtpParameters-codec.html b/tests/wpt/tests/webrtc-extensions/RTCRtpParameters-codec.html
index 5c81349b152..cce2c1661f7 100644
--- a/tests/wpt/tests/webrtc-extensions/RTCRtpParameters-codec.html
+++ b/tests/wpt/tests/webrtc-extensions/RTCRtpParameters-codec.html
@@ -9,6 +9,20 @@
 <script>
   'use strict';
 
+  function arrayEquals(a, b) {
+    return Array.isArray(a) && Array.isArray(b) &&
+        a.length === b.length &&
+        a.every((val, i) => val === b[i]);
+  }
+
+  async function sleep(timeout) {
+    return new Promise(resolve => {
+      step_timeout(() => {
+        resolve();
+      }, timeout);
+    });
+  }
+
   function findFirstCodec(name) {
     return RTCRtpSender.getCapabilities(name.split('/')[0]).codecs.filter(c => c.mimeType.localeCompare(name, undefined, { sensitivity: 'base' }) === 0)[0];
   }
@@ -34,6 +48,38 @@
     return codecs;
   }
 
+  async function waitForAllLayers(t, sender) {
+    const encodings_count = sender.getParameters().encodings.length;
+    return step_wait_async(t, async () => {
+      const stats = await sender.getStats();
+      return [...stats]
+        .filter(([k, v]) => v.type === 'outbound-rtp').length == encodings_count;
+    }, `Wait for ${encodings_count} layers to start`);
+  }
+
+  function step_wait_async(t, cond, description, timeout=3000, interval=100) {
+    return new Promise(resolve => {
+      var timeout_full = timeout * t.timeout_multiplier;
+      var remaining = Math.ceil(timeout_full / interval);
+
+      var wait_for_inner = t.step_func(async () => {
+          if (await cond()) {
+              resolve();
+          } else {
+              if(remaining === 0) {
+                  assert(false, "step_wait_async", description,
+                          "Timed out waiting on condition");
+              }
+              remaining--;
+              await sleep(interval);
+              wait_for_inner();
+          }
+      });
+
+      wait_for_inner();
+    });
+  }
+
   promise_test(async t => {
     const pc = new RTCPeerConnection();
     t.add_cleanup(() => pc.close());
@@ -152,11 +198,26 @@
       channel: 2,
     };
 
-    assert_throws_dom('OperationError', () => pc.addTransceiver('video', {
+    assert_throws_dom('OperationError', () => pc.addTransceiver('audio', {
       sendEncodings: [{codec: newCodec}],
     }));
   }, `Creating an audio sender with addTransceiver and non-existing codec should throw OperationError`);
 
+  promise_test(async t => {
+    const pc = new RTCPeerConnection();
+    t.add_cleanup(() => pc.close());
+
+    const newCodec = {
+      mimeType: "dummy/newCodec",
+      clockRate: 90000,
+      channel: 2,
+    };
+
+    assert_throws_dom('OperationError', () => pc.addTransceiver('audio', {
+      sendEncodings: [{codec: newCodec}],
+    }));
+  }, `Creating an audio sender with addTransceiver and non-existing codec type should throw OperationError`);
+
   promise_test(async t => {
     const pc = new RTCPeerConnection();
     t.add_cleanup(() => pc.close());
@@ -171,6 +232,20 @@
     }));
   }, `Creating a video sender with addTransceiver and non-existing codec should throw OperationError`);
 
+  promise_test(async t => {
+    const pc = new RTCPeerConnection();
+    t.add_cleanup(() => pc.close());
+
+    const newCodec = {
+      mimeType: "dummy/newCodec",
+      clockRate: 90000,
+    };
+
+    assert_throws_dom('OperationError', () => pc.addTransceiver('video', {
+      sendEncodings: [{codec: newCodec}],
+    }));
+  }, `Creating a video sender with addTransceiver and non-existing codec type should throw OperationError`);
+
   promise_test(async t => {
     const pc = new RTCPeerConnection();
     t.add_cleanup(() => pc.close());
@@ -384,7 +459,12 @@
 
     await sender.setParameters(param);
 
-    codecs = await codecsForSender(sender);
+    await step_wait_async(t, async () => {
+      let old_codecs = codecs;
+      codecs = await codecsForSender(sender);
+      return !arrayEquals(codecs, old_codecs);
+    }, 'Waiting for current codecs to change', 5000, 200);
+
     assert_array_equals(codecs, [opus.mimeType]);
   }, `Stats output-rtp should match the selected codec in non-simulcast usecase on an audio sender`);
 
@@ -416,7 +496,102 @@
 
     await sender.setParameters(param);
 
-    codecs = await codecsForSender(sender);
+    await step_wait_async(t, async () => {
+      let old_codecs = codecs;
+      codecs = await codecsForSender(sender);
+      return !arrayEquals(codecs, old_codecs);
+    }, 'Waiting for current codecs to change', 5000, 200);
+
     assert_array_equals(codecs, [vp8.mimeType]);
   }, `Stats output-rtp should match the selected codec in non-simulcast usecase on a video sender`);
+
+  promise_test(async (t) => {
+    const pc1 = new RTCPeerConnection();
+    const pc2 = new RTCPeerConnection();
+    t.add_cleanup(() => pc1.close());
+    t.add_cleanup(() => pc2.close());
+    const stream = await getNoiseStream({video:true});
+    t.add_cleanup(() => stream.getTracks().forEach(track => track.stop()));
+
+    const vp8 = findFirstCodec('video/VP8');
+    const nonVP8 = codecsNotMatching(vp8.mimeType);
+
+    const transceiver = pc1.addTransceiver(stream.getTracks()[0], {
+      sendEncodings: [{rid: '0'}, {rid: '1'}, {rid: '2'}],
+    });
+    const sender = transceiver.sender;
+
+    transceiver.setCodecPreferences(nonVP8.concat([vp8]));
+
+    exchangeIceCandidates(pc1, pc2);
+    await doOfferToSendSimulcastAndAnswer(pc1, pc2, ['0', '1', '2']);
+
+    await waitForAllLayers(t, sender);
+
+    let codecs = await codecsForSender(sender);
+    assert_not_equals(codecs[0], vp8.mimeType);
+    assert_not_equals(codecs[1], vp8.mimeType);
+    assert_not_equals(codecs[2], vp8.mimeType);
+
+    let param = sender.getParameters();
+    param.encodings[0].codec = vp8;
+    param.encodings[1].codec = vp8;
+    param.encodings[2].codec = vp8;
+
+    await sender.setParameters(param);
+
+    // Waiting for 10s as ramp-up time can be slow in the runners.
+    await step_wait_async(t, async () => {
+      let old_codecs = codecs;
+      codecs = await codecsForSender(sender);
+      return !arrayEquals(codecs, old_codecs);
+    }, 'Waiting for current codecs to change', 10000, 200);
+
+    assert_array_equals(codecs, [vp8.mimeType, vp8.mimeType, vp8.mimeType]);
+  }, `Stats output-rtp should match the selected codec in simulcast usecase on a video sender`);
+
+  promise_test(async (t) => {
+    const pc1 = new RTCPeerConnection();
+    const pc2 = new RTCPeerConnection();
+    t.add_cleanup(() => pc1.close());
+    t.add_cleanup(() => pc2.close());
+    const stream = await getNoiseStream({video:true});
+    t.add_cleanup(() => stream.getTracks().forEach(track => track.stop()));
+
+    const vp8 = findFirstCodec('video/VP8');
+    const nonVP8 = codecsNotMatching(vp8.mimeType);
+
+    const transceiver = pc1.addTransceiver(stream.getTracks()[0], {
+      sendEncodings: [{rid: '0'}, {rid: '1'}, {rid: '2'}],
+    });
+    const sender = transceiver.sender;
+
+    transceiver.setCodecPreferences(nonVP8.concat([vp8]));
+
+    exchangeIceCandidates(pc1, pc2);
+    await doOfferToSendSimulcastAndAnswer(pc1, pc2, ['0', '1', '2']);
+
+    await waitForAllLayers(t, sender);
+
+    let codecs = await codecsForSender(sender);
+    assert_not_equals(codecs[0], vp8.mimeType);
+    assert_not_equals(codecs[1], vp8.mimeType);
+    assert_not_equals(codecs[2], vp8.mimeType);
+
+    let param = sender.getParameters();
+    param.encodings[1].codec = vp8;
+
+    await sender.setParameters(param);
+
+    await step_wait_async(t, async () => {
+      let old_codecs = codecs;
+      codecs = await codecsForSender(sender);
+      return !arrayEquals(codecs, old_codecs);
+    }, 'Waiting for current codecs to change', 5000, 200);
+
+    assert_not_equals(codecs[0], vp8.mimeType);
+    assert_equals(codecs[1], vp8.mimeType);
+    assert_not_equals(codecs[2], vp8.mimeType);
+  }, `Stats output-rtp should match the selected mixed codecs in simulcast usecase on a video sender`);
+
 </script>
diff --git a/tests/wpt/tests/webrtc/RTCDataChannel-binaryType.window.js b/tests/wpt/tests/webrtc/RTCDataChannel-binaryType.window.js
index c63281bd51b..f641f519762 100644
--- a/tests/wpt/tests/webrtc/RTCDataChannel-binaryType.window.js
+++ b/tests/wpt/tests/webrtc/RTCDataChannel-binaryType.window.js
@@ -1,7 +1,15 @@
 'use strict';
 
 const validBinaryTypes = ['blob', 'arraybuffer'];
-const invalidBinaryTypes = ['jellyfish', 'arraybuffer ', '', null, undefined];
+const invalidBinaryTypes = ['jellyfish', 'arraybuffer ', '', null, undefined, 234, 54n];
+
+test((t) => {
+  const pc = new RTCPeerConnection();
+  t.add_cleanup(() => pc.close());
+  const dc = pc.createDataChannel('test-binary-type');
+
+  assert_equals(dc.binaryType, "blob", `dc.binaryType should be 'blob'`);
+}, `Default binaryType value`);
 
 for (const binaryType of validBinaryTypes) {
   test((t) => {
@@ -20,8 +28,8 @@ for (const binaryType of invalidBinaryTypes) {
     t.add_cleanup(() => pc.close());
     const dc = pc.createDataChannel('test-binary-type');
 
-    assert_throws_dom('SyntaxError', () => {
-      dc.binaryType = binaryType;
-    });
-  }, `Setting invalid binaryType '${binaryType}' should throw SyntaxError`);
+    dc.binaryType = "arraybuffer";
+    dc.binaryType = binaryType;
+    assert_equals(dc.binaryType, "arraybuffer");
+  }, `Setting binaryType to '${binaryType}' should be ignored`);
 }
diff --git a/tests/wpt/tests/webrtc/RTCPeerConnection-helper.js b/tests/wpt/tests/webrtc/RTCPeerConnection-helper.js
index eefe10579b4..5d188328e80 100644
--- a/tests/wpt/tests/webrtc/RTCPeerConnection-helper.js
+++ b/tests/wpt/tests/webrtc/RTCPeerConnection-helper.js
@@ -657,6 +657,13 @@ function preferCodec(transceiver, mimeType, sdpFmtpLine) {
   return transceiver.setCodecPreferences(codecs);
 }
 
+function findSendCodecCapability(mimeType, sdpFmtpLine) {
+  return RTCRtpSender.getCapabilities(mimeType.split('/')[0])
+    .codecs
+    .filter(c => c.mimeType.localeCompare(name, undefined, { sensitivity: 'base' }) === 0
+      && (c.sdpFmtpLine === sdpFmtpLine || !sdpFmtpLine))[0];
+}
+
 // Contains a set of values and will yell at you if you try to add a value twice.
 class UniqueSet extends Set {
   constructor(items) {
diff --git a/tests/wpt/tests/webrtc/back-forward-cache-with-closed-webrtc-connection-ccns.https.tentative.window.js b/tests/wpt/tests/webrtc/back-forward-cache-with-closed-webrtc-connection-ccns.https.tentative.window.js
index bc55a257a8e..20a0a655906 100644
--- a/tests/wpt/tests/webrtc/back-forward-cache-with-closed-webrtc-connection-ccns.https.tentative.window.js
+++ b/tests/wpt/tests/webrtc/back-forward-cache-with-closed-webrtc-connection-ccns.https.tentative.window.js
@@ -23,11 +23,8 @@ promise_test(async t => {
   // The page should not be eligible for BFCache because of the usage
   // of WebRTC.
   await assertBFCacheEligibility(rc1, /*shouldRestoreFromBFCache=*/ false);
-  // The `BrowsingInstanceNotSwapped` reason will be added because of the
-  // sticky feature, and it will be reported as "Internal error".
   await assertNotRestoredFromBFCache(rc1, [
     'WebRTCSticky',
-    'MainResourceHasCacheControlNoStore',
-    'Internal error'
+    'MainResourceHasCacheControlNoStore'
   ]);
 });
diff --git a/tests/wpt/tests/webrtc/back-forward-cache-with-open-webrtc-connection-ccns.https.tentative.window.js b/tests/wpt/tests/webrtc/back-forward-cache-with-open-webrtc-connection-ccns.https.tentative.window.js
index 01c6efe5b4a..5c1aad74806 100644
--- a/tests/wpt/tests/webrtc/back-forward-cache-with-open-webrtc-connection-ccns.https.tentative.window.js
+++ b/tests/wpt/tests/webrtc/back-forward-cache-with-open-webrtc-connection-ccns.https.tentative.window.js
@@ -23,12 +23,8 @@ promise_test(async t => {
   // The page should not be eligible for BFCache because of the usage
   // of WebRTC.
   await assertBFCacheEligibility(rc1, /*shouldRestoreFromBFCache=*/ false);
-  // The `BrowsingInstanceNotSwapped` reason will be added because of the
-  // sticky feature, and it will be reported as "Internal error".
   await assertNotRestoredFromBFCache(rc1, [
     'WebRTC',
     'WebRTCSticky',
-    'MainResourceHasCacheControlNoStore',
-    'Internal error'
-  ]);
+    'MainResourceHasCacheControlNoStore']);
 });
diff --git a/tests/wpt/tests/webrtc/protocol/dtls-fingerprint-validation.html b/tests/wpt/tests/webrtc/protocol/dtls-fingerprint-validation.html
index 0ddc8488ae5..9d1739244d0 100644
--- a/tests/wpt/tests/webrtc/protocol/dtls-fingerprint-validation.html
+++ b/tests/wpt/tests/webrtc/protocol/dtls-fingerprint-validation.html
@@ -9,29 +9,55 @@
 <body>
 <script>
 
+function makeZeroFingerprint(algorithm) {
+  const length = algorithm === 'sha-1' ? 160 : parseInt(algorithm.split('-')[1], 10);
+  let zeros = [];
+  for (let i = 0; i < length; i += 8) {
+    zeros.push('00');
+  }
+  return 'a=fingerprint:' + algorithm + ' ' + zeros.join(':');
+}
+
 // Tests that an invalid fingerprint leads to a connectionState 'failed'.
 promise_test(async t => {
   const pc1 = new RTCPeerConnection();
-  const pc2 = new RTCPeerConnection();
   t.add_cleanup(() => pc1.close());
+  const pc2 = new RTCPeerConnection();
   t.add_cleanup(() => pc2.close());
   pc1.createDataChannel('datachannel');
   exchangeIceCandidates(pc1, pc2);
-  const offer = await pc1.createOffer();
-  await pc2.setRemoteDescription(offer);
-  await pc1.setLocalDescription(offer);
+  await pc1.setLocalDescription();
+  await pc2.setRemoteDescription(pc1.localDescription);
   const answer = await pc2.createAnswer();
-  await pc1.setRemoteDescription(new RTCSessionDescription({
+  await pc1.setRemoteDescription({
     type: answer.type,
-    sdp: answer.sdp.replace(/a=fingerprint:sha-256 .*/g,
-      'a=fingerprint:sha-256 00:00:00:00:00:00:00:00:00:00:00:00:00:' +
-      '00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00'),
-  }));
+    sdp: answer.sdp.replace(/a=fingerprint:sha-256 .*/g, makeZeroFingerprint('sha-256')),
+  });
   await pc2.setLocalDescription(answer);
 
   await waitForConnectionStateChange(pc1, ['failed']);
   await waitForConnectionStateChange(pc2, ['failed']);
 }, 'Connection fails if one side provides a wrong DTLS fingerprint');
+
+['sha-1', 'sha-256', 'sha-384', 'sha-512'].forEach(hashFunc => {
+  promise_test(async t => {
+    const pc1 = new RTCPeerConnection();
+    t.add_cleanup(() => pc1.close());
+    const pc2 = new RTCPeerConnection();
+    t.add_cleanup(() => pc2.close());
+    pc1.createDataChannel('datachannel');
+
+    await pc1.setLocalDescription();
+    await pc2.setRemoteDescription(pc1.localDescription);
+    const answer = await pc2.createAnswer();
+    await pc1.setRemoteDescription({
+      type: answer.type,
+      sdp: answer.sdp.replace(/a=fingerprint:sha-256 .*/g, makeZeroFingerprint(hashFunc)),
+    });
+    await pc2.setLocalDescription(answer);
+  }, 'SDP negotiation with a ' + hashFunc + ' fingerprint succeds');
+});
+
 </script>
 </body>
 </html>
diff --git a/tests/wpt/tests/webrtc/protocol/rtp-headerextensions.html b/tests/wpt/tests/webrtc/protocol/rtp-headerextensions.html
index c377a613f6e..d1d8bb62bf8 100644
--- a/tests/wpt/tests/webrtc/protocol/rtp-headerextensions.html
+++ b/tests/wpt/tests/webrtc/protocol/rtp-headerextensions.html
@@ -26,7 +26,7 @@ a=sendonly
 a=mid:audio
 a=rtpmap:111 opus/48000/2
 a=setup:actpass
-` + extmaps.audio.map(ext => SDPUtils.writeExtmap(ext));
+` + extmaps.audio.map(ext => SDPUtils.writeExtmap(ext)).join('');
   }
   if (extmaps.video) {
     sdp += `m=video 9 RTP/SAVPF 112
@@ -36,7 +36,7 @@ a=sendonly
 a=mid:video
 a=rtpmap:112 VP8/90000
 a=setup:actpass
-` + extmaps.video.map(ext => SDPUtils.writeExtmap(ext));
+` + extmaps.video.map(ext => SDPUtils.writeExtmap(ext)).join('');
   }
   return sdp;
 }
@@ -98,4 +98,36 @@ promise_test(async t => {
     assert_true(!!extensions.find(e => e.uri === answer_extension.uri));
   }
 }, 'Negotiates the subset of supported extensions offered');
+
+promise_test(async t => {
+  const pc = new RTCPeerConnection();
+  t.add_cleanup(() => pc.close());
+
+  // Some implementations may refuse 15 as invalid id because of
+  // https://www.rfc-editor.org/rfc/rfc8285#section-4.2
+  // which only applies to one-byte extensions with ids 0-14.
+  const sdp = createOfferSdp({audio: [{
+    id: 15, uri: 'urn:ietf:params:rtp-hdrext:sdes:mid',
+  }]});
+  await pc.setRemoteDescription({type: 'offer', sdp});
+}, 'Supports header extensions with id=15');
+
+promise_test(async t => {
+  const pc = new RTCPeerConnection();
+  t.add_cleanup(() => pc.close());
+
+  const sdp = createOfferSdp({audio: [{
+    id: 16, uri: 'urn:ietf:params:rtp-hdrext:sdes:mid',
+  }, {
+    id: 17, uri: 'urn:ietf:params:rtp-hdrext:ssrc-audio-level',
+  }]});
+  await pc.setRemoteDescription({type: 'offer', sdp});
+  await pc.setLocalDescription();
+  const answer_section = SDPUtils.splitSections(pc.localDescription.sdp)[1];
+  const answer_extensions = SDPUtils.matchPrefix(answer_section, 'a=extmap:')
+    .map(line => SDPUtils.parseExtmap(line));
+  assert_equals(answer_extensions.length, 2);
+  assert_true(!!answer_extensions.find(e => e.uri === 'urn:ietf:params:rtp-hdrext:sdes:mid'));
+  assert_true(!!answer_extensions.find(e => e.uri === 'urn:ietf:params:rtp-hdrext:ssrc-audio-level'));
+}, 'Supports two-byte header extensions');
 </script>
diff --git a/tests/wpt/tests/websockets/META.yml b/tests/wpt/tests/websockets/META.yml
index da999b994f3..77a6bff0bff 100644
--- a/tests/wpt/tests/websockets/META.yml
+++ b/tests/wpt/tests/websockets/META.yml
@@ -3,4 +3,3 @@ suggested_reviewers:
   - jdm
   - ricea
   - yutakahirano
-  - zqzhang
diff --git a/tests/wpt/tests/websockets/back-forward-cache-with-closed-websocket-connection-ccns.tentative.window.js b/tests/wpt/tests/websockets/back-forward-cache-with-closed-websocket-connection-ccns.tentative.window.js
index ccc45f2877d..f6ee5edeaa9 100644
--- a/tests/wpt/tests/websockets/back-forward-cache-with-closed-websocket-connection-ccns.tentative.window.js
+++ b/tests/wpt/tests/websockets/back-forward-cache-with-closed-websocket-connection-ccns.tentative.window.js
@@ -24,11 +24,8 @@ promise_test(async t => {
   // The page should not be eligible for BFCache because of the usage
   // of WebSocket.
   await assertBFCacheEligibility(rc1, /*shouldRestoreFromBFCache=*/ false);
-  // The `BrowsingInstanceNotSwapped` reason will be added because of the
-  // sticky feature, and it will be reported as "Internal error".
   await assertNotRestoredFromBFCache(rc1, [
     'WebSocketSticky',
-    'MainResourceHasCacheControlNoStore',
-    'Internal error'
+    'MainResourceHasCacheControlNoStore'
   ]);
 });
diff --git a/tests/wpt/tests/websockets/back-forward-cache-with-open-websocket-connection-ccns.tentative.window.js b/tests/wpt/tests/websockets/back-forward-cache-with-open-websocket-connection-ccns.tentative.window.js
index 563fd4792ef..f37a04af91a 100644
--- a/tests/wpt/tests/websockets/back-forward-cache-with-open-websocket-connection-ccns.tentative.window.js
+++ b/tests/wpt/tests/websockets/back-forward-cache-with-open-websocket-connection-ccns.tentative.window.js
@@ -24,12 +24,9 @@ promise_test(async t => {
   // The page should not be eligible for BFCache because of the usage
   // of WebSocket.
   await assertBFCacheEligibility(rc1, /*shouldRestoreFromBFCache=*/ false);
-  // The `BrowsingInstanceNotSwapped` reason will be added because of the
-  // sticky feature, and it will be reported as "Internal error".
   await assertNotRestoredFromBFCache(rc1, [
     'WebSocket',
     'WebSocketSticky',
-    'MainResourceHasCacheControlNoStore',
-    'Internal error'
+    'MainResourceHasCacheControlNoStore'
   ]);
 });
diff --git a/tests/wpt/tests/websockets/back-forward-cache-with-open-websocket-connection.window.js b/tests/wpt/tests/websockets/back-forward-cache-with-open-websocket-connection.window.js
index 2baf38f303c..6c48a570101 100644
--- a/tests/wpt/tests/websockets/back-forward-cache-with-open-websocket-connection.window.js
+++ b/tests/wpt/tests/websockets/back-forward-cache-with-open-websocket-connection.window.js
@@ -17,5 +17,5 @@ promise_test(async t => {
   await openWebSocket(rc1);
   // The page should not be eligible for BFCache because of open WebSocket connection.
   await assertBFCacheEligibility(rc1, /*shouldRestoreFromBFCache=*/ false);
-  await assertNotRestoredFromBFCache(rc1, ['WebSocket']);
+  await assertNotRestoredFromBFCache(rc1, ['websocket']);
 });
diff --git a/tests/wpt/tests/webstorage/META.yml b/tests/wpt/tests/webstorage/META.yml
index 020075c3f24..a3853105f8f 100644
--- a/tests/wpt/tests/webstorage/META.yml
+++ b/tests/wpt/tests/webstorage/META.yml
@@ -2,5 +2,4 @@ spec: https://html.spec.whatwg.org/multipage/webstorage.html
 suggested_reviewers:
   - siusin
   - inexorabletash
-  - zqzhang
   - jdm
diff --git a/tests/wpt/tests/webtransport/back-forward-cache-with-closed-webtransport-connection-ccns.https.tentative.window.js b/tests/wpt/tests/webtransport/back-forward-cache-with-closed-webtransport-connection-ccns.https.tentative.window.js
index 7dce2551737..2133dce195f 100644
--- a/tests/wpt/tests/webtransport/back-forward-cache-with-closed-webtransport-connection-ccns.https.tentative.window.js
+++ b/tests/wpt/tests/webtransport/back-forward-cache-with-closed-webtransport-connection-ccns.https.tentative.window.js
@@ -24,11 +24,8 @@ promise_test(async t => {
   // The page should not be eligible for BFCache because of the usage
   // of WebTransport.
   await assertBFCacheEligibility(rc1, /*shouldRestoreFromBFCache=*/ false);
-  // The `BrowsingInstanceNotSwapped` reason will be added because of the
-  // sticky feature, and it will be reported as "Internal error".
   await assertNotRestoredFromBFCache(rc1, [
     'WebTransportSticky',
-    'MainResourceHasCacheControlNoStore',
-    'Internal error'
+    'MainResourceHasCacheControlNoStore'
   ]);
 });
diff --git a/tests/wpt/tests/webtransport/back-forward-cache-with-open-webtransport-connection-ccns.https.tentative.window.js b/tests/wpt/tests/webtransport/back-forward-cache-with-open-webtransport-connection-ccns.https.tentative.window.js
index 077957a39d9..fbee105deb9 100644
--- a/tests/wpt/tests/webtransport/back-forward-cache-with-open-webtransport-connection-ccns.https.tentative.window.js
+++ b/tests/wpt/tests/webtransport/back-forward-cache-with-open-webtransport-connection-ccns.https.tentative.window.js
@@ -24,11 +24,8 @@ promise_test(async t => {
   // The page should not be eligible for BFCache because of the usage
   // of WebTransport.
   await assertBFCacheEligibility(rc1, /*shouldRestoreFromBFCache=*/ false);
-  // The `BrowsingInstanceNotSwapped` reason will be added because of the
-  // sticky feature, and it will be reported as "Internal error".
   await assertNotRestoredFromBFCache(rc1, [
     'WebTransportSticky',
-    'MainResourceHasCacheControlNoStore',
-    'Internal error'
+    'MainResourceHasCacheControlNoStore'
   ]);
 });
diff --git a/tests/wpt/tests/webtransport/handlers/sendorder.py b/tests/wpt/tests/webtransport/handlers/sendorder.py
new file mode 100644
index 00000000000..3677d4033c4
--- /dev/null
+++ b/tests/wpt/tests/webtransport/handlers/sendorder.py
@@ -0,0 +1,52 @@
+from typing import Optional, Tuple
+from urllib.parse import urlsplit, parse_qsl
+
+return_stream_id = 0;
+summary : bytes = [];
+
+def session_established(session):
+    # When a WebTransport session is established, a bidirectional stream is
+    # created by the server, which is used to echo back stream data from the
+    # client.
+    path: Optional[bytes] = None
+    for key, value in session.request_headers:
+        if key == b':path':
+            path = value
+    assert path is not None
+    qs = dict(parse_qsl(urlsplit(path).query))
+    token = qs[b'token']
+    if token is None:
+        raise Exception('token is missing, path = {}'.format(path))
+    session.dict_for_handlers['token'] = token
+    global summary;
+    # need an initial value to replace
+    session.stash.put(key=token, value=summary)
+
+def stream_data_received(session,
+                         stream_id: int,
+                         data: bytes,
+                         stream_ended: bool):
+    # we want to record the order that data arrives, and feed that ordering back to
+    # the sender.  Instead of echoing all the data, we'll send back
+    # just the first byte of each message.   This requires the sender to send buffers
+    # filled with only a single byte value.
+    # The test can then examine the stream of data received by the server to
+    # determine if orderings are correct.
+    # note that the size in bytes received here can vary wildly
+
+    # Send back the data on the control stream
+    global summary
+    summary += data[0:1]
+    token = session.dict_for_handlers['token']
+    old_data = session.stash.take(key=token) or {}
+    session.stash.put(key=token, value=summary)
+
+def stream_reset(session, stream_id: int, error_code: int) -> None:
+    global summary;
+    token = session.dict_for_handlers['token']
+    session.stash.put(key=token, value=summary)
+    summary = []
+
+# do something different to include datagrams...
+def datagram_received(session, data: bytes):
+    session.send_datagram(data)
diff --git a/tests/wpt/tests/webtransport/sendorder.https.any.js b/tests/wpt/tests/webtransport/sendorder.https.any.js
new file mode 100644
index 00000000000..40c6e9b17fc
--- /dev/null
+++ b/tests/wpt/tests/webtransport/sendorder.https.any.js
@@ -0,0 +1,251 @@
+// META: global=window,worker
+// META: script=/common/get-host-info.sub.js
+// META: script=resources/webtransport-test-helpers.sub.js
+// META: script=/common/utils.js
+
+
+promise_test(async t => {
+  // Establish a WebTransport session.
+  const wt = new WebTransport(webtransport_url('echo.py'));
+  await wt.ready;
+
+  // Create a bidirectional stream with sendorder
+  const {readable, writable} = await wt.createBidirectionalStream({sendOrder: 3});
+  assert_equals(writable.sendOrder, 3);
+
+  // Write a message to the writable end, and close it.
+  const writer = writable.getWriter();
+  const encoder = new TextEncoder();
+  writer.write(encoder.encode('Hello World')).catch(() => {});
+  await writer.close();
+
+  // Read the data on the readable end.
+  const reply = await read_stream_as_string(readable);
+
+  // Check that the message from the readable end matches the writable end.
+  assert_equals(reply, 'Hello World');
+}, 'WebTransport client should be able to create and handle a bidirectional stream with sendOrder');
+
+promise_test(async t => {
+  // Establish a WebTransport session.
+  const wt = new WebTransport(webtransport_url('echo.py'));
+  await wt.ready;
+
+  // Create a bidirectional stream with sendorder
+  const {readable, writable} = await wt.createBidirectionalStream();
+  assert_equals(writable.sendOrder, null);
+  // modify it
+  writable.sendOrder = 4;
+  assert_equals(writable.sendOrder, 4);
+}, 'WebTransport client should be able to modify unset sendOrder after stream creation');
+
+promise_test(async t => {
+  // Establish a WebTransport session.
+  const wt = new WebTransport(webtransport_url('echo.py'));
+  await wt.ready;
+
+    // Create a bidirectional stream without sendorder
+  const {readable, writable} = await wt.createBidirectionalStream({sendOrder: 3});
+  assert_equals(writable.sendOrder, 3);
+  // modify it
+  writable.sendOrder = 5;
+  assert_equals(writable.sendOrder, 5);
+  writable.sendOrder = null;
+  assert_equals(writable.sendOrder, null);
+  // Note: this doesn't verify the underlying stack actually changes priority, just the API
+  // for controlling sendOrder
+}, 'WebTransport client should be able to modify existing sendOrder after stream creation');
+
+promise_test(async t => {
+  // Establish a WebTransport session.
+  const id = token();
+  const wt = new WebTransport(webtransport_url(`sendorder.py?token=${id}`));
+  await wt.ready;
+  const bytes_low = new Uint8Array(65536).fill('1');
+  const bytes_unordered = new Uint8Array(65536).fill('0');
+
+  // Create a bidirectional stream without sendOrder
+  const {writable: unordered_writable} = await wt.createBidirectionalStream();
+
+  // Create a bidirectional stream with sendOrder
+  const {writable: low_writable} = await wt.createBidirectionalStream({sendOrder: 1});
+
+  // Write a large block to the lower-priority stream, async
+  const low_writer = low_writable.getWriter();
+  assert_equals(low_writable.sendOrder, 1);
+
+  // Write a large block to the lower-priority stream, async
+  const unordered_writer = unordered_writable.getWriter();
+
+  // enough bytes written to ensure we'll fill the congestion window even
+  // on a local server
+  // this should be enough to require queuing
+  for (let i = 0; i < 30; i++) {
+    low_writer.write(bytes_low).catch(() => {});
+  }
+  for (let i = 0; i < 30; i++) {
+    unordered_writer.write(bytes_unordered).catch(() => {});
+  }
+
+  await Promise.all([low_writer.close(), unordered_writer.close()]);
+
+  // Read the data - first byte for each data reception
+  const reply = await query(id);
+
+  // If unordered data avoids starvation, some of it will come in before the end
+  // of the sendordered data.
+  // first packet normally will be '1', since that would likely
+  // start being sent before unordered data starts queuing, but that's
+  // not required by the spec, just that the unordered stream isn't starved
+  //assert_equals(reply[0], 1);
+  // Scan for the first 0 after we get a 1, then verify that more 1's come in after the first 0
+  let ok = false;
+  for (i = 0; i < reply.length; i++) {
+    if (reply[i] == 1) {
+      // scan for a 0
+      for (; i < reply.length; i++) {
+        if (reply[i] == 0) {
+          for (; i < reply.length; i++) {
+            if (reply[i] == 1) {
+              // some unordered data came in before sendordered data, we're good
+              ok = true;
+              break;
+            }
+          }
+          break;
+        }
+      }
+      break;
+    }
+  }
+  assert_true(ok);
+}, 'WebTransport sendorder should not starve a stream without sendorder');
+
+promise_test(async t => {
+  // Establish a WebTransport session.
+  const id = token();
+  const wt = new WebTransport(webtransport_url(`sendorder.py?token=${id}`));
+  await wt.ready;
+  const bytes_low = new Uint8Array(65536).fill('1');
+  const bytes_unordered = new Uint8Array(65536).fill('0');
+  const bytes_high = new Uint8Array(65536).fill('2');
+
+  // Create a bidirectional stream without sendOrder
+  const {writable: unordered_writable} = await wt.createBidirectionalStream();
+
+  // Create a bidirectional stream with sendOrder
+  const {writable: low_writable} = await wt.createBidirectionalStream({sendOrder: 1});
+
+  // Create a second bidirectional stream with higher sendOrder
+  const {writable: high_writable} = await wt.createBidirectionalStream({sendOrder: 2});
+
+  // Write a large block to the lower-priority stream, async
+  const unordered_writer = unordered_writable.getWriter();
+
+  // Write a large block to the lower-priority stream, async
+  const low_writer = low_writable.getWriter();
+  assert_equals(low_writable.sendOrder, 1);
+  const high_writer = high_writable.getWriter();
+  assert_equals(high_writable.sendOrder, 2);
+
+  // enough bytes written to ensure we'll fill the congestion window even
+  // on a local server
+  // this should be enough to require queuing
+  for (let i = 0; i < 30; i++) {
+    unordered_writer.write(bytes_unordered).catch(() => {});
+  }
+  for (let i = 0; i < 30; i++) {
+    low_writer.write(bytes_low).catch(() => {});
+  }
+  // these should jump the queue and get sent before the low-priority data finishes
+  for (let i = 0; i < 30; i++) {
+    high_writer.write(bytes_high).catch(() => {});
+  }
+
+  await Promise.all([low_writer.close(), unordered_writer.close(), high_writer.close()]);
+
+  // Read the data - first byte for each data reception
+  const reply = await query(id);
+
+  // If high priority data gets prioritized, it won't be last received.  If
+  // it isn't prioritized, it will likely come in after all the
+  // low-priority data.  The first packet normally will be '0' (unordered),
+  // since that would likely start being sent before low_priority data
+  // shows up in the queue (and then they'll round-robin until
+  // high-priority data gets queued). Some low-priority data will likely
+  // start coming in before the high priority data gets queued; after high
+  // priority data is queued it should jump ahead of the low-priority data
+  // (and interleave with unordered).  Some low-priority data may
+  // interleave with high-priority data, since it doesn't get queued all at
+  // once.
+  assert_true(reply[reply.length-1] != 2);
+}, 'WebTransport sendorder should starve a lower priority stream');
+
+promise_test(async t => {
+  // Establish a WebTransport session.
+  const id = token();
+  const wt = new WebTransport(webtransport_url(`sendorder.py?token=${id}`));
+  await wt.ready;
+  const bytes_low = new Uint8Array(65536).fill('1');
+  const bytes_unordered = new Uint8Array(65536).fill('0');
+  const bytes_high = new Uint8Array(65536).fill('2');
+
+  // Create a bidirectional stream without sendOrder
+  const {writable: unordered_writable} = await wt.createBidirectionalStream();
+
+  // Create a bidirectional stream with sendOrder
+  const {writable: low_writable} = await wt.createBidirectionalStream({sendOrder: 1});
+
+  // Create a second bidirectional stream with higher sendOrder
+  const {writable: high_writable} = await wt.createBidirectionalStream({sendOrder: 2});
+
+  // Write a large block to the lower-priority stream, async
+  const unordered_writer = unordered_writable.getWriter();
+
+  // Write a large block to the lower-priority stream, async
+  const low_writer = low_writable.getWriter();
+  assert_equals(low_writable.sendOrder, 1);
+  const high_writer = high_writable.getWriter();
+  assert_equals(high_writable.sendOrder, 2);
+
+  // enough bytes written to ensure we'll fill the congestion window even
+  // on a local server
+  // this should be enough to require queuing
+  for (let i = 0; i < 30; i++) {
+    unordered_writer.write(bytes_unordered).catch(() => {});
+  }
+  // Alternate version where high-priority data should always come in
+  // before low-priority, assuming we've saturated the output queue and can
+  // feed data in faster than it goes through.
+  for (let i = 0; i < 30; i++) {
+    high_writer.write(bytes_high).catch(() => {});
+  }
+  for (let i = 0; i < 30; i++) {
+    low_writer.write(bytes_low).catch(() => {});
+  }
+
+  await Promise.all([low_writer.close(), unordered_writer.close(), high_writer.close()]);
+
+  // Read the data - first byte for each data reception
+  const reply = await query(id);
+
+  // Scan for the last 2, and verify there are no 1's before it
+  let ok = true;
+  for (i = 0; i < reply.length; i++) {
+    if (reply[i] == 1) {
+      // scan for a 2
+      for (; i < reply.length; i++) {
+        if (reply[i] == 2) {
+          // priority 1 data should never jump in front of priority 2
+          ok = false;
+          break;
+        }
+      }
+      break;
+    }
+  }
+  assert_true(ok);
+}, 'WebTransport sendorder should starve a lower priority stream, variant 2');
+
+
+// XXX add tests for unordered vs ordered
diff --git a/tests/wpt/tests/window-management/multi-screen-window-open-fullscreen.tentative.https.html b/tests/wpt/tests/window-management/multi-screen-window-open-fullscreen.tentative.https.html
new file mode 100644
index 00000000000..008c53d4e74
--- /dev/null
+++ b/tests/wpt/tests/window-management/multi-screen-window-open-fullscreen.tentative.https.html
@@ -0,0 +1,51 @@
+<!DOCTYPE html>
+<meta name="timeout" content="long">
+<!-- user agents are not required to support open features other than `noopener`
+     and on some platforms position and size features don't make sense -->
+<meta name="flags" content="may">
+<title>Window Management test: Fullscreen popups with window.open()</title>
+<link rel="help" href="https://w3c.github.io/window-management/">
+Tests the ability to open a fullscreen popup window on each screen.<br>
+The host device must have 2+ screens to test cross-screen fullscreen popups.
+<br><br>
+<button id="closeButton" onclick="closePopups">Close popups</button><br>
+<input id="autoClose" type="checkbox" checked=true>Auto-close popups</input>
+<ul id="list"></ul>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="resources/helpers.js"></script>
+<script>
+  'use strict';
+
+  let popups = [];
+  function closePopups() {
+    popups.forEach(p => p.close());
+    popups = [];
+  }
+
+  promise_test(async setUpTest => {
+    await setUpWindowManagement(setUpTest);
+    for (const [i, s] of window.screenDetails.screens.entries()) {
+      const name = `Open a fullscreen popup on '${s.label || i}'`;
+      await promise_test(async test => {
+        await buttonClick(test, name);
+        const popup = await openPopupOnScreen(s, /*assertPlacement=*/false,
+                            /*fullscreen=*/true);
+        popups.push(popup);
+        await poll(() => {
+          return popup.document.fullscreenElement ==
+            popup.document.documentElement
+        });
+        const context = `popup: ${windowLog(popup)}, ${screenLog(screen)}`;
+        assert_equals(popup.screenLeft, s.availLeft, context)
+        assert_equals(popup.screenRight, s.availRight, context);
+        assert_equals(popup.screen.availHeight, s.availHeight, context);
+        assert_equals(popup.screen.availWidth, s.availWidth, context);
+        if (autoClose.checked)
+          closePopups();
+      }, name);
+    }
+  }, 'Use multi-screen details to open a fullscreen popup window on each screen');
+</script>
diff --git a/tests/wpt/tests/window-management/resources/helpers.js b/tests/wpt/tests/window-management/resources/helpers.js
index 71ebab15c6a..ee77fd8d30d 100644
--- a/tests/wpt/tests/window-management/resources/helpers.js
+++ b/tests/wpt/tests/window-management/resources/helpers.js
@@ -65,10 +65,13 @@ async function poll(condition, interval = 100, duration = 3000) {
 }
 
 // Open and return a popup on `screen`, optionally asserting placement.
-async function openPopupOnScreen(screen, assertPlacement = true) {
+async function openPopupOnScreen(screen, assertPlacement = true, fullscreen = false) {
   const left = screen.availLeft + Math.floor(screen.availWidth / 2) - 150;
   const top = screen.availTop + Math.floor(screen.availHeight / 2) - 50;
-  const features = `left=${left},top=${top},width=300,height=100`;
+  let features = `left=${left},top=${top},width=300,height=100`;
+  if (fullscreen) {
+    features += ",fullscreen";
+  }
   log(`Opening a popup with features '${features}' on ${screenLog(screen)}`);
   // Window.open() synchronously returns a Window with estimated screenLeft|Top,
   // which may be clamped to the opener's screen or incompletely initialized.
diff --git a/tests/wpt/tests/workers/META.yml b/tests/wpt/tests/workers/META.yml
index a7297d38447..b5b28235ce1 100644
--- a/tests/wpt/tests/workers/META.yml
+++ b/tests/wpt/tests/workers/META.yml
@@ -1,6 +1,5 @@
 spec: https://html.spec.whatwg.org/multipage/workers.html
 suggested_reviewers:
-  - zqzhang
   - caitp
   - jdm
   - annevk
diff --git a/tests/wpt/tests/workers/constructors/SharedWorker/same-origin.html b/tests/wpt/tests/workers/constructors/SharedWorker/same-origin.html
index ad464ad50d1..4f1b62a6605 100644
--- a/tests/wpt/tests/workers/constructors/SharedWorker/same-origin.html
+++ b/tests/wpt/tests/workers/constructors/SharedWorker/same-origin.html
@@ -17,7 +17,12 @@ testSharedWorkerHelper = (t, script) => {
 }
 
 test(() => {
-  assert_throws_dom("SecurityError", () => { new SharedWorker('unsupported:', ''); });
+  assert_throws_dom("SyntaxError", () => { new SharedWorker('https://test:test', ''); });
+}, "non-parsable URL");
+
+async_test(t => {
+  // Parses fine as a URL, fails to fetch according to Fetch
+  testSharedWorkerHelper(t, 'unsupported:');
 }, "unsupported_scheme");
 
 async_test(t => {
diff --git a/tests/wpt/tests/workers/constructors/Worker/same-origin.html b/tests/wpt/tests/workers/constructors/Worker/same-origin.html
index 7c86319c14d..56dbfe3b3f3 100644
--- a/tests/wpt/tests/workers/constructors/Worker/same-origin.html
+++ b/tests/wpt/tests/workers/constructors/Worker/same-origin.html
@@ -19,7 +19,12 @@ function testWorkerHelper(t, script) {
 }
 
 test(function() {
-  assert_throws_dom("SecurityError", function() { new Worker('unsupported:'); });
+  assert_throws_dom("SyntaxError", function() { new Worker('https://test:test'); });
+}, "non-parsable URL");
+
+async_test(function(t) {
+  // Parses fine as a URL, fails to fetch according to Fetch
+  testWorkerHelper(t, 'unsupported:');
 }, "unsupported_scheme");
 
 async_test(function() {
diff --git a/tests/wpt/tests/workers/modules/dedicated-worker-import-data-url-cross-origin.html b/tests/wpt/tests/workers/modules/dedicated-worker-import-data-url-cross-origin.html
index 37390947b64..2f790a06a5c 100644
--- a/tests/wpt/tests/workers/modules/dedicated-worker-import-data-url-cross-origin.html
+++ b/tests/wpt/tests/workers/modules/dedicated-worker-import-data-url-cross-origin.html
@@ -12,8 +12,10 @@ const import_from_data_url_worker_test = (importType, isDataURL, expectation) =>
     const dataURL = `data:text/javascript,import "${importURL}";`;
     const worker = new Worker(dataURL, { type: 'module' });
     worker.postMessage('Send message for tests from main script.');
-    const msgEvent =
-        await new Promise(resolve => worker.onmessage = resolve);
+    const msgEvent = await new Promise((resolve, reject) =>{
+        worker.onmessage = resolve;
+        worker.onerror = reject;
+    }).catch(e => assert_true(false));
     assert_array_equals(msgEvent.data,
         expectation === 'blocked' ? ['ERROR']
                                   : ['export-block-cross-origin.js']);
diff --git a/tests/wpt/tests/workers/modules/dedicated-worker-import-data-url.any.js b/tests/wpt/tests/workers/modules/dedicated-worker-import-data-url.any.js
index 0d8510da0c2..b837ad67da6 100644
--- a/tests/wpt/tests/workers/modules/dedicated-worker-import-data-url.any.js
+++ b/tests/wpt/tests/workers/modules/dedicated-worker-import-data-url.any.js
@@ -14,7 +14,10 @@ function import_data_url_test(testCase) {
 
     const worker = new Worker(dataURL, { type: 'module'});
     worker.postMessage('Send message for tests from main script.');
-    const msgEvent = await new Promise(resolve => worker.onmessage = resolve);
+    const msgEvent = await new Promise((resolve, reject) =>{
+        worker.onmessage = resolve;
+        worker.onerror = reject;
+    }).catch(e => assert_true(false));
     assert_array_equals(msgEvent.data, testCase.expectation);
   }, testCase.description);
 }
diff --git a/tests/wpt/tests/workers/modules/resources/dynamic-import-remote-origin-referrer-checker-worker.sub.js b/tests/wpt/tests/workers/modules/resources/dynamic-import-remote-origin-referrer-checker-worker.sub.js
index 3f281faa7c3..014a3467e86 100644
--- a/tests/wpt/tests/workers/modules/resources/dynamic-import-remote-origin-referrer-checker-worker.sub.js
+++ b/tests/wpt/tests/workers/modules/resources/dynamic-import-remote-origin-referrer-checker-worker.sub.js
@@ -1,5 +1,5 @@
 // Import a remote origin script.
-const import_url = 'https://{{domains[www1]}}:{{ports[https][0]}}/workers/modules/resources/export-referrer-checker.py';
+const import_url = 'https://{{hosts[alt][]}}:{{ports[https][0]}}/workers/modules/resources/export-referrer-checker.py';
 if ('DedicatedWorkerGlobalScope' in self &&
     self instanceof DedicatedWorkerGlobalScope) {
   import(import_url)
diff --git a/tests/wpt/tests/workers/modules/resources/static-import-remote-origin-referrer-checker-worker.sub.js b/tests/wpt/tests/workers/modules/resources/static-import-remote-origin-referrer-checker-worker.sub.js
index 45fc5493c92..c1f8340f36d 100644
--- a/tests/wpt/tests/workers/modules/resources/static-import-remote-origin-referrer-checker-worker.sub.js
+++ b/tests/wpt/tests/workers/modules/resources/static-import-remote-origin-referrer-checker-worker.sub.js
@@ -1,5 +1,5 @@
 // Import a remote origin script.
-import * as module from 'https://{{domains[www1]}}:{{ports[https][0]}}/workers/modules/resources/export-referrer-checker.py';
+import * as module from 'https://{{hosts[alt][]}}:{{ports[https][0]}}/workers/modules/resources/export-referrer-checker.py';
 if ('DedicatedWorkerGlobalScope' in self &&
     self instanceof DedicatedWorkerGlobalScope) {
   postMessage(module.referrer);
diff --git a/tests/wpt/tests/workers/modules/shared-worker-import-data-url-cross-origin.html b/tests/wpt/tests/workers/modules/shared-worker-import-data-url-cross-origin.html
index 3f22c5094d1..06724a2b9ea 100644
--- a/tests/wpt/tests/workers/modules/shared-worker-import-data-url-cross-origin.html
+++ b/tests/wpt/tests/workers/modules/shared-worker-import-data-url-cross-origin.html
@@ -12,8 +12,11 @@ const import_from_data_url_worker_test = (importType, isDataURL, expectation) =>
     const dataURL = `data:text/javascript,import "${importURL}";`;
     const worker = new SharedWorker(dataURL, { type: 'module' });
     worker.port.postMessage('Send message for tests from main script.');
-    const msgEvent =
-        await new Promise(resolve => worker.port.onmessage = resolve);
+    const msgEvent = await new Promise((resolve, reject) =>{
+        worker.port.onmessage = resolve;
+        worker.onerror = reject;
+    }).catch(e => assert_true(false));
+
     assert_array_equals(msgEvent.data,
         expectation === 'blocked' ? ['ERROR']
                                   : ['export-block-cross-origin.js']);
diff --git a/tests/wpt/tests/workers/modules/shared-worker-import-data-url.window.js b/tests/wpt/tests/workers/modules/shared-worker-import-data-url.window.js
index 6d54c0e2320..5c77f6d9366 100644
--- a/tests/wpt/tests/workers/modules/shared-worker-import-data-url.window.js
+++ b/tests/wpt/tests/workers/modules/shared-worker-import-data-url.window.js
@@ -14,8 +14,10 @@ function import_data_url_test(testCase) {
 
     const worker = new SharedWorker(dataURL, { type: 'module'});
     worker.port.postMessage('Send message for tests from main script.');
-    const msgEvent =
-        await new Promise(resolve => worker.port.onmessage = resolve);
+    const msgEvent = await new Promise((resolve, reject) =>{
+        worker.port.onmessage = resolve;
+        worker.onerror = reject;
+    }).catch(e => assert_true(false));
     assert_array_equals(msgEvent.data, testCase.expectation);
   }, testCase.description);
 }
diff --git a/tests/wpt/tests/workers/semantics/interface-objects/001.worker.js b/tests/wpt/tests/workers/semantics/interface-objects/001.worker.js
index 80fc597380a..873e8701bb6 100644
--- a/tests/wpt/tests/workers/semantics/interface-objects/001.worker.js
+++ b/tests/wpt/tests/workers/semantics/interface-objects/001.worker.js
@@ -4,7 +4,6 @@ var expected = [
   "WorkerGlobalScope",
   "DedicatedWorkerGlobalScope",
   "Worker",
-  "SharedWorker",
   "MessagePort",
   "MessageEvent",
   "WorkerNavigator",
@@ -14,7 +13,6 @@ var expected = [
   "ImageBitmap",
   "CanvasGradient",
   "CanvasPattern",
-  "CanvasPath",
   "TextMetrics",
   "Path2D",
   "PromiseRejectionEvent",
diff --git a/tests/wpt/tests/workers/semantics/interface-objects/002.worker.js b/tests/wpt/tests/workers/semantics/interface-objects/002.worker.js
index d4f48354eda..9c8dc6746e0 100644
--- a/tests/wpt/tests/workers/semantics/interface-objects/002.worker.js
+++ b/tests/wpt/tests/workers/semantics/interface-objects/002.worker.js
@@ -1,6 +1,8 @@
 importScripts("/resources/testharness.js");
 var unexpected = [
   // https://html.spec.whatwg.org/
+  "SharedWorker",
+  "CanvasPath",
   "SharedWorkerGlobalScope",
   "AbstractView",
   "AbstractWorker",
diff --git a/tests/wpt/tests/workers/semantics/interface-objects/003.any.js b/tests/wpt/tests/workers/semantics/interface-objects/003.any.js
index 4d595bccce6..974756c5080 100644
--- a/tests/wpt/tests/workers/semantics/interface-objects/003.any.js
+++ b/tests/wpt/tests/workers/semantics/interface-objects/003.any.js
@@ -2,11 +2,9 @@
 
 var expected = [
   // https://html.spec.whatwg.org/
-  "ApplicationCache",
   "WorkerGlobalScope",
   "SharedWorkerGlobalScope",
   "Worker",
-  "SharedWorker",
   "MessagePort",
   "MessageEvent",
   "WorkerNavigator",
@@ -16,7 +14,6 @@ var expected = [
   "ImageBitmap",
   "CanvasGradient",
   "CanvasPattern",
-  "CanvasPath",
   "Path2D",
   "PromiseRejectionEvent",
   "EventSource",
diff --git a/tests/wpt/tests/workers/semantics/interface-objects/004.any.js b/tests/wpt/tests/workers/semantics/interface-objects/004.any.js
index 822379e2c90..1b0b93b5df0 100644
--- a/tests/wpt/tests/workers/semantics/interface-objects/004.any.js
+++ b/tests/wpt/tests/workers/semantics/interface-objects/004.any.js
@@ -2,6 +2,9 @@
 
 var unexpected = [
   // https://html.spec.whatwg.org/
+  "ApplicationCache",
+  "SharedWorker",
+  "CanvasPath",
   "DedicatedWorkerGlobalScope",
   "AbstractView",
   "AbstractWorker",
diff --git a/tests/wpt/tests/xhr/send-redirect.htm b/tests/wpt/tests/xhr/send-redirect.htm
index 16b3231e25b..7d73f0f64cc 100644
--- a/tests/wpt/tests/xhr/send-redirect.htm
+++ b/tests/wpt/tests/xhr/send-redirect.htm
@@ -9,28 +9,37 @@
   <body>
     <div id="log"></div>
     <script>
+      // https://fetch.spec.whatwg.org/#statuses
+      var redirect_codes = new Set([301, 302, 303, 307, 308]);
       function redirect(code) {
-        var test = async_test(document.title + " (" + code + ")")
+        var test = async_test(`${document.title} (${code} does ${redirect_codes.has(code)? "redirect": "not redirect"})`);
         test.step(function() {
-          var client = new XMLHttpRequest()
+          var client = new XMLHttpRequest();
           client.onreadystatechange = function() {
             test.step(function() {
               if(client.readyState == 4) {
-                assert_equals(client.getResponseHeader("x-request-method"), "GET")
-                assert_equals(client.getResponseHeader("x-request-content-type"), "application/x-pony")
-                test.done()
+                if (redirect_codes.has(code)) {
+                  assert_equals(client.getResponseHeader("x-request-method"), "GET");
+                  assert_equals(client.getResponseHeader("x-request-content-type"), "application/x-pony");
+                  assert_equals(client.status, 200);
+                } else {
+                  assert_equals(client.getResponseHeader("x-request-method"), null);
+                  assert_equals(client.getResponseHeader("x-request-content-type"), null);
+                  assert_equals(client.status, code);
+                }
+                test.done();
               }
             })
           }
-          client.open("GET", "resources/redirect.py?location=content.py&code=" + code)
-          client.setRequestHeader("Content-Type", "application/x-pony")
-          client.send(null)
+          client.open("GET", "resources/redirect.py?location=content.py&code=" + code);
+          client.setRequestHeader("Content-Type", "application/x-pony");
+          client.send(null);
         })
       }
-      redirect("301")
-      redirect("302")
-      redirect("303")
-      redirect("307")
+
+      for (var number of [300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 350, 399]) {
+        redirect(number);
+      }
     </script>
   </body>
 </html>
diff --git a/tests/wpt/webgl/meta-legacy-layout/conformance2/state/gl-object-get-calls.html.ini b/tests/wpt/webgl/meta-legacy-layout/conformance2/state/gl-object-get-calls.html.ini
index 422fc61d6e5..6e0dee35b92 100644
--- a/tests/wpt/webgl/meta-legacy-layout/conformance2/state/gl-object-get-calls.html.ini
+++ b/tests/wpt/webgl/meta-legacy-layout/conformance2/state/gl-object-get-calls.html.ini
@@ -2,6 +2,7 @@
   bug: https://github.com/servo/servo/issues/26128
   expected:
     if os == "mac": CRASH
+    TIMEOUT
   [WebGL test #201: gl.getTexParameter(gl.TEXTURE_2D, gl.TEXTURE_WRAP_R) should be 33071 (of type number). Was null (of type object).]
     expected: FAIL
 
@@ -119,3 +120,5 @@
   [WebGL test #202: gl.getTexParameter(gl.TEXTURE_2D, gl.TEXTURE_IMMUTABLE_FORMAT) should be false (of type boolean). Was 0 (of type number).]
     expected: FAIL
 
+  [Overall test]
+    expected: NOTRUN
diff --git a/tests/wpt/webgl/meta/conformance/reading/read-pixels-test.html.ini b/tests/wpt/webgl/meta/conformance/reading/read-pixels-test.html.ini
index 77eb67d4ae6..05acbdae111 100644
--- a/tests/wpt/webgl/meta/conformance/reading/read-pixels-test.html.ini
+++ b/tests/wpt/webgl/meta/conformance/reading/read-pixels-test.html.ini
@@ -60,3 +60,6 @@
 
   [WebGL test #39: getError expected: INVALID_ENUM. Was INVALID_OPERATION : Should not be able to read as UNSIGNED_SHORT]
     expected: FAIL
+
+  [Overall test]
+    expected: NOTRUN